no message

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

@@ -458,11 +458,20 @@ public class AppraiseRelaLogic {
 
         List<PgAppraiseApply> applyList = pgAppraiseApplyService.lambdaQuery()
                 .in(PgAppraiseApply::getId, ids)
-                .in(PgAppraiseApply::getStatus, AppraiseApplyStatusEnum.OK.getKey(), AppraiseApplyStatusEnum.WAIT_CENTER.getKey())
-                .isNull(PgAppraiseApply::getRejectTime)
-                .isNull(PgAppraiseApply::getCloseBy)
                 .list();
 
+        for (PgAppraiseApply apply : applyList) {
+            if (Objects.nonNull(apply.getRejectTime())) {
+                throw new RemoteServiceException(apply.getOrderBaseId() + "工单编号的申诉记录有“驳回可重申诉信息”，不能操作“驳回可再申诉”");
+            }
+            if (Objects.nonNull(apply.getCloseTime())) {
+                throw new RemoteServiceException(apply.getOrderBaseId() + "工单编号的申诉记录有“驳回不可再申诉信息”，不能操作“驳回可再申诉”");
+            }
+            if (!apply.getStatus().equals(AppraiseApplyStatusEnum.OK.getKey())) {
+                throw new RemoteServiceException(apply.getOrderBaseId() + "工单编号的申诉记录非“审核通过”，不能操作“驳回可再申诉”");
+            }
+        }
+
         final List<String> normIds = applyList.stream().map(PgAppraiseApply::getId).collect(Collectors.toList());
 
         pgAppraiseApplyService.lambdaUpdate()