feat: 兑付通知逻辑更新1

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmPackageManager.java

@@ -211,11 +211,18 @@ public class WmPackageManager {
         List<SysCheckChainNodeCheckHistory> okTasks = CollUtil.isNotEmpty(tasks) ? checkChainNodeCheckHistoryService.list(Wrappers.<SysCheckChainNodeCheckHistory>lambdaQuery().eq(SysCheckChainNodeCheckHistory::getNodeId, OK_CHAIN_TASK_NODE)
                 .in(SysCheckChainNodeCheckHistory::getTargetId, taskIds)) : Collections.emptyList();
 
+
+        List<WmPackageRedemptionNotice> notices = packageRedemptionNoticeService.list(Wrappers.<WmPackageRedemptionNotice>lambdaQuery()
+                .eq(WmPackageRedemptionNotice::getPackageId, packageId)
+                .in(WmPackageRedemptionNotice::getNoticeState, WmPackageRedemptionNotice.NoticeState.CONFIRM.getState(), WmPackageRedemptionNotice.NoticeState.ARGUE.getState(), WmPackageRedemptionNotice.NoticeState.DONE.getState())
+                .orderByDesc(WmPackageRedemptionNotice::getCreateTime));
+
         Map<String, Object> result = new HashMap<>(10);
         result.put("id", packageId);
         result.put("pkgSn", scorePackage.getPackageSn());
         result.put("pkgName", scorePackage.getScorePackageName());
         result.put("pkgScore", scorePackage.getScore());
+        result.put("nextStep", CollUtil.isNotEmpty(notices) ? notices.get(0).getStep() + 1 : 1);
 
         int taskTotalCount = tasks.size();
         result.put("taskTotalCount", taskTotalCount);
@@ -314,13 +321,13 @@ public class WmPackageManager {
         String checkRemarks;
 
         // 审核通过
-        if (checkResult){
+        if (checkResult) {
             noticeState = WmPackageRedemptionNotice.NoticeState.SEND;
             checkState = WmPackageRedemptionNotice.CheckState.PASSED;
             checkRemarks = StrUtil.isBlank(resource.getCheckRemarks()) ? "通过（系统追加）" : resource.getCheckRemarks();
         }
         // 审核不通过
-        else  {
+        else {
             noticeState = WmPackageRedemptionNotice.NoticeState.PENDING;
             checkState = WmPackageRedemptionNotice.CheckState.REJECTED;
             checkRemarks = resource.getCheckRemarks();