jiujian / client-customer-order-api

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

fix order

Inline Side-by-side
Showing 4 changed files with 12 additions and 4 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; 210 + private Integer payPrice = 0;
211 211
212 @ApiModelProperty(value = "是否在线付费；0=未付费，1=付费") 212 @ApiModelProperty(value = "是否在线付费；0=未付费，1=付费")
213 private Boolean onlinePay; 213 private Boolean onlinePay;
......
...@@ -237,7 +237,7 @@ public class OrderServiceRpcClient { ...@@ -237,7 +237,7 @@ public class OrderServiceRpcClient {
237 .setShowName(orderDetailDto.getShowName()) 237 .setShowName(orderDetailDto.getShowName())
238 .setPrice(orderDetailDto.getPrice()) 238 .setPrice(orderDetailDto.getPrice())
239 .setMealDetailJson(mealDetail) 239 .setMealDetailJson(mealDetail)
240 - .setAdjustSkuRemark(orderDetailDto.getAdjustSkuRemark()) 240 +// .setAdjustSkuRemark(orderDetailDto.getAdjustSkuRemark())
241 .setNotServe(orderDetailDto.getNotServe()) 241 .setNotServe(orderDetailDto.getNotServe())
242 .setShouldCreateAdjustSkuRemark(true) 242 .setShouldCreateAdjustSkuRemark(true)
243 .setShouldCreatePrice(true) 243 .setShouldCreatePrice(true)
......
...@@ -22,6 +22,7 @@ import com.infoloop.tianting.model.dto.OrderDbDTO.CreateOrderResponse; ...@@ -22,6 +22,7 @@ import com.infoloop.tianting.model.dto.OrderDbDTO.CreateOrderResponse;
22 import com.infoloop.tianting.model.dto.OrderDbDTO.CustomerDetailDto; 22 import com.infoloop.tianting.model.dto.OrderDbDTO.CustomerDetailDto;
23 import com.infoloop.tianting.model.dto.OrderDbDTO.CustomerNotice; 23 import com.infoloop.tianting.model.dto.OrderDbDTO.CustomerNotice;
24 import com.infoloop.tianting.model.dto.OrderDbDTO.MealDetailDto; 24 import com.infoloop.tianting.model.dto.OrderDbDTO.MealDetailDto;
25 +import com.infoloop.tianting.model.dto.OrderDbDTO.OperatorCreateOrderDetailDto;
25 import com.infoloop.tianting.model.dto.OrderDbDTO.OperatorCreateOrderDto; 26 import com.infoloop.tianting.model.dto.OrderDbDTO.OperatorCreateOrderDto;
26 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderAndDetailsDto; 27 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderAndDetailsDto;
27 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDetailBatchUpdateDto; 28 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDetailBatchUpdateDto;
...@@ -73,6 +74,8 @@ public class OrderServiceImpl implements OrderService { ...@@ -73,6 +74,8 @@ public class OrderServiceImpl implements OrderService {
73 final var customer = clientCustomerServiceRpcClient.getClientCustomerById(operatorCreateOrderDto.getCustomerId()).getResponse(); 74 final var customer = clientCustomerServiceRpcClient.getClientCustomerById(operatorCreateOrderDto.getCustomerId()).getResponse();
74 final var record = clientCustomerServiceRpcClient.getClientCustomerHospitalRecordsByCustomerId(customer.getEnterpriseId(), customer.getId()).getResponse(); 75 final var record = clientCustomerServiceRpcClient.getClientCustomerHospitalRecordsByCustomerId(customer.getEnterpriseId(), customer.getId()).getResponse();
75 CreateOrderDto createOrderDto = new CreateOrderDto(); 76 CreateOrderDto createOrderDto = new CreateOrderDto();
77 + createOrderDto.setShouldCreateCustomerId(true);
78 + createOrderDto.setShouldCreateOpenId(false);
76 createOrderDto.setCustomerId(operatorCreateOrderDto.getCustomerId()); 79 createOrderDto.setCustomerId(operatorCreateOrderDto.getCustomerId());
77 createOrderDto.setStallId(operatorCreateOrderDto.getStallId()); 80 createOrderDto.setStallId(operatorCreateOrderDto.getStallId());
78 createOrderDto.setMenuId(operatorCreateOrderDto.getMenuId()); 81 createOrderDto.setMenuId(operatorCreateOrderDto.getMenuId());
...@@ -129,7 +132,7 @@ public class OrderServiceImpl implements OrderService { ...@@ -129,7 +132,7 @@ public class OrderServiceImpl implements OrderService {
129 .collect(Collectors.toList()); 132 .collect(Collectors.toList());
130 final var rpcSkus = skuServiceRpcClient.getDishSkusByIds(skuIds).getResponseList(); 133 final var rpcSkus = skuServiceRpcClient.getDishSkusByIds(skuIds).getResponseList();
131 Integer totalSkuCount = 0; 134 Integer totalSkuCount = 0;
132 - for (CreateOrderDetailDto orderDetail: createOrderDto.getOrderDetailDtos()) { 135 + for (OperatorCreateOrderDetailDto orderDetail: operatorCreateOrderDto.getOrderDetailDtos()) {
133 totalSkuCount += orderDetail.getCount(); 136 totalSkuCount += orderDetail.getCount();
134 final var optionalTargetMenuDetail = menuDetails.stream().filter(detail -> detail.getId() == orderDetail.getMenuDetailId()).findFirst(); 137 final var optionalTargetMenuDetail = menuDetails.stream().filter(detail -> detail.getId() == orderDetail.getMenuDetailId()).findFirst();
135 if(optionalTargetMenuDetail.isEmpty()) { 138 if(optionalTargetMenuDetail.isEmpty()) {
......
...@@ -112,6 +112,7 @@ message SingleClientCustomerOrderRpcResponse { ...@@ -112,6 +112,7 @@ message SingleClientCustomerOrderRpcResponse {
112 bool isDeleted = 32; 112 bool isDeleted = 32;
113 bool isRead = 33; 113 bool isRead = 33;
114 bool isConfirm = 34; 114 bool isConfirm = 34;
115 + bool isAllocation = 35;
115 } 116 }
116 117
117 message GetClientCustomerOrderByIdRpcRequest { 118 message GetClientCustomerOrderByIdRpcRequest {
...@@ -205,6 +206,8 @@ message QueryClientCustomerOrdersByConditionRpcRequest { ...@@ -205,6 +206,8 @@ message QueryClientCustomerOrdersByConditionRpcRequest {
205 bool isRead = 43; 206 bool isRead = 43;
206 bool shouldFilterIsConfirm = 44; 207 bool shouldFilterIsConfirm = 44;
207 bool isConfirm = 45; 208 bool isConfirm = 45;
209 + bool shouldFilterIsAllocation = 46;
210 + bool isAllocation = 47;
208 } 211 }
209 212
210 message QueryClientCustomerOrdersByConditionRpcResponse { 213 message QueryClientCustomerOrdersByConditionRpcResponse {
...@@ -330,6 +333,8 @@ message ClientCustomerOrderModification { ...@@ -330,6 +333,8 @@ message ClientCustomerOrderModification {
330 bool isRead = 49; 333 bool isRead = 49;
331 bool shouldUpdateIsConfirm = 50; 334 bool shouldUpdateIsConfirm = 50;
332 bool isConfirm = 51; 335 bool isConfirm = 51;
336 + bool shouldUpdateIsAllocation = 52;
337 + bool isAllocation = 53;
333 } 338 }
334 339
335 message UpdateClientCustomerOrderRpcRequest { 340 message UpdateClientCustomerOrderRpcRequest {
......