需求

mall-server-api/src/main/java/com/gree/mall/manager/bean/apply/WorkerInvolveApplyBean.java

@@ -0,0 +1,15 @@
+package com.gree.mall.manager.bean.apply;
+
+import com.gree.mall.manager.plus.entity.WorkerInvolveApply;
+import com.gree.mall.manager.plus.entity.WorkerInvolveApplyItem;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class WorkerInvolveApplyBean extends WorkerInvolveApply {
+
+    @ApiModelProperty(value = "网点审批信息")
+    private WorkerInvolveApplyItem workerInvolveApplyItem;
+}

mall-server-api/src/main/java/com/gree/mall/manager/controller/apply/WorkerInvolveController.java

@@ -5,6 +5,7 @@ package com.gree.mall.manager.controller.apply;
 import cn.hutool.core.lang.TypeReference;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gree.mall.manager.annotation.ZfireList;
+import com.gree.mall.manager.bean.apply.WorkerInvolveApplyBean;
 import com.gree.mall.manager.bean.apply.WorkerInvolveApplyDetail;
 import com.gree.mall.manager.bean.apply.WorkerInvolveApplyVO;
 import com.gree.mall.manager.helper.ResponseHelper;
@@ -76,10 +77,10 @@ public class WorkerInvolveController {
     @PostMapping("/websitAppeal")
     @ApiOperation("网点审批")
     public ResponseHelper websitAppeal(
-            @RequestBody WorkerInvolveApplyItem workerInvolveApplyItem,
+            @RequestBody WorkerInvolveApplyBean workerInvolveApplyBean,
             HttpServletRequest request
     ) throws ParseException {
-        workerInvolveLogic.websitAppeal(workerInvolveApplyItem);
+        workerInvolveLogic.websitAppeal(workerInvolveApplyBean);
         return ResponseHelper.success();
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/OrderBaseController.java

@@ -154,6 +154,23 @@ public class OrderBaseController {
         return ResponseHelper.success();
     }
 
+    @ApiNotAuth
+    @PostMapping("/cancelJsm")
+    @ApiOperation(value = "取消工单")
+    public ResponseHelper cancelJsm(@RequestParam String orderBaseId) throws InterruptedException {
+        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_ORDER + orderBaseId);
+        if(!obtain.tryLock(10,TimeUnit.SECONDS)){
+            throw new RemoteServiceException("系统繁忙,请稍后再试");
+        }
+        try {
+            orderBaseLogic.cancelJsm(orderBaseId);
+        }finally {
+            obtain.unlock();
+        }
+
+        return ResponseHelper.success();
+    }
+
     @PostMapping("/active")
     @ApiOperation(value = "激活工单")
     public ResponseHelper active(@RequestParam String orderBaseId) throws InterruptedException {

mall-server-api/src/main/java/com/gree/mall/manager/logic/apply/WorkerInvolveLogic.java

@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.activity.PromotionActivityBatchBean;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.bean.apply.WorkerInvolveApplyDetail;
-import com.gree.mall.manager.bean.apply.WorkerInvolveApplyVO;
-import com.gree.mall.manager.bean.apply.WorkerInvolvePrincipalDetail;
-import com.gree.mall.manager.bean.apply.WorkerInvolvePrincipalVO;
+import com.gree.mall.manager.bean.apply.*;
 import com.gree.mall.manager.bean.es.ESGoodsVO;
 import com.gree.mall.manager.commonmapper.CommonMapper;
 import com.gree.mall.manager.exception.RemoteServiceException;
@@ -127,15 +124,13 @@ public class WorkerInvolveLogic {
         return workerInvolveApplyDetail;
     }
 
-    public void websitAppeal(WorkerInvolveApplyItem workerInvolveApplyItem) {
+    public void websitAppeal(WorkerInvolveApplyBean workerInvolveApplyBean) {
 
-        WorkerInvolveApply workerInvolveApply = workerInvolveApplyService.getById(workerInvolveApplyItem.getInvolveApplyId());
-
-        workerInvolveApply.setStatus(workerInvolveApplyItem.getWebsitStatus());
+        workerInvolveApplyBean.setStatus(workerInvolveApplyBean.getWorkerInvolveApplyItem().getWebsitStatus());
 
-        workerInvolveApply.updateById();
+        workerInvolveApplyBean.updateById();
 
-        workerInvolveApplyItem.insert();
+        workerInvolveApplyBean.getWorkerInvolveApplyItem().insert();
     }
 
     public void appeal(WorkerInvolveApplyItem workerInvolveApplyItem) {

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -2264,4 +2264,21 @@ public class OrderBaseLogic {
         return pgOrderBase;
 
     }
+
+    @Transactional
+    public void cancelJsm(String orderBaseId) {
+
+        PgOrderBase pgOrderBase = pgOrderBaseService.getById(orderBaseId);
+        if (pgOrderBase == null) {
+           return;
+        }
+        if (OrderBaseStatusEnum.isOver().contains(pgOrderBase.getOrderStatus())) {
+           return;
+        }
+        pgOrderBase.setOrderStatus(OrderBaseStatusEnum.YQX.getKey());
+        pgOrderBase.setOrderStatusText(OrderBaseStatusEnum.YQX.getRemark());
+        pgOrderBase.updateById();
+
+        orderLogLogic.addLog(orderBaseId, "取消工单", "取消工单-家盛茂商城api", "");
+    }
 }