feat: 修改askTransport接口和update接口

guzijian
1 parent b9ab82ad
Showing 3 changed files with 23 additions and 17 deletions
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailTransportVo.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderMapper.xml
@@ -11,6 +11,7 @@ public class OrderDetailTransportVo {
     private String garOrderId;
     private String garRealCarCount;
     private List<String> currentImages;
+    private Integer garOrderDisposalStatus;
     /**
      * 承接经营单位
      */
@@ -245,4 +246,11 @@ public class OrderDetailTransportVo {
         this.garOrderCompanyTel = garOrderCompanyTel;
     }
+    public Integer getGarOrderDisposalStatus() {
+        return garOrderDisposalStatus;
+    }
+
+    public void setGarOrderDisposalStatus(Integer garOrderDisposalStatus) {
+        this.garOrderDisposalStatus = garOrderDisposalStatus;
+    }
 }
@@ -297,13 +297,22 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             // TODO 处理场所负责人
             return handlerDisposalSiteOrderStatus(dto, user);
         }
-
         throw new BizException(ResultCode.CODE_500);
     }
     private String handlerDisposalSiteOrderStatus(OrderUpdateDto dto, GarUser user) {
-        throw new BizException(ResultCode.CODE_500);
+        // 完成订单
+        GarOrder order = getById(dto.getGarOrderId());
+        // TODO 发送短信  通知企业和用户 修改订单状态为完成 disposal 和 handler表的状态一起修改
+        String message = "您的清运订单已完成，可前往小程序进行评价，感谢您的使用";
+        smsUtils.sendMessage(order.getGarOrderContactTel(), message);
+        smsUtils.sendMessage(order.getGarOrderCompanyTel(), "您的清运订单已完成，详情可在小程序查看。");
+        successOrder(order);
+        redisCache.deleteObject(order.getGarOrderId());
+        // TODO 用户消息通知 订单菜单消息
+        userOrderMessageSend(order, message);
+        return "当前订单已完成";
     }
     private boolean checkCode(String code, String orderId, String userId) {
@@ -799,7 +808,6 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     public String askTransport(AskTransportDto dto) {
         // TODO 判断是否运载完毕  已经到预估趟次则不在生成验证码
         String orderId = dto.getGarOrderId();
-
         // 查询当前运载几趟  如果全部运输完毕则发送成功短信
         LambdaQueryWrapper<GarOrderMatchAsk> qw = new LambdaQueryWrapper<>();
         qw.eq(GarOrderMatchAsk::getGarOrderId, dto.getGarOrderId());
@@ -825,36 +833,25 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 imageList.add(image);
             }
             garOrderImageService.saveBatch(imageList);
-            if (transportCount == (order.getGarRealCarCount() - 1)) {
-                // TODO 发送短信  通知企业和用户 修改订单状态为完成 disposal 和 handler表的状态一起修改
-                String message = "您的清运订单已完成，可前往小程序进行评价，感谢您的使用";
-                smsUtils.sendMessage(order.getGarOrderContactTel(), message);
-                smsUtils.sendMessage(order.getGarOrderCompanyTel(), "您的清运订单已完成，详情可在小程序查看。");
-                successOrder(order, dto);
-                redisCache.deleteObject(orderId);
-                // TODO 用户消息通知 订单菜单消息
-                userOrderMessageSend(order, message);
-                return "当前订单已完成";
-            }
             return "当前趟次记录成功";
         }
         throw new BizException(ResultCode.CODE_400, "当前记录无效,已完成所有趟次！");
     }
-    private void successOrder(GarOrder order, AskTransportDto dto) {
+    private void successOrder(GarOrder order) {
         order.setGarOrderHandlerStatus(GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue());
         order.setGarHandlerEvaluateFlag(GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue());
         order.setGarEvaluateFlag(GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue());
         updateById(order);
         // 更新disposal
         LambdaUpdateWrapper<GarOrderMatchDisposal> uwd = new LambdaUpdateWrapper<>();
-        uwd.eq(GarOrderMatchDisposal::getGarOrderId, dto.getGarOrderId())
+        uwd.eq(GarOrderMatchDisposal::getGarOrderId, order.getGarOrderId())
                 .set(GarOrderMatchDisposal::getGarOrderDisposalStatus, GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue());
         disposalService.update(uwd);
         // 更新handler
         LambdaUpdateWrapper<GarOrderMatchHandler> uwh = new LambdaUpdateWrapper<>();
-        uwh.eq(GarOrderMatchHandler::getGarOrderId, dto.getGarOrderId())
+        uwh.eq(GarOrderMatchHandler::getGarOrderId, order.getGarOrderId())
                 .set(GarOrderMatchHandler::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue());
         handlerService.update(uwh);
     }
@@ -41,6 +41,7 @@
         <result property="garOrderContactTel" column="gar_order_contact_tel" jdbcType="VARCHAR"/>
         <result property="garOrderCompanyId" column="gar_order_company_id" jdbcType="VARCHAR"/>
         <result property="garOrderCompanyName" column="gar_order_company_name" jdbcType="VARCHAR"/>
+        <result property="garOrderDisposalStatus" column="gar_order_disposal_status" jdbcType="INTEGER"/>
         <result property="garOrderCompanyTel" column="gar_order_company_tel" jdbcType="VARCHAR"/>
         <result property="garRemark" column="gar_remark" jdbcType="VARCHAR"/>
         <result property="garLatitude" column="gar_latitude" jdbcType="DOUBLE"/>