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

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/workorder/OrderBaseAppraiseVO.java

@@ -13,9 +13,9 @@ import java.util.Date;
 @Data
 public class OrderBaseAppraiseVO {
 
-//    @ZfireField(sortNum = 2)
-//    @ApiModelProperty(value = "所属商户")
-//    private String companyWechatName;
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "所属商户")
+    private String companyWechatId;
 
     @ZfireField(sortNum = 3)
     @ApiModelProperty(value = "网点编号")
@@ -65,9 +65,9 @@ public class OrderBaseAppraiseVO {
     @ZfireField(sortNum = 17)
     @ApiModelProperty(value = "师傅报完工时间")
     private Date overTime ;
-//    @ZfireField(sortNum = 18)
-//    @ApiModelProperty(value = "网点报完工时间")
-//    private Date websitOverTime;
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "网点报完工时间")
+    private Date websitOverTime;
     @ZfireField(sortNum = 19)
     @ApiModelProperty(value = "评价类型")
     private AppraiseStatusEnum appraiseStatus;

mall-server-api/src/main/java/com/gree/mall/manager/bean/workorder/PgAppraiseApplyCountBean.java

@@ -0,0 +1,17 @@
+package com.gree.mall.manager.bean.workorder;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class PgAppraiseApplyCountBean {
+
+    @ApiModelProperty(value = "待申诉数量")
+    private Integer waitCount;
+
+    @ApiModelProperty(value = "待审核数量")
+    private Integer centerCount;
+
+}

mall-server-api/src/main/java/com/gree/mall/manager/bean/workorder/PgAppraiseApplyVO.java

@@ -21,6 +21,12 @@ public class PgAppraiseApplyVO {
     @ApiModelProperty(value = "id")
     private String id;
 
+    @ApiModelProperty(value = "状态")
+    private AppraiseApplyStatusEnum status;
+
+    @ApiModelProperty(value = "审核结果")
+    private AppraiseStatusEnum examineResult;
+
     @ApiModelProperty(value = "工单编号")
     private String orderBaseId;
 
@@ -84,9 +90,6 @@ public class PgAppraiseApplyVO {
     @ApiModelProperty(value = "申诉时间")
     private Date applyTime;
 
-    @ApiModelProperty(value = "审核结果")
-    private AppraiseStatusEnum examineResult;
-
     @ApiModelProperty(value = "中心判定网点")
     private AppraiseOnusEnum websitResult;
 
@@ -129,6 +132,10 @@ public class PgAppraiseApplyVO {
     private Date rejectTime;
 
     @ZfireField(hide = true)
-    @ApiModelProperty(value = "状态 WAIT=待申诉  WAIT_CENTER=待中心审核 OK=审核通过")
-    private AppraiseApplyStatusEnum status;
+    @ApiModelProperty(value = "二次申诉创建时间")
+    private Date secondCreateTime;
+
+    @ZfireField(hide = true, ignoreSelect = true)
+    @ApiModelProperty(value = "二次申诉按钮是否显示")
+    private String showSecondBtn;
 }

mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/AppraiseApplyController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.annotation.ZfireList;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.workorder.PgAppraiseApplyBean;
+import com.gree.mall.manager.bean.workorder.PgAppraiseApplyCountBean;
 import com.gree.mall.manager.bean.workorder.PgAppraiseApplyVO;
 import com.gree.mall.manager.bean.workorder.PgAppraiseCategoryVO;
 import com.gree.mall.manager.constant.Constant;
@@ -127,6 +128,13 @@ public class AppraiseApplyController {
         FieldUtils.exportData(page.getRecords(), zfireParamBean.getExportFields(), request, response);
     }
 
+    @PostMapping("/apply/count")
+    @ApiOperation(value = "评价申诉-列表")
+    public ResponseHelper<PgAppraiseApplyCountBean> applyCount() {
+        PgAppraiseApplyCountBean count = appraiseRelaLogic.applyCount();
+        return ResponseHelper.success(count);
+    }
+
     @PostMapping("/apply/detail")
     @ApiOperation(value = "评价申诉-详情")
     public ResponseHelper<PgAppraiseApplyBean> applyDetail(String id) {

mall-server-api/src/main/java/com/gree/mall/manager/enums/workorder/AppraiseApplyStatusEnum.java

@@ -13,7 +13,9 @@ public enum AppraiseApplyStatusEnum implements BaseEnum {
 
     WAIT("WAIT","待申诉"),
     WAIT_CENTER("WAIT_CENTER","待中心审核"),
-    OK("OK","审核通过"),
+    OK("OK","已审核"),
+    OVER("OVER","中心超时未审核"),
+    OVER_APPLY("OVER_APPLY","超时未申诉"),
     ;
 
     @JsonValue

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

@@ -8,10 +8,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.workorder.PgAppraiseApplyBean;
+import com.gree.mall.manager.bean.workorder.PgAppraiseApplyCountBean;
 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;
@@ -180,15 +182,33 @@ public class AppraiseRelaLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         FieldUtils.supplyParam(zfireParamBean, PgAppraiseApplyVO.class, adminUser);
         final IPage<PgAppraiseApplyVO> page = commonMapper.appraiseApplyList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean);
-        if (CollectionUtil.isNotEmpty(page.getRecords()) && adminUser.getType() == 0) {
-            // 网点账户置空最高驳回人信息
+        if (CollectionUtil.isNotEmpty(page.getRecords())) {
+            final PgAppraiseConfig config = pgAppraiseConfigService.lambdaQuery()
+                    .eq(PgAppraiseConfig::getCompanyWechatId, page.getRecords().get(0).getCompanyWechatId())
+                    .eq(PgAppraiseConfig::getType, AppraiseConfigTypeEnum.SECOND_A.getKey())
+                    .one();
             for (PgAppraiseApplyVO record : page.getRecords()) {
-                record.setCloseBy(null);
-                record.setCloseTime(null);
-                record.setRejectBy(null);
-                record.setRejectTime(null);
+                if (adminUser.getType() == 0) {
+                    // 网点账户置空最高驳回人信息
+                    record.setCloseBy(null);
+                    record.setCloseTime(null);
+                    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");
+                    }
+                }
             }
         }
+
         return page;
     }
 
@@ -211,8 +231,8 @@ public class AppraiseRelaLogic {
 
         if (!isAdd) {
             // 有id查询是否有记录
-            final PgAppraiseApply apply = pgAppraiseApplyService.getById(bean.getId());
-            if (Objects.isNull(apply)) {
+            final PgAppraiseApply oldApply = pgAppraiseApplyService.getById(bean.getId());
+            if (Objects.isNull(oldApply)) {
                 // 没有记录置空新建
                 bean.setId(null);
                 isAdd = true;
@@ -366,7 +386,7 @@ public class AppraiseRelaLogic {
             Date applyTime = apply.getApplyTime();
             final PgAppraiseConfig config = pgAppraiseConfigService.lambdaQuery()
                     .eq(PgAppraiseConfig::getCompanyWechatId, apply.getCompanyWechatId())
-                    .eq(PgAppraiseConfig::getType, !apply.getIsSecond() ? AppraiseConfigTypeEnum.FIRST_A.getKey() : AppraiseConfigTypeEnum.SECOND_A.getKey())
+                    .eq(PgAppraiseConfig::getType, !apply.getIsSecond() ? AppraiseConfigTypeEnum.FIRST_C.getKey() : AppraiseConfigTypeEnum.SECOND_C.getKey())
                     .one();
             final int val = Integer.parseInt(config.getVal());
             Date endTime = DateUtil.offsetHour(applyTime, val);
@@ -429,6 +449,7 @@ public class AppraiseRelaLogic {
             PgAppraiseApply copy = new PgAppraiseApply();
             this.copyApply(copy, apply);
             copy.setIsSecond(true);
+            copy.setSecondCreateTime(DateUtil.dateSecond());
             copy.insert();
         }
 
@@ -467,8 +488,10 @@ public class AppraiseRelaLogic {
             if (Objects.nonNull(apply.getCloseTime())) {
                 throw new RemoteServiceException(apply.getOrderBaseId() + "工单编号的申诉记录有“驳回不可再申诉信息”，不能操作“驳回可再申诉”");
             }
-            if (!apply.getStatus().equals(AppraiseApplyStatusEnum.OK.getKey())) {
-                throw new RemoteServiceException(apply.getOrderBaseId() + "工单编号的申诉记录非“审核通过”，不能操作“驳回可再申诉”");
+            if (!(apply.getStatus().equals(AppraiseApplyStatusEnum.OK.getKey())
+                    || apply.getStatus().equals(AppraiseApplyStatusEnum.OVER.getKey())
+                    || apply.getStatus().equals(AppraiseApplyStatusEnum.OVER_APPLY.getKey()))) {
+                throw new RemoteServiceException(apply.getOrderBaseId() + "工单编号的申诉记录非“审核通过”或“超时未审核”或“超时未申诉”，不能操作“驳回可再申诉”");
             }
         }
 
@@ -534,7 +557,7 @@ public class AppraiseRelaLogic {
 
         final List<PgAppraiseApply> applyList = pgAppraiseApplyService.lambdaQuery()
                 .in(PgAppraiseApply::getId, ids)
-                .eq(PgAppraiseApply::getStatus, AppraiseApplyStatusEnum.OK.getKey())
+                .in(PgAppraiseApply::getStatus, AppraiseApplyStatusEnum.OK.getKey(), AppraiseApplyStatusEnum.OVER.getKey(), AppraiseApplyStatusEnum.OVER_APPLY.getKey())
                 .orderByAsc(PgAppraiseApply::getApplyTime)
                 .list();
 
@@ -542,8 +565,10 @@ public class AppraiseRelaLogic {
             final List<String> orderIds = applyList.stream().map(PgAppraiseApply::getOrderBaseId).collect(Collectors.toList());
             final Map<String, PgAppraiseApply> applyMap = applyList.stream().collect(Collectors.toMap(PgAppraiseApply::getOrderBaseId, Function.identity(), (key1, key2) -> key2));
             for (PgAppraiseApply apply : applyList) {
-                if (!apply.getStatus().equals(AppraiseApplyStatusEnum.OK.getKey())) {
-                    throw new RemoteServiceException(apply.getOrderBaseId() + "工单编号的申诉记录非“审核通过”，不能操作“驳回不可再申诉”");
+                if (!(apply.getStatus().equals(AppraiseApplyStatusEnum.OK.getKey())
+                        || apply.getStatus().equals(AppraiseApplyStatusEnum.OVER.getKey())
+                        || apply.getStatus().equals(AppraiseApplyStatusEnum.OVER_APPLY.getKey()))) {
+                    throw new RemoteServiceException(apply.getOrderBaseId() + "工单编号的申诉记录非“审核通过”或“超时未审核”或“超时未申诉”，不能操作“驳回不可再申诉”");
                 }
                 apply.setExamineResult(apply.getAppraiseStatus());
             }
@@ -570,4 +595,20 @@ public class AppraiseRelaLogic {
     }
 
 
+    public PgAppraiseApplyCountBean applyCount() {
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+        PgAppraiseApplyCountBean bean = new PgAppraiseApplyCountBean();
+
+        final Integer count = pgAppraiseApplyService.lambdaQuery()
+                .in(CollectionUtil.isNotEmpty(adminUser.getAdminWebsitIds()), PgAppraiseApply::getWebsitId, adminUser.getAdminWebsitIds())
+                .eq(PgAppraiseApply::getStatus, AppraiseApplyStatusEnum.WAIT.getKey())
+                .count();
+        final Integer centerCount = pgAppraiseApplyService.lambdaQuery()
+                .in(CollectionUtil.isNotEmpty(adminUser.getAdminWebsitIds()), PgAppraiseApply::getWebsitId, adminUser.getAdminWebsitIds())
+                .eq(PgAppraiseApply::getStatus, AppraiseApplyStatusEnum.WAIT_CENTER.getKey())
+                .count();
+        bean.setWaitCount(count);
+        bean.setCenterCount(centerCount);
+        return bean;
+    }
 }

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

@@ -2,6 +2,7 @@ package com.gree.mall.manager.logic.workorder;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -23,10 +24,8 @@ import com.gree.mall.manager.constant.SysDictConstant;
 import com.gree.mall.manager.enums.*;
 import com.gree.mall.manager.enums.admin.AdminWebsitTypeEnum;
 import com.gree.mall.manager.enums.base.BaseEnum;
-import com.gree.mall.manager.enums.workorder.OrderBaseStatusEnum;
-import com.gree.mall.manager.enums.workorder.OrderFlagEnum;
-import com.gree.mall.manager.enums.workorder.OrderTypeEnum;
 import com.gree.mall.manager.enums.workorder.SaleTypeEnum;
+import com.gree.mall.manager.enums.workorder.*;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.logic.common.LbsAmapLogic;
@@ -99,6 +98,7 @@ public class OrderBaseLogic {
     private final NoticeRecordService noticeRecordService;
     private final LeaseOrderService leaseOrderService;
     private final PgAppraiseApplyService pgAppraiseApplyService;
+    private final PgAppraiseConfigService pgAppraiseConfigService;
     private final ElasticsearchRestTemplate elasticsearchRestTemplate;
 
     /**
@@ -212,6 +212,10 @@ public class OrderBaseLogic {
                     .in(PgAppraiseApply::getOrderBaseId, page.getRecords().stream().map(OrderBaseAppraiseVO::getId).collect(Collectors.toList()))
                     .groupBy(PgAppraiseApply::getOrderBaseId)
                     .list();
+            final PgAppraiseConfig config = pgAppraiseConfigService.lambdaQuery()
+                    .eq(PgAppraiseConfig::getCompanyWechatId, page.getRecords().get(0).getCompanyWechatId())
+                    .eq(PgAppraiseConfig::getType, AppraiseConfigTypeEnum.FIRST_A.getKey())
+                    .one();
             // 查询申诉记录
             if (CollectionUtil.isNotEmpty(applyList)) {
                 final Map<String, String> applyMap = applyList.stream().collect(Collectors.toMap(PgAppraiseApply::getOrderBaseId, PgAppraiseApply::getId));
@@ -221,6 +225,27 @@ public class OrderBaseLogic {
                     }
                 }
             }
+            for (OrderBaseAppraiseVO record : page.getRecords()) {
+                if (StringUtils.isNotBlank(record.getAppraiseApplyId())) {
+                    continue;
+                }
+                if (!(record.getOrderStatus().getKey().equals(OrderBaseStatusEnum.YWG.getKey())
+                        || record.getOrderStatus().getKey().equals(OrderBaseStatusEnum.YJS.getKey()))) {
+                    record.setAppraiseApplyId("1");
+                    continue;
+                }
+                Date overTime = record.getOverTime();
+                if (Objects.isNull(overTime)) {
+                    overTime = record.getWebsitOverTime();
+                }
+                if (Objects.nonNull(overTime)) {
+                    final int val = Integer.parseInt(config.getVal());
+                    DateTime endTime = DateUtil.offsetHour(overTime, val);
+                    if (DateUtil.date().after(endTime)) {
+                        record.setAppraiseApplyId("2");
+                    }
+                }
+            }
         }
         return page;
     }

mall-server-api/src/main/java/com/gree/mall/manager/schedule/AppraiseApplySchedule.java

@@ -0,0 +1,132 @@
+package com.gree.mall.manager.schedule;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
+import com.gree.mall.manager.enums.workorder.AppraiseApplyStatusEnum;
+import com.gree.mall.manager.enums.workorder.AppraiseConfigTypeEnum;
+import com.gree.mall.manager.enums.workorder.AppraiseOnusEnum;
+import com.gree.mall.manager.enums.workorder.AppraiseStatusEnum;
+import com.gree.mall.manager.plus.entity.PgAppraiseApply;
+import com.gree.mall.manager.plus.entity.PgAppraiseConfig;
+import com.gree.mall.manager.plus.entity.PgOrderBase;
+import com.gree.mall.manager.plus.service.PgAppraiseApplyService;
+import com.gree.mall.manager.plus.service.PgAppraiseConfigService;
+import com.gree.mall.manager.plus.service.PgOrderBaseService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@ConditionalOnProperty(name = "schedule.enable", havingValue = "true", matchIfMissing = true)
+@Slf4j
+@Component
+public class AppraiseApplySchedule {
+
+    @Resource
+    PgAppraiseApplyService pgAppraiseApplyService;
+    @Resource
+    PgAppraiseConfigService pgAppraiseConfigService;
+    @Resource
+    PgOrderBaseService pgOrderBaseService;
+    @Value("${spring.profiles.active}")
+    private String env;
+
+    /**
+     * 待中心审核检查超时
+     */
+    @Scheduled(fixedDelay = 2 * 1000)
+    public void task1(){
+        if(env.equals("test") || env.equals("prd")) {
+            final List<PgAppraiseApply> applyList = pgAppraiseApplyService.lambdaQuery()
+                    .eq(PgAppraiseApply::getStatus, AppraiseApplyStatusEnum.WAIT_CENTER.getKey())
+                    .list();
+            if (CollectionUtil.isNotEmpty(applyList)) {
+                // 首次审核时间不能超时, 二次审核时间不能超时，从网点提交首次申诉时间开始计算
+                final List<PgAppraiseConfig> configList = pgAppraiseConfigService.lambdaQuery()
+                        .eq(PgAppraiseConfig::getCompanyWechatId, applyList.get(0).getCompanyWechatId())
+                        .in(PgAppraiseConfig::getType, AppraiseConfigTypeEnum.FIRST_C.getKey(), AppraiseConfigTypeEnum.SECOND_C.getKey())
+                        .list();
+
+                final Map<String, String> configMap = configList.stream().collect(Collectors.toMap(PgAppraiseConfig::getType, PgAppraiseConfig::getVal));
+
+                for (PgAppraiseApply apply : applyList) {
+                    String value = configMap.get(!apply.getIsSecond() ? AppraiseConfigTypeEnum.FIRST_C.getKey() : AppraiseConfigTypeEnum.SECOND_C.getKey());
+                    final int val = Integer.parseInt(value);
+                    Date endTime = DateUtil.offsetHour(apply.getApplyTime(), val);
+                    if (DateUtil.date().after(endTime)) {
+                        pgAppraiseApplyService.lambdaUpdate()
+                                .set(PgAppraiseApply::getExamineResult, AppraiseStatusEnum.A.getKey())
+                                .set(PgAppraiseApply::getStatus, AppraiseApplyStatusEnum.OVER.getKey())
+                                .set(PgAppraiseApply::getWebsitResult, AppraiseOnusEnum.NOT.getKey())
+                                .set(PgAppraiseApply::getCategoryId, null)
+                                .set(PgAppraiseApply::getParentCategoryId, null)
+                                .set(PgAppraiseApply::getCategoryName, null)
+                                .set(PgAppraiseApply::getParentCategoryName, null)
+                                .set(PgAppraiseApply::getIsWebsitCall, null)
+                                .set(PgAppraiseApply::getConfirmBy, "中心超时未审核")
+                                .set(PgAppraiseApply::getInfoConfirmTime, null)
+                                .set(PgAppraiseApply::getSettleConfirmTime, null)
+                                .eq(PgAppraiseApply::getId, apply.getId())
+                                .update();
+                        pgOrderBaseService.lambdaUpdate()
+                                .eq(PgOrderBase::getAppraiseApplyResult, AppraiseStatusEnum.A.getKey())
+                                .eq(PgOrderBase::getId, apply.getId())
+                                .update();
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 二次申诉检查超时
+     */
+    @Scheduled(fixedDelay = 2 * 1000)
+    public void task2(){
+        if(env.equals("test") || env.equals("prd")) {
+            final List<PgAppraiseApply> applyList = pgAppraiseApplyService.lambdaQuery()
+                    .eq(PgAppraiseApply::getStatus, AppraiseApplyStatusEnum.WAIT.getKey())
+                    .eq(PgAppraiseApply::getIsSecond, true)
+                    .isNotNull(PgAppraiseApply::getSettleConfirmTime)
+                    .list();
+            if (CollectionUtil.isNotEmpty(applyList)) {
+                // 二次申诉时间不能超时，从中心首次审核时间开始计算
+                final PgAppraiseConfig config = pgAppraiseConfigService.lambdaQuery()
+                        .eq(PgAppraiseConfig::getCompanyWechatId, applyList.get(0).getCompanyWechatId())
+                        .eq(PgAppraiseConfig::getType, AppraiseConfigTypeEnum.SECOND_A.getKey())
+                        .one();
+
+                for (PgAppraiseApply apply : applyList) {
+                    String value = config.getVal();
+                    final int val = Integer.parseInt(value);
+                    Date endTime = DateUtil.offsetHour(apply.getApplyTime(), val);
+                    if (DateUtil.date().after(endTime)) {
+                        pgAppraiseApplyService.lambdaUpdate()
+                                .set(PgAppraiseApply::getExamineResult, apply.getAppraiseStatus())
+                                .set(PgAppraiseApply::getStatus, AppraiseApplyStatusEnum.OVER_APPLY.getKey())
+                                .set(PgAppraiseApply::getWebsitResult, AppraiseOnusEnum.ALL.getKey())
+                                .set(PgAppraiseApply::getCategoryId, null)
+                                .set(PgAppraiseApply::getParentCategoryId, null)
+                                .set(PgAppraiseApply::getCategoryName, null)
+                                .set(PgAppraiseApply::getParentCategoryName, null)
+                                .set(PgAppraiseApply::getIsWebsitCall, null)
+                                .set(PgAppraiseApply::getConfirmBy, "超时未申诉")
+                                .eq(PgAppraiseApply::getId, apply.getId())
+                                .update();
+                        pgOrderBaseService.lambdaUpdate()
+                                .eq(PgOrderBase::getAppraiseApplyResult, apply.getAppraiseStatus())
+                                .eq(PgOrderBase::getId, apply.getId())
+                                .update();
+                    }
+                }
+            }
+        }
+    }
+}