楚江ERP：锁价无规格操作申请单取消

@@ -250,4 +250,18 @@ public class SpecLockDelayApplicationController extends DefaultBaseController {
         return InvokeResultBuilder.success(result);
     }
 
+
+    /**
+     * 订单申请延期取消
+     */
+    @ApiOperation("订单申请延期取消")
+    @GetMapping("/cancel")
+    public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id) {
+
+        specLockDelayApplicationService.cancelApplication(id);
+
+        specLockDelayApplicationService.cleanCacheByKey(id);
+
+        return InvokeResultBuilder.success();
+    }
 }

@@ -41,4 +41,18 @@ public enum CustomerDevelopStatus implements BaseEnum<Integer> {
         }
         return null;
     }
+
+    /**
+     * 通过name获取desc（安全版本，不区分大小写）
+     * @param name 枚举名称
+     * @return 描述信息
+     */
+    public static String getDescByNameSafe(String name) {
+        for (CustomerDevelopStatus status : values()) {
+            if (status.name().equalsIgnoreCase(name)) {
+                return status.getDesc();
+            }
+        }
+        return null;
+    }
 }

@@ -165,7 +165,7 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
                 || FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {
             specLockDelayApplicationService.updateAuditStatus(businessId, "REFUSE");
         } else if (FlowInstanceStatus.UNDO.getCode().equals(flowStatus)) {
-            specLockDelayApplicationService.updateAuditStatus(businessId, "CANCEL");
+            specLockDelayApplicationService.updateAuditStatus(businessId, "REFUSE");
         }
     }
 

@@ -121,12 +121,13 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
             throw new DefaultClientException("锁价无规格操作申请单不存在！");
         }
 
+        if (!CustomerDevelopStatus.REFUSE.name().equals(data.getApprovalStatus())) {
+            throw new DefaultClientException(CustomerDevelopStatus.getDescByNameSafe(data.getApprovalStatus()) + "的状态的锁价无规格操作申请单不允许修改！");
+        }
+
         LambdaUpdateWrapper<SpecLockDelayApplication> updateWrapper = Wrappers.lambdaUpdate(SpecLockDelayApplication.class)
-                .set(SpecLockDelayApplication::getContractId, vo.getContractId())
                 .set(SpecLockDelayApplication::getSpecLockDate, vo.getSpecLockDate())
-                .set(SpecLockDelayApplication::getApplicationCount, vo.getApplicationCount())
                 .set(SpecLockDelayApplication::getDelayReason, vo.getDelayReason())
-                .set(SpecLockDelayApplication::getApprovalStatus, vo.getApprovalStatus())
                 .eq(SpecLockDelayApplication::getId, vo.getId());
 
         getBaseMapper().update(updateWrapper);
@@ -163,6 +164,44 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
         cleanCacheByKey(id);
     }
 
+    @Override
+    @OpLog(type = OtherOpLogType.class, name = "锁价无规格操作申请单取消，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    public void cancelApplication(String id) {
+        SpecLockDelayApplication data = getBaseMapper().selectById(id);
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("锁价无规格操作申请单不存在！");
+        }
+
+        if (CustomerDevelopStatus.CANCEL.name().equals(data.getApprovalStatus())) {
+            throw new DefaultClientException("锁价无规格操作申请单已经取消！");
+        }
+
+        if (!CustomerDevelopStatus.REFUSE.name().equals(data.getApprovalStatus())) {
+            throw new DefaultClientException(CustomerDevelopStatus.getDescByNameSafe(data.getApprovalStatus()) + "的状态的锁价无规格操作申请单不允许取消！");
+        }
+
+        Wrapper<SpecLockDelayApplication> wrapper = Wrappers.lambdaUpdate(SpecLockDelayApplication.class)
+                .set(SpecLockDelayApplication::getApprovalStatus, CustomerDevelopStatus.CANCEL.name())
+                .set(SpecLockDelayApplication::getApprovedAt, LocalDateTime.now())
+                .set(SpecLockDelayApplication::getApproverId, SecurityUtil.getCurrentUser().getId())
+                .eq(SpecLockDelayApplication::getId, id);
+
+        getBaseMapper().update(wrapper);
+
+        UpdateSpecLockDelayApplicationVo vo = new UpdateSpecLockDelayApplicationVo();
+        vo.setId(id);
+        vo.setApprovalStatus(CustomerDevelopStatus.CANCEL.name());
+        vo.setApprovedAt(LocalDateTime.now());
+        vo.setApproverId(SecurityUtil.getCurrentUser().getId());
+
+
+        OpLogUtil.setVariable("id", id);
+        OpLogUtil.setExtra(vo);
+
+        cleanCacheByKey(id);
+    }
+
     @CacheEvict(value = SpecLockDelayApplication.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @Override
     public void cleanCacheByKey(Serializable key) {

@@ -60,5 +60,12 @@ public interface SpecLockDelayApplicationService extends BaseMpService<SpecLockD
      */
     void updateAuditStatus(String id, String approvedStatus);
 
+    /**
+     * 取消申请
+     *
+     * @param id
+     */
+    void cancelApplication(String id);
+
 }