no message

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

@@ -13,7 +13,6 @@ import com.gree.mall.manager.bean.workorder.PgAppraiseApplyVO;
 import com.gree.mall.manager.bean.workorder.PgAppraiseCategoryVO;
 import com.gree.mall.manager.commonmapper.CommonMapper;
 import com.gree.mall.manager.enums.ExamineStatusEnum;
-import com.gree.mall.manager.enums.IsEnum;
 import com.gree.mall.manager.enums.workorder.*;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
@@ -195,17 +194,17 @@ public class AppraiseRelaLogic {
                     record.setRejectBy(null);
                     record.setRejectTime(null);
                 }
-                if (record.getIsSecond().getKey().equals(IsEnum.Y.getKey())
-                        && Objects.nonNull(record.getSecondCreateTime())
-                        && record.getStatus().getKey().equals(AppraiseApplyStatusEnum.WAIT.getKey())) {
-                    // 检查二次申诉是否显示按钮
-                    final int val = Integer.parseInt(config.getVal());
-                    DateTime endTime = DateUtil.offsetHour(record.getSecondCreateTime(), val);
-
-                    if (DateUtil.date().after(endTime)) {
-                        record.setShowSecondBtn("0");
-                    }
-                }
+//                if (record.getIsSecond().getKey().equals(IsEnum.Y.getKey())
+//                        && Objects.nonNull(record.getSecondCreateTime())
+//                        && record.getStatus().getKey().equals(AppraiseApplyStatusEnum.WAIT.getKey())) {
+//                    // 检查二次申诉是否显示按钮
+//                    final int val = Integer.parseInt(config.getVal());
+//                    DateTime endTime = DateUtil.offsetHour(record.getSecondCreateTime(), val);
+//
+//                    if (DateUtil.date().after(endTime)) {
+//                        record.setShowSecondBtn("0");
+//                    }
+//                }
             }
         }
 
@@ -309,6 +308,17 @@ public class AppraiseRelaLogic {
             if (DateUtil.date().after(endTime)) {
                 throw new RemoteServiceException("已超" + str + "申诉时间, 提交失败");
             }
+
+            if (isAdd) {
+                // 新增时判断是否已申诉过
+                Integer count = pgAppraiseApplyService.lambdaQuery()
+                        .eq(PgAppraiseApply::getIsSecond, false)
+                        .eq(PgAppraiseApply::getOrderBaseId, bean.getOrderBaseId())
+                        .count();
+                if (count > 0) {
+                    throw new RemoteServiceException("已有中差评申诉记录, 提交失败");
+                }
+            }
         }
         bean.setIsSecond(applyCount > 0);