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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/policy/WorkerLogic.java

@@ -130,18 +130,17 @@ public class WorkerLogic {
                     .in(WorkerPolicy::getStatus,"DSX","BZZ")
                     .le(WorkerPolicy::getEndTime, DateUtil.offsetDay(new Date(),7))
                     .eq(WorkerPolicy::getPolicyType,"AC")
-                    .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
-                    .le(WorkerPolicy::getExTime,new Date())
+                    .and(item -> item.isNull(WorkerPolicy::getExTime).or().le(WorkerPolicy::getExTime,new Date()))
                     .count() > 0){
 
 
                 List<WorkerPolicy> list = workerPolicyService.lambdaQuery()
                         .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
-                        .in(WorkerPolicy::getStatus, "DSX", "BZZ")
-                        .le(WorkerPolicy::getEndTime, DateUtil.offsetDay(new Date(), 7))
-                        .eq(WorkerPolicy::getPolicyType, "AC")
-                        .eq(WorkerPolicy::getWebsitUserId, websitUser.getId())
-                        .le(WorkerPolicy::getExTime, new Date()).list();
+                        .in(WorkerPolicy::getStatus,"DSX","BZZ")
+                        .le(WorkerPolicy::getEndTime, DateUtil.offsetDay(new Date(),7))
+                        .eq(WorkerPolicy::getPolicyType,"AC")
+                        .and(item -> item.isNull(WorkerPolicy::getExTime).or().le(WorkerPolicy::getExTime,new Date()))
+                        .list();
 
                 AdminWebsit adminWebsit = adminWebsitService.getById(websitUser.getWebsitId());
 
@@ -159,7 +158,7 @@ public class WorkerLogic {
                         .in(WorkerPolicy::getStatus,"YSX")
                         .notIn(WorkerPolicy::getStatus,"DSX","BZZ")
                         .eq(WorkerPolicy::getPolicyType,"AC")
-                        .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
+                        .and(item -> item.isNull(WorkerPolicy::getExTime).or().le(WorkerPolicy::getExTime,new Date()))
                         .set(WorkerPolicy::getExTime,DateUtil.endOfDay(new Date())).update();
             }
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderLogLogic.java

@@ -70,6 +70,7 @@ public class OrderLogLogic {
                     .set(PgOrderBase::getAppointmentEndTime, pgOrderOperatorLog.getAppointmentEndTime())
                     .set(PgOrderBase::getLastOperatorAppointmentTime, new Date())
                     .set(PgOrderBase::getChangeRemark, pgOrderOperatorLog.getContent())
+                    .set(PgOrderBase::getAppointmentRemark, pgOrderOperatorLog.getContent())
                     .eq(PgOrderBase::getId, pgOrderOperatorLog.getOrderBaseId())
                     .update();
         }

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

@@ -344,7 +344,7 @@ public class SyncOrderInfoLogic {
 
             String json = JSONUtil.toJsonStr(workOrderSearchReq);
 
-            log.info("工单同步详情返回："+json);
+
 
             String body = HttpUtils.requestPostBody(greeUrl + Constant.gree.POST_WORKER_ORDER_DETAIL, json, heard);
 
@@ -352,6 +352,9 @@ public class SyncOrderInfoLogic {
             String s = bodyMap.get("data").toString();
 
 
+            log.info("工单同步详情返回："+s);
+
+
             JSONArray jsonArray = JSONUtil.parseArray(s);
 
             List<WorkOrderRelationBean> itfGreeSynDownloadRecBeans = JSONUtil.toList(jsonArray, WorkOrderRelationBean.class);

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

@@ -659,7 +659,7 @@ public class AgreementLogic {
                     policyOrderService.lambdaUpdate()
                             .in(PolicyOrder::getId, policyOrderId)
                             .set(PolicyOrder::getStartTime, DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), 1)))
-                            .set(PolicyOrder::getEndTime, DateUtil.offsetMillisecond(DateUtil.endOfDay(DateUtil.offsetMonth(new Date(), 12)),-999))
+                            .set(PolicyOrder::getEndTime, this.getEndOfDay(DateUtil.offsetMonth(new Date(), 12)))
                             .set(PolicyOrder::getIsReceipt, IsYesNoEnum.YES.getKey())
                             .set(PolicyOrder::getReceiptTime, new Date())
                             .set(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.DSX.getKey()).update();