jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
wangyingyang
38cf9203 1 parent 4f279566

fix default

Inline Side-by-side
Showing 2 changed files with 4 additions and 2 deletions
...@@ -195,7 +195,7 @@ public class OrderDbDTO { ...@@ -195,7 +195,7 @@ public class OrderDbDTO {
195 private Boolean shouldCreateOpenId; 195 private Boolean shouldCreateOpenId;
196 196
197 @ApiModelProperty(value = "阳光厅点餐客户 ID") 197 @ApiModelProperty(value = "阳光厅点餐客户 ID")
198 - private String openId = ""; 198 + private String openId;
199 199
200 @ApiModelProperty(value = "状态订单；待备餐=1，备餐中=2，部分出餐=3，已出餐=4，已取消=5") 200 @ApiModelProperty(value = "状态订单；待备餐=1，备餐中=2，部分出餐=3，已出餐=4，已取消=5")
201 private Integer status; 201 private Integer status;
...@@ -207,7 +207,7 @@ public class OrderDbDTO { ...@@ -207,7 +207,7 @@ public class OrderDbDTO {
207 private Integer totalNum; 207 private Integer totalNum;
208 208
209 @ApiModelProperty(value = "实际支付金额，单位为分") 209 @ApiModelProperty(value = "实际支付金额，单位为分")
210 - private Integer payPrice = 0; 210 + private Integer payPrice;
211 211
212 @ApiModelProperty(value = "是否在线付费；0=未付费，1=付费") 212 @ApiModelProperty(value = "是否在线付费；0=未付费，1=付费")
213 private Boolean onlinePay; 213 private Boolean onlinePay;
......
...@@ -76,6 +76,7 @@ public class OrderServiceImpl implements OrderService { ...@@ -76,6 +76,7 @@ public class OrderServiceImpl implements OrderService {
76 CreateOrderDto createOrderDto = new CreateOrderDto(); 76 CreateOrderDto createOrderDto = new CreateOrderDto();
77 createOrderDto.setShouldCreateCustomerId(true); 77 createOrderDto.setShouldCreateCustomerId(true);
78 createOrderDto.setShouldCreateOpenId(false); 78 createOrderDto.setShouldCreateOpenId(false);
79 + createOrderDto.setOpenId("");
79 createOrderDto.setCustomerId(operatorCreateOrderDto.getCustomerId()); 80 createOrderDto.setCustomerId(operatorCreateOrderDto.getCustomerId());
80 createOrderDto.setStallId(operatorCreateOrderDto.getStallId()); 81 createOrderDto.setStallId(operatorCreateOrderDto.getStallId());
81 createOrderDto.setMenuId(operatorCreateOrderDto.getMenuId()); 82 createOrderDto.setMenuId(operatorCreateOrderDto.getMenuId());
...@@ -84,6 +85,7 @@ public class OrderServiceImpl implements OrderService { ...@@ -84,6 +85,7 @@ public class OrderServiceImpl implements OrderService {
84 createOrderDto.setCreatedBy(operatorLoginInfo.getId()); 85 createOrderDto.setCreatedBy(operatorLoginInfo.getId());
85 createOrderDto.setClientId(customer.getClientId()); 86 createOrderDto.setClientId(customer.getClientId());
86 createOrderDto.setAddress(record.getDepartmentName() + record.getRoomNo()); 87 createOrderDto.setAddress(record.getDepartmentName() + record.getRoomNo());
88 + createOrderDto.setPayPrice(0);
87 final var menu = menuServiceRpcClient.getMenuById(operator.getEnterpriseId(), 89 final var menu = menuServiceRpcClient.getMenuById(operator.getEnterpriseId(),
88 createOrderDto.getMenuId()).getResponse(); 90 createOrderDto.getMenuId()).getResponse();
89 createOrderDto.setCloseTimeType( 91 createOrderDto.setCloseTimeType(
......