Merge branch 'feat-dingwf-mvp616' into develop

project-order/src/main/java/com/alibaba/cloud/integration/order/dto/LocationDTO.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 
 @Data
 @Data
 public class LocationDTO {
 public class LocationDTO {
-    private String address;
+    private String formattedAddress;
     private String country;
     private String country;
     private String province;
     private String province;
     private String citycode;
     private String citycode;

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/OrderCreateServiceImpl.java

@@ -108,7 +108,7 @@ public class OrderCreateServiceImpl implements OrderCreateService {
         entity.setProvince(location.getProvince());
         entity.setProvince(location.getProvince());
         entity.setCity(location.getCity());
         entity.setCity(location.getCity());
         entity.setCounty(location.getDistrict());
         entity.setCounty(location.getDistrict());
-        entity.setAddress(location.getAddress());
+        entity.setAddress(location.getFormattedAddress());
         // 根据分单，填写clusterId/branchId/groupId/teamId等
         // 根据分单，填写clusterId/branchId/groupId/teamId等
         String layer = productCategoryDao.getLayerByBrandAndTypeAndSkill(req.getBrand(), req.getType(), req.getSkill());
         String layer = productCategoryDao.getLayerByBrandAndTypeAndSkill(req.getBrand(), req.getType(), req.getSkill());
         String loc = String.format("%f,%f", req.getLocation().getLng(), req.getLocation().getLat());
         String loc = String.format("%f,%f", req.getLocation().getLng(), req.getLocation().getLat());

project-order/src/main/resources/application.yaml

@@ -32,8 +32,8 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     type: com.alibaba.druid.pool.DruidDataSource
 
 
 logging:
 logging:
-  level:
-    root: ${LOG_LEVEL:INFO}
+  pattern:
+    dateformat: "yyyy-MM-dd HH:mm:ss.SSS '+0800'"
 
 
 seata:
 seata:
   application-id: ${spring.application.name}
   application-id: ${spring.application.name}