feats

src/main/java/com/yunzhi/nanyang/controller/TaOrderController.java

@@ -59,6 +59,9 @@ public class TaOrderController extends BaseController {
     @Autowired
     public ITaDispatchService iTaDispatchService;
 
+    @Autowired
+    public ITaWorkJobService iTaWorkJobService;
+
     @Autowired
     public ITaWorkMessageService iTaWorkMessageService;
 
@@ -205,7 +208,15 @@ public class TaOrderController extends BaseController {
             return ResponseBean.error("订单已支付");
         }
 
+        if (taOrder.getWorkStatus() != Constants.WORK_READY) {
+            return ResponseBean.error("订单已分配");
+        }
+
         if(iTaOrderService.removeLogicById(id)){
+            // 取消分配
+            iTaDispatchService.removeByOrder(id);
+            iTaWorkJobService.removeByOrder(id);
+
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/yunzhi/nanyang/service/ITaDispatchService.java

@@ -20,4 +20,6 @@ public interface ITaDispatchService extends IBaseService<TaDispatch> {
     IPage<TaOrder> getPageBy(IPage<TaOrder> pg, String orgId, String typeId, String machineryId, LocalDateTime start, LocalDateTime end, String phone, String status, Boolean isWarn);
 
     TaWorkJob createNew(TaDispatch taDispatch, TaOrder taOrder) throws Exception;
+
+    boolean removeByOrder(String orderId) throws Exception;
 }

src/main/java/com/yunzhi/nanyang/service/ITaWorkJobService.java

@@ -24,4 +24,6 @@ public interface ITaWorkJobService extends IBaseService<TaWorkJob> {
     TaWorkJob getDetailBy(String id);
 
     IPage<TaWorkJob> getAdminPageBy(IPage<TaWorkJob> pg, String orgId, LocalDateTime startDate, LocalDateTime endDate, Integer status, String orderNo, String machineryTypeId, String machineryId, String workerName);
+
+    boolean removeByOrder(String orderId);
 }

src/main/java/com/yunzhi/nanyang/service/impl/TaDispatchServiceImpl.java

@@ -1,5 +1,6 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.common.Constants;
 import com.yunzhi.nanyang.entity.TaDispatch;
@@ -86,4 +87,13 @@ public class TaDispatchServiceImpl extends BaseServiceImpl<TaDispatchMapper, TaD
 
         return taWorkJob;
     }
+
+    @Override
+    public boolean removeByOrder(String orderId) throws Exception {
+        UpdateWrapper<TaDispatch> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("order_id", orderId);
+        updateWrapper.set("status", Constants.STATUS_DELETE);
+
+        return update(updateWrapper);
+    }
 }

src/main/java/com/yunzhi/nanyang/service/impl/TaWorkJobServiceImpl.java

@@ -1,5 +1,6 @@
 package com.yunzhi.nanyang.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.nanyang.common.Constants;
 import com.yunzhi.nanyang.entity.TaDispatch;
@@ -67,4 +68,13 @@ public class TaWorkJobServiceImpl extends BaseServiceImpl<TaWorkJobMapper, TaWor
                                            String workerName) {
         return baseMapper.getAdminPageBy(pg, orgId, startDate, endDate, status, orderNo, machineryTypeId, machineryId, workerName);
     }
+
+    @Override
+    public boolean removeByOrder(String orderId) {
+        UpdateWrapper<TaWorkJob> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("order_id", orderId);
+        updateWrapper.set("status", Constants.STATUS_DELETE);
+
+        return update(updateWrapper);
+    }
 }