zhuyifan

fix(service): 修复订单创建时的时区问题

...@@ -593,7 +593,7 @@ public class OrderServiceRpcClient { ...@@ -593,7 +593,7 @@ public class OrderServiceRpcClient {
593 .setMenuId(createOrderDto.getMenuId()) 593 .setMenuId(createOrderDto.getMenuId())
594 .setTotalNum(createOrderDto.getTotalNum()) 594 .setTotalNum(createOrderDto.getTotalNum())
595 .setShouldCreatePayPrice(createOrderDto.getOnlinePay() == OnlinePayEnum.LEAVE_HOSPITAL).setPayPrice(createOrderDto.getPayPrice()) 595 .setShouldCreatePayPrice(createOrderDto.getOnlinePay() == OnlinePayEnum.LEAVE_HOSPITAL).setPayPrice(createOrderDto.getPayPrice())
596 - .setMealTime(createOrderDto.getMealTime().toLocalDate().atStartOfDay(DateUtil.CHINA_ZONE).toInstant().toEpochMilli()) 596 + .setMealTime(createOrderDto.getMealTime().toLocalDate().atStartOfDay().toEpochSecond(ZoneOffset.ofHours(8)) * 1000)
597 .setShouldCreatePickupCode(createOrderDto.getCloseTimeType().equals(CloseTimeType.IMMEDIATELY)).setPickupCode(generatePickupCode()) 597 .setShouldCreatePickupCode(createOrderDto.getCloseTimeType().equals(CloseTimeType.IMMEDIATELY)).setPickupCode(generatePickupCode())
598 .setShouldCreateOrderType(true).setOrderType(menuById.getResponse().getOrderRuleJson().getCloseTimeType() == CloseTimeTypeEnum.RESERVATION ? OrderTypeEnum.DELIVERY : OrderTypeEnum.DINE_IN) 598 .setShouldCreateOrderType(true).setOrderType(menuById.getResponse().getOrderRuleJson().getCloseTimeType() == CloseTimeTypeEnum.RESERVATION ? OrderTypeEnum.DELIVERY : OrderTypeEnum.DINE_IN)
599 .setShouldCreateRemark(true).setRemark(createOrderDto.getRemark()) 599 .setShouldCreateRemark(true).setRemark(createOrderDto.getRemark())
......