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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/workorder/OrderBaseController.java

@@ -136,8 +136,8 @@ public class OrderBaseController {
     @PostMapping("/rece")
     @ApiOperation("确定接单")
     public ResponseHelper rece(
-            @ApiParam(value = "工单id", required = true) @RequestParam String orderBaseId,
-            @ApiParam(value = "小工师傅") @RequestParam List<String> workerList
+            @ApiParam(value = "工单id", required = true) @RequestParam(required = false) String orderBaseId,
+            @ApiParam(value = "小工师傅", required = false) @RequestParam(required = false) List<String> workerList
     ){
         orderBaseLogic.rece(orderBaseId, workerList);
         return ResponseHelper.success();

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/AgreementLogic.java

@@ -1492,13 +1492,16 @@ public class AgreementLogic {
                 .count() > 0) {
             leLetterService.lambdaUpdate().eq(LeLetter::getStatus, LetterStatusEnum.SEND.getKey())
                     .le(LeLetter::getSendTime, DateUtil.offsetDay(new Date(),-1*leConfig.getDayNum()))
+                    .set(LeLetter::getExamineStatus, "OK")
+                    .set(LeLetter::getExamineTime, new Date())
+                    .set(LeLetter::getExamineName, "申诉截止时间已到白动批复")
                     .set(LeLetter::getStatus,LetterStatusEnum.EXECUTED.getKey()).update();
         }
 
         if (leConfig.getIsDay().equals(IsYesNoEnum.YES.getKey())) {
 
             List<LeLetterItem> letterItems = leLetterItemService.lambdaQuery().eq(LeLetterItem::getWebsitAppeal, "AP")
-                    .isNull(LeLetterItem::getExamineStatus)
+                    .and(item -> item.isNull(LeLetterItem::getExamineStatus).or().eq(LeLetterItem::getExamineStatus,""))
                     .le(LeLetterItem::getCreateTime, DateUtil.offsetDay(new Date(), -1 * leConfig.getCoreNum()))
                     .list();
 

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

@@ -112,6 +112,7 @@ public class ChangeOrderLogic {
         pgOrderBaseService.lambdaUpdate()
                 .eq(PgOrderBase::getId,id)
                 .set(!StringUtils.isEmpty(remark),PgOrderBase::getChangeRemark,remark)
+                .set(!StringUtils.isEmpty(remark),PgOrderBase::getAppointmentRemark,remark)
                 .set(PgOrderBase::getAppointmentTime,appointmentTime)
                 .set(PgOrderBase::getAppointmentEndTime,appointmentEndTime)
                 .set(PgOrderBase::getLastOperatorAppointmentTime,new Date())