jiujian / client-customer-order-service

Go to a project
Toggle navigation Toggle navigation pinning
wangyingyang
1995fc40 1 parent bf44261d

update order

Inline Side-by-side
Showing 6 changed files with 337 additions and 195 deletions
1 package com.tianting.infoloop.service; 1 package com.tianting.infoloop.service;
2 2
3 import com.baomidou.mybatisplus.extension.service.IService; 3 import com.baomidou.mybatisplus.extension.service.IService;
4 -import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrderAndDetailsRpcRequest;
5 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrdersRpcRequest; 4 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrdersRpcRequest;
6 import com.infoloop.tianting.clientcustomerorderservice.BatchUpdateClientCustomerOrdersRpcRequest; 5 import com.infoloop.tianting.clientcustomerorderservice.BatchUpdateClientCustomerOrdersRpcRequest;
7 import com.infoloop.tianting.clientcustomerorderservice.CreateClientCustomerOrderRpcRequest; 6 import com.infoloop.tianting.clientcustomerorderservice.CreateClientCustomerOrderRpcRequest;
...@@ -16,8 +15,6 @@ public interface OrderDbService extends IService<OrderDb> { ...@@ -16,8 +15,6 @@ public interface OrderDbService extends IService<OrderDb> {
16 15
17 List<OrderDb> batchCreateOrderDbs(BatchCreateClientCustomerOrdersRpcRequest batchCreateOrdersRequest); 16 List<OrderDb> batchCreateOrderDbs(BatchCreateClientCustomerOrdersRpcRequest batchCreateOrdersRequest);
18 17
19 - List<OrderDb> batchCreateOrdersAndDetails(BatchCreateClientCustomerOrderAndDetailsRpcRequest createOrdersAndDetailsRequest);
20 -
21 Boolean updateOrderDb(UpdateClientCustomerOrderRpcRequest updateOrderRequest); 18 Boolean updateOrderDb(UpdateClientCustomerOrderRpcRequest updateOrderRequest);
22 19
23 Boolean batchUpdateOrderDbs(BatchUpdateClientCustomerOrdersRpcRequest batchUpdateOrdersRequest); 20 Boolean batchUpdateOrderDbs(BatchUpdateClientCustomerOrdersRpcRequest batchUpdateOrdersRequest);
......
...@@ -7,8 +7,6 @@ import static com.tianting.infoloop.constants.ConfigConstants.DATA_SOURCE_SLAVE; ...@@ -7,8 +7,6 @@ import static com.tianting.infoloop.constants.ConfigConstants.DATA_SOURCE_SLAVE;
7 import com.baomidou.dynamic.datasource.annotation.DS; 7 import com.baomidou.dynamic.datasource.annotation.DS;
8 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 8 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
9 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 9 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
10 -import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrderAndDetailsRpcRequest;
11 -import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrderAndDetailsRpcResponse;
12 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrderDetailsRpcRequest; 10 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrderDetailsRpcRequest;
13 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrderDetailsRpcResponse; 11 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrderDetailsRpcResponse;
14 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrdersRpcRequest; 12 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrdersRpcRequest;
...@@ -333,24 +331,24 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu ...@@ -333,24 +331,24 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
333 responseStreamObserver.onCompleted(); 331 responseStreamObserver.onCompleted();
334 } 332 }
335 333
336 - @Override 334 +// @Override
337 - @DS(DATA_SOURCE_MASTER) 335 +// @DS(DATA_SOURCE_MASTER)
338 - public void batchCreateClientCustomerOrderAndDetails( 336 +// public void batchCreateClientCustomerOrderAndDetails(
339 - final BatchCreateClientCustomerOrderAndDetailsRpcRequest request, 337 +// final BatchCreateClientCustomerOrderAndDetailsRpcRequest request,
340 - final StreamObserver<BatchCreateClientCustomerOrderAndDetailsRpcResponse> 338 +// final StreamObserver<BatchCreateClientCustomerOrderAndDetailsRpcResponse>
341 - responseStreamObserver) { 339 +// responseStreamObserver) {
342 - final var builder = BatchCreateClientCustomerOrderAndDetailsRpcResponse.newBuilder(); 340 +// final var builder = BatchCreateClientCustomerOrderAndDetailsRpcResponse.newBuilder();
343 - try { 341 +// try {
344 - final var data = orderDbService.batchCreateOrdersAndDetails(request); 342 +// final var data = orderDbService.batchCreateOrdersAndDetails(request);
345 - builder.setIsCreated(data.size() == request.getOrderCreationsCount()).addAllOrderIds(data.stream().map( 343 +// builder.setIsCreated(data.size() == request.getOrderCreationsCount()).addAllOrderIds(data.stream().map(
346 - OrderDb::getId).collect(Collectors.toList())); 344 +// OrderDb::getId).collect(Collectors.toList()));
347 - } catch (final Exception e) { 345 +// } catch (final Exception e) {
348 - log.error("batchCreateClientCustomerOrderAndDetails error;", e); 346 +// log.error("batchCreateClientCustomerOrderAndDetails error;", e);
349 - responseStreamObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException()); 347 +// responseStreamObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException());
350 - } 348 +// }
351 - responseStreamObserver.onNext(builder.build()); 349 +// responseStreamObserver.onNext(builder.build());
352 - responseStreamObserver.onCompleted(); 350 +// responseStreamObserver.onCompleted();
353 - } 351 +// }
354 352
355 @Override 353 @Override
356 @DS(DATA_SOURCE_MASTER) 354 @DS(DATA_SOURCE_MASTER)
......
...@@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -6,9 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
6 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 6 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 import com.fasterxml.jackson.databind.JsonNode; 7 import com.fasterxml.jackson.databind.JsonNode;
8 import com.fasterxml.jackson.databind.ObjectMapper; 8 import com.fasterxml.jackson.databind.ObjectMapper;
9 -import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrderAndDetailsRpcRequest; 9 +//import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrderAndDetailsRpcRequest;
10 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrdersRpcRequest; 10 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrdersRpcRequest;
11 import com.infoloop.tianting.clientcustomerorderservice.BatchUpdateClientCustomerOrdersRpcRequest; 11 import com.infoloop.tianting.clientcustomerorderservice.BatchUpdateClientCustomerOrdersRpcRequest;
12 +import com.infoloop.tianting.clientcustomerorderservice.ClientCustomerOrderCreation;
12 import com.infoloop.tianting.clientcustomerorderservice.CreateClientCustomerOrderRpcRequest; 13 import com.infoloop.tianting.clientcustomerorderservice.CreateClientCustomerOrderRpcRequest;
13 import com.infoloop.tianting.clientcustomerorderservice.OrderStatusEnum; 14 import com.infoloop.tianting.clientcustomerorderservice.OrderStatusEnum;
14 import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderRpcRequest; 15 import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderRpcRequest;
...@@ -120,6 +121,43 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl ...@@ -120,6 +121,43 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
120 if (!res) { 121 if (!res) {
121 throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_GEN_FAIL); 122 throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_GEN_FAIL);
122 } 123 }
124 + if (createOrderRpcRequest.getCreation().getShouldCreateOrderDetails()) {
125 + var detailList = createOrderRpcRequest.getCreation().getOrderDetailsList().stream()
126 + .map(detailCreation -> {
127 + OrderDetailDb orderDetailDb = new OrderDetailDb();
128 + orderDetailDb.setCreationSource(createOrderRpcRequest.getCreationSourceValue());
129 + orderDetailDb.setCreatedBy(createOrderRpcRequest.getCreatedBy());
130 + orderDetailDb.setUpdateSource(createOrderRpcRequest.getCreationSourceValue());
131 + orderDetailDb.setUpdatedBy(createOrderRpcRequest.getCreatedBy());
132 + orderDetailDb.setOrderId(detailCreation.getOrderId());
133 + orderDetailDb.setMenuDetailId(detailCreation.getMenuDetailId());
134 + orderDetailDb.setCount(detailCreation.getCount());
135 + orderDetailDb.setMealId(detailCreation.getMealId());
136 + orderDetailDb.setCategoryId(detailCreation.getCategoryId());
137 + orderDetailDb.setSkuId(detailCreation.getSkuId());
138 + if (detailCreation.getShouldCreateShowName()) {
139 + orderDetailDb.setShowName(detailCreation.getShowName());
140 + }
141 + if (detailCreation.getShouldCreatePrice()) {
142 + orderDetailDb.setPrice(detailCreation.getPrice());
143 + }
144 + if (detailCreation.getShouldCreateAdjustSkuRemark()) {
145 + orderDetailDb.setAdjustSkuRemark(detailCreation.getAdjustSkuRemark());
146 + }
147 + orderDetailDb.setNotServe(false);
148 + if (detailCreation.getShouldCreateMealDetailJson()) {
149 +// orderDetailDb.setMealDetailJson(objectMapper.valueToTree(detailCreation.getMealDetailJson()));
150 + }
151 + return orderDetailDb;
152 + })
153 + .collect(Collectors.toList());
154 + List<OrderDetailDb> resOrderDetails = SpringUtil.getBean(OrderDetailDbServiceImpl.class)
155 + .saveBatch(detailList) ? detailList : Collections.emptyList();
156 +
157 + if (resOrderDetails.size() != createOrderRpcRequest.getCreation().getOrderDetailsCount()) {
158 + throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_DETAIL_GEN_FAIL);
159 + }
160 + }
123 return orderDb; 161 return orderDb;
124 } 162 }
125 163
...@@ -127,7 +165,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl ...@@ -127,7 +165,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
127 public List<OrderDb> batchCreateOrderDbs( 165 public List<OrderDb> batchCreateOrderDbs(
128 BatchCreateClientCustomerOrdersRpcRequest batchCreateOrdersRequest) { 166 BatchCreateClientCustomerOrdersRpcRequest batchCreateOrdersRequest) {
129 ObjectMapper objectMapper = new ObjectMapper(); 167 ObjectMapper objectMapper = new ObjectMapper();
130 - var list = batchCreateOrdersRequest.getCreationsList().stream() 168 + var orderList = batchCreateOrdersRequest.getCreationsList().stream()
131 .map(creation ->{ 169 .map(creation ->{
132 OrderDb orderDb = new OrderDb(); 170 OrderDb orderDb = new OrderDb();
133 String orderCode = IdUtil.getSnowflake(0, 0).nextIdStr(); 171 String orderCode = IdUtil.getSnowflake(0, 0).nextIdStr();
...@@ -202,7 +240,127 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl ...@@ -202,7 +240,127 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
202 } 240 }
203 ) 241 )
204 .collect(Collectors.toList()); 242 .collect(Collectors.toList());
205 - return SpringUtil.getBean(OrderDbServiceImpl.class).saveBatch(list) ? list : Collections.emptyList(); 243 +// SpringUtil.getBean(OrderDbServiceImpl.class).saveBatch(list) ? list : Collections.emptyList();
244 +
245 + List<OrderDb> resOrders = SpringUtil.getBean(OrderDbServiceImpl.class)
246 + .saveBatch(orderList) ? orderList : Collections.emptyList();
247 + if (resOrders.size() != batchCreateOrdersRequest.getCreationsCount()) {
248 + throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_GEN_FAIL);
249 + }
250 +
251 + for(ClientCustomerOrderCreation creation: batchCreateOrdersRequest.getCreationsList()){
252 + OrderDb orderDb = new OrderDb();
253 + String orderCode = IdUtil.getSnowflake(0, 0).nextIdStr();
254 + orderDb.setOrderCode(orderCode);
255 + orderDb.setEnterpriseId(batchCreateOrdersRequest.getEnterpriseId());
256 + orderDb.setClientId(creation.getClientId());
257 + orderDb.setStallId(creation.getStallId());
258 + if (creation.getShouldCreateOpenId()) {
259 + orderDb.setOpenId(creation.getOpenId());
260 + }
261 + if (creation.getShouldCreateCustomerNoticeJson())
262 + {
263 + orderDb.setCustomerId(creation.getCustomerId());
264 + }
265 + orderDb.setStatus(creation.getStatusValue());
266 + orderDb.setMenuId(creation.getMenuId());
267 + orderDb.setTotalNum(creation.getTotalNum());
268 + if (creation.getShouldCreatePayPrice()) {
269 + orderDb.setPayPrice(creation.getPayPrice());
270 + }
271 + if (creation.getShouldCreatePayTime()) {
272 + orderDb.setPayTime(Instant.ofEpochMilli(creation.getPayTime())
273 + .atZone(ZoneId.systemDefault())
274 + .toLocalDateTime());
275 + }
276 + if (creation.getShouldCreateOnlinePay()) {
277 + orderDb.setOnlinePay(creation.getOnlinePay());
278 + }
279 + if (creation.getShouldCreatePayStatus()) {
280 + orderDb.setPayStatus(creation.getPayStatusValue());
281 + }
282 + if (creation.getShouldCreateTransactionId()) {
283 + orderDb.setTransactionId(creation.getTransactionId());
284 + }
285 + if (creation.getShouldCreateErrorMsg()) {
286 + orderDb.setErrorMsg(creation.getErrorMsg());
287 + }
288 + if (creation.getShouldCreateAddress()) {
289 + orderDb.setAddress(creation.getAddress());
290 + }
291 + if (creation.getShouldCreateRoomNo()) {
292 + orderDb.setRoomNo(creation.getRoomNo());
293 + }
294 + if (creation.getShouldCreateTableCode()) {
295 + orderDb.setTableCode(creation.getTableCode());
296 + }
297 + if (creation.getShouldCreatePickupCode()) {
298 + orderDb.setPickupCode(creation.getPickupCode());
299 + }
300 + if (creation.getShouldCreateOrderType()) {
301 + orderDb.setOrderType(creation.getOrderTypeValue());
302 + }
303 + if (creation.getShouldCreateRemark()) {
304 + orderDb.setRemark(creation.getRemark());
305 + }
306 + if (creation.getShouldCreateCustomerNoticeJson()) {
307 + JsonNode notice = objectMapper.valueToTree(creation.getCustomerNoticeJson());
308 + orderDb.setCustomerNoticeJson(notice);
309 + }
310 + LocalDateTime mealTime = Instant.ofEpochMilli(creation.getMealTime())
311 + .atZone(ZoneId.systemDefault())
312 + .toLocalDateTime();
313 + orderDb.setMealTime(mealTime);
314 + orderDb.setCreatedBy(batchCreateOrdersRequest.getCreatedBy());
315 + orderDb.setCreationSource(batchCreateOrdersRequest.getCreationSourceValue());
316 + orderDb.setUpdatedBy(batchCreateOrdersRequest.getCreatedBy());
317 + orderDb.setUpdateSource(batchCreateOrdersRequest.getCreationSourceValue());
318 + orderDb.setCloseTimeType(creation.getCloseTimeTypeValue());
319 + orderDb.setIsRead(creation.getIsRead());
320 + boolean res = this.save(orderDb);
321 + if (!res) {
322 + throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_GEN_FAIL);
323 + }
324 +
325 + if (creation.getShouldCreateOrderDetails()) {
326 + var detailList = creation.getOrderDetailsList().stream()
327 + .map(detailCreation -> {
328 + OrderDetailDb orderDetailDb = new OrderDetailDb();
329 + orderDetailDb.setCreationSource(batchCreateOrdersRequest.getCreationSourceValue());
330 + orderDetailDb.setCreatedBy(batchCreateOrdersRequest.getCreatedBy());
331 + orderDetailDb.setUpdateSource(batchCreateOrdersRequest.getCreationSourceValue());
332 + orderDetailDb.setUpdatedBy(batchCreateOrdersRequest.getCreatedBy());
333 + orderDetailDb.setOrderId(detailCreation.getOrderId());
334 + orderDetailDb.setMenuDetailId(detailCreation.getMenuDetailId());
335 + orderDetailDb.setCount(detailCreation.getCount());
336 + orderDetailDb.setMealId(detailCreation.getMealId());
337 + orderDetailDb.setCategoryId(detailCreation.getCategoryId());
338 + orderDetailDb.setSkuId(detailCreation.getSkuId());
339 + if (detailCreation.getShouldCreateShowName()) {
340 + orderDetailDb.setShowName(detailCreation.getShowName());
341 + }
342 + if (detailCreation.getShouldCreatePrice()) {
343 + orderDetailDb.setPrice(detailCreation.getPrice());
344 + }
345 + if (detailCreation.getShouldCreateAdjustSkuRemark()) {
346 + orderDetailDb.setAdjustSkuRemark(detailCreation.getAdjustSkuRemark());
347 + }
348 + orderDetailDb.setNotServe(false);
349 + if (detailCreation.getShouldCreateMealDetailJson()) {
350 + orderDetailDb.setMealDetailJson(objectMapper.valueToTree(detailCreation.getMealDetailJson()));
351 + }
352 + return orderDetailDb;
353 + })
354 + .collect(Collectors.toList());
355 + List<OrderDetailDb> resOrderDetails = SpringUtil.getBean(OrderDetailDbServiceImpl.class)
356 + .saveBatch(detailList) ? detailList : Collections.emptyList();
357 +
358 + if (resOrderDetails.size() != creation.getOrderDetailsCount()) {
359 + throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_DETAIL_GEN_FAIL);
360 + }
361 + }
362 + }
363 + return resOrders;
206 } 364 }
207 365
208 @Override 366 @Override
...@@ -402,129 +560,129 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl ...@@ -402,129 +560,129 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
402 return orderDbMapper.selectList(wrapper); 560 return orderDbMapper.selectList(wrapper);
403 } 561 }
404 562
405 - @Override 563 +// @Override
406 - public List<OrderDb> batchCreateOrdersAndDetails( 564 +// public List<OrderDb> batchCreateOrdersAndDetails(
407 - BatchCreateClientCustomerOrderAndDetailsRpcRequest createOrdersAndDetailsRequest) { 565 +// BatchCreateClientCustomerOrderAndDetailsRpcRequest createOrdersAndDetailsRequest) {
408 - ObjectMapper objectMapper = new ObjectMapper(); 566 +// ObjectMapper objectMapper = new ObjectMapper();
409 - var orderList = createOrdersAndDetailsRequest.getOrderCreationsList().stream() 567 +// var orderList = createOrdersAndDetailsRequest.getOrderCreationsList().stream()
410 - .map(creation -> { 568 +// .map(creation -> {
411 - OrderDb orderDb = new OrderDb(); 569 +// OrderDb orderDb = new OrderDb();
412 - String orderCode = IdUtil.getSnowflake(0, 0).nextIdStr(); 570 +// String orderCode = IdUtil.getSnowflake(0, 0).nextIdStr();
413 - orderDb.setOrderCode(orderCode); 571 +// orderDb.setOrderCode(orderCode);
414 - orderDb.setEnterpriseId(createOrdersAndDetailsRequest.getEnterpriseId()); 572 +// orderDb.setEnterpriseId(createOrdersAndDetailsRequest.getEnterpriseId());
415 - orderDb.setClientId(creation.getClientId()); 573 +// orderDb.setClientId(creation.getClientId());
416 - orderDb.setStallId(creation.getStallId()); 574 +// orderDb.setStallId(creation.getStallId());
417 - if (creation.getShouldCreateOpenId()) { 575 +// if (creation.getShouldCreateOpenId()) {
418 - orderDb.setOpenId(creation.getOpenId()); 576 +// orderDb.setOpenId(creation.getOpenId());
419 - } 577 +// }
420 - if (creation.getShouldCreateCustomerNoticeJson()) 578 +// if (creation.getShouldCreateCustomerNoticeJson())
421 - { 579 +// {
422 - orderDb.setCustomerId(creation.getCustomerId()); 580 +// orderDb.setCustomerId(creation.getCustomerId());
423 - } 581 +// }
424 - orderDb.setStatus(creation.getStatusValue()); 582 +// orderDb.setStatus(creation.getStatusValue());
425 - orderDb.setMenuId(creation.getMenuId()); 583 +// orderDb.setMenuId(creation.getMenuId());
426 - orderDb.setTotalNum(creation.getTotalNum()); 584 +// orderDb.setTotalNum(creation.getTotalNum());
427 - if (creation.getShouldCreatePayPrice()) { 585 +// if (creation.getShouldCreatePayPrice()) {
428 - orderDb.setPayPrice(creation.getPayPrice()); 586 +// orderDb.setPayPrice(creation.getPayPrice());
429 - } 587 +// }
430 - if (creation.getShouldCreatePayTime()) { 588 +// if (creation.getShouldCreatePayTime()) {
431 - orderDb.setPayTime(Instant.ofEpochMilli(creation.getPayTime()) 589 +// orderDb.setPayTime(Instant.ofEpochMilli(creation.getPayTime())
432 - .atZone(ZoneId.systemDefault()) 590 +// .atZone(ZoneId.systemDefault())
433 - .toLocalDateTime()); 591 +// .toLocalDateTime());
434 - } 592 +// }
435 - if (creation.getShouldCreateOnlinePay()) { 593 +// if (creation.getShouldCreateOnlinePay()) {
436 - orderDb.setOnlinePay(creation.getOnlinePay()); 594 +// orderDb.setOnlinePay(creation.getOnlinePay());
437 - } 595 +// }
438 - if (creation.getShouldCreatePayStatus()) { 596 +// if (creation.getShouldCreatePayStatus()) {
439 - orderDb.setPayStatus(creation.getPayStatusValue()); 597 +// orderDb.setPayStatus(creation.getPayStatusValue());
440 - } 598 +// }
441 - if (creation.getShouldCreateTransactionId()) { 599 +// if (creation.getShouldCreateTransactionId()) {
442 - orderDb.setTransactionId(creation.getTransactionId()); 600 +// orderDb.setTransactionId(creation.getTransactionId());
443 - } 601 +// }
444 - if (creation.getShouldCreateErrorMsg()) { 602 +// if (creation.getShouldCreateErrorMsg()) {
445 - orderDb.setErrorMsg(creation.getErrorMsg()); 603 +// orderDb.setErrorMsg(creation.getErrorMsg());
446 - } 604 +// }
447 - if (creation.getShouldCreateAddress()) { 605 +// if (creation.getShouldCreateAddress()) {
448 - orderDb.setAddress(creation.getAddress()); 606 +// orderDb.setAddress(creation.getAddress());
449 - } 607 +// }
450 - if (creation.getShouldCreateRoomNo()) { 608 +// if (creation.getShouldCreateRoomNo()) {
451 - orderDb.setRoomNo(creation.getRoomNo()); 609 +// orderDb.setRoomNo(creation.getRoomNo());
452 - } 610 +// }
453 - if (creation.getShouldCreateTableCode()) { 611 +// if (creation.getShouldCreateTableCode()) {
454 - orderDb.setTableCode(creation.getTableCode()); 612 +// orderDb.setTableCode(creation.getTableCode());
455 - } 613 +// }
456 - if (creation.getShouldCreatePickupCode()) { 614 +// if (creation.getShouldCreatePickupCode()) {
457 - orderDb.setPickupCode(creation.getPickupCode()); 615 +// orderDb.setPickupCode(creation.getPickupCode());
458 - } 616 +// }
459 - if (creation.getShouldCreateOrderType()) { 617 +// if (creation.getShouldCreateOrderType()) {
460 - orderDb.setOrderType(creation.getOrderTypeValue()); 618 +// orderDb.setOrderType(creation.getOrderTypeValue());
461 - } 619 +// }
462 - if (creation.getShouldCreateRemark()) { 620 +// if (creation.getShouldCreateRemark()) {
463 - orderDb.setRemark(creation.getRemark()); 621 +// orderDb.setRemark(creation.getRemark());
464 - } 622 +// }
465 - if (creation.getShouldCreateCustomerNoticeJson()) { 623 +// if (creation.getShouldCreateCustomerNoticeJson()) {
466 - JsonNode notice = objectMapper.valueToTree(creation.getCustomerNoticeJson()); 624 +// JsonNode notice = objectMapper.valueToTree(creation.getCustomerNoticeJson());
467 - orderDb.setCustomerNoticeJson(notice); 625 +// orderDb.setCustomerNoticeJson(notice);
468 - } 626 +// }
469 - LocalDateTime mealTime = Instant.ofEpochMilli(creation.getMealTime()) 627 +// LocalDateTime mealTime = Instant.ofEpochMilli(creation.getMealTime())
470 - .atZone(ZoneId.systemDefault()) 628 +// .atZone(ZoneId.systemDefault())
471 - .toLocalDateTime(); 629 +// .toLocalDateTime();
472 - orderDb.setMealTime(mealTime); 630 +// orderDb.setMealTime(mealTime);
473 - orderDb.setCreatedBy(createOrdersAndDetailsRequest.getCreatedBy()); 631 +// orderDb.setCreatedBy(createOrdersAndDetailsRequest.getCreatedBy());
474 - orderDb.setCreationSource(createOrdersAndDetailsRequest.getCreationSourceValue()); 632 +// orderDb.setCreationSource(createOrdersAndDetailsRequest.getCreationSourceValue());
475 - orderDb.setUpdatedBy(createOrdersAndDetailsRequest.getCreatedBy()); 633 +// orderDb.setUpdatedBy(createOrdersAndDetailsRequest.getCreatedBy());
476 - orderDb.setUpdateSource(createOrdersAndDetailsRequest.getCreationSourceValue()); 634 +// orderDb.setUpdateSource(createOrdersAndDetailsRequest.getCreationSourceValue());
477 - orderDb.setCloseTimeType(creation.getCloseTimeTypeValue()); 635 +// orderDb.setCloseTimeType(creation.getCloseTimeTypeValue());
478 - orderDb.setIsRead(creation.getIsRead()); 636 +// orderDb.setIsRead(creation.getIsRead());
479 - 637 +//
480 - return orderDb; 638 +// return orderDb;
481 - } 639 +// }
482 - ) 640 +// )
483 - .collect(Collectors.toList()); 641 +// .collect(Collectors.toList());
484 - 642 +//
485 - List<OrderDb> resOrders = SpringUtil.getBean(OrderDbServiceImpl.class) 643 +// List<OrderDb> resOrders = SpringUtil.getBean(OrderDbServiceImpl.class)
486 - .saveBatch(orderList) ? orderList : Collections.emptyList(); 644 +// .saveBatch(orderList) ? orderList : Collections.emptyList();
487 - if (resOrders.size() != createOrdersAndDetailsRequest.getOrderCreationsCount()) { 645 +// if (resOrders.size() != createOrdersAndDetailsRequest.getOrderCreationsCount()) {
488 - throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_GEN_FAIL); 646 +// throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_GEN_FAIL);
489 - } 647 +// }
490 - 648 +//
491 - var detailList = createOrdersAndDetailsRequest.getDetailCreationsList().stream() 649 +// var detailList = createOrdersAndDetailsRequest.getDetailCreationsList().stream()
492 - .map(creation -> { 650 +// .map(creation -> {
493 - OrderDetailDb orderDetailDb = new OrderDetailDb(); 651 +// OrderDetailDb orderDetailDb = new OrderDetailDb();
494 - orderDetailDb.setCreationSource(createOrdersAndDetailsRequest.getCreationSourceValue()); 652 +// orderDetailDb.setCreationSource(createOrdersAndDetailsRequest.getCreationSourceValue());
495 - orderDetailDb.setCreatedBy(createOrdersAndDetailsRequest.getCreatedBy()); 653 +// orderDetailDb.setCreatedBy(createOrdersAndDetailsRequest.getCreatedBy());
496 - orderDetailDb.setUpdateSource(createOrdersAndDetailsRequest.getCreationSourceValue()); 654 +// orderDetailDb.setUpdateSource(createOrdersAndDetailsRequest.getCreationSourceValue());
497 - orderDetailDb.setUpdatedBy(createOrdersAndDetailsRequest.getCreatedBy()); 655 +// orderDetailDb.setUpdatedBy(createOrdersAndDetailsRequest.getCreatedBy());
498 - orderDetailDb.setOrderId(creation.getOrderId()); 656 +// orderDetailDb.setOrderId(creation.getOrderId());
499 - orderDetailDb.setMenuDetailId(creation.getMenuDetailId()); 657 +// orderDetailDb.setMenuDetailId(creation.getMenuDetailId());
500 - orderDetailDb.setCount(creation.getCount()); 658 +// orderDetailDb.setCount(creation.getCount());
501 - orderDetailDb.setMealId(creation.getMealId()); 659 +// orderDetailDb.setMealId(creation.getMealId());
502 - orderDetailDb.setCategoryId(creation.getCategoryId()); 660 +// orderDetailDb.setCategoryId(creation.getCategoryId());
503 - orderDetailDb.setSkuId(creation.getSkuId()); 661 +// orderDetailDb.setSkuId(creation.getSkuId());
504 - if (creation.getShouldCreateShowName()) { 662 +// if (creation.getShouldCreateShowName()) {
505 - orderDetailDb.setShowName(creation.getShowName()); 663 +// orderDetailDb.setShowName(creation.getShowName());
506 - } 664 +// }
507 - if (creation.getShouldCreatePrice()) { 665 +// if (creation.getShouldCreatePrice()) {
508 - orderDetailDb.setPrice(creation.getPrice()); 666 +// orderDetailDb.setPrice(creation.getPrice());
509 - } 667 +// }
510 - if (creation.getShouldCreateAdjustSkuRemark()) { 668 +// if (creation.getShouldCreateAdjustSkuRemark()) {
511 - orderDetailDb.setAdjustSkuRemark(creation.getAdjustSkuRemark()); 669 +// orderDetailDb.setAdjustSkuRemark(creation.getAdjustSkuRemark());
512 - } 670 +// }
513 - orderDetailDb.setNotServe(creation.getNotServe()); 671 +// orderDetailDb.setNotServe(creation.getNotServe());
514 - if (creation.getShouldCreateMealDetailJson()) { 672 +// if (creation.getShouldCreateMealDetailJson()) {
515 - orderDetailDb.setMealDetailJson(objectMapper.valueToTree(creation.getMealDetailJson())); 673 +// orderDetailDb.setMealDetailJson(objectMapper.valueToTree(creation.getMealDetailJson()));
516 - } 674 +// }
517 - 675 +//
518 - return orderDetailDb; 676 +// return orderDetailDb;
519 - }) 677 +// })
520 - .collect(Collectors.toList()); 678 +// .collect(Collectors.toList());
521 - List<OrderDetailDb> resOrderDetails = SpringUtil.getBean(OrderDetailDbServiceImpl.class) 679 +// List<OrderDetailDb> resOrderDetails = SpringUtil.getBean(OrderDetailDbServiceImpl.class)
522 - .saveBatch(detailList) ? detailList : Collections.emptyList(); 680 +// .saveBatch(detailList) ? detailList : Collections.emptyList();
523 - 681 +//
524 - if (resOrderDetails.size() != createOrdersAndDetailsRequest.getDetailCreationsCount()) { 682 +// if (resOrderDetails.size() != createOrdersAndDetailsRequest.getDetailCreationsCount()) {
525 - throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_DETAIL_GEN_FAIL); 683 +// throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_DETAIL_GEN_FAIL);
526 - } 684 +// }
527 - return resOrders; 685 +// return resOrders;
528 - } 686 +// }
529 687
530 } 688 }
......
...@@ -43,7 +43,9 @@ public class OrderDetailDbServiceImpl extends ServiceImpl<OrderDetailMapper, Ord ...@@ -43,7 +43,9 @@ public class OrderDetailDbServiceImpl extends ServiceImpl<OrderDetailMapper, Ord
43 CreateClientCustomerOrderDetailRpcRequest createOrderDetailRequest) { 43 CreateClientCustomerOrderDetailRpcRequest createOrderDetailRequest) {
44 ObjectMapper objectMapper = new ObjectMapper(); 44 ObjectMapper objectMapper = new ObjectMapper();
45 OrderDetailDb orderDetailDb = new OrderDetailDb(); 45 OrderDetailDb orderDetailDb = new OrderDetailDb();
46 - orderDetailDb.setOrderId(createOrderDetailRequest.getCreation().getOrderId()); 46 + if (createOrderDetailRequest.getCreation().getShouldCreateOrderId()){
47 + orderDetailDb.setOrderId(createOrderDetailRequest.getCreation().getOrderId());
48 + }
47 orderDetailDb.setMenuDetailId(createOrderDetailRequest.getCreation().getMenuDetailId()); 49 orderDetailDb.setMenuDetailId(createOrderDetailRequest.getCreation().getMenuDetailId());
48 orderDetailDb.setCount(createOrderDetailRequest.getCreation().getCount()); 50 orderDetailDb.setCount(createOrderDetailRequest.getCreation().getCount());
49 orderDetailDb.setMealId(createOrderDetailRequest.getCreation().getMealId()); 51 orderDetailDb.setMealId(createOrderDetailRequest.getCreation().getMealId());
...@@ -63,7 +65,7 @@ public class OrderDetailDbServiceImpl extends ServiceImpl<OrderDetailMapper, Ord ...@@ -63,7 +65,7 @@ public class OrderDetailDbServiceImpl extends ServiceImpl<OrderDetailMapper, Ord
63 if (createOrderDetailRequest.getCreation().getShouldCreateAdjustSkuRemark()) { 65 if (createOrderDetailRequest.getCreation().getShouldCreateAdjustSkuRemark()) {
64 orderDetailDb.setAdjustSkuRemark(createOrderDetailRequest.getCreation().getAdjustSkuRemark()); 66 orderDetailDb.setAdjustSkuRemark(createOrderDetailRequest.getCreation().getAdjustSkuRemark());
65 } 67 }
66 - orderDetailDb.setNotServe(createOrderDetailRequest.getCreation().getNotServe()); 68 + orderDetailDb.setNotServe(false);
67 if (createOrderDetailRequest.getCreation().getShouldCreateMealDetailJson()) { 69 if (createOrderDetailRequest.getCreation().getShouldCreateMealDetailJson()) {
68 orderDetailDb.setMealDetailJson(objectMapper.valueToTree(createOrderDetailRequest.getCreation().getMealDetailJson())); 70 orderDetailDb.setMealDetailJson(objectMapper.valueToTree(createOrderDetailRequest.getCreation().getMealDetailJson()));
69 } 71 }
...@@ -87,7 +89,6 @@ public class OrderDetailDbServiceImpl extends ServiceImpl<OrderDetailMapper, Ord ...@@ -87,7 +89,6 @@ public class OrderDetailDbServiceImpl extends ServiceImpl<OrderDetailMapper, Ord
87 orderDetailDb.setCreatedBy(batchCreateOrderDetailsRequest.getCreatedBy()); 89 orderDetailDb.setCreatedBy(batchCreateOrderDetailsRequest.getCreatedBy());
88 orderDetailDb.setUpdateSource(batchCreateOrderDetailsRequest.getCreationSourceValue()); 90 orderDetailDb.setUpdateSource(batchCreateOrderDetailsRequest.getCreationSourceValue());
89 orderDetailDb.setUpdatedBy(batchCreateOrderDetailsRequest.getCreatedBy()); 91 orderDetailDb.setUpdatedBy(batchCreateOrderDetailsRequest.getCreatedBy());
90 - orderDetailDb.setOrderId(creation.getOrderId());
91 orderDetailDb.setMenuDetailId(creation.getMenuDetailId()); 92 orderDetailDb.setMenuDetailId(creation.getMenuDetailId());
92 orderDetailDb.setCount(creation.getCount()); 93 orderDetailDb.setCount(creation.getCount());
93 orderDetailDb.setMealId(creation.getMealId()); 94 orderDetailDb.setMealId(creation.getMealId());
...@@ -96,6 +97,9 @@ public class OrderDetailDbServiceImpl extends ServiceImpl<OrderDetailMapper, Ord ...@@ -96,6 +97,9 @@ public class OrderDetailDbServiceImpl extends ServiceImpl<OrderDetailMapper, Ord
96 orderDetailDb.setIsDeleted(false); 97 orderDetailDb.setIsDeleted(false);
97 orderDetailDb.setNotServe(false); 98 orderDetailDb.setNotServe(false);
98 orderDetailDb.setEnterpriseId(batchCreateOrderDetailsRequest.getEnterpriseId()); 99 orderDetailDb.setEnterpriseId(batchCreateOrderDetailsRequest.getEnterpriseId());
100 + if (creation.getShouldCreateOrderId()) {
101 + orderDetailDb.setOrderId(creation.getOrderId());
102 + }
99 if (creation.getShouldCreateShowName()) { 103 if (creation.getShouldCreateShowName()) {
100 orderDetailDb.setShowName(creation.getShowName()); 104 orderDetailDb.setShowName(creation.getShowName());
101 } 105 }
...@@ -105,18 +109,15 @@ public class OrderDetailDbServiceImpl extends ServiceImpl<OrderDetailMapper, Ord ...@@ -105,18 +109,15 @@ public class OrderDetailDbServiceImpl extends ServiceImpl<OrderDetailMapper, Ord
105 if (creation.getShouldCreateAdjustSkuRemark()) { 109 if (creation.getShouldCreateAdjustSkuRemark()) {
106 orderDetailDb.setAdjustSkuRemark(creation.getAdjustSkuRemark()); 110 orderDetailDb.setAdjustSkuRemark(creation.getAdjustSkuRemark());
107 } 111 }
108 - System.out.println("_______________________________");
109 if (creation.getShouldCreateMealDetailJson()) { 112 if (creation.getShouldCreateMealDetailJson()) {
110 - System.out.println("______________object_________________"); 113 +// final JsonNode a;
111 - final JsonNode a; 114 +// try {
112 - try { 115 +// a = objectMapper.readTree(ProtoBeanUtil.protoToJson(creation.getMealDetailJson()));
113 - a = objectMapper.readTree(ProtoBeanUtil.protoToJson(creation.getMealDetailJson())); 116 +// orderDetailDb.setMealDetailJson(a);
114 - orderDetailDb.setMealDetailJson(a); 117 +// System.out.println(a);
115 - System.out.println(a); 118 +// } catch (JsonProcessingException e) {
116 - } catch (JsonProcessingException e) { 119 +// e.printStackTrace();
117 - e.printStackTrace(); 120 +// }
118 - }
119 - System.out.println("______________object_____end____________");
120 } 121 }
121 return orderDetailDb; 122 return orderDetailDb;
122 }) 123 })
......
...@@ -18,7 +18,6 @@ service ClientCustomerOrderServiceRpc { ...@@ -18,7 +18,6 @@ service ClientCustomerOrderServiceRpc {
18 rpc UpdateClientCustomerOrder (UpdateClientCustomerOrderRpcRequest) returns (UpdateClientCustomerOrderRpcResponse) {} 18 rpc UpdateClientCustomerOrder (UpdateClientCustomerOrderRpcRequest) returns (UpdateClientCustomerOrderRpcResponse) {}
19 rpc BatchUpdateClientCustomerOrders (BatchUpdateClientCustomerOrdersRpcRequest) returns (BatchUpdateClientCustomerOrdersRpcResponse) {} 19 rpc BatchUpdateClientCustomerOrders (BatchUpdateClientCustomerOrdersRpcRequest) returns (BatchUpdateClientCustomerOrdersRpcResponse) {}
20 rpc DeleteClientCustomerOrdersByIds (DeleteClientCustomerOrdersByIdsRpcRequest) returns (DeleteClientCustomerOrdersRpcResponse) {} 20 rpc DeleteClientCustomerOrdersByIds (DeleteClientCustomerOrdersByIdsRpcRequest) returns (DeleteClientCustomerOrdersRpcResponse) {}
21 - rpc BatchCreateClientCustomerOrderAndDetails (BatchCreateClientCustomerOrderAndDetailsRpcRequest) returns (BatchCreateClientCustomerOrderAndDetailsRpcResponse) {}
22 21
23 //订单明细 22 //订单明细
24 rpc GetClientCustomerOrderDetailById (GetClientCustomerOrderDetailByIdRpcRequest) returns (GetClientCustomerOrderDetailByIdRpcResponse) {} 23 rpc GetClientCustomerOrderDetailById (GetClientCustomerOrderDetailByIdRpcRequest) returns (GetClientCustomerOrderDetailByIdRpcResponse) {}
...@@ -232,6 +231,8 @@ message ClientCustomerOrderCreation{ ...@@ -232,6 +231,8 @@ message ClientCustomerOrderCreation{
232 bool shouldCreateCustomerNoticeJson = 37; 231 bool shouldCreateCustomerNoticeJson = 37;
233 CustomerNotice customerNoticeJson = 38; 232 CustomerNotice customerNoticeJson = 38;
234 bool isRead = 39; 233 bool isRead = 39;
234 + bool shouldCreateOrderDetails = 40;
235 + repeated ClientCustomerOrderDetailCreation orderDetails = 41;
235 } 236 }
236 237
237 message CreateClientCustomerOrderRpcRequest { 238 message CreateClientCustomerOrderRpcRequest {
...@@ -343,20 +344,6 @@ message DeleteClientCustomerOrdersRpcResponse { ...@@ -343,20 +344,6 @@ message DeleteClientCustomerOrdersRpcResponse {
343 bool isDeleted = 1; 344 bool isDeleted = 1;
344 } 345 }
345 346
346 -message BatchCreateClientCustomerOrderAndDetailsRpcRequest {
347 - int32 enterpriseId = 1;
348 - int32 createdBy = 2;
349 - OrderSourceEnum creationSource = 3;
350 - repeated ClientCustomerOrderCreation orderCreations = 4;
351 - repeated ClientCustomerOrderDetailCreation detailCreations = 5;
352 -}
353 -
354 -message BatchCreateClientCustomerOrderAndDetailsRpcResponse {
355 - repeated int32 orderIds = 1;
356 - bool isCreated = 2;
357 -}
358 -
359 -
360 message MealDetail { 347 message MealDetail {
361 string basicMaterials = 1; 348 string basicMaterials = 1;
362 repeated string tastes = 2; 349 repeated string tastes = 2;
...@@ -422,21 +409,22 @@ message GetClientCustomerOrderDetailsByOrderIdsRpcResponse { ...@@ -422,21 +409,22 @@ message GetClientCustomerOrderDetailsByOrderIdsRpcResponse {
422 } 409 }
423 410
424 message ClientCustomerOrderDetailCreation{ 411 message ClientCustomerOrderDetailCreation{
425 - int32 orderId = 1; 412 + bool shouldCreateOrderId = 1;
426 - int32 menuDetailId = 2; 413 + int32 orderId = 2;
427 - int32 count = 3; 414 + int32 menuDetailId = 3;
428 - int32 mealId = 4; 415 + int32 count = 4;
429 - int32 categoryId = 5; 416 + int32 mealId = 5;
430 - int32 skuId = 6; 417 + int32 categoryId = 6;
431 - bool shouldCreateShowName = 7; 418 + int32 skuId = 7;
432 - string showName = 8; 419 + bool shouldCreateShowName = 8;
433 - bool shouldCreateMealDetailJson = 9; 420 + string showName = 9;
434 - MealDetail mealDetailJson = 10; 421 + bool shouldCreateMealDetailJson = 10;
435 - bool shouldCreatePrice = 11; 422 + MealDetail mealDetailJson = 11;
436 - int32 price = 12; 423 + bool shouldCreatePrice = 12;
437 - bool shouldCreateAdjustSkuRemark = 13; 424 + int32 price = 13;
438 - string adjustSkuRemark = 14; 425 + bool shouldCreateAdjustSkuRemark = 14;
439 - bool notServe = 15; 426 + string adjustSkuRemark = 15;
427 + bool notServe = 16;
440 } 428 }
441 429
442 message CreateClientCustomerOrderDetailRpcRequest { 430 message CreateClientCustomerOrderDetailRpcRequest {
......
...@@ -26,5 +26,5 @@ mybatis-plus.global-config.db-config.logic-not-delete-value=0 ...@@ -26,5 +26,5 @@ mybatis-plus.global-config.db-config.logic-not-delete-value=0
26 mybatis-plus.global-config.db-config.logic-delete-field=isDeleted 26 mybatis-plus.global-config.db-config.logic-delete-field=isDeleted
27 mybatis-plus.mapper-locations=classpath*:mapper/*.xml 27 mybatis-plus.mapper-locations=classpath*:mapper/*.xml
28 mybatis-plus.typeAliasesPackage=com.tianting.infoloop.model.db 28 mybatis-plus.typeAliasesPackage=com.tianting.infoloop.model.db
29 -tenant.enable=false 29 +tenant.enable=true
30 tenant.column=enterpriseId 30 tenant.column=enterpriseId
......