RentalOrders(update)

src/main/java/com/mmc/oms/controller/RentalOrdersController.java

@@ -82,7 +82,7 @@ public class RentalOrdersController extends BaseController {
     @ApiOperation(value = "小程序————订单分页列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = OrderInfoDTO.class)})
     @PostMapping("listPageWechatOrder")
-    public ResultBody listPageWechatOrder(
+    public ResultBody<OrderInfoDTO> listPageWechatOrder(
             HttpServletRequest request, @RequestBody OrderInfoQO param) {
         return ResultBody.success(rentalOrdersService.listPageWechatOrder(this.getCurrentAccount(request), param));
     }

src/main/resources/mapper/RentalOrdersDao.xml

@@ -138,6 +138,7 @@
         SELECT o.id,
                o.order_no,
                o.ware_img,
+               o.ware_no,
                o.ware_title,
                o.sku_title,
                o.unit_price,
@@ -164,10 +165,13 @@
                o.buyer_phone,
                o.uid,
                o.nick_name,
+               o.rent_price,
+               o.send_ware_time,
                tsd.doing,
                tsd.`status`,
                tsd.waiting,
-               tsd.lease_order_status
+               tsd.lease_order_status,
+               o.pay_no
         FROM order_info o
                  LEFT JOIN tran_status_dic tsd ON tsd.`status` = o.tran_status
         WHERE o.order_no = #{orderNo}
@@ -430,7 +434,8 @@
 
     <select id="listPageOrderInfo" resultMap="orderInfoResultMap" parameterType="com.mmc.oms.model.qo.OrderInfoQO">
         select o.id,o.order_no,o.ware_title,o.ware_img,o.sku_title,o.tran_status,
-        o.ware_num,o.should_pay,o.actual_pay,
+        o.ware_num,o.should_pay,o.actual_pay,o.start_date,o.end_date,o.pay_day,
+        o.pay_time,o.buyer_name, o.buyer_phone,o.pay_no,o.send_ware_time,
         rp.order_info_id,rp.receipt_method,rp.take_name,
         rp.take_phone,rp.region,rp.detail_address,rp.repo_name,rp.repo_address,
         rp.book_phone,rp.send_ex_code,rp.send_ex_no,rp.send_address,rp.ren_method,