jiujian / client-customer-order-service

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

update order

Expand all
Inline Side-by-side
Showing 6 changed files with 52 additions and 68 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)
......
...@@ -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
......