RentalOrder(update)

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

 package com.mmc.oms.controller;
 
 import com.mmc.oms.common.publicinterface.Send;
-import com.mmc.oms.common.publicinterface.Take;
 import com.mmc.oms.common.result.ResultBody;
 import com.mmc.oms.model.dto.order.OrderInfoDTO;
 import com.mmc.oms.model.dto.transtatus.TranStatusDicDTO;
@@ -101,7 +100,7 @@ public class RentalOrdersController extends BaseController {
     @ApiOperation(value = "web/小程序 确认收货-订单")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("renterTakeOrder")
-    public ResultBody renterTakeOrder(@Validated({Take.class}) @RequestBody OrderVcuVO param) {
+    public ResultBody renterTakeOrder(@RequestBody OrderVcuVO param) {
         return rentalOrdersService.renterTakeOrder(param);
     }
 

src/main/java/com/mmc/oms/service/Impl/RentalOrdersServiceImpl.java

@@ -312,6 +312,7 @@ public class RentalOrdersServiceImpl implements RentalOrdersService {
             return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count);
         }
         Integer pageNo = param.getPageNo();
+        param.setRepoAccountId(cuser.getUserAccountId());
         param.buildCurrentPage();
         List<OrderInfoDTO> data =
                 rentalOrdersDao.listPcOrderInfo(param).stream()
@@ -409,6 +410,9 @@ public class RentalOrdersServiceImpl implements RentalOrdersService {
     @Override
     public ResultBody renterTakeOrder(OrderVcuVO param) {
         OrderInfoDO order = rentalOrdersDao.getOrderInfo(param.getOrderInfoId());
+        if (null == order) {
+            return ResultBody.error(ResultEnum.ORDER_NO_EXIT_ERROR);
+        }
         if (!TranStatusDic.YFH.getStatus().equals(order.getTranStatus())) {
             return ResultBody.error(ResultEnum.ORDER_STATUS_ERROR);
         }

src/main/resources/mapper/RentalOrdersDao.xml

@@ -271,7 +271,7 @@
     <select id="listPcOrderInfo" resultMap="orderInfoResultMap" parameterType="com.mmc.oms.model.qo.OrderInfoQO">
         select o.id,o.order_no,o.ware_title,o.sku_title,o.ware_img,o.deposit,
         o.unit_price,o.ware_num,o.buyer_name,o.buyer_phone,o.uid,o.remark,
-        o.tran_status,o.should_pay,o.actual_pay,o.pf_remark,o.create_time,o.ware_no,o.nick_name,
+        o.tran_status,o.should_pay,o.actual_pay,o.pf_remark,o.create_time,o.ware_no,o.nick_name,o.repo_account_id
         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,
@@ -283,7 +283,7 @@
         from order_info o
         inner join order_receipt rp on rp.order_info_id=o.id
         LEFT JOIN tran_status_dic ts on ts.`status` =o.tran_status
-        <where>1=1
+        <where>o.repo_account_id=#{repoAccountId}
             <if test=" buyerAccount != null and buyerAccount != '' ">
                 and (
                 o.uid like CONCAT('%',#{buyerAccount},'%')