jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
dbfda5e6 1 parent d27c9a53

fix

Inline Side-by-side
Showing 3 changed files with 2 additions and 11 deletions
...@@ -248,12 +248,6 @@ public class OrderDbDTO { ...@@ -248,12 +248,6 @@ public class OrderDbDTO {
248 @ApiModelProperty(value = "客户 ID") 248 @ApiModelProperty(value = "客户 ID")
249 private Integer customerId; 249 private Integer customerId;
250 250
251 - @ApiModelProperty(value = "需要创建阳光厅点餐客户open ID")
252 - private Boolean shouldCreateOpenId;
253 -
254 - @ApiModelProperty(value = "阳光厅点餐客户 ID")
255 - private String openId;
256 -
257 @ApiModelProperty(value = "状态订单；待备餐=1，备餐中=2，部分出餐=3，已出餐=4，已取消=5") 251 @ApiModelProperty(value = "状态订单；待备餐=1，备餐中=2，部分出餐=3，已出餐=4，已取消=5")
258 private Integer status; 252 private Integer status;
259 253
......
...@@ -539,8 +539,8 @@ public class OrderServiceRpcClient { ...@@ -539,8 +539,8 @@ public class OrderServiceRpcClient {
539 .setStatus(orderStatus) 539 .setStatus(orderStatus)
540 .setAddress(createOrderDto.getAddress()) 540 .setAddress(createOrderDto.getAddress())
541 .setClientId(createOrderDto.getClientId()) 541 .setClientId(createOrderDto.getClientId())
542 - .setShouldCreateOpenId(createOrderDto.getShouldCreateOpenId()) 542 + .setShouldCreateOpenId(!LoginContextHolder.getOpenId().isEmpty())
543 - .setOpenId(createOrderDto.getOpenId()) 543 + .setOpenId(LoginContextHolder.getOpenId())
544 .setShouldCreateRoomNo(!createOrderDto.getRoomNo().isEmpty()) 544 .setShouldCreateRoomNo(!createOrderDto.getRoomNo().isEmpty())
545 .setRoomNo(createOrderDto.getRoomNo()) 545 .setRoomNo(createOrderDto.getRoomNo())
546 .setShouldCreateTableCode(createOrderDto.getOrderType().equals(OrderTypeEnum.DINE_IN.getValue()) || !createOrderDto.getTableCode().isEmpty()) 546 .setShouldCreateTableCode(createOrderDto.getOrderType().equals(OrderTypeEnum.DINE_IN.getValue()) || !createOrderDto.getTableCode().isEmpty())
......
...@@ -92,8 +92,6 @@ public class OrderServiceImpl implements OrderService { ...@@ -92,8 +92,6 @@ public class OrderServiceImpl implements OrderService {
92 final var record = clientCustomerServiceRpcClient.getClientCustomerHospitalRecordsByCustomerId(customer.getEnterpriseId(), customer.getId()).getResponse(); 92 final var record = clientCustomerServiceRpcClient.getClientCustomerHospitalRecordsByCustomerId(customer.getEnterpriseId(), customer.getId()).getResponse();
93 CreateOrderDto createOrderDto = new CreateOrderDto(); 93 CreateOrderDto createOrderDto = new CreateOrderDto();
94 createOrderDto.setShouldCreateCustomerId(true); 94 createOrderDto.setShouldCreateCustomerId(true);
95 - createOrderDto.setShouldCreateOpenId(true);
96 - createOrderDto.setOpenId(operatorLoginInfo.getOpenId());
97 createOrderDto.setTableCode(operatorCreateOrderDto.getTableCode()); 95 createOrderDto.setTableCode(operatorCreateOrderDto.getTableCode());
98 createOrderDto.setCustomerId(operatorCreateOrderDto.getCustomerId()); 96 createOrderDto.setCustomerId(operatorCreateOrderDto.getCustomerId());
99 createOrderDto.setStallId(operatorCreateOrderDto.getStallId()); 97 createOrderDto.setStallId(operatorCreateOrderDto.getStallId());
...@@ -126,7 +124,6 @@ public class OrderServiceImpl implements OrderService { ...@@ -126,7 +124,6 @@ public class OrderServiceImpl implements OrderService {
126 } 124 }
127 createOrderDto.setOrderType(orderType.getNumber()); 125 createOrderDto.setOrderType(orderType.getNumber());
128 createOrderDto.setShouldCreateCustomerId(true); 126 createOrderDto.setShouldCreateCustomerId(true);
129 - createOrderDto.setShouldCreateOpenId(false);
130 127
131 final var labelRefs = clientCustomerServiceRpcClient.getCustomerLabelsByCustomerId(customer.getEnterpriseId(), customer.getId()).getResponsesList(); 128 final var labelRefs = clientCustomerServiceRpcClient.getCustomerLabelsByCustomerId(customer.getEnterpriseId(), customer.getId()).getResponsesList();
132 final var labelIds = labelRefs.stream().map(SingleClientCustomerLabelRefRpcResponse::getLabelId).collect(Collectors.toList()); 129 final var labelIds = labelRefs.stream().map(SingleClientCustomerLabelRefRpcResponse::getLabelId).collect(Collectors.toList());
......