jiujian / client-customer-order-service

Go to a project
Toggle navigation Toggle navigation pinning
wangyingyang
2cecf4fc 1 parent 929bb32c

update order

Inline Side-by-side
Showing 6 changed files with 164 additions and 112 deletions
...@@ -3,4 +3,4 @@ org.gradle.parallel=true ...@@ -3,4 +3,4 @@ org.gradle.parallel=true
3 org.gradle.caching=true 3 org.gradle.caching=true
4 org.gradle.jvmargs=-Xmx4096m -XX:MetaspaceSize=512m -XX:MaxMetaspaceSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 4 org.gradle.jvmargs=-Xmx4096m -XX:MetaspaceSize=512m -XX:MaxMetaspaceSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
5 org.gradle.configureondemand=true 5 org.gradle.configureondemand=true
6 -org.gradle.java.home=/usr/lib/jvm/java-11-openjdk-amd64
...\ No newline at end of file ...\ No newline at end of file
6 +#org.gradle.java.home=/usr/lib/jvm/java-11-openjdk-amd64
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -18,30 +18,30 @@ public class MyMetaObjectHandler implements MetaObjectHandler { ...@@ -18,30 +18,30 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
18 this.strictInsertFill(metaObject, "createdAt", LocalDateTime.class, LocalDateTime.now()); 18 this.strictInsertFill(metaObject, "createdAt", LocalDateTime.class, LocalDateTime.now());
19 this.strictUpdateFill(metaObject, "updatedAt", LocalDateTime.class, LocalDateTime.now()); 19 this.strictUpdateFill(metaObject, "updatedAt", LocalDateTime.class, LocalDateTime.now());
20 this.strictInsertFill(metaObject, "isDeleted", Integer.class, NOT_DELETED_FLAG); 20 this.strictInsertFill(metaObject, "isDeleted", Integer.class, NOT_DELETED_FLAG);
21 - final var userId = ContextHolder.getUserId(); 21 +// final var userId = ContextHolder.getUserId();
22 - final var source = ContextHolder.getSource(); 22 +// final var source = ContextHolder.getSource();
23 - if (userId != null) { 23 +// if (userId != null) {
24 - this.strictInsertFill(metaObject, "createdBy", Integer.class, userId); 24 +// this.strictInsertFill(metaObject, "createdBy", Integer.class, userId);
25 - this.strictInsertFill(metaObject, "updatedBy", Integer.class, userId); 25 +// this.strictInsertFill(metaObject, "updatedBy", Integer.class, userId);
26 - } 26 +// }
27 - if (source != null) { 27 +// if (source != null) {
28 - this.strictInsertFill(metaObject, "creationSource", Integer.class, source); 28 +// this.strictInsertFill(metaObject, "creationSource", Integer.class, source);
29 - this.strictInsertFill(metaObject, "updateSource", Integer.class, source); 29 +// this.strictInsertFill(metaObject, "updateSource", Integer.class, source);
30 - } 30 +// }
31 } 31 }
32 32
33 //更新时的填充策略 33 //更新时的填充策略
34 @Override 34 @Override
35 public void updateFill(MetaObject metaObject) { 35 public void updateFill(MetaObject metaObject) {
36 this.strictUpdateFill(metaObject, "updatedAt", LocalDateTime.class, LocalDateTime.now()); 36 this.strictUpdateFill(metaObject, "updatedAt", LocalDateTime.class, LocalDateTime.now());
37 - final var userId = ContextHolder.getUserId(); 37 +// final var userId = ContextHolder.getUserId();
38 - final var source = ContextHolder.getSource(); 38 +// final var source = ContextHolder.getSource();
39 - if (userId != null) { 39 +// if (userId != null) {
40 - this.strictInsertFill(metaObject, "updatedBy", Integer.class, userId); 40 +// this.strictInsertFill(metaObject, "updatedBy", Integer.class, userId);
41 - } 41 +// }
42 - if (source != null) { 42 +// if (source != null) {
43 - this.strictInsertFill(metaObject, "updateSource", Integer.class, source); 43 +// this.strictInsertFill(metaObject, "updateSource", Integer.class, source);
44 - } 44 +// }
45 } 45 }
46 } 46 }
47 47
......
...@@ -4,7 +4,9 @@ package com.tianting.infoloop.service.grpc; ...@@ -4,7 +4,9 @@ package com.tianting.infoloop.service.grpc;
4 import cn.hutool.core.date.LocalDateTimeUtil; 4 import cn.hutool.core.date.LocalDateTimeUtil;
5 import com.baomidou.dynamic.datasource.annotation.DS; 5 import com.baomidou.dynamic.datasource.annotation.DS;
6 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 6 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
7 +import com.baomidou.mybatisplus.core.metadata.IPage;
7 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 8 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
9 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
8 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrderDetailsRpcRequest; 10 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrderDetailsRpcRequest;
9 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrderDetailsRpcResponse; 11 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrderDetailsRpcResponse;
10 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrdersRpcRequest; 12 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrdersRpcRequest;
...@@ -41,6 +43,8 @@ import com.infoloop.tianting.clientcustomerorderservice.GetOrderOperationRecords ...@@ -41,6 +43,8 @@ import com.infoloop.tianting.clientcustomerorderservice.GetOrderOperationRecords
41 import com.infoloop.tianting.clientcustomerorderservice.OrderOperationRecord; 43 import com.infoloop.tianting.clientcustomerorderservice.OrderOperationRecord;
42 import com.infoloop.tianting.clientcustomerorderservice.QueryClientCustomerOrdersByConditionRpcRequest; 44 import com.infoloop.tianting.clientcustomerorderservice.QueryClientCustomerOrdersByConditionRpcRequest;
43 import com.infoloop.tianting.clientcustomerorderservice.QueryClientCustomerOrdersByConditionRpcResponse; 45 import com.infoloop.tianting.clientcustomerorderservice.QueryClientCustomerOrdersByConditionRpcResponse;
46 +import com.infoloop.tianting.clientcustomerorderservice.QueryClientCustomerOrdersByPaginationRpcRequest;
47 +import com.infoloop.tianting.clientcustomerorderservice.QueryClientCustomerOrdersByPaginationRpcResponse;
44 import com.infoloop.tianting.clientcustomerorderservice.SingleClientCustomerOrderDetailRpcResponse; 48 import com.infoloop.tianting.clientcustomerorderservice.SingleClientCustomerOrderDetailRpcResponse;
45 import com.infoloop.tianting.clientcustomerorderservice.SingleClientCustomerOrderRpcResponse; 49 import com.infoloop.tianting.clientcustomerorderservice.SingleClientCustomerOrderRpcResponse;
46 import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderDetailRpcRequest; 50 import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderDetailRpcRequest;
...@@ -170,6 +174,35 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu ...@@ -170,6 +174,35 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
170 174
171 @Override 175 @Override
172 @DS(DATA_SOURCE_MASTER) 176 @DS(DATA_SOURCE_MASTER)
177 + public void queryClientCustomerOrdersByPagination(final QueryClientCustomerOrdersByPaginationRpcRequest request,
178 + final StreamObserver<QueryClientCustomerOrdersByPaginationRpcResponse> responseObserver) {
179 + final var builder = QueryClientCustomerOrdersByPaginationRpcResponse.newBuilder();
180 + try {
181 + IPage<OrderDb> page = new Page<>(request.getPageNo(), request.getPageSize());
182 + LambdaQueryWrapper<OrderDb> queryWrapper = Wrappers.lambdaQuery();
183 + if (!request.getKeyword().isEmpty()) {
184 + queryWrapper.like(OrderDb::getMealTime, request.getKeyword());
185 + }
186 + queryWrapper.eq(OrderDb::getEnterpriseId, request.getEnterpriseId());
187 + queryWrapper.eq(OrderDb::getClientId, request.getClientId());
188 + queryWrapper.eq(OrderDb::getStatus, request.getStatusValue());
189 + final var result = orderDbService.page(page, queryWrapper);
190 + builder.setTotal(result.getTotal());
191 + builder.setPages(result.getPages());
192 + if (!result.getRecords().isEmpty()) {
193 + builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(result.getRecords(), SingleClientCustomerOrderRpcResponse.class));
194 + }
195 + } catch (final Exception e) {
196 + log.error("queryClientCustomerOrdersByPagination error;", e);
197 + responseObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException());
198 + }
199 + responseObserver.onNext(builder.build());
200 + responseObserver.onCompleted();
201 + }
202 +
203 +
204 + @Override
205 + @DS(DATA_SOURCE_MASTER)
173 public void queryClientCustomerOrdersByCondition(final 206 public void queryClientCustomerOrdersByCondition(final
174 QueryClientCustomerOrdersByConditionRpcRequest request, 207 QueryClientCustomerOrdersByConditionRpcRequest request,
175 final StreamObserver<QueryClientCustomerOrdersByConditionRpcResponse> responseStreamObserver) { 208 final StreamObserver<QueryClientCustomerOrdersByConditionRpcResponse> responseStreamObserver) {
......
...@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -6,7 +6,6 @@ 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;
10 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrdersRpcRequest; 9 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustomerOrdersRpcRequest;
11 import com.infoloop.tianting.clientcustomerorderservice.BatchUpdateClientCustomerOrdersRpcRequest; 10 import com.infoloop.tianting.clientcustomerorderservice.BatchUpdateClientCustomerOrdersRpcRequest;
12 import com.infoloop.tianting.clientcustomerorderservice.ClientCustomerOrderCreation; 11 import com.infoloop.tianting.clientcustomerorderservice.ClientCustomerOrderCreation;
...@@ -16,7 +15,6 @@ import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrde ...@@ -16,7 +15,6 @@ import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrde
16 import com.tianting.infoloop.mapper.OrderDbMapper; 15 import com.tianting.infoloop.mapper.OrderDbMapper;
17 import com.tianting.infoloop.model.db.OrderDb; 16 import com.tianting.infoloop.model.db.OrderDb;
18 import com.tianting.infoloop.model.db.OrderDetailDb; 17 import com.tianting.infoloop.model.db.OrderDetailDb;
19 -import com.tianting.infoloop.model.db.TestExampleDb;
20 import com.tianting.infoloop.service.OrderDbService; 18 import com.tianting.infoloop.service.OrderDbService;
21 import com.tianting.infoloop.service.OrderDetailDbService; 19 import com.tianting.infoloop.service.OrderDetailDbService;
22 import com.tianting.infoloop.utils.exception.ErrorCodeConstants; 20 import com.tianting.infoloop.utils.exception.ErrorCodeConstants;
...@@ -55,11 +53,10 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl ...@@ -55,11 +53,10 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
55 if (createOrderRpcRequest.getCreation().getShouldCreateOpenId()) { 53 if (createOrderRpcRequest.getCreation().getShouldCreateOpenId()) {
56 orderDb.setOpenId(createOrderRpcRequest.getCreation().getOpenId()); 54 orderDb.setOpenId(createOrderRpcRequest.getCreation().getOpenId());
57 } 55 }
58 - if (createOrderRpcRequest.getCreation().getShouldCreateCustomerNoticeJson()) 56 + if (createOrderRpcRequest.getCreation().getShouldCreateCustomerNoticeJson()) {
59 - {
60 orderDb.setCustomerId(createOrderRpcRequest.getCreation().getCustomerId()); 57 orderDb.setCustomerId(createOrderRpcRequest.getCreation().getCustomerId());
61 } 58 }
62 - orderDb.setStatus(createOrderRpcRequest.getCreation().getStatusValue()); 59 + orderDb.setStatus(OrderStatusEnum.TO_PREPARE_VALUE);
63 orderDb.setMenuId(createOrderRpcRequest.getCreation().getMenuId()); 60 orderDb.setMenuId(createOrderRpcRequest.getCreation().getMenuId());
64 orderDb.setTotalNum(createOrderRpcRequest.getCreation().getTotalNum()); 61 orderDb.setTotalNum(createOrderRpcRequest.getCreation().getTotalNum());
65 if (createOrderRpcRequest.getCreation().getShouldCreatePayPrice()) { 62 if (createOrderRpcRequest.getCreation().getShouldCreatePayPrice()) {
...@@ -129,12 +126,14 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl ...@@ -129,12 +126,14 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
129 orderDetailDb.setCreatedBy(createOrderRpcRequest.getCreatedBy()); 126 orderDetailDb.setCreatedBy(createOrderRpcRequest.getCreatedBy());
130 orderDetailDb.setUpdateSource(createOrderRpcRequest.getCreationSourceValue()); 127 orderDetailDb.setUpdateSource(createOrderRpcRequest.getCreationSourceValue());
131 orderDetailDb.setUpdatedBy(createOrderRpcRequest.getCreatedBy()); 128 orderDetailDb.setUpdatedBy(createOrderRpcRequest.getCreatedBy());
132 - orderDetailDb.setOrderId(detailCreation.getOrderId()); 129 + orderDetailDb.setOrderId(orderDb.getId());
133 orderDetailDb.setMenuDetailId(detailCreation.getMenuDetailId()); 130 orderDetailDb.setMenuDetailId(detailCreation.getMenuDetailId());
134 orderDetailDb.setCount(detailCreation.getCount()); 131 orderDetailDb.setCount(detailCreation.getCount());
135 orderDetailDb.setMealId(detailCreation.getMealId()); 132 orderDetailDb.setMealId(detailCreation.getMealId());
136 orderDetailDb.setCategoryId(detailCreation.getCategoryId()); 133 orderDetailDb.setCategoryId(detailCreation.getCategoryId());
137 orderDetailDb.setSkuId(detailCreation.getSkuId()); 134 orderDetailDb.setSkuId(detailCreation.getSkuId());
135 + orderDetailDb.setEnterpriseId(orderDb.getEnterpriseId());
136 + orderDetailDb.setIsDeleted(false);
138 if (detailCreation.getShouldCreateShowName()) { 137 if (detailCreation.getShouldCreateShowName()) {
139 orderDetailDb.setShowName(detailCreation.getShowName()); 138 orderDetailDb.setShowName(detailCreation.getShowName());
140 } 139 }
...@@ -165,89 +164,90 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl ...@@ -165,89 +164,90 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
165 public List<OrderDb> batchCreateOrderDbs( 164 public List<OrderDb> batchCreateOrderDbs(
166 BatchCreateClientCustomerOrdersRpcRequest batchCreateOrdersRequest) { 165 BatchCreateClientCustomerOrdersRpcRequest batchCreateOrdersRequest) {
167 ObjectMapper objectMapper = new ObjectMapper(); 166 ObjectMapper objectMapper = new ObjectMapper();
168 - var orderList = batchCreateOrdersRequest.getCreationsList().stream() 167 +// var orderList = batchCreateOrdersRequest.getCreationsList().stream()
169 - .map(creation ->{ 168 +// .map(creation ->{
170 - OrderDb orderDb = new OrderDb(); 169 +// OrderDb orderDb = new OrderDb();
171 - String orderCode = IdUtil.getSnowflake(0, 0).nextIdStr(); 170 +// String orderCode = IdUtil.getSnowflake(0, 0).nextIdStr();
172 - orderDb.setOrderCode(orderCode); 171 +// orderDb.setOrderCode(orderCode);
173 - orderDb.setEnterpriseId(batchCreateOrdersRequest.getEnterpriseId()); 172 +// orderDb.setEnterpriseId(batchCreateOrdersRequest.getEnterpriseId());
174 - orderDb.setClientId(creation.getClientId()); 173 +// orderDb.setClientId(creation.getClientId());
175 - orderDb.setStallId(creation.getStallId()); 174 +// orderDb.setStallId(creation.getStallId());
176 - if (creation.getShouldCreateOpenId()) { 175 +// if (creation.getShouldCreateOpenId()) {
177 - orderDb.setOpenId(creation.getOpenId()); 176 +// orderDb.setOpenId(creation.getOpenId());
178 - } 177 +// }
179 - if (creation.getShouldCreateCustomerNoticeJson()) 178 +// if (creation.getShouldCreateCustomerNoticeJson())
180 - { 179 +// {
181 - orderDb.setCustomerId(creation.getCustomerId()); 180 +// orderDb.setCustomerId(creation.getCustomerId());
182 - } 181 +// }
183 - orderDb.setStatus(creation.getStatusValue()); 182 +// orderDb.setStatus(creation.getStatusValue());
184 - orderDb.setMenuId(creation.getMenuId()); 183 +// orderDb.setMenuId(creation.getMenuId());
185 - orderDb.setTotalNum(creation.getTotalNum()); 184 +// orderDb.setTotalNum(creation.getTotalNum());
186 - if (creation.getShouldCreatePayPrice()) { 185 +// if (creation.getShouldCreatePayPrice()) {
187 - orderDb.setPayPrice(creation.getPayPrice()); 186 +// orderDb.setPayPrice(creation.getPayPrice());
188 - } 187 +// }
189 - if (creation.getShouldCreatePayTime()) { 188 +// if (creation.getShouldCreatePayTime()) {
190 - orderDb.setPayTime(Instant.ofEpochMilli(creation.getPayTime()) 189 +// orderDb.setPayTime(Instant.ofEpochMilli(creation.getPayTime())
191 - .atZone(ZoneId.systemDefault()) 190 +// .atZone(ZoneId.systemDefault())
192 - .toLocalDateTime()); 191 +// .toLocalDateTime());
193 - } 192 +// }
194 - if (creation.getShouldCreateOnlinePay()) { 193 +// if (creation.getShouldCreateOnlinePay()) {
195 - orderDb.setOnlinePay(creation.getOnlinePay()); 194 +// orderDb.setOnlinePay(creation.getOnlinePay());
196 - } 195 +// }
197 - if (creation.getShouldCreatePayStatus()) { 196 +// if (creation.getShouldCreatePayStatus()) {
198 - orderDb.setPayStatus(creation.getPayStatusValue()); 197 +// orderDb.setPayStatus(creation.getPayStatusValue());
199 - } 198 +// }
200 - if (creation.getShouldCreateTransactionId()) { 199 +// if (creation.getShouldCreateTransactionId()) {
201 - orderDb.setTransactionId(creation.getTransactionId()); 200 +// orderDb.setTransactionId(creation.getTransactionId());
202 - } 201 +// }
203 - if (creation.getShouldCreateErrorMsg()) { 202 +// if (creation.getShouldCreateErrorMsg()) {
204 - orderDb.setErrorMsg(creation.getErrorMsg()); 203 +// orderDb.setErrorMsg(creation.getErrorMsg());
205 - } 204 +// }
206 - if (creation.getShouldCreateAddress()) { 205 +// if (creation.getShouldCreateAddress()) {
207 - orderDb.setAddress(creation.getAddress()); 206 +// orderDb.setAddress(creation.getAddress());
208 - } 207 +// }
209 - if (creation.getShouldCreateRoomNo()) { 208 +// if (creation.getShouldCreateRoomNo()) {
210 - orderDb.setRoomNo(creation.getRoomNo()); 209 +// orderDb.setRoomNo(creation.getRoomNo());
211 - } 210 +// }
212 - if (creation.getShouldCreateTableCode()) { 211 +// if (creation.getShouldCreateTableCode()) {
213 - orderDb.setTableCode(creation.getTableCode()); 212 +// orderDb.setTableCode(creation.getTableCode());
214 - } 213 +// }
215 - if (creation.getShouldCreatePickupCode()) { 214 +// if (creation.getShouldCreatePickupCode()) {
216 - orderDb.setPickupCode(creation.getPickupCode()); 215 +// orderDb.setPickupCode(creation.getPickupCode());
217 - } 216 +// }
218 - if (creation.getShouldCreateOrderType()) { 217 +// if (creation.getShouldCreateOrderType()) {
219 - orderDb.setOrderType(creation.getOrderTypeValue()); 218 +// orderDb.setOrderType(creation.getOrderTypeValue());
220 - } 219 +// }
221 - if (creation.getShouldCreateRemark()) { 220 +// if (creation.getShouldCreateRemark()) {
222 - orderDb.setRemark(creation.getRemark()); 221 +// orderDb.setRemark(creation.getRemark());
223 - } 222 +// }
224 - if (creation.getShouldCreateCustomerNoticeJson()) { 223 +// if (creation.getShouldCreateCustomerNoticeJson()) {
225 - JsonNode notice = objectMapper.valueToTree(creation.getCustomerNoticeJson()); 224 +// JsonNode notice = objectMapper.valueToTree(creation.getCustomerNoticeJson());
226 - orderDb.setCustomerNoticeJson(notice); 225 +// orderDb.setCustomerNoticeJson(notice);
227 - } 226 +// }
228 - LocalDateTime mealTime = Instant.ofEpochMilli(creation.getMealTime()) 227 +// LocalDateTime mealTime = Instant.ofEpochMilli(creation.getMealTime())
229 - .atZone(ZoneId.systemDefault()) 228 +// .atZone(ZoneId.systemDefault())
230 - .toLocalDateTime(); 229 +// .toLocalDateTime();
231 - orderDb.setMealTime(mealTime); 230 +// orderDb.setMealTime(mealTime);
232 - orderDb.setCreatedBy(batchCreateOrdersRequest.getCreatedBy()); 231 +// orderDb.setCreatedBy(batchCreateOrdersRequest.getCreatedBy());
233 - orderDb.setCreationSource(batchCreateOrdersRequest.getCreationSourceValue()); 232 +// orderDb.setCreationSource(batchCreateOrdersRequest.getCreationSourceValue());
234 - orderDb.setUpdatedBy(batchCreateOrdersRequest.getCreatedBy()); 233 +// orderDb.setUpdatedBy(batchCreateOrdersRequest.getCreatedBy());
235 - orderDb.setUpdateSource(batchCreateOrdersRequest.getCreationSourceValue()); 234 +// orderDb.setUpdateSource(batchCreateOrdersRequest.getCreationSourceValue());
236 - orderDb.setCloseTimeType(creation.getCloseTimeTypeValue()); 235 +// orderDb.setCloseTimeType(creation.getCloseTimeTypeValue());
237 - orderDb.setIsRead(creation.getIsRead()); 236 +// orderDb.setIsRead(creation.getIsRead());
238 - 237 +// orderDb.setIsDeleted(false);
239 - return orderDb; 238 +//
240 - } 239 +// return orderDb;
241 - ) 240 +// }
242 - .collect(Collectors.toList()); 241 +// )
242 +// .collect(Collectors.toList());
243 // SpringUtil.getBean(OrderDbServiceImpl.class).saveBatch(list) ? list : Collections.emptyList(); 243 // SpringUtil.getBean(OrderDbServiceImpl.class).saveBatch(list) ? list : Collections.emptyList();
244 244
245 - List<OrderDb> resOrders = SpringUtil.getBean(OrderDbServiceImpl.class) 245 +// List<OrderDb> resOrders = SpringUtil.getBean(OrderDbServiceImpl.class)
246 - .saveBatch(orderList) ? orderList : Collections.emptyList(); 246 +// .saveBatch(orderList) ? orderList : Collections.emptyList();
247 - if (resOrders.size() != batchCreateOrdersRequest.getCreationsCount()) { 247 +// if (resOrders.size() != batchCreateOrdersRequest.getCreationsCount()) {
248 - throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_GEN_FAIL); 248 +// throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_GEN_FAIL);
249 - } 249 +// }
250 - 250 + List<OrderDb> resOrders = new ArrayList<>();
251 for(ClientCustomerOrderCreation creation: batchCreateOrdersRequest.getCreationsList()){ 251 for(ClientCustomerOrderCreation creation: batchCreateOrdersRequest.getCreationsList()){
252 OrderDb orderDb = new OrderDb(); 252 OrderDb orderDb = new OrderDb();
253 String orderCode = IdUtil.getSnowflake(0, 0).nextIdStr(); 253 String orderCode = IdUtil.getSnowflake(0, 0).nextIdStr();
...@@ -262,7 +262,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl ...@@ -262,7 +262,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
262 { 262 {
263 orderDb.setCustomerId(creation.getCustomerId()); 263 orderDb.setCustomerId(creation.getCustomerId());
264 } 264 }
265 - orderDb.setStatus(creation.getStatusValue()); 265 + orderDb.setStatus(OrderStatusEnum.TO_PREPARE_VALUE);
266 orderDb.setMenuId(creation.getMenuId()); 266 orderDb.setMenuId(creation.getMenuId());
267 orderDb.setTotalNum(creation.getTotalNum()); 267 orderDb.setTotalNum(creation.getTotalNum());
268 if (creation.getShouldCreatePayPrice()) { 268 if (creation.getShouldCreatePayPrice()) {
...@@ -317,10 +317,12 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl ...@@ -317,10 +317,12 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
317 orderDb.setUpdateSource(batchCreateOrdersRequest.getCreationSourceValue()); 317 orderDb.setUpdateSource(batchCreateOrdersRequest.getCreationSourceValue());
318 orderDb.setCloseTimeType(creation.getCloseTimeTypeValue()); 318 orderDb.setCloseTimeType(creation.getCloseTimeTypeValue());
319 orderDb.setIsRead(creation.getIsRead()); 319 orderDb.setIsRead(creation.getIsRead());
320 + orderDb.setIsDeleted(false);
320 boolean res = this.save(orderDb); 321 boolean res = this.save(orderDb);
321 if (!res) { 322 if (!res) {
322 throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_GEN_FAIL); 323 throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_GEN_FAIL);
323 } 324 }
325 + resOrders.add(orderDb);
324 326
325 if (creation.getShouldCreateOrderDetails()) { 327 if (creation.getShouldCreateOrderDetails()) {
326 var detailList = creation.getOrderDetailsList().stream() 328 var detailList = creation.getOrderDetailsList().stream()
...@@ -330,12 +332,13 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl ...@@ -330,12 +332,13 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
330 orderDetailDb.setCreatedBy(batchCreateOrdersRequest.getCreatedBy()); 332 orderDetailDb.setCreatedBy(batchCreateOrdersRequest.getCreatedBy());
331 orderDetailDb.setUpdateSource(batchCreateOrdersRequest.getCreationSourceValue()); 333 orderDetailDb.setUpdateSource(batchCreateOrdersRequest.getCreationSourceValue());
332 orderDetailDb.setUpdatedBy(batchCreateOrdersRequest.getCreatedBy()); 334 orderDetailDb.setUpdatedBy(batchCreateOrdersRequest.getCreatedBy());
333 - orderDetailDb.setOrderId(detailCreation.getOrderId()); 335 + orderDetailDb.setOrderId(orderDb.getId());
334 orderDetailDb.setMenuDetailId(detailCreation.getMenuDetailId()); 336 orderDetailDb.setMenuDetailId(detailCreation.getMenuDetailId());
335 orderDetailDb.setCount(detailCreation.getCount()); 337 orderDetailDb.setCount(detailCreation.getCount());
336 orderDetailDb.setMealId(detailCreation.getMealId()); 338 orderDetailDb.setMealId(detailCreation.getMealId());
337 orderDetailDb.setCategoryId(detailCreation.getCategoryId()); 339 orderDetailDb.setCategoryId(detailCreation.getCategoryId());
338 orderDetailDb.setSkuId(detailCreation.getSkuId()); 340 orderDetailDb.setSkuId(detailCreation.getSkuId());
341 + orderDetailDb.setIsDeleted(false);
339 if (detailCreation.getShouldCreateShowName()) { 342 if (detailCreation.getShouldCreateShowName()) {
340 orderDetailDb.setShowName(detailCreation.getShowName()); 343 orderDetailDb.setShowName(detailCreation.getShowName());
341 } 344 }
......
...@@ -131,10 +131,10 @@ public class GrpcServerInterceptor implements ServerInterceptor { ...@@ -131,10 +131,10 @@ public class GrpcServerInterceptor implements ServerInterceptor {
131 final var enterpriseId = headers.get(enterpriseIdKey) == null ? "0" : headers.get(enterpriseIdKey); 131 final var enterpriseId = headers.get(enterpriseIdKey) == null ? "0" : headers.get(enterpriseIdKey);
132 final var source = headers.get(sourceKey) == null ? "0" : headers.get(sourceKey); 132 final var source = headers.get(sourceKey) == null ? "0" : headers.get(sourceKey);
133 log.info("userContext; methodName:{}, userId:{}, enterpriseId:{}, source:{}", methodName, userId, enterpriseId, source); 133 log.info("userContext; methodName:{}, userId:{}, enterpriseId:{}, source:{}", methodName, userId, enterpriseId, source);
134 - return Context.current() 134 + return Context.current();
135 - .withValue(ConfigConstants.USER_ID, userId) 135 +// .withValue(ConfigConstants.USER_ID, userId)
136 - .withValue(ConfigConstants.ENTERPRISE_ID, enterpriseId) 136 +// .withValue(ConfigConstants.ENTERPRISE_ID, enterpriseId)
137 - .withValue(ConfigConstants.SOURCE, source); 137 +// .withValue(ConfigConstants.SOURCE, source);
138 } 138 }
139 139
140 private static class GrpcGetter implements Propagation.RemoteGetter<Metadata> { 140 private static class GrpcGetter implements Propagation.RemoteGetter<Metadata> {
......
...@@ -18,6 +18,7 @@ service ClientCustomerOrderServiceRpc { ...@@ -18,6 +18,7 @@ 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 QueryClientCustomerOrdersByPagination (QueryClientCustomerOrdersByPaginationRpcRequest) returns (QueryClientCustomerOrdersByPaginationRpcResponse) {}
21 22
22 //订单明细 23 //订单明细
23 rpc GetClientCustomerOrderDetailById (GetClientCustomerOrderDetailByIdRpcRequest) returns (GetClientCustomerOrderDetailByIdRpcResponse) {} 24 rpc GetClientCustomerOrderDetailById (GetClientCustomerOrderDetailByIdRpcRequest) returns (GetClientCustomerOrderDetailByIdRpcResponse) {}
...@@ -142,6 +143,21 @@ message GetClientCustomerOrdersByCustomerIdRpcResponse { ...@@ -142,6 +143,21 @@ message GetClientCustomerOrdersByCustomerIdRpcResponse {
142 repeated SingleClientCustomerOrderRpcResponse responses = 1; 143 repeated SingleClientCustomerOrderRpcResponse responses = 1;
143 } 144 }
144 145
146 +message QueryClientCustomerOrdersByPaginationRpcRequest {
147 + string keyword = 1;
148 + OrderStatusEnum status = 2;
149 + int32 clientId = 3;
150 + int32 enterpriseId = 4;
151 + int32 pageNo = 5;
152 + int32 pageSize = 6;
153 +}
154 +
155 +message QueryClientCustomerOrdersByPaginationRpcResponse {
156 + int64 total = 1;
157 + int64 pages = 2;
158 + repeated SingleClientCustomerOrderRpcResponse responses = 3;
159 +}
160 +
145 message QueryClientCustomerOrdersByConditionRpcRequest { 161 message QueryClientCustomerOrdersByConditionRpcRequest {
146 int32 enterpriseId = 1; 162 int32 enterpriseId = 1;
147 bool shouldFilterOrderCode = 2; 163 bool shouldFilterOrderCode = 2;
......