From d58f6629879c457cd49fdb8d3cc7318c497c5dc3 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 16 九月 2026 16:54:15 +0800
Subject: [PATCH] refactor(aftersales): 故障赔付/服务补偿单审核改为审批配置状态机
---
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/compensation/AfterSaleCompensationController.java | 21 +-
/dev/null | 23 ---
yudao-module-aftersales/pom.xml | 5
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/compensation/AfterSaleCompensationMapper.java | 46 ++++++
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/compensation/AfterSaleCompensationServiceImpl.java | 194 ++++++++------------------
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/compensation/vo/AfterSaleCompensationAuditReqVO.java | 14 +-
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/compensation/AfterSaleCompensationDO.java | 22 ++-
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java | 10
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/compensation/AfterSaleCompensationService.java | 31 ++--
yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/compensation/vo/AfterSaleCompensationRespVO.java | 14 +-
10 files changed, 169 insertions(+), 211 deletions(-)
diff --git a/yudao-module-aftersales/pom.xml b/yudao-module-aftersales/pom.xml
index ab92efd..c26cd5c 100644
--- a/yudao-module-aftersales/pom.xml
+++ b/yudao-module-aftersales/pom.xml
@@ -42,11 +42,6 @@
<artifactId>yudao-module-infra</artifactId>
<version>${revision}</version>
</dependency>
- <dependency>
- <groupId>cn.iocoder.boot</groupId>
- <artifactId>yudao-module-bpm</artifactId>
- <version>${revision}</version>
- </dependency>
<!-- MDM 涓绘暟鎹鐞� API -->
<dependency>
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/compensation/AfterSaleCompensationController.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/compensation/AfterSaleCompensationController.java
index 638d7ba..7071532 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/compensation/AfterSaleCompensationController.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/compensation/AfterSaleCompensationController.java
@@ -29,7 +29,6 @@
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "绠＄悊鍚庡彴 - 鍞悗璧斾粯/鏈嶅姟琛ュ伩鍗�")
@RestController
@@ -88,27 +87,27 @@
}
@PutMapping("/submit")
- @Operation(summary = "鎻愪氦璧斾粯/鏈嶅姟琛ュ伩鍗曞鎵�")
+ @Operation(summary = "鎻愪氦璧斾粯/鏈嶅姟琛ュ伩鍗曞鎵癸紙鏈彁浜�/瀹℃牳涓嶉�氳繃鈫掑鎵逛腑锛夛紝瀹℃壒浜虹敱瀹℃壒閰嶇疆缁熶竴鎸囧畾")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
@PreAuthorize("@ss.hasPermission('aftersales:compensation:submit')")
- public CommonResult<Boolean> submitCompensation(@RequestParam("id") Long id,
- @RequestParam("processDefinitionKey") String processDefinitionKey) {
- compensationService.submitCompensation(id, processDefinitionKey, getLoginUserId());
+ public CommonResult<Boolean> submitCompensation(@RequestParam("id") Long id) {
+ compensationService.submitCompensation(id);
return success(true);
}
@PutMapping("/audit")
- @Operation(summary = "瀹℃壒璧斾粯/鏈嶅姟琛ュ伩鍗曪紙閫氳繃/椹冲洖锛�")
+ @Operation(summary = "瀹℃牳璧斾粯/鏈嶅姟琛ュ伩鍗曪紙瀹℃壒涓啋瀹℃牳閫氳繃/瀹℃牳涓嶉�氳繃锛夛紝浠呭鎵逛汉鏈汉鍙搷浣�")
@PreAuthorize("@ss.hasPermission('aftersales:compensation:audit')")
public CommonResult<Boolean> auditCompensation(@Valid @RequestBody AfterSaleCompensationAuditReqVO auditReqVO) {
- compensationService.auditCompensation(auditReqVO);
+ compensationService.auditCompensation(auditReqVO.getId(), auditReqVO.getPass(), auditReqVO.getReviewRemark());
return success(true);
}
- @GetMapping("/approve-process-list")
- @Operation(summary = "鑾峰緱璧斾粯/鏈嶅姟琛ュ伩鍗曞鎵规祦绋嬪畾涔夊垪琛�")
+ @GetMapping("/approver-ids")
+ @Operation(summary = "鑾峰緱瀹℃壒浜虹紪鍙烽泦鍚堬紝渚涘墠绔垽鏂槸鍚﹀睍绀哄鏍告寜閽�")
@PreAuthorize("@ss.hasPermission('aftersales:compensation:query')")
- public CommonResult<List<Map<String, Object>>> getCompensationApproveProcessDefinitionList() {
- return success(compensationService.getCompensationApproveProcessDefinitionList());
+ public CommonResult<Set<Long>> getApproverUserIds() {
+ return success(compensationService.getCompensationApproverUserIds());
}
// ========== 鍐呴儴鏂规硶锛氭壒閲忔嫾瑁呭叧鑱斿悕绉� ==========
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/compensation/vo/AfterSaleCompensationAuditReqVO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/compensation/vo/AfterSaleCompensationAuditReqVO.java
index 1ce26b9..6cc35de 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/compensation/vo/AfterSaleCompensationAuditReqVO.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/compensation/vo/AfterSaleCompensationAuditReqVO.java
@@ -5,9 +5,9 @@
import lombok.Data;
/**
- * 鍞悗璧斾粯/鏈嶅姟琛ュ伩鍗� 瀹℃壒 Request VO
+ * 鍞悗璧斾粯/鏈嶅姟琛ュ伩鍗� 瀹℃牳 Request VO
*/
-@Schema(description = "鍞悗璧斾粯/鏈嶅姟琛ュ伩鍗� - 瀹℃壒 Request VO")
+@Schema(description = "鍞悗璧斾粯/鏈嶅姟琛ュ伩鍗� - 瀹℃牳 Request VO")
@Data
public class AfterSaleCompensationAuditReqVO {
@@ -15,11 +15,11 @@
@NotNull(message = "璧斾粯鍗曠紪鍙蜂笉鑳戒负绌�")
private Long id;
- @Schema(description = "瀹℃壒缁撴灉锛�20 閫氳繃 / 30 椹冲洖锛�", requiredMode = Schema.RequiredMode.REQUIRED, example = "20")
- @NotNull(message = "瀹℃壒缁撴灉涓嶈兘涓虹┖")
- private Integer auditStatus;
+ @Schema(description = "鏄惁閫氳繃锛歵rue=瀹℃牳閫氳繃 / false=瀹℃牳涓嶉�氳繃", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
+ @NotNull(message = "璇烽�夋嫨瀹℃牳缁撴灉")
+ private Boolean pass;
- @Schema(description = "瀹℃壒澶囨敞", example = "鍚屾剰璧斾粯")
- private String remark;
+ @Schema(description = "瀹℃牳鎰忚锛堥�氳繃鏃堕�夊～ / 涓嶉�氳繃鏃跺繀濉級", example = "閲戦闇�鍐嶆鏍稿")
+ private String reviewRemark;
}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/compensation/vo/AfterSaleCompensationRespVO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/compensation/vo/AfterSaleCompensationRespVO.java
index 83b375d..954ae28 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/compensation/vo/AfterSaleCompensationRespVO.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/controller/admin/compensation/vo/AfterSaleCompensationRespVO.java
@@ -61,17 +61,17 @@
@Schema(description = "瀹℃壒鐘舵�佸悕绉�", example = "鏈彁浜�")
private String auditStatusName;
- @Schema(description = "瀹℃壒娴佺▼瀹炰緥缂栧彿")
- private String processInstanceId;
+ @Schema(description = "瀹℃牳浜虹敤鎴风紪鍙�", example = "1")
+ private Long reviewerId;
- @Schema(description = "瀹℃牳浜�", example = "1")
- private Long auditUserId;
+ @Schema(description = "瀹℃牳浜哄鍚�", example = "鏉庡伐")
+ private String reviewerName;
@Schema(description = "瀹℃牳鏃堕棿")
- private LocalDateTime auditTime;
+ private LocalDateTime reviewTime;
- @Schema(description = "瀹℃牳澶囨敞")
- private String auditRemark;
+ @Schema(description = "瀹℃牳鎰忚锛堝鏍搁�氳繃鏃剁殑鎰忚 / 瀹℃牳涓嶉�氳繃鏃剁殑鍘熷洜锛�", example = "閲戦闇�鍐嶆鏍稿")
+ private String reviewRemark;
@Schema(description = "鏀粯鐘舵�侊紙璐﹀姟鑱斿姩棰勭暀锛�")
private Integer payStatus;
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/compensation/AfterSaleCompensationDO.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/compensation/AfterSaleCompensationDO.java
index a1ffb70..a62ba32 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/compensation/AfterSaleCompensationDO.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/dataobject/compensation/AfterSaleCompensationDO.java
@@ -65,25 +65,33 @@
/**
* 瀹℃壒鐘舵��
*
+ * 鍙敱涓氬姟娴佺▼椹卞姩锛屼笉鎺ュ彈鍓嶇鐩存帴璧嬪�硷細鍒涘缓鏃跺浐瀹氫负鏈彁浜わ紝鎻愪氦瀹℃壒鍚庣疆涓哄鎵逛腑锛�
+ * 瀹℃牳閫氳繃 / 涓嶉�氳繃鐢�
+ * {@link cn.iocoder.yudao.module.aftersales.service.compensation.AfterSaleCompensationService#auditCompensation}
+ * 鎺ㄨ繘銆�
+ *
* 鏋氫妇 {@link AfterSaleCompensationAuditStatusEnum}
*/
private Integer auditStatus;
/**
- * 瀹℃壒娴佺▼瀹炰緥缂栧彿
+ * 瀹℃牳浜虹敤鎴风紪鍙�
+ *
+ * 瀹℃壒浜虹敱銆岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶆寜涓氬姟绫诲瀷缁熶竴閰嶇疆锛堜笟鍔＄紪鐮� compensation_approve锛夛紝
+ * 鎻愪氦鏃朵笉鎸囧畾锛涙澶勮褰曞疄闄呮墽琛屽鏍哥殑鐢ㄦ埛銆�
*/
- private String processInstanceId;
+ private Long reviewerId;
/**
- * 瀹℃牳浜�
+ * 瀹℃牳浜哄鍚嶏紙瀹℃牳鏃跺啑浣欒褰曪紝閬垮厤鍒楄〃灞曠ず鍐嶆煡鐢ㄦ埛锛�
*/
- private Long auditUserId;
+ private String reviewerName;
/**
* 瀹℃牳鏃堕棿
*/
- private LocalDateTime auditTime;
+ private LocalDateTime reviewTime;
/**
- * 瀹℃牳澶囨敞
+ * 瀹℃牳鎰忚锛堝鏍搁�氳繃鏃剁殑鎰忚 / 瀹℃牳涓嶉�氳繃鏃剁殑鍘熷洜锛�
*/
- private String auditRemark;
+ private String reviewRemark;
/**
* 鏀粯鐘舵�侊紙璐﹀姟鑱斿姩棰勭暀锛屾帴璐㈠姟鍚庝娇鐢級
*/
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/compensation/AfterSaleCompensationMapper.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/compensation/AfterSaleCompensationMapper.java
index a6d3f7f..59c48be 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/compensation/AfterSaleCompensationMapper.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/dal/mysql/compensation/AfterSaleCompensationMapper.java
@@ -5,7 +5,10 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.aftersales.controller.admin.compensation.vo.AfterSaleCompensationPageReqVO;
import cn.iocoder.yudao.module.aftersales.dal.dataobject.compensation.AfterSaleCompensationDO;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
+
+import java.time.LocalDateTime;
/**
* 鍞悗璧斾粯/鏈嶅姟琛ュ伩鍗� Mapper
@@ -17,6 +20,49 @@
return selectOne(AfterSaleCompensationDO::getCompensationNo, compensationNo);
}
+ /**
+ * 鎻愪氦瀹℃壒锛氱疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
+ *
+ * 鐢� UpdateWrapper 鑰岄潪 updateById锛歁yBatis-Plus 榛樿鐨勫瓧娈垫洿鏂扮瓥鐣ヤ細蹇界暐 null锛�
+ * 鐩存帴 updateById 鏃犳硶鎶婂鏍镐笉閫氳繃鍚庢畫鐣欑殑瀹℃牳浜恒�佸鏍告椂闂淬�佸鏍告剰瑙佺湡姝ｆ竻绌恒��
+ *
+ * @param id 璧斾粯鍗曠紪鍙�
+ * @param status 鐩爣鐘舵�侊紙瀹℃壒涓級
+ * @return 褰卞搷琛屾暟
+ */
+ default int submitAndResetAuditInfo(Long id, Integer status) {
+ return update(null, new LambdaUpdateWrapper<AfterSaleCompensationDO>()
+ .eq(AfterSaleCompensationDO::getId, id)
+ .set(AfterSaleCompensationDO::getAuditStatus, status)
+ .set(AfterSaleCompensationDO::getReviewerId, null)
+ .set(AfterSaleCompensationDO::getReviewerName, null)
+ .set(AfterSaleCompensationDO::getReviewTime, null)
+ .set(AfterSaleCompensationDO::getReviewRemark, null));
+ }
+
+ /**
+ * 瀹℃牳锛氬啓鍏ュ鏍哥粨鏋溿�佸鏍镐汉涓庡鏍告剰瑙�
+ *
+ * reviewRemark 鍏佽涓� null锛堝鏍搁�氳繃鏃舵剰瑙佸彲閫夛級锛屾晠鍚屾牱浣跨敤 UpdateWrapper 鐩村啓銆�
+ *
+ * @param id 璧斾粯鍗曠紪鍙�
+ * @param status 鐩爣鐘舵�侊紙瀹℃牳閫氳繃 / 瀹℃牳涓嶉�氳繃锛�
+ * @param reviewerId 瀹℃牳浜虹紪鍙�
+ * @param reviewerName 瀹℃牳浜哄鍚�
+ * @param reviewRemark 瀹℃牳鎰忚
+ * @return 褰卞搷琛屾暟
+ */
+ default int auditCompensation(Long id, Integer status, Long reviewerId,
+ String reviewerName, String reviewRemark) {
+ return update(null, new LambdaUpdateWrapper<AfterSaleCompensationDO>()
+ .eq(AfterSaleCompensationDO::getId, id)
+ .set(AfterSaleCompensationDO::getAuditStatus, status)
+ .set(AfterSaleCompensationDO::getReviewerId, reviewerId)
+ .set(AfterSaleCompensationDO::getReviewerName, reviewerName)
+ .set(AfterSaleCompensationDO::getReviewTime, LocalDateTime.now())
+ .set(AfterSaleCompensationDO::getReviewRemark, reviewRemark));
+ }
+
default PageResult<AfterSaleCompensationDO> selectPage(AfterSaleCompensationPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<AfterSaleCompensationDO>()
.likeIfPresent(AfterSaleCompensationDO::getCompensationNo, reqVO.getCompensationNo())
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java
index 033251f..0b0bd22 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/enums/ErrorCodeConstants.java
@@ -38,10 +38,10 @@
// ========== 璧斾粯/鏈嶅姟琛ュ伩鍗� 1-022-004-000 ==========
ErrorCode COMPENSATION_NOT_EXISTS = new ErrorCode(1_022_004_000, "璧斾粯/鏈嶅姟琛ュ伩鍗曚笉瀛樺湪");
ErrorCode COMPENSATION_NO_EXISTS = new ErrorCode(1_022_004_001, "鐢熸垚璧斾粯鍗曞彿閲嶅锛岃閲嶈瘯");
- ErrorCode COMPENSATION_SUBMIT_FAIL_NOT_DRAFT = new ErrorCode(1_022_004_002, "鎻愪氦璧斾粯鍗曞鎵瑰け璐ワ紝鍘熷洜锛氳禂浠樺崟涓嶆槸鑽夌鐘舵��");
- ErrorCode COMPENSATION_BPM_PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1_022_004_003, "璧斾粯鍗曞鎵规祦绋嬩笉瀛樺湪鎴栨湭婵�娲伙紝璇锋鏌� BPM 閰嶇疆");
- ErrorCode COMPENSATION_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS = new ErrorCode(1_022_004_004, "鏇存柊璧斾粯鍗曞鎵圭姸鎬佸け璐ワ紝鍘熷洜锛氳禂浠樺崟涓嶅浜庡鎵逛腑");
- ErrorCode COMPENSATION_DELETE_FAIL_NOT_DRAFT = new ErrorCode(1_022_004_005, "璧斾粯鍗曚笉鏄崏绋跨姸鎬侊紝鏃犳硶鍒犻櫎");
- ErrorCode COMPENSATION_TICKET_NOT_EXISTS = new ErrorCode(1_022_004_006, "鍏宠仈鐨勫敭鍚庡伐鍗曚笉瀛樺湪");
+ ErrorCode COMPENSATION_SUBMIT_FAIL_NOT_EDITABLE = new ErrorCode(1_022_004_002, "鍙湁鏈彁浜ゆ垨瀹℃牳涓嶉�氳繃鐘舵�佺殑璧斾粯鍗曟墠鑳芥彁浜ゅ鎵�");
+ ErrorCode COMPENSATION_AUDIT_FAIL_NOT_PROCESS = new ErrorCode(1_022_004_003, "鍙湁瀹℃壒涓姸鎬佺殑璧斾粯鍗曟墠鑳藉鏍�");
+ ErrorCode COMPENSATION_DELETE_FAIL_NOT_DRAFT = new ErrorCode(1_022_004_004, "璧斾粯鍗曚笉鏄崏绋跨姸鎬侊紝鏃犳硶鍒犻櫎");
+ ErrorCode COMPENSATION_TICKET_NOT_EXISTS = new ErrorCode(1_022_004_005, "鍏宠仈鐨勫敭鍚庡伐鍗曚笉瀛樺湪");
+ ErrorCode COMPENSATION_AUDIT_REJECT_REASON_REQUIRED = new ErrorCode(1_022_004_006, "瀹℃牳涓嶉�氳繃鏃跺繀椤诲～鍐欎笉閫氳繃鍘熷洜");
}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/compensation/AfterSaleCompensationService.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/compensation/AfterSaleCompensationService.java
index 6d7a05a..8b8c6b8 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/compensation/AfterSaleCompensationService.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/compensation/AfterSaleCompensationService.java
@@ -1,13 +1,11 @@
package cn.iocoder.yudao.module.aftersales.service.compensation;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.aftersales.controller.admin.compensation.vo.AfterSaleCompensationAuditReqVO;
import cn.iocoder.yudao.module.aftersales.controller.admin.compensation.vo.AfterSaleCompensationPageReqVO;
import cn.iocoder.yudao.module.aftersales.controller.admin.compensation.vo.AfterSaleCompensationSaveReqVO;
import cn.iocoder.yudao.module.aftersales.dal.dataobject.compensation.AfterSaleCompensationDO;
-import java.util.List;
-import java.util.Map;
+import java.util.Set;
/**
* 鍞悗璧斾粯/鏈嶅姟琛ュ伩鍗� Service 鎺ュ彛
@@ -25,23 +23,28 @@
PageResult<AfterSaleCompensationDO> getCompensationPage(AfterSaleCompensationPageReqVO pageReqVO);
/**
- * 鎻愪氦璧斾粯鍗曞鎵�
+ * 鎻愪氦璧斾粯鍗曞鎵癸紙鏈彁浜� / 瀹℃牳涓嶉�氳繃 鈫� 瀹℃壒涓級
+ *
+ * 瀹℃壒浜虹敱銆岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶆寜涓氬姟绫诲瀷 compensation_approve 缁熶竴鎸囧畾锛屾彁浜ゆ椂涓嶉�変汉銆�
+ *
+ * @param id 璧斾粯鍗曠紪鍙�
*/
- void submitCompensation(Long id, String processDefinitionKey, Long userId);
+ void submitCompensation(Long id);
/**
- * 瀹℃壒璧斾粯鍗曪紙閫氳繃/椹冲洖锛�
+ * 鑾峰緱璧斾粯鍗曞鎵逛汉缂栧彿闆嗗悎锛屼緵鍓嶇鍒ゆ柇鏄惁灞曠ず瀹℃牳鎸夐挳
+ *
+ * @return 瀹℃壒浜虹敤鎴风紪鍙烽泦鍚�
*/
- void auditCompensation(AfterSaleCompensationAuditReqVO auditReqVO);
+ Set<Long> getCompensationApproverUserIds();
/**
- * 鏇存柊璧斾粯鍗曞鎵圭姸鎬侊紙BPM 鐩戝惉鍥炶皟锛�
+ * 瀹℃牳璧斾粯鍗曪紙瀹℃壒涓� 鈫� 瀹℃牳閫氳繃 / 瀹℃牳涓嶉�氳繃锛�
+ *
+ * @param id 璧斾粯鍗曠紪鍙�
+ * @param pass 鏄惁閫氳繃
+ * @param reviewRemark 瀹℃牳鎰忚锛屽鏍镐笉閫氳繃鏃跺繀濉�
*/
- void updateCompensationAuditStatus(Long id, Integer bpmResult);
-
- /**
- * 鑾峰緱璧斾粯鍗曞鎵规祦绋嬪畾涔夊垪琛�
- */
- List<Map<String, Object>> getCompensationApproveProcessDefinitionList();
+ void auditCompensation(Long id, Boolean pass, String reviewRemark);
}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/compensation/AfterSaleCompensationServiceImpl.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/compensation/AfterSaleCompensationServiceImpl.java
index b888bef..ab4bfab 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/compensation/AfterSaleCompensationServiceImpl.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/compensation/AfterSaleCompensationServiceImpl.java
@@ -1,43 +1,31 @@
package cn.iocoder.yudao.module.aftersales.service.compensation;
-import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.aftersales.controller.admin.compensation.vo.AfterSaleCompensationAuditReqVO;
import cn.iocoder.yudao.module.aftersales.controller.admin.compensation.vo.AfterSaleCompensationPageReqVO;
import cn.iocoder.yudao.module.aftersales.controller.admin.compensation.vo.AfterSaleCompensationSaveReqVO;
import cn.iocoder.yudao.module.aftersales.dal.dataobject.compensation.AfterSaleCompensationDO;
import cn.iocoder.yudao.module.aftersales.dal.mysql.compensation.AfterSaleCompensationMapper;
import cn.iocoder.yudao.module.aftersales.enums.AfterSaleCompensationAuditStatusEnum;
import cn.iocoder.yudao.module.aftersales.enums.ErrorCodeConstants;
-import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
-import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
-import cn.iocoder.yudao.module.bpm.service.definition.BpmCategoryService;
-import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
+import cn.iocoder.yudao.module.system.api.approval.ApprovalConfigApi;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
-import org.flowable.engine.repository.ProcessDefinition;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
import java.util.Set;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-import static cn.iocoder.yudao.module.aftersales.util.AfterSaleCompensationStatusUtils.convertBpmResultToAuditStatus;
/**
* 鍞悗璧斾粯/鏈嶅姟琛ュ伩鍗� Service 瀹炵幇绫�
@@ -47,22 +35,19 @@
@Slf4j
public class AfterSaleCompensationServiceImpl implements AfterSaleCompensationService {
- private static final Integer AUDIT_DRAFT = 0;
- private static final Integer AUDIT_PASS = 20;
-
/**
- * BPM 璧斾粯瀹℃壒鍒嗙被缂栫爜
+ * 璧斾粯鍗曞鎵圭殑涓氬姟绫诲瀷缂栫爜
+ *
+ * 涓� system_approval_config.biz_type 瀵瑰簲锛屽鎵逛汉鍦ㄣ�岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶄腑缁存姢銆�
*/
- private static final String COMPENSATION_APPROVE_CATEGORY_CODE = "compensation_approve";
+ private static final String COMPENSATION_APPROVE_BIZ_TYPE = "compensation_approve";
@Resource
private AfterSaleCompensationMapper compensationMapper;
@Resource
- private BpmProcessInstanceApi bpmProcessInstanceApi;
+ private ApprovalConfigApi approvalConfigApi;
@Resource
- private BpmCategoryService bpmCategoryService;
- @Resource
- private BpmProcessDefinitionService bpmProcessDefinitionService;
+ private AdminUserApi adminUserApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -73,7 +58,7 @@
}
AfterSaleCompensationDO entity = BeanUtils.toBean(createReqVO, AfterSaleCompensationDO.class, req -> req
.setCompensationNo(compensationNo)
- .setAuditStatus(AUDIT_DRAFT));
+ .setAuditStatus(AfterSaleCompensationAuditStatusEnum.DRAFT.getStatus()));
compensationMapper.insert(entity);
return entity.getId();
}
@@ -84,7 +69,7 @@
if (exists == null) {
throw exception(ErrorCodeConstants.COMPENSATION_NOT_EXISTS);
}
- if (ObjUtil.notEqual(exists.getAuditStatus(), AUDIT_DRAFT)) {
+ if (ObjUtil.notEqual(exists.getAuditStatus(), AfterSaleCompensationAuditStatusEnum.DRAFT.getStatus())) {
throw exception(ErrorCodeConstants.COMPENSATION_DELETE_FAIL_NOT_DRAFT);
}
AfterSaleCompensationDO entity = BeanUtils.toBean(updateReqVO, AfterSaleCompensationDO.class, req -> req
@@ -100,7 +85,7 @@
if (exists == null) {
throw exception(ErrorCodeConstants.COMPENSATION_NOT_EXISTS);
}
- if (ObjUtil.notEqual(exists.getAuditStatus(), AUDIT_DRAFT)) {
+ if (ObjUtil.notEqual(exists.getAuditStatus(), AfterSaleCompensationAuditStatusEnum.DRAFT.getStatus())) {
throw exception(ErrorCodeConstants.COMPENSATION_DELETE_FAIL_NOT_DRAFT);
}
compensationMapper.deleteById(id);
@@ -117,130 +102,75 @@
}
@Override
- public void submitCompensation(Long id, String processDefinitionKey, Long userId) {
- // 1. 鏍￠獙璧斾粯鍗曟槸鍚﹀湪鑽夌鐘舵��
- AfterSaleCompensationDO compensation = compensationMapper.selectById(id);
- if (compensation == null) {
- throw exception(ErrorCodeConstants.COMPENSATION_NOT_EXISTS);
- }
- if (ObjUtil.notEqual(compensation.getAuditStatus(), AfterSaleCompensationAuditStatusEnum.DRAFT.getStatus())) {
- throw exception(ErrorCodeConstants.COMPENSATION_SUBMIT_FAIL_NOT_DRAFT);
+ @Transactional(rollbackFor = Exception.class)
+ public void submitCompensation(Long id) {
+ // 1. 鏍￠獙瀛樺湪 + 鍙彁浜ょ姸鎬侊紙鏈彁浜� / 瀹℃牳涓嶉�氳繃锛�
+ AfterSaleCompensationDO compensation = validateCompensationExists(id);
+ if (ObjUtil.notEqual(compensation.getAuditStatus(), AfterSaleCompensationAuditStatusEnum.DRAFT.getStatus())
+ && ObjUtil.notEqual(compensation.getAuditStatus(), AfterSaleCompensationAuditStatusEnum.REJECT.getStatus())) {
+ throw exception(ErrorCodeConstants.COMPENSATION_SUBMIT_FAIL_NOT_EDITABLE);
}
- // 2. 鏍￠獙璧斾粯瀹℃壒鍒嗙被鍜屾祦绋嬪畾涔夋槸鍚﹀瓨鍦紝涓斾紶鍏ョ殑娴佺▼瀹氫箟澶勪簬婵�娲荤姸鎬�
- validateCompensationApproveCategoryAndProcessDefinition();
- ProcessDefinition processDefinition = bpmProcessDefinitionService.getActiveProcessDefinition(processDefinitionKey);
- if (processDefinition == null) {
- throw exception(ErrorCodeConstants.COMPENSATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
- }
+ // 2. 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉锛堟湭閰嶇疆鏃舵姏鍑哄甫鏄庣‘鎻愮ず鐨勪笟鍔″紓甯革級
+ approvalConfigApi.validateApprovalEnabledAndGetApprovers(COMPENSATION_APPROVE_BIZ_TYPE);
- // 3. 鍒涘缓璧斾粯瀹℃壒娴佺▼瀹炰緥
- String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId,
- new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(processDefinitionKey)
- .setBusinessKey(String.valueOf(id)));
-
- // 4. 鏇存柊璧斾粯鍗曟祦绋嬬紪鍙蜂笌瀹℃壒鐘舵��
- compensationMapper.updateById(new AfterSaleCompensationDO().setId(id).setProcessInstanceId(processInstanceId)
- .setAuditStatus(AfterSaleCompensationAuditStatusEnum.PROCESS.getStatus()));
+ // 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
+ compensationMapper.submitAndResetAuditInfo(id, AfterSaleCompensationAuditStatusEnum.PROCESS.getStatus());
}
@Override
- public void auditCompensation(AfterSaleCompensationAuditReqVO auditReqVO) {
- AfterSaleCompensationDO exists = compensationMapper.selectById(auditReqVO.getId());
- if (exists == null) {
- throw exception(ErrorCodeConstants.COMPENSATION_NOT_EXISTS);
- }
- AfterSaleCompensationDO update = new AfterSaleCompensationDO();
- update.setId(exists.getId());
- update.setAuditStatus(auditReqVO.getAuditStatus());
- update.setAuditUserId(getLoginUserId());
- update.setAuditTime(LocalDateTime.now());
- if (StrUtil.isNotBlank(auditReqVO.getRemark())) {
- update.setAuditRemark(auditReqVO.getRemark());
- }
- compensationMapper.updateById(update);
+ public Set<Long> getCompensationApproverUserIds() {
+ return approvalConfigApi.getApproverUserIds(COMPENSATION_APPROVE_BIZ_TYPE);
}
@Override
- public void updateCompensationAuditStatus(Long id, Integer bpmResult) {
- // 1.1 鏍￠獙璧斾粯鍗曟槸鍚﹀瓨鍦�
- AfterSaleCompensationDO compensation = compensationMapper.selectById(id);
- if (compensation == null) {
- throw exception(ErrorCodeConstants.COMPENSATION_NOT_EXISTS);
- }
- // 1.2 鍙湁瀹℃壒涓紝鍙互鏇存柊瀹℃壒缁撴灉
+ @Transactional(rollbackFor = Exception.class)
+ public void auditCompensation(Long id, Boolean pass, String reviewRemark) {
+ // 1. 鏍￠獙瀛樺湪
+ AfterSaleCompensationDO compensation = validateCompensationExists(id);
+ // 2. 鏍￠獙澶勪簬瀹℃壒涓姸鎬�
if (ObjUtil.notEqual(compensation.getAuditStatus(), AfterSaleCompensationAuditStatusEnum.PROCESS.getStatus())) {
- log.error("[updateCompensationAuditStatus][compensation({}) 涓嶅浜庡鎵逛腑锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]", compensation.getId(), bpmResult);
- throw exception(ErrorCodeConstants.COMPENSATION_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
+ throw exception(ErrorCodeConstants.COMPENSATION_AUDIT_FAIL_NOT_PROCESS);
}
-
- // 2. 鏇存柊璧斾粯鍗曞鎵圭粨鏋�
- Integer auditStatus = convertBpmResultToAuditStatus(bpmResult);
- compensationMapper.updateById(new AfterSaleCompensationDO().setId(id).setAuditStatus(auditStatus));
+ // 3. 鏍￠獙褰撳墠鐧诲綍鐢ㄦ埛鏄涓氬姟绫诲瀷鐨勫鎵逛汉锛堟垨绛撅細浠讳竴浜哄潎鍙鏍革級
+ Long userId = getLoginUserId();
+ approvalConfigApi.validateApprover(COMPENSATION_APPROVE_BIZ_TYPE, userId);
+ // 4. 瀹℃牳涓嶉�氳繃锛氬繀椤诲～鍐欏師鍥狅紝鐘舵�佺疆涓哄鏍镐笉閫氳繃锛岄��鍥炴彁浜や汉淇敼鍚庡彲閲嶆柊鎻愪氦
+ if (!Boolean.TRUE.equals(pass)) {
+ if (StrUtil.isBlank(reviewRemark)) {
+ throw exception(ErrorCodeConstants.COMPENSATION_AUDIT_REJECT_REASON_REQUIRED);
+ }
+ compensationMapper.auditCompensation(id, AfterSaleCompensationAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark);
+ return;
+ }
+ // 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
+ compensationMapper.auditCompensation(id, AfterSaleCompensationAuditStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark);
+ // 6. 瀹℃牳閫氳繃鍚庣殑鍚庣疆涓氬姟閫昏緫锛氬綋鍓嶈禂浠樺崟瀹℃壒閫氳繃鍚庢棤鑷姩鐢熸垚涓嬫父鍗曟嵁鐨勫姩浣滐紝
+ // 鏀粯鐘舵�侊紙payStatus锛夊緟鍚庣画鎺ュ叆璐㈠姟妯″潡鏃跺啀鑱斿姩銆�
}
- @Override
- public List<Map<String, Object>> getCompensationApproveProcessDefinitionList() {
- // 1. 鏍￠獙璧斾粯瀹℃壒鍒嗙被鍜屾祦绋嬪畾涔夋槸鍚﹀瓨鍦�
- validateCompensationApproveCategoryAndProcessDefinition();
-
- // 2. 鑾峰彇鍒嗙被涓嬬殑娴佺▼瀹氫箟淇℃伅
- List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
- .getProcessDefinitionInfoListByCategory(COMPENSATION_APPROVE_CATEGORY_CODE);
-
- // 3. 鑾峰彇娴佺▼瀹氫箟璇︽儏
- Set<String> processDefinitionIds = convertSet(definitionInfoList, BpmProcessDefinitionInfoDO::getProcessDefinitionId);
- List<ProcessDefinition> processDefinitions = bpmProcessDefinitionService.getProcessDefinitionList(processDefinitionIds);
-
- // 4. 杩囨护锛氬彧淇濈暀婵�娲荤姸鎬侊紝涓旂浉鍚� key 鍙繚鐣欐渶鏂扮増鏈�
- Map<String, ProcessDefinition> latestVersionMap = new HashMap<>();
- for (ProcessDefinition pd : processDefinitions) {
- if (pd.isSuspended()) {
- continue;
- }
- ProcessDefinition existing = latestVersionMap.get(pd.getKey());
- if (existing == null || pd.getVersion() > existing.getVersion()) {
- latestVersionMap.put(pd.getKey(), pd);
- }
+ private AfterSaleCompensationDO validateCompensationExists(Long id) {
+ AfterSaleCompensationDO compensation = compensationMapper.selectById(id);
+ if (compensation == null) {
+ throw exception(ErrorCodeConstants.COMPENSATION_NOT_EXISTS);
}
-
- // 5. 杩斿洖娴佺▼瀹氫箟鍒楄〃
- List<Map<String, Object>> result = new ArrayList<>();
- for (ProcessDefinition pd : latestVersionMap.values()) {
- Map<String, Object> item = new HashMap<>();
- item.put("id", pd.getId());
- item.put("key", pd.getKey());
- item.put("name", pd.getName());
- item.put("version", pd.getVersion());
- result.add(item);
- }
- return result;
+ return compensation;
}
/**
- * 鏍￠獙 BPM 璧斾粯瀹℃壒鍒嗙被鍜屾祦绋嬪畾涔夋槸鍚﹀瓨鍦�
+ * 鑾峰彇鐢ㄦ埛鏄电О
+ *
+ * @param userId 鐢ㄦ埛缂栧彿
+ * @return 鏄电О锛岀敤鎴蜂笉瀛樺湪鏃惰繑鍥� null
*/
- private void validateCompensationApproveCategoryAndProcessDefinition() {
- // 1. 鏍￠獙鍒嗙被鏄惁瀛樺湪
- Map<String, ?> categoryMap = bpmCategoryService.getCategoryMap(Collections.singletonList(COMPENSATION_APPROVE_CATEGORY_CODE));
- if (!categoryMap.containsKey(COMPENSATION_APPROVE_CATEGORY_CODE)) {
- throw exception(ErrorCodeConstants.COMPENSATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
+ private String getUserNickname(Long userId) {
+ if (userId == null) {
+ return null;
}
-
- // 2. 鏍￠獙鍒嗙被涓嬫槸鍚︽湁鍙敤鐨勬祦绋嬪畾涔�
- List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
- .getProcessDefinitionInfoListByCategory(COMPENSATION_APPROVE_CATEGORY_CODE);
- if (CollUtil.isEmpty(definitionInfoList)) {
- throw exception(ErrorCodeConstants.COMPENSATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
- }
-
- // 3. 鏍￠獙鏄惁鏈夋縺娲荤姸鎬佺殑娴佺▼瀹氫箟
- Set<String> processDefinitionIds = convertSet(definitionInfoList, BpmProcessDefinitionInfoDO::getProcessDefinitionId);
- List<ProcessDefinition> processDefinitions = bpmProcessDefinitionService.getProcessDefinitionList(processDefinitionIds);
- boolean hasActiveDefinition = processDefinitions.stream().anyMatch(pd -> !pd.isSuspended());
- if (!hasActiveDefinition) {
- throw exception(ErrorCodeConstants.COMPENSATION_BPM_PROCESS_DEFINITION_NOT_EXISTS);
- }
+ AdminUserRespDTO user = adminUserApi.getUser(userId);
+ return user == null ? null : user.getNickname();
}
private String generateCompensationNo() {
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/compensation/listener/AfterSaleCompensationStatusListener.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/compensation/listener/AfterSaleCompensationStatusListener.java
deleted file mode 100644
index dc95be8..0000000
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/compensation/listener/AfterSaleCompensationStatusListener.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package cn.iocoder.yudao.module.aftersales.service.compensation.listener;
-
-import cn.iocoder.yudao.module.aftersales.dal.dataobject.compensation.AfterSaleCompensationDO;
-import cn.iocoder.yudao.module.aftersales.dal.mysql.compensation.AfterSaleCompensationMapper;
-import cn.iocoder.yudao.module.aftersales.enums.AfterSaleCompensationAuditStatusEnum;
-import cn.iocoder.yudao.module.aftersales.service.compensation.AfterSaleCompensationService;
-import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
-import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.ApplicationListener;
-import org.springframework.stereotype.Component;
-
-/**
- * 璧斾粯/鏈嶅姟琛ュ伩鍗曞鎵圭殑缁撴灉鐩戝惉鍣ㄥ疄鐜扮被
- *
- * 閫氳繃 businessKey锛堣禂浠樺崟ID锛夊尮閰嶏紝鑰屼笉鏄浐瀹氱殑娴佺▼瀹氫箟 Key锛�
- * 杩欐牱鍙互鏀寔鍒嗙被涓嬩换鎰� Key 鐨勬祦绋嬫ā鍨嬨��
- */
-@Component
-@Slf4j
-public class AfterSaleCompensationStatusListener implements ApplicationListener<BpmProcessInstanceStatusEvent> {
-
- @Resource
- private AfterSaleCompensationService compensationService;
- @Resource
- private AfterSaleCompensationMapper compensationMapper;
-
- @Override
- public void onApplicationEvent(BpmProcessInstanceStatusEvent event) {
- // 閫氳繃 businessKey 鏌ヨ璧斾粯鍗�
- Long compensationId;
- try {
- compensationId = Long.parseLong(event.getBusinessKey());
- } catch (NumberFormatException e) {
- return; // businessKey 涓嶆槸鏁板瓧锛屽拷鐣�
- }
-
- AfterSaleCompensationDO compensation = compensationMapper.selectById(compensationId);
- if (compensation == null) {
- return; // 涓嶆槸璧斾粯鍗曪紝蹇界暐
- }
-
- // 鍙湁瀹℃壒涓姸鎬佺殑璧斾粯鍗曟墠澶勭悊
- if (!AfterSaleCompensationAuditStatusEnum.PROCESS.getStatus().equals(compensation.getAuditStatus())) {
- log.warn("[onApplicationEvent] 璧斾粯鍗�({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝褰撳墠鐘舵��: {}", compensationId, compensation.getAuditStatus());
- return;
- }
-
- log.info("[onApplicationEvent] 璧斾粯鍗�({}) 瀹℃壒鐘舵�佹洿鏂�: {}", compensationId, event.getStatus());
- // 鏇存柊瀹℃壒鐘舵��
- compensationService.updateCompensationAuditStatus(compensationId, event.getStatus());
- }
-
-}
diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/util/AfterSaleCompensationStatusUtils.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/util/AfterSaleCompensationStatusUtils.java
deleted file mode 100644
index 946b81b..0000000
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/util/AfterSaleCompensationStatusUtils.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package cn.iocoder.yudao.module.aftersales.util;
-
-import cn.hutool.core.lang.Assert;
-import cn.iocoder.yudao.module.aftersales.enums.AfterSaleCompensationAuditStatusEnum;
-import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
-
-/**
- * 鍞悗璧斾粯/琛ュ伩鍗曟祦绋嬪伐鍏风被
- */
-public class AfterSaleCompensationStatusUtils {
-
- /**
- * BPM 瀹℃壒缁撴灉杞崲
- */
- public static Integer convertBpmResultToAuditStatus(Integer bpmResult) {
- Integer auditStatus = BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult) ? AfterSaleCompensationAuditStatusEnum.APPROVE.getStatus()
- : BpmTaskStatusEnum.REJECT.getStatus().equals(bpmResult) ? AfterSaleCompensationAuditStatusEnum.REJECT.getStatus()
- : BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmResult) ? AfterSaleCompensationAuditStatusEnum.CANCEL.getStatus() : null;
- Assert.notNull(auditStatus, "BPM 瀹℃壒缁撴灉({}) 杞崲澶辫触", bpmResult);
- return auditStatus;
- }
-
-}
--
Gitblit v1.9.3