jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
1eb8acae 1 parent 565df6f6

fix

Inline Side-by-side
Showing 3 changed files with 10 additions and 11 deletions
...@@ -4,24 +4,20 @@ import com.infoloop.tianting.clientcustomerorderservice.CloseTimeType; ...@@ -4,24 +4,20 @@ import com.infoloop.tianting.clientcustomerorderservice.CloseTimeType;
4 import com.infoloop.tianting.clientcustomerorderservice.OrderSourceEnum; 4 import com.infoloop.tianting.clientcustomerorderservice.OrderSourceEnum;
5 import com.infoloop.tianting.clientcustomerorderservice.OrderStatusEnum; 5 import com.infoloop.tianting.clientcustomerorderservice.OrderStatusEnum;
6 import com.infoloop.tianting.clientcustomerorderservice.ServeStatusEnum; 6 import com.infoloop.tianting.clientcustomerorderservice.ServeStatusEnum;
7 -import com.infoloop.tianting.menuservice.CloseTimeTypeEnum;
8 import com.infoloop.tianting.model.common.PageInfo; 7 import com.infoloop.tianting.model.common.PageInfo;
9 import io.swagger.annotations.ApiModel; 8 import io.swagger.annotations.ApiModel;
10 import io.swagger.annotations.ApiModelProperty; 9 import io.swagger.annotations.ApiModelProperty;
11 -import io.swagger.models.auth.In;
12 -import java.time.LocalDateTime;
13 -import java.util.ArrayList;
14 -import java.util.List;
15 -import java.util.Optional;
16 -import javax.validation.Valid;
17 -import jdk.jfr.StackTrace;
18 import lombok.AllArgsConstructor; 10 import lombok.AllArgsConstructor;
19 import lombok.Builder; 11 import lombok.Builder;
20 -import lombok.Builder.Default;
21 import lombok.Data; 12 import lombok.Data;
22 import lombok.NoArgsConstructor; 13 import lombok.NoArgsConstructor;
23 import lombok.ToString; 14 import lombok.ToString;
24 15
16 +import javax.validation.Valid;
17 +import java.time.LocalDateTime;
18 +import java.util.ArrayList;
19 +import java.util.List;
20 +
25 @Data 21 @Data
26 @ApiModel(description = "订单DTO") 22 @ApiModel(description = "订单DTO")
27 public class OrderDbDTO { 23 public class OrderDbDTO {
...@@ -216,6 +212,9 @@ public class OrderDbDTO { ...@@ -216,6 +212,9 @@ public class OrderDbDTO {
216 @ApiModelProperty(value = "用餐日期") 212 @ApiModelProperty(value = "用餐日期")
217 private LocalDateTime mealTime; 213 private LocalDateTime mealTime;
218 214
215 + @ApiModelProperty(value = "桌号")
216 + private String tableCode;
217 +
219 @ApiModelProperty(value = "备注") 218 @ApiModelProperty(value = "备注")
220 private String remark; 219 private String remark;
221 220
......
...@@ -516,7 +516,7 @@ public class OrderServiceRpcClient { ...@@ -516,7 +516,7 @@ public class OrderServiceRpcClient {
516 .setOpenId(createOrderDto.getOpenId()) 516 .setOpenId(createOrderDto.getOpenId())
517 .setShouldCreateRoomNo(!createOrderDto.getRoomNo().isEmpty()) 517 .setShouldCreateRoomNo(!createOrderDto.getRoomNo().isEmpty())
518 .setRoomNo(createOrderDto.getRoomNo()) 518 .setRoomNo(createOrderDto.getRoomNo())
519 - .setShouldCreateTableCode(createOrderDto.getOrderType().equals(OrderTypeEnum.DINE_IN.getValue())) 519 + .setShouldCreateTableCode(createOrderDto.getOrderType().equals(OrderTypeEnum.DINE_IN.getValue()) || !createOrderDto.getTableCode().isEmpty())
520 .setTableCode(createOrderDto.getTableCode()) 520 .setTableCode(createOrderDto.getTableCode())
521 .setOnlinePay(createOrderDto.getOnlinePay()) 521 .setOnlinePay(createOrderDto.getOnlinePay())
522 .setShouldCreatePayStatus(createOrderDto.getOnlinePay()) 522 .setShouldCreatePayStatus(createOrderDto.getOnlinePay())
......
...@@ -95,6 +95,7 @@ public class OrderServiceImpl implements OrderService { ...@@ -95,6 +95,7 @@ public class OrderServiceImpl implements OrderService {
95 createOrderDto.setShouldCreateCustomerId(true); 95 createOrderDto.setShouldCreateCustomerId(true);
96 createOrderDto.setShouldCreateOpenId(false); 96 createOrderDto.setShouldCreateOpenId(false);
97 createOrderDto.setOpenId(""); 97 createOrderDto.setOpenId("");
98 + createOrderDto.setTableCode(operatorCreateOrderDto.getTableCode());
98 createOrderDto.setCustomerId(operatorCreateOrderDto.getCustomerId()); 99 createOrderDto.setCustomerId(operatorCreateOrderDto.getCustomerId());
99 createOrderDto.setStallId(operatorCreateOrderDto.getStallId()); 100 createOrderDto.setStallId(operatorCreateOrderDto.getStallId());
100 createOrderDto.setMenuId(operatorCreateOrderDto.getMenuId()); 101 createOrderDto.setMenuId(operatorCreateOrderDto.getMenuId());
...@@ -161,7 +162,6 @@ public class OrderServiceImpl implements OrderService { ...@@ -161,7 +162,6 @@ public class OrderServiceImpl implements OrderService {
161 .build(); 162 .build();
162 createOrderDto.setCustomerNoticeJson(customerNotice); 163 createOrderDto.setCustomerNoticeJson(customerNotice);
163 164
164 - createOrderDto.setTableCode("");
165 createOrderDto.setUpdatedBy(operatorLoginInfo.getId()); 165 createOrderDto.setUpdatedBy(operatorLoginInfo.getId());
166 createOrderDto.setUpdateSource(OrderSourceEnum.STALL.getNumber()); 166 createOrderDto.setUpdateSource(OrderSourceEnum.STALL.getNumber());
167 List<CreateOrderDetailDto> orderDetailDtoList = new ArrayList<>(); 167 List<CreateOrderDetailDto> orderDetailDtoList = new ArrayList<>();
......