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

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

@@ -184,5 +184,8 @@ public class OrderBaseVO   {
     private String operateEntity;
 
 
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "是否是工单3.0同步true/false")
+    private Boolean isThreeOrder;
 
 }

mall-server-api/src/main/java/com/gree/mall/manager/config/MpMetaObjectHandler.java

@@ -27,6 +27,9 @@ public class MpMetaObjectHandler implements MetaObjectHandler {
         if(StringUtils.isNotBlank(username)){
             by = "(" + username+ ")" + by;
         }
+        if (this.getFieldValByName("isThreeOrder",metaObject) != null)
+            return;
+
       //  if (Objects.isNull(this.getFieldValByName("createBy", metaObject))) {
             this.setFieldValByName("createBy", by, metaObject);
        // }

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

@@ -1263,6 +1263,8 @@ public class OrderBaseExcelLogic {
 
     public void saveThreeOrder(SyncOrderDto syncOrderDto) {
 
+
+
         AdminUserCom adminUser = commonLogic.getAdminUser();
         //品牌map
         Map<String, Brand> brandMap = sysDictCompanyLogic.brandMapOfName(adminUser.getCompanyWechatId());
@@ -1311,6 +1313,7 @@ public class OrderBaseExcelLogic {
                 pgOrderBase.setStreetId(region.getId());
 
             }
+            pgOrderBase.setIsThreeOrder(true);
         }
 
 
@@ -1321,6 +1324,7 @@ public class OrderBaseExcelLogic {
         pgOrderProductService.saveOrUpdateBatch(syncOrderDto.getOrderProducts());
 
         pgOrderOperatorLogService.saveOrUpdateBatch(syncOrderDto.getPgOrderOperatorLogs());
+
     }
 
 }