jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
b8946734 1 parent c3b93742

fix

Inline Side-by-side
Showing 3 changed files with 3 additions and 2 deletions
...@@ -271,7 +271,7 @@ public class OrderDbDTO { ...@@ -271,7 +271,7 @@ public class OrderDbDTO {
271 private Integer customerId; 271 private Integer customerId;
272 272
273 @ApiModelProperty(value = "状态订单；待备餐=1，备餐中=2，部分出餐=3，已出餐=4，已取消=5") 273 @ApiModelProperty(value = "状态订单；待备餐=1，备餐中=2，部分出餐=3，已出餐=4，已取消=5")
274 - private Integer status; 274 + private OrderStatusEnum status;
275 275
276 @ApiModelProperty(value = "餐单 id") 276 @ApiModelProperty(value = "餐单 id")
277 @NotNull(message = "餐单 id不能为空") 277 @NotNull(message = "餐单 id不能为空")
......
...@@ -557,7 +557,7 @@ public class OrderServiceRpcClient { ...@@ -557,7 +557,7 @@ public class OrderServiceRpcClient {
557 .setShouldCreateCustomerId(createOrderDto.getShouldCreateCustomerId()) 557 .setShouldCreateCustomerId(createOrderDto.getShouldCreateCustomerId())
558 .setShouldCreateCustomerId(true).setCustomerId(createOrderDto.getCustomerId()) 558 .setShouldCreateCustomerId(true).setCustomerId(createOrderDto.getCustomerId())
559 .setStallId(createOrderDto.getStallId()) 559 .setStallId(createOrderDto.getStallId())
560 - .setStatus(orderStatus) 560 + .setStatus(createOrderDto.getStatus() != null ? createOrderDto.getStatus() : orderStatus)
561 .setAddress(createOrderDto.getAddress()) 561 .setAddress(createOrderDto.getAddress())
562 .setClientId(createOrderDto.getClientId()) 562 .setClientId(createOrderDto.getClientId())
563 .setShouldCreateOpenId(!LoginContextHolder.getOpenId().isEmpty()).setOpenId(LoginContextHolder.getOpenId()) 563 .setShouldCreateOpenId(!LoginContextHolder.getOpenId().isEmpty()).setOpenId(LoginContextHolder.getOpenId())
......
...@@ -113,6 +113,7 @@ public class OrderServiceImpl implements OrderService { ...@@ -113,6 +113,7 @@ public class OrderServiceImpl implements OrderService {
113 createOrderDto.setCreationSource(OrderSourceEnum.STALL.getNumber()); 113 createOrderDto.setCreationSource(OrderSourceEnum.STALL.getNumber());
114 createOrderDto.setEnterpriseId(operatorLoginInfo.getEnterpriseId()); 114 createOrderDto.setEnterpriseId(operatorLoginInfo.getEnterpriseId());
115 createOrderDto.setOnlinePay(operatorCreateOrderDto.getOnlinePay()); 115 createOrderDto.setOnlinePay(operatorCreateOrderDto.getOnlinePay());
116 + createOrderDto.setStatus(OrderStatusEnum.PREPARING);
116 OrderTypeEnum orderType; 117 OrderTypeEnum orderType;
117 if (menu.getOrderRuleJson().getCloseTimeType() == CloseTimeTypeEnum.RESERVATION) { 118 if (menu.getOrderRuleJson().getCloseTimeType() == CloseTimeTypeEnum.RESERVATION) {
118 orderType = OrderTypeEnum.DELIVERY; 119 orderType = OrderTypeEnum.DELIVERY;
......