Merge remote-tracking branch 'origin/develop' into develop

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

@@ -216,8 +216,14 @@ public class AppraiseRelaLogic {
         if (StringUtils.isBlank(bean.getReason())) {
             throw new RemoteServiceException("申诉理由不能为空");
         }
+
         final PgOrderBase orderBase = pgOrderBaseService.getById(bean.getOrderBaseId());
 
+        if (orderBase.getAppraiseStatus().equals(AppraiseStatusEnum.A.getKey())
+                || orderBase.getAppraiseStatus().equals(AppraiseStatusEnum.D.getKey())) {
+            throw new RemoteServiceException("工单评价为“好评”，不需要申诉");
+        }
+
         final PgAppraiseApply beforeApply = pgAppraiseApplyService.lambdaQuery()
                 .eq(PgAppraiseApply::getIsSecond, false)
                 .eq(PgAppraiseApply::getOrderBaseId, bean.getOrderBaseId())
@@ -364,7 +370,14 @@ public class AppraiseRelaLogic {
             throw new RemoteServiceException("请选择判定服务人员");
         }
 
-        apply.setInfoConfirmTime(apply.getIsSecond() ? null : DateUtil.date())
+        final PgAppraiseCategory parentCategory = pgAppraiseCategoryService.getById(bean.getParentCategoryId());
+        final PgAppraiseCategory category = pgAppraiseCategoryService.getById(bean.getCategoryId());
+
+        apply.setParentCategoryId(bean.getParentCategoryId())
+                .setParentCategoryName(parentCategory.getName())
+                .setCategoryId(bean.getCategoryId())
+                .setCategoryName(category.getName())
+                .setInfoConfirmTime(apply.getIsSecond() ? null : DateUtil.date())
                 .setSettleConfirmTime(apply.getIsSecond() ? DateUtil.date() : null)
                 .setConfirmBy(adminUser.getNickName())
                 .setStatus(ExamineStatusEnum.OK.getKey());