FengChaoYu 4 місяців тому
батько
коміт
8ba0d8defe

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

@@ -245,6 +245,17 @@ public class AppraiseRelaLogic {
             throw new RemoteServiceException("申诉理由不能为空");
         }
 
+        if (isAdd) {
+            // 新增时判断是否已申诉过
+            Integer count = pgAppraiseApplyService.lambdaQuery()
+                    .eq(PgAppraiseApply::getIsSecond, false)
+                    .eq(PgAppraiseApply::getOrderBaseId, bean.getOrderBaseId())
+                    .count();
+            if (count > 0) {
+                throw new RemoteServiceException("已申诉, 提交失败");
+            }
+        }
+
         final PgOrderBase orderBase = pgOrderBaseService.getById(bean.getOrderBaseId());
 
         if (adminUser.getType() == 0 && !adminUser.getAdminWebsitIds().contains(orderBase.getWebsitId())) {
@@ -292,17 +303,6 @@ public class AppraiseRelaLogic {
 
         // 有驳回可重诉人忽略申诉配置
         if (superCount == 0) {
-            if (isAdd) {
-                // 新增时判断是否已申诉过
-                Integer count = pgAppraiseApplyService.lambdaQuery()
-                        .eq(PgAppraiseApply::getIsSecond, false)
-                        .eq(PgAppraiseApply::getOrderBaseId, bean.getOrderBaseId())
-                        .count();
-                if (count > 0) {
-                    throw new RemoteServiceException("已申诉, 提交失败");
-                }
-            }
-
             Date overTime = Objects.nonNull(orderBase.getOverTime()) ? orderBase.getOverTime() : orderBase.getWebsitOverTime();
             DateTime endTime;
             // 1、完工时间超过配置时间的,不可再提交;
@@ -327,6 +327,7 @@ public class AppraiseRelaLogic {
         }
         bean.setIsSecond(applyCount > 1);
 
+
         //2、该工单已有中差评申诉数据的,不可再提交;(已申诉、待审核状态的,均不可再创建申诉)
         Integer waitCount = pgAppraiseApplyService.lambdaQuery()
                 .eq(PgAppraiseApply::getOrderBaseId, bean.getOrderBaseId())