jiujian / client-customer-order-service

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
25c8b5e5 1 parent bd8ceb67

fix

Inline Side-by-side
Showing 1 changed file with 5 additions and 222 deletions
1 package com.tianting.infoloop.service.impl; 1 package com.tianting.infoloop.service.impl;
2 2
3 +import cn.hutool.core.date.LocalDateTimeUtil;
3 import cn.hutool.core.util.IdUtil; 4 import cn.hutool.core.util.IdUtil;
4 import cn.hutool.extra.spring.SpringUtil; 5 import cn.hutool.extra.spring.SpringUtil;
5 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 6 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
...@@ -27,9 +28,7 @@ import org.springframework.stereotype.Service; ...@@ -27,9 +28,7 @@ import org.springframework.stereotype.Service;
27 import org.springframework.transaction.annotation.Transactional; 28 import org.springframework.transaction.annotation.Transactional;
28 29
29 import java.time.Instant; 30 import java.time.Instant;
30 -import java.time.LocalDateTime;
31 import java.time.ZoneId; 31 import java.time.ZoneId;
32 -import java.time.ZoneOffset;
33 import java.util.ArrayList; 32 import java.util.ArrayList;
34 import java.util.Collections; 33 import java.util.Collections;
35 import java.util.List; 34 import java.util.List;
...@@ -107,8 +106,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl ...@@ -107,8 +106,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
107 .build()); 106 .build());
108 orderDb.setCustomerNoticeJson(notice); 107 orderDb.setCustomerNoticeJson(notice);
109 } 108 }
110 - LocalDateTime mealTime = Instant.ofEpochMilli(createOrderRpcRequest.getCreation().getMealTime()).atOffset(ZoneOffset.UTC).toLocalDateTime(); 109 + orderDb.setMealTime(LocalDateTimeUtil.of(createOrderRpcRequest.getCreation().getMealTime()));
111 - orderDb.setMealTime(mealTime);
112 orderDb.setPayStatus(createOrderRpcRequest.getCreation().getPayStatusValue()); 110 orderDb.setPayStatus(createOrderRpcRequest.getCreation().getPayStatusValue());
113 orderDb.setCreatedBy(createOrderRpcRequest.getCreatedBy()); 111 orderDb.setCreatedBy(createOrderRpcRequest.getCreatedBy());
114 orderDb.setCreationSource(createOrderRpcRequest.getCreationSourceValue()); 112 orderDb.setCreationSource(createOrderRpcRequest.getCreationSourceValue());
...@@ -180,89 +178,6 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl ...@@ -180,89 +178,6 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
180 public List<OrderDb> batchCreateOrderDbs( 178 public List<OrderDb> batchCreateOrderDbs(
181 BatchCreateClientCustomerOrdersRpcRequest batchCreateOrdersRequest) { 179 BatchCreateClientCustomerOrdersRpcRequest batchCreateOrdersRequest) {
182 ObjectMapper objectMapper = new ObjectMapper(); 180 ObjectMapper objectMapper = new ObjectMapper();
183 -// var orderList = batchCreateOrdersRequest.getCreationsList().stream()
184 -// .map(creation ->{
185 -// OrderDb orderDb = new OrderDb();
186 -// String orderCode = IdUtil.getSnowflake(0, 0).nextIdStr();
187 -// orderDb.setOrderCode(orderCode);
188 -// orderDb.setEnterpriseId(batchCreateOrdersRequest.getEnterpriseId());
189 -// orderDb.setClientId(creation.getClientId());
190 -// orderDb.setStallId(creation.getStallId());
191 -// if (creation.getShouldCreateOpenId()) {
192 -// orderDb.setOpenId(creation.getOpenId());
193 -// }
194 -// if (creation.getShouldCreateCustomerNoticeJson())
195 -// {
196 -// orderDb.setCustomerId(creation.getCustomerId());
197 -// }
198 -// orderDb.setStatus(creation.getStatusValue());
199 -// orderDb.setMenuId(creation.getMenuId());
200 -// orderDb.setTotalNum(creation.getTotalNum());
201 -// if (creation.getShouldCreatePayPrice()) {
202 -// orderDb.setPayPrice(creation.getPayPrice());
203 -// }
204 -// if (creation.getShouldCreatePayTime()) {
205 -// orderDb.setPayTime(Instant.ofEpochMilli(creation.getPayTime())
206 -// .atZone(ZoneId.systemDefault())
207 -// .toLocalDateTime());
208 -// }
209 -// if (creation.getShouldCreateOnlinePay()) {
210 -// orderDb.setOnlinePay(creation.getOnlinePay());
211 -// }
212 -// if (creation.getShouldCreatePayStatus()) {
213 -// orderDb.setPayStatus(creation.getPayStatusValue());
214 -// }
215 -// if (creation.getShouldCreateTransactionId()) {
216 -// orderDb.setTransactionId(creation.getTransactionId());
217 -// }
218 -// if (creation.getShouldCreateErrorMsg()) {
219 -// orderDb.setErrorMsg(creation.getErrorMsg());
220 -// }
221 -// if (creation.getShouldCreateAddress()) {
222 -// orderDb.setAddress(creation.getAddress());
223 -// }
224 -// if (creation.getShouldCreateRoomNo()) {
225 -// orderDb.setRoomNo(creation.getRoomNo());
226 -// }
227 -// if (creation.getShouldCreateTableCode()) {
228 -// orderDb.setTableCode(creation.getTableCode());
229 -// }
230 -// if (creation.getShouldCreatePickupCode()) {
231 -// orderDb.setPickupCode(creation.getPickupCode());
232 -// }
233 -// if (creation.getShouldCreateOrderType()) {
234 -// orderDb.setOrderType(creation.getOrderTypeValue());
235 -// }
236 -// if (creation.getShouldCreateRemark()) {
237 -// orderDb.setRemark(creation.getRemark());
238 -// }
239 -// if (creation.getShouldCreateCustomerNoticeJson()) {
240 -// JsonNode notice = objectMapper.valueToTree(creation.getCustomerNoticeJson());
241 -// orderDb.setCustomerNoticeJson(notice);
242 -// }
243 -// LocalDateTime mealTime = Instant.ofEpochMilli(creation.getMealTime())
244 -// .atZone(ZoneId.systemDefault())
245 -// .toLocalDateTime();
246 -// orderDb.setMealTime(mealTime);
247 -// orderDb.setCreatedBy(batchCreateOrdersRequest.getCreatedBy());
248 -// orderDb.setCreationSource(batchCreateOrdersRequest.getCreationSourceValue());
249 -// orderDb.setUpdatedBy(batchCreateOrdersRequest.getCreatedBy());
250 -// orderDb.setUpdateSource(batchCreateOrdersRequest.getCreationSourceValue());
251 -// orderDb.setCloseTimeType(creation.getCloseTimeTypeValue());
252 -// orderDb.setIsRead(creation.getIsRead());
253 -// orderDb.setIsDeleted(false);
254 -//
255 -// return orderDb;
256 -// }
257 -// )
258 -// .collect(Collectors.toList());
259 -// SpringUtil.getBean(OrderDbServiceImpl.class).saveBatch(list) ? list : Collections.emptyList();
260 -
261 -// List<OrderDb> resOrders = SpringUtil.getBean(OrderDbServiceImpl.class)
262 -// .saveBatch(orderList) ? orderList : Collections.emptyList();
263 -// if (resOrders.size() != batchCreateOrdersRequest.getCreationsCount()) {
264 -// throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_GEN_FAIL);
265 -// }
266 List<OrderDb> resOrders = new ArrayList<>(); 181 List<OrderDb> resOrders = new ArrayList<>();
267 for (ClientCustomerOrderCreation creation : batchCreateOrdersRequest.getCreationsList()) { 182 for (ClientCustomerOrderCreation creation : batchCreateOrdersRequest.getCreationsList()) {
268 OrderDb orderDb = new OrderDb(); 183 OrderDb orderDb = new OrderDb();
...@@ -325,10 +240,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl ...@@ -325,10 +240,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
325 .build()); 240 .build());
326 orderDb.setCustomerNoticeJson(notice); 241 orderDb.setCustomerNoticeJson(notice);
327 } 242 }
328 - LocalDateTime mealTime = Instant.ofEpochMilli(creation.getMealTime()) 243 + orderDb.setMealTime(LocalDateTimeUtil.of(creation.getMealTime()));
329 - .atZone(ZoneOffset.ofHours(8))
330 - .toLocalDateTime();
331 - orderDb.setMealTime(mealTime);
332 orderDb.setCreatedBy(batchCreateOrdersRequest.getCreatedBy()); 244 orderDb.setCreatedBy(batchCreateOrdersRequest.getCreatedBy());
333 orderDb.setCreationSource(batchCreateOrdersRequest.getCreationSourceValue()); 245 orderDb.setCreationSource(batchCreateOrdersRequest.getCreationSourceValue());
334 orderDb.setUpdatedBy(batchCreateOrdersRequest.getCreatedBy()); 246 orderDb.setUpdatedBy(batchCreateOrdersRequest.getCreatedBy());
...@@ -464,9 +376,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl ...@@ -464,9 +376,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
464 orderDb.setTransactionId(updateOrderRequest.getModification().getTransactionId()); 376 orderDb.setTransactionId(updateOrderRequest.getModification().getTransactionId());
465 } 377 }
466 if (updateOrderRequest.getModification().getShouldUpdateMealTime()) { 378 if (updateOrderRequest.getModification().getShouldUpdateMealTime()) {
467 - orderDb.setMealTime(Instant.ofEpochMilli(updateOrderRequest.getModification().getMealTime()) 379 + orderDb.setMealTime(LocalDateTimeUtil.of(updateOrderRequest.getModification().getMealTime()));
468 - .atZone(ZoneId.systemDefault())
469 - .toLocalDateTime());
470 } 380 }
471 if (updateOrderRequest.getModification().getShouldUpdateAddress()) { 381 if (updateOrderRequest.getModification().getShouldUpdateAddress()) {
472 orderDb.setAddress(updateOrderRequest.getModification().getAddress()); 382 orderDb.setAddress(updateOrderRequest.getModification().getAddress());
...@@ -566,9 +476,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl ...@@ -566,9 +476,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
566 orderDb.setTransactionId(modification.getTransactionId()); 476 orderDb.setTransactionId(modification.getTransactionId());
567 } 477 }
568 if (modification.getShouldUpdateMealTime()) { 478 if (modification.getShouldUpdateMealTime()) {
569 - orderDb.setMealTime(Instant.ofEpochMilli(modification.getMealTime()) 479 + orderDb.setMealTime(LocalDateTimeUtil.of(modification.getMealTime()));
570 - .atZone(ZoneId.systemDefault())
571 - .toLocalDateTime());
572 } 480 }
573 if (modification.getShouldUpdateAddress()) { 481 if (modification.getShouldUpdateAddress()) {
574 orderDb.setAddress(modification.getAddress()); 482 orderDb.setAddress(modification.getAddress());
...@@ -623,129 +531,4 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl ...@@ -623,129 +531,4 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
623 return orderDbMapper.selectList(wrapper); 531 return orderDbMapper.selectList(wrapper);
624 } 532 }
625 533
626 -// @Override
627 -// public List<OrderDb> batchCreateOrdersAndDetails(
628 -// BatchCreateClientCustomerOrderAndDetailsRpcRequest createOrdersAndDetailsRequest) {
629 -// ObjectMapper objectMapper = new ObjectMapper();
630 -// var orderList = createOrdersAndDetailsRequest.getOrderCreationsList().stream()
631 -// .map(creation -> {
632 -// OrderDb orderDb = new OrderDb();
633 -// String orderCode = IdUtil.getSnowflake(0, 0).nextIdStr();
634 -// orderDb.setOrderCode(orderCode);
635 -// orderDb.setEnterpriseId(createOrdersAndDetailsRequest.getEnterpriseId());
636 -// orderDb.setClientId(creation.getClientId());
637 -// orderDb.setStallId(creation.getStallId());
638 -// if (creation.getShouldCreateOpenId()) {
639 -// orderDb.setOpenId(creation.getOpenId());
640 -// }
641 -// if (creation.getShouldCreateCustomerNoticeJson())
642 -// {
643 -// orderDb.setCustomerId(creation.getCustomerId());
644 -// }
645 -// orderDb.setStatus(creation.getStatusValue());
646 -// orderDb.setMenuId(creation.getMenuId());
647 -// orderDb.setTotalNum(creation.getTotalNum());
648 -// if (creation.getShouldCreatePayPrice()) {
649 -// orderDb.setPayPrice(creation.getPayPrice());
650 -// }
651 -// if (creation.getShouldCreatePayTime()) {
652 -// orderDb.setPayTime(Instant.ofEpochMilli(creation.getPayTime())
653 -// .atZone(ZoneId.systemDefault())
654 -// .toLocalDateTime());
655 -// }
656 -// if (creation.getShouldCreateOnlinePay()) {
657 -// orderDb.setOnlinePay(creation.getOnlinePay());
658 -// }
659 -// if (creation.getShouldCreatePayStatus()) {
660 -// orderDb.setPayStatus(creation.getPayStatusValue());
661 -// }
662 -// if (creation.getShouldCreateTransactionId()) {
663 -// orderDb.setTransactionId(creation.getTransactionId());
664 -// }
665 -// if (creation.getShouldCreateErrorMsg()) {
666 -// orderDb.setErrorMsg(creation.getErrorMsg());
667 -// }
668 -// if (creation.getShouldCreateAddress()) {
669 -// orderDb.setAddress(creation.getAddress());
670 -// }
671 -// if (creation.getShouldCreateRoomNo()) {
672 -// orderDb.setRoomNo(creation.getRoomNo());
673 -// }
674 -// if (creation.getShouldCreateTableCode()) {
675 -// orderDb.setTableCode(creation.getTableCode());
676 -// }
677 -// if (creation.getShouldCreatePickupCode()) {
678 -// orderDb.setPickupCode(creation.getPickupCode());
679 -// }
680 -// if (creation.getShouldCreateOrderType()) {
681 -// orderDb.setOrderType(creation.getOrderTypeValue());
682 -// }
683 -// if (creation.getShouldCreateRemark()) {
684 -// orderDb.setRemark(creation.getRemark());
685 -// }
686 -// if (creation.getShouldCreateCustomerNoticeJson()) {
687 -// JsonNode notice = objectMapper.valueToTree(creation.getCustomerNoticeJson());
688 -// orderDb.setCustomerNoticeJson(notice);
689 -// }
690 -// LocalDateTime mealTime = Instant.ofEpochMilli(creation.getMealTime())
691 -// .atZone(ZoneId.systemDefault())
692 -// .toLocalDateTime();
693 -// orderDb.setMealTime(mealTime);
694 -// orderDb.setCreatedBy(createOrdersAndDetailsRequest.getCreatedBy());
695 -// orderDb.setCreationSource(createOrdersAndDetailsRequest.getCreationSourceValue());
696 -// orderDb.setUpdatedBy(createOrdersAndDetailsRequest.getCreatedBy());
697 -// orderDb.setUpdateSource(createOrdersAndDetailsRequest.getCreationSourceValue());
698 -// orderDb.setCloseTimeType(creation.getCloseTimeTypeValue());
699 -// orderDb.setIsRead(creation.getIsRead());
700 -//
701 -// return orderDb;
702 -// }
703 -// )
704 -// .collect(Collectors.toList());
705 -//
706 -// List<OrderDb> resOrders = SpringUtil.getBean(OrderDbServiceImpl.class)
707 -// .saveBatch(orderList) ? orderList : Collections.emptyList();
708 -// if (resOrders.size() != createOrdersAndDetailsRequest.getOrderCreationsCount()) {
709 -// throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_GEN_FAIL);
710 -// }
711 -//
712 -// var detailList = createOrdersAndDetailsRequest.getDetailCreationsList().stream()
713 -// .map(creation -> {
714 -// OrderDetailDb orderDetailDb = new OrderDetailDb();
715 -// orderDetailDb.setCreationSource(createOrdersAndDetailsRequest.getCreationSourceValue());
716 -// orderDetailDb.setCreatedBy(createOrdersAndDetailsRequest.getCreatedBy());
717 -// orderDetailDb.setUpdateSource(createOrdersAndDetailsRequest.getCreationSourceValue());
718 -// orderDetailDb.setUpdatedBy(createOrdersAndDetailsRequest.getCreatedBy());
719 -// orderDetailDb.setOrderId(creation.getOrderId());
720 -// orderDetailDb.setMenuDetailId(creation.getMenuDetailId());
721 -// orderDetailDb.setCount(creation.getCount());
722 -// orderDetailDb.setMealId(creation.getMealId());
723 -// orderDetailDb.setCategoryId(creation.getCategoryId());
724 -// orderDetailDb.setSkuId(creation.getSkuId());
725 -// if (creation.getShouldCreateShowName()) {
726 -// orderDetailDb.setShowName(creation.getShowName());
727 -// }
728 -// if (creation.getShouldCreatePrice()) {
729 -// orderDetailDb.setPrice(creation.getPrice());
730 -// }
731 -// if (creation.getShouldCreateAdjustSkuRemark()) {
732 -// orderDetailDb.setAdjustSkuRemark(creation.getAdjustSkuRemark());
733 -// }
734 -// orderDetailDb.setNotServe(creation.getNotServe());
735 -// if (creation.getShouldCreateMealDetailJson()) {
736 -// orderDetailDb.setMealDetailJson(objectMapper.valueToTree(creation.getMealDetailJson()));
737 -// }
738 -//
739 -// return orderDetailDb;
740 -// })
741 -// .collect(Collectors.toList());
742 -// List<OrderDetailDb> resOrderDetails = SpringUtil.getBean(OrderDetailDbServiceImpl.class)
743 -// .saveBatch(detailList) ? detailList : Collections.emptyList();
744 -//
745 -// if (resOrderDetails.size() != createOrdersAndDetailsRequest.getDetailCreationsCount()) {
746 -// throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_DETAIL_GEN_FAIL);
747 -// }
748 -// return resOrders;
749 -// }
750 -
751 } 534 }
......