zhuyifan

fix

......@@ -248,12 +248,6 @@ public class OrderDbDTO {
@ApiModelProperty(value = "客户 ID")
private Integer customerId;
@ApiModelProperty(value = "需要创建阳光厅点餐客户open ID")
private Boolean shouldCreateOpenId;
@ApiModelProperty(value = "阳光厅点餐客户 ID")
private String openId;
@ApiModelProperty(value = "状态订单;待备餐=1,备餐中=2,部分出餐=3,已出餐=4,已取消=5")
private Integer status;
......
......@@ -539,8 +539,8 @@ public class OrderServiceRpcClient {
.setStatus(orderStatus)
.setAddress(createOrderDto.getAddress())
.setClientId(createOrderDto.getClientId())
.setShouldCreateOpenId(createOrderDto.getShouldCreateOpenId())
.setOpenId(createOrderDto.getOpenId())
.setShouldCreateOpenId(!LoginContextHolder.getOpenId().isEmpty())
.setOpenId(LoginContextHolder.getOpenId())
.setShouldCreateRoomNo(!createOrderDto.getRoomNo().isEmpty())
.setRoomNo(createOrderDto.getRoomNo())
.setShouldCreateTableCode(createOrderDto.getOrderType().equals(OrderTypeEnum.DINE_IN.getValue()) || !createOrderDto.getTableCode().isEmpty())
......
......@@ -92,8 +92,6 @@ public class OrderServiceImpl implements OrderService {
final var record = clientCustomerServiceRpcClient.getClientCustomerHospitalRecordsByCustomerId(customer.getEnterpriseId(), customer.getId()).getResponse();
CreateOrderDto createOrderDto = new CreateOrderDto();
createOrderDto.setShouldCreateCustomerId(true);
createOrderDto.setShouldCreateOpenId(true);
createOrderDto.setOpenId(operatorLoginInfo.getOpenId());
createOrderDto.setTableCode(operatorCreateOrderDto.getTableCode());
createOrderDto.setCustomerId(operatorCreateOrderDto.getCustomerId());
createOrderDto.setStallId(operatorCreateOrderDto.getStallId());
......@@ -126,7 +124,6 @@ public class OrderServiceImpl implements OrderService {
}
createOrderDto.setOrderType(orderType.getNumber());
createOrderDto.setShouldCreateCustomerId(true);
createOrderDto.setShouldCreateOpenId(false);
final var labelRefs = clientCustomerServiceRpcClient.getCustomerLabelsByCustomerId(customer.getEnterpriseId(), customer.getId()).getResponsesList();
final var labelIds = labelRefs.stream().map(SingleClientCustomerLabelRefRpcResponse::getLabelId).collect(Collectors.toList());
......