jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
9776a229 1 parent e9ed9311

fix

Inline Side-by-side
Showing 1 changed file with 4 additions and 6 deletions
...@@ -526,11 +526,9 @@ public class OrderServiceRpcClient { ...@@ -526,11 +526,9 @@ public class OrderServiceRpcClient {
526 .addAllDoctors(createOrderDto.getCustomerNoticeJson().getDoctors()) 526 .addAllDoctors(createOrderDto.getCustomerNoticeJson().getDoctors())
527 .build(); 527 .build();
528 528
529 - //判断用餐时间是否是当天 529 + final var menuById = menuServiceRpcClient.getMenuById(createOrderDto.getEnterpriseId(), createOrderDto.getMenuId());
530 - final var mealDate = createOrderDto.getMealTime().toLocalDate();
531 - final var todayDate = LocalDate.now();
532 OrderStatusEnum orderStatus = OrderStatusEnum.TO_PREPARE; 530 OrderStatusEnum orderStatus = OrderStatusEnum.TO_PREPARE;
533 - if (mealDate.equals(todayDate)) { 531 + if (menuById.getResponse().getOrderRuleJson().getModeOfPayment() == ModeOfPaymentEnum.ONLINE && menuById.getResponse().getOrderRuleJson().getCloseTimeType() == CloseTimeTypeEnum.IMMEDIATELY) {
534 orderStatus = OrderStatusEnum.PREPARING; 532 orderStatus = OrderStatusEnum.PREPARING;
535 } 533 }
536 534
...@@ -554,7 +552,7 @@ public class OrderServiceRpcClient { ...@@ -554,7 +552,7 @@ public class OrderServiceRpcClient {
554 .setMenuId(createOrderDto.getMenuId()) 552 .setMenuId(createOrderDto.getMenuId())
555 .setTotalNum(createOrderDto.getTotalNum()) 553 .setTotalNum(createOrderDto.getTotalNum())
556 .setPayPrice(createOrderDto.getPayPrice()) 554 .setPayPrice(createOrderDto.getPayPrice())
557 - .setMealTime(mealDate.atStartOfDay().toInstant(ZoneOffset.UTC).toEpochMilli()) 555 + .setMealTime(LocalDate.now().atStartOfDay().toInstant(ZoneOffset.UTC).toEpochMilli())
558 .setShouldCreateTableCode(createOrderDto.getCloseTimeType().equals(CloseTimeType.IMMEDIATELY)) 556 .setShouldCreateTableCode(createOrderDto.getCloseTimeType().equals(CloseTimeType.IMMEDIATELY))
559 .setShouldCreatePickupCode(createOrderDto.getCloseTimeType().equals(CloseTimeType.IMMEDIATELY)) 557 .setShouldCreatePickupCode(createOrderDto.getCloseTimeType().equals(CloseTimeType.IMMEDIATELY))
560 .setPickupCode(generatePickupCode()) 558 .setPickupCode(generatePickupCode())
...@@ -566,7 +564,7 @@ public class OrderServiceRpcClient { ...@@ -566,7 +564,7 @@ public class OrderServiceRpcClient {
566 .setShouldCreateOrderDetails(true) 564 .setShouldCreateOrderDetails(true)
567 .addAllOrderDetails(orderDetails) 565 .addAllOrderDetails(orderDetails)
568 .build(); 566 .build();
569 - final var menuById = menuServiceRpcClient.getMenuById(createOrderDto.getEnterpriseId(), createOrderDto.getMenuId()); 567 +
570 if (menuById.getResponse().getOrderRuleJson().getCloseTimeType() == CloseTimeTypeEnum.IMMEDIATELY) { 568 if (menuById.getResponse().getOrderRuleJson().getCloseTimeType() == CloseTimeTypeEnum.IMMEDIATELY) {
571 final var skuIds = createOrderDto.getOrderDetailDtos().stream().map(CreateOrderDetailDto::getSkuId).collect(Collectors.toList()); 569 final var skuIds = createOrderDto.getOrderDetailDtos().stream().map(CreateOrderDetailDto::getSkuId).collect(Collectors.toList());
572 final var skuSellQuantities = this.querySkuSellQuantitiesByStallAndSkuIds(createOrderDto.getEnterpriseId(), createOrderDto.getStallId(), skuIds); 570 final var skuSellQuantities = this.querySkuSellQuantitiesByStallAndSkuIds(createOrderDto.getEnterpriseId(), createOrderDto.getStallId(), skuIds);
......