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

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

@@ -508,10 +508,6 @@ public class OrderBaseLogic {
             pgOrderBase.setWorkerReceTime(new Date());
             pgOrderBase.updateById();
         }else {
-            if (pgOrderBase.getOrderStatus().equals(OrderBaseStatusEnum.DJD.getKey())){
-                pgOrderBase.setOrderStatus(OrderBaseStatusEnum.FWZ.getKey());
-                pgOrderBase.setOrderStatusText(OrderBaseStatusEnum.FWZ.getRemark());
-            }
             pgOrderBase.setIsMeet(true);
             pgOrderBase.updateById();
         }

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

@@ -1230,6 +1230,7 @@ public class AgreementLogic {
                     leLetterService.lambdaUpdate().eq(LeLetter::getStatus, LetterStatusEnum.WAIT_EXAMINE.getKey())
                             .eq(LeLetter::getLeLetterId,letterItem.getLeLetterId())
                             .set(LeLetter::getStatus, LetterStatusEnum.REVOKE.getKey())
+                            .set(LeLetter::getExamineStatus, "OK")
                             .update();
 
                 }

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

@@ -227,6 +227,7 @@ public class OrderBaseExcelLogic {
             PgOrderBase pgOrderBase = new PgOrderBase();
             pgOrderBase.setId(orderBaseId);
             pgOrderBase.setIsImport(true);
+            pgOrderBase.setIsMeet(true);
             pgOrderBase.setOrderType(orderSmallType1.getOrderType());
             pgOrderBase.setOrderTypeText(BaseEnum.keyToEnum(OrderTypeEnum.class, orderSmallType1.getOrderType()).getRemark());
             pgOrderBase.setOrderSmallType(orderSmallType1.getId());
@@ -600,6 +601,7 @@ public class OrderBaseExcelLogic {
             pgOrderBase.setOrderSmallTypeText(orderSmallType1.getOrderSmallTypeText());
             pgOrderBase.setCompanyWechatId(adminUser.getCompanyWechatId());
             pgOrderBase.setCompanyWechatName(adminUser.getCompanyName());
+            pgOrderBase.setIsMeet(true);
             if (adminWebsit != null) {
                 orderBaseStatusEnum = OrderBaseStatusEnum.DWDPG;
 

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

@@ -231,6 +231,8 @@ public class OrderBaseLogic {
         orderBase.setIsQd(orderAddBeanDTO.getIsQd());
         orderBase.setIsQdNotice(true);
         orderBase.setId(orderBaseId);
+        orderBase.setIsMeet(true);
+
 
         //是否变更了师傅
         Boolean changeWorker = false;