jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
99537cf5 1 parent eaa9c800

fix

Inline Side-by-side
Showing 1 changed file with 5 additions and 4 deletions
...@@ -47,7 +47,7 @@ import com.infoloop.tianting.exception.ErrorCodeEnum; ...@@ -47,7 +47,7 @@ import com.infoloop.tianting.exception.ErrorCodeEnum;
47 import com.infoloop.tianting.logic.delay.DelayedQueue; 47 import com.infoloop.tianting.logic.delay.DelayedQueue;
48 import com.infoloop.tianting.logic.delay.OrderAutoCancelDelayTask; 48 import com.infoloop.tianting.logic.delay.OrderAutoCancelDelayTask;
49 import com.infoloop.tianting.logic.delay.param.AutoCancelParam; 49 import com.infoloop.tianting.logic.delay.param.AutoCancelParam;
50 -import com.infoloop.tianting.menuservice.CloseTimeTypeEnum; 50 +import com.infoloop.tianting.menuservice.ModeOfPaymentEnum;
51 import com.infoloop.tianting.model.bo.AddSkusSellQuantityBO; 51 import com.infoloop.tianting.model.bo.AddSkusSellQuantityBO;
52 import com.infoloop.tianting.model.bo.SkuSellQuantityBO; 52 import com.infoloop.tianting.model.bo.SkuSellQuantityBO;
53 import com.infoloop.tianting.model.dto.OperationDTO.BatchOperationDto; 53 import com.infoloop.tianting.model.dto.OperationDTO.BatchOperationDto;
...@@ -66,6 +66,7 @@ import com.infoloop.tianting.utils.DateUtil; ...@@ -66,6 +66,7 @@ import com.infoloop.tianting.utils.DateUtil;
66 import com.infoloop.tianting.utils.JsonUtil; 66 import com.infoloop.tianting.utils.JsonUtil;
67 import lombok.RequiredArgsConstructor; 67 import lombok.RequiredArgsConstructor;
68 import lombok.extern.slf4j.Slf4j; 68 import lombok.extern.slf4j.Slf4j;
69 +import org.redisson.api.RAtomicLong;
69 import org.redisson.api.RedissonClient; 70 import org.redisson.api.RedissonClient;
70 import org.springframework.beans.factory.annotation.Autowired; 71 import org.springframework.beans.factory.annotation.Autowired;
71 import org.springframework.stereotype.Service; 72 import org.springframework.stereotype.Service;
...@@ -477,7 +478,7 @@ public class OrderServiceRpcClient { ...@@ -477,7 +478,7 @@ public class OrderServiceRpcClient {
477 String currentDate = DateUtil.formatDate(today, DateUtil.YYYY_MM_DD); 478 String currentDate = DateUtil.formatDate(today, DateUtil.YYYY_MM_DD);
478 String redisKey = REDIS_KEY_PREFIX + currentDate; 479 String redisKey = REDIS_KEY_PREFIX + currentDate;
479 // 获取分布式原子Long对象，用于原子自增操作 480 // 获取分布式原子Long对象，用于原子自增操作
480 - org.redisson.api.RAtomicLong atomicLong = redissonClient.getAtomicLong(redisKey); 481 + RAtomicLong atomicLong = redissonClient.getAtomicLong(redisKey);
481 // 原子自增并获取当前值 482 // 原子自增并获取当前值
482 long counter = atomicLong.incrementAndGet(); 483 long counter = atomicLong.incrementAndGet();
483 return String.format("%04d", (int) counter); 484 return String.format("%04d", (int) counter);
...@@ -565,7 +566,7 @@ public class OrderServiceRpcClient { ...@@ -565,7 +566,7 @@ public class OrderServiceRpcClient {
565 .addAllOrderDetails(orderDetails) 566 .addAllOrderDetails(orderDetails)
566 .build(); 567 .build();
567 final var menuById = menuServiceRpcClient.getMenuById(createOrderDto.getEnterpriseId(), createOrderDto.getMenuId()); 568 final var menuById = menuServiceRpcClient.getMenuById(createOrderDto.getEnterpriseId(), createOrderDto.getMenuId());
568 - if (menuById.getResponse().getOrderRuleJson().getCloseTimeType() == CloseTimeTypeEnum.IMMEDIATELY) { 569 + if (menuById.getResponse().getOrderRuleJson().getModeOfPayment() == ModeOfPaymentEnum.ONLINE) {
569 final var skuIds = createOrderDto.getOrderDetailDtos().stream().map(CreateOrderDetailDto::getSkuId).collect(Collectors.toList()); 570 final var skuIds = createOrderDto.getOrderDetailDtos().stream().map(CreateOrderDetailDto::getSkuId).collect(Collectors.toList());
570 final var skuSellQuantities = this.querySkuSellQuantitiesByStallAndSkuIds(createOrderDto.getEnterpriseId(), createOrderDto.getStallId(), skuIds); 571 final var skuSellQuantities = this.querySkuSellQuantitiesByStallAndSkuIds(createOrderDto.getEnterpriseId(), createOrderDto.getStallId(), skuIds);
571 final var skuSellQuantityMap = skuSellQuantities.stream().collect(Collectors.toMap(SingleSkuSellQuantityRpcResponse::getSkuId, Function.identity())); 572 final var skuSellQuantityMap = skuSellQuantities.stream().collect(Collectors.toMap(SingleSkuSellQuantityRpcResponse::getSkuId, Function.identity()));
...@@ -599,7 +600,7 @@ public class OrderServiceRpcClient { ...@@ -599,7 +600,7 @@ public class OrderServiceRpcClient {
599 .setEnterpriseId(createOrderDto.getEnterpriseId()) 600 .setEnterpriseId(createOrderDto.getEnterpriseId())
600 .setCreatedBy(createOrderDto.getCreatedBy()) 601 .setCreatedBy(createOrderDto.getCreatedBy())
601 .build()); 602 .build());
602 - if (orderResponse.getIsCreated() && menuById.getResponse().getOrderRuleJson().getCloseTimeType() == CloseTimeTypeEnum.IMMEDIATELY) { 603 + if (orderResponse.getIsCreated() && menuById.getResponse().getOrderRuleJson().getModeOfPayment() == ModeOfPaymentEnum.ONLINE) {
603 final var isSuccess = this.addSkusSellQuantities(createOrderDto.getEnterpriseId(), createOrderDto.getStallId(), 604 final var isSuccess = this.addSkusSellQuantities(createOrderDto.getEnterpriseId(), createOrderDto.getStallId(),
604 orderDetails.stream().map(e -> AddSkusSellQuantityBO.builder() 605 orderDetails.stream().map(e -> AddSkusSellQuantityBO.builder()
605 .skuId(e.getSkuId()) 606 .skuId(e.getSkuId())
......