jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
92086258 1 parent 757cfeed

fix(payment): 修复支付回调中的时间格式转换问题

Inline Side-by-side
Showing 1 changed file with 6 additions and 4 deletions
...@@ -57,7 +57,6 @@ import java.text.ParseException; ...@@ -57,7 +57,6 @@ import java.text.ParseException;
57 import java.time.Instant; 57 import java.time.Instant;
58 import java.time.LocalDate; 58 import java.time.LocalDate;
59 import java.time.LocalDateTime; 59 import java.time.LocalDateTime;
60 -import java.time.ZoneOffset;
61 import java.util.ArrayList; 60 import java.util.ArrayList;
62 import java.util.List; 61 import java.util.List;
63 import java.util.stream.Collectors; 62 import java.util.stream.Collectors;
...@@ -209,10 +208,12 @@ public class PayServiceClient { ...@@ -209,10 +208,12 @@ public class PayServiceClient {
209 log.info("callback updateClientCustomerOrder result: {}", updateResponse.getIsUpdated()); 208 log.info("callback updateClientCustomerOrder result: {}", updateResponse.getIsUpdated());
210 if (updateResponse.getIsUpdated()) { 209 if (updateResponse.getIsUpdated()) {
211 String createdAt = Instant.ofEpochMilli(orderById.getCreatedAt()) 210 String createdAt = Instant.ofEpochMilli(orderById.getCreatedAt())
212 - .atZone(ZoneOffset.UTC) 211 + .atZone(DateUtil.CHINA_ZONE)
212 + .minusHours(8)
213 .format(DateUtil.Y_M_D_H_M_S); 213 .format(DateUtil.Y_M_D_H_M_S);
214 String payTimed = Instant.ofEpochMilli(orderById.getPayTime()) 214 String payTimed = Instant.ofEpochMilli(orderById.getPayTime())
215 - .atZone(ZoneOffset.UTC) 215 + .atZone(DateUtil.CHINA_ZONE)
216 + .minusHours(8)
216 .format(DateUtil.Y_M_D_H_M_S); 217 .format(DateUtil.Y_M_D_H_M_S);
217 final var orderPaymentSuccessData = 218 final var orderPaymentSuccessData =
218 OrderPaymentSuccessData.builder() 219 OrderPaymentSuccessData.builder()
...@@ -350,7 +351,8 @@ public class PayServiceClient { ...@@ -350,7 +351,8 @@ public class PayServiceClient {
350 351
351 // 构建paycontent 352 // 构建paycontent
352 String payTime = Instant.ofEpochMilli(orderById.getPayTime()) 353 String payTime = Instant.ofEpochMilli(orderById.getPayTime())
353 - .atZone(ZoneOffset.UTC) 354 + .atZone(DateUtil.CHINA_ZONE)
355 + .minusHours(8)
354 .format(DateUtil.YMDHMS); 356 .format(DateUtil.YMDHMS);
355 357
356 BigDecimal price = 358 BigDecimal price =
......