jiujian / client-customer-order-service

Go to a project
Toggle navigation Toggle navigation pinning
wangyingyang
3f6d5de8 1 parent 09ed71ee

fix

Inline Side-by-side
Showing 2 changed files with 10 additions and 1 deletions
...@@ -26,6 +26,7 @@ import com.tianting.infoloop.utils.exception.ServiceExceptionUtil; ...@@ -26,6 +26,7 @@ import com.tianting.infoloop.utils.exception.ServiceExceptionUtil;
26 import java.time.Instant; 26 import java.time.Instant;
27 import java.time.LocalDateTime; 27 import java.time.LocalDateTime;
28 import java.time.ZoneId; 28 import java.time.ZoneId;
29 +import java.time.ZoneOffset;
29 import java.util.ArrayList; 30 import java.util.ArrayList;
30 import java.util.Collections; 31 import java.util.Collections;
31 import java.util.List; 32 import java.util.List;
...@@ -110,7 +111,8 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl ...@@ -110,7 +111,8 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
110 orderDb.setCustomerNoticeJson(notice); 111 orderDb.setCustomerNoticeJson(notice);
111 } 112 }
112 LocalDateTime mealTime = Instant.ofEpochMilli(createOrderRpcRequest.getCreation().getMealTime()) 113 LocalDateTime mealTime = Instant.ofEpochMilli(createOrderRpcRequest.getCreation().getMealTime())
113 - .atZone(ZoneId.systemDefault()) 114 +// .atZone(ZoneId.systemDefault())
115 + .atOffset(ZoneOffset.UTC)
114 .toLocalDateTime(); 116 .toLocalDateTime();
115 orderDb.setMealTime(mealTime); 117 orderDb.setMealTime(mealTime);
116 orderDb.setPayStatus(PayStatusEnum.SUCCEED_VALUE); 118 orderDb.setPayStatus(PayStatusEnum.SUCCEED_VALUE);
......
...@@ -14,6 +14,13 @@ spring.datasource.dynamic.datasource.slave.url=jdbc:mysql://localhost:3306/cater ...@@ -14,6 +14,13 @@ spring.datasource.dynamic.datasource.slave.url=jdbc:mysql://localhost:3306/cater
14 spring.datasource.dynamic.datasource.slave.username=root 14 spring.datasource.dynamic.datasource.slave.username=root
15 spring.datasource.dynamic.datasource.slave.password=QAZwsx098 15 spring.datasource.dynamic.datasource.slave.password=QAZwsx098
16 spring.datasource.dynamic.primary=master 16 spring.datasource.dynamic.primary=master
17 +#spring.datasource.dynamic.datasource.master.url=jdbc:mysql://rm-uf63gfjzejp163e3g4o.mysql.rds.aliyuncs.com:3306/qingniu?autoReconnect=true&tcpKeepAlive=true&rewriteBatchedStatements=true&statementInterceptors=com.tianting.infoloop.tracing.MysqlZipkinInterceptor&useSSL=false
18 +#spring.datasource.dynamic.datasource.master.username=jj_infoloop_stage
19 +#spring.datasource.dynamic.datasource.master.password=H8kjNeChi1wimXw
20 +#spring.datasource.dynamic.datasource.slave.url=jdbc:mysql://rm-uf63gfjzejp163e3g4o.mysql.rds.aliyuncs.com:3306/qingniu?autoReconnect=true&tcpKeepAlive=true&statementInterceptors=com.tianting.infoloop.tracing.MysqlZipkinInterceptor&useSSL=false
21 +#spring.datasource.dynamic.datasource.slave.username=jj_infoloop_stage
22 +#spring.datasource.dynamic.datasource.slave.password=H8kjNeChi1wimXw
23 +#spring.datasource.dynamic.primary=master
17 24
18 logging.config=classpath:logback-spring.xml 25 logging.config=classpath:logback-spring.xml
19 26
......