zhuyifan

fix

......@@ -271,7 +271,7 @@ public class OrderDbDTO {
private Integer customerId;
@ApiModelProperty(value = "状态订单;待备餐=1,备餐中=2,部分出餐=3,已出餐=4,已取消=5")
private Integer status;
private OrderStatusEnum status;
@ApiModelProperty(value = "餐单 id")
@NotNull(message = "餐单 id不能为空")
......
......@@ -557,7 +557,7 @@ public class OrderServiceRpcClient {
.setShouldCreateCustomerId(createOrderDto.getShouldCreateCustomerId())
.setShouldCreateCustomerId(true).setCustomerId(createOrderDto.getCustomerId())
.setStallId(createOrderDto.getStallId())
.setStatus(orderStatus)
.setStatus(createOrderDto.getStatus() != null ? createOrderDto.getStatus() : orderStatus)
.setAddress(createOrderDto.getAddress())
.setClientId(createOrderDto.getClientId())
.setShouldCreateOpenId(!LoginContextHolder.getOpenId().isEmpty()).setOpenId(LoginContextHolder.getOpenId())
......
......@@ -113,6 +113,7 @@ public class OrderServiceImpl implements OrderService {
createOrderDto.setCreationSource(OrderSourceEnum.STALL.getNumber());
createOrderDto.setEnterpriseId(operatorLoginInfo.getEnterpriseId());
createOrderDto.setOnlinePay(operatorCreateOrderDto.getOnlinePay());
createOrderDto.setStatus(OrderStatusEnum.PREPARING);
OrderTypeEnum orderType;
if (menu.getOrderRuleJson().getCloseTimeType() == CloseTimeTypeEnum.RESERVATION) {
orderType = OrderTypeEnum.DELIVERY;
......