Merge branch 'feature-dingwf-0715' into develop

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderCreateServiceImpl.java

@@ -89,7 +89,8 @@ public class OrderCreateServiceImpl implements OrderCreateService {
         entity.setId(IdUtil.getSnowflake().nextIdStr());
         entity.setId(IdUtil.getSnowflake().nextIdStr());
         String orderId = req.getOrderId();
         String orderId = req.getOrderId();
         if (StringUtils.isEmpty(orderId)) {
         if (StringUtils.isEmpty(orderId)) {
-            orderId = UUID.randomUUID().toString().replace("-", "");
+            String s = UUID.randomUUID().toString().replace("-", "");
+            orderId = s.substring(s.length()-9);
         }
         }
         entity.setOrderId(orderId);
         entity.setOrderId(orderId);
         entity.setName(req.getName());
         entity.setName(req.getName());

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

@@ -26,7 +26,7 @@ spring:
   #   - optional:nacos:datasource-config.yaml
   #   - optional:nacos:datasource-config.yaml
   datasource:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.10.0.116:3306/saas_aftersale_test?serverTimezone=UTC
+    url: jdbc:mysql://10.10.0.116:3306/saas_aftersale_test?serverTimezone=Asia/Shanghai
     username: root
     username: root
     password: 123456
     password: 123456
     type: com.alibaba.druid.pool.DruidDataSource
     type: com.alibaba.druid.pool.DruidDataSource