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
package com.tianting.infoloop.service.impl;
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.extra.spring.SpringUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......@@ -27,9 +28,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
......@@ -107,8 +106,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
.build());
orderDb.setCustomerNoticeJson(notice);
}
LocalDateTime mealTime = Instant.ofEpochMilli(createOrderRpcRequest.getCreation().getMealTime()).atOffset(ZoneOffset.UTC).toLocalDateTime();
orderDb.setMealTime(mealTime);
orderDb.setMealTime(LocalDateTimeUtil.of(createOrderRpcRequest.getCreation().getMealTime()));
orderDb.setPayStatus(createOrderRpcRequest.getCreation().getPayStatusValue());
orderDb.setCreatedBy(createOrderRpcRequest.getCreatedBy());
orderDb.setCreationSource(createOrderRpcRequest.getCreationSourceValue());
......@@ -180,89 +178,6 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
public List<OrderDb> batchCreateOrderDbs(
BatchCreateClientCustomerOrdersRpcRequest batchCreateOrdersRequest) {
ObjectMapper objectMapper = new ObjectMapper();
// var orderList = batchCreateOrdersRequest.getCreationsList().stream()
// .map(creation ->{
// OrderDb orderDb = new OrderDb();
// String orderCode = IdUtil.getSnowflake(0, 0).nextIdStr();
// orderDb.setOrderCode(orderCode);
// orderDb.setEnterpriseId(batchCreateOrdersRequest.getEnterpriseId());
// orderDb.setClientId(creation.getClientId());
// orderDb.setStallId(creation.getStallId());
// if (creation.getShouldCreateOpenId()) {
// orderDb.setOpenId(creation.getOpenId());
// }
// if (creation.getShouldCreateCustomerNoticeJson())
// {
// orderDb.setCustomerId(creation.getCustomerId());
// }
// orderDb.setStatus(creation.getStatusValue());
// orderDb.setMenuId(creation.getMenuId());
// orderDb.setTotalNum(creation.getTotalNum());
// if (creation.getShouldCreatePayPrice()) {
// orderDb.setPayPrice(creation.getPayPrice());
// }
// if (creation.getShouldCreatePayTime()) {
// orderDb.setPayTime(Instant.ofEpochMilli(creation.getPayTime())
// .atZone(ZoneId.systemDefault())
// .toLocalDateTime());
// }
// if (creation.getShouldCreateOnlinePay()) {
// orderDb.setOnlinePay(creation.getOnlinePay());
// }
// if (creation.getShouldCreatePayStatus()) {
// orderDb.setPayStatus(creation.getPayStatusValue());
// }
// if (creation.getShouldCreateTransactionId()) {
// orderDb.setTransactionId(creation.getTransactionId());
// }
// if (creation.getShouldCreateErrorMsg()) {
// orderDb.setErrorMsg(creation.getErrorMsg());
// }
// if (creation.getShouldCreateAddress()) {
// orderDb.setAddress(creation.getAddress());
// }
// if (creation.getShouldCreateRoomNo()) {
// orderDb.setRoomNo(creation.getRoomNo());
// }
// if (creation.getShouldCreateTableCode()) {
// orderDb.setTableCode(creation.getTableCode());
// }
// if (creation.getShouldCreatePickupCode()) {
// orderDb.setPickupCode(creation.getPickupCode());
// }
// if (creation.getShouldCreateOrderType()) {
// orderDb.setOrderType(creation.getOrderTypeValue());
// }
// if (creation.getShouldCreateRemark()) {
// orderDb.setRemark(creation.getRemark());
// }
// if (creation.getShouldCreateCustomerNoticeJson()) {
// JsonNode notice = objectMapper.valueToTree(creation.getCustomerNoticeJson());
// orderDb.setCustomerNoticeJson(notice);
// }
// LocalDateTime mealTime = Instant.ofEpochMilli(creation.getMealTime())
// .atZone(ZoneId.systemDefault())
// .toLocalDateTime();
// orderDb.setMealTime(mealTime);
// orderDb.setCreatedBy(batchCreateOrdersRequest.getCreatedBy());
// orderDb.setCreationSource(batchCreateOrdersRequest.getCreationSourceValue());
// orderDb.setUpdatedBy(batchCreateOrdersRequest.getCreatedBy());
// orderDb.setUpdateSource(batchCreateOrdersRequest.getCreationSourceValue());
// orderDb.setCloseTimeType(creation.getCloseTimeTypeValue());
// orderDb.setIsRead(creation.getIsRead());
// orderDb.setIsDeleted(false);
//
// return orderDb;
// }
// )
// .collect(Collectors.toList());
// SpringUtil.getBean(OrderDbServiceImpl.class).saveBatch(list) ? list : Collections.emptyList();
// List<OrderDb> resOrders = SpringUtil.getBean(OrderDbServiceImpl.class)
// .saveBatch(orderList) ? orderList : Collections.emptyList();
// if (resOrders.size() != batchCreateOrdersRequest.getCreationsCount()) {
// throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_GEN_FAIL);
// }
List<OrderDb> resOrders = new ArrayList<>();
for (ClientCustomerOrderCreation creation : batchCreateOrdersRequest.getCreationsList()) {
OrderDb orderDb = new OrderDb();
......@@ -325,10 +240,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
.build());
orderDb.setCustomerNoticeJson(notice);
}
LocalDateTime mealTime = Instant.ofEpochMilli(creation.getMealTime())
.atZone(ZoneOffset.ofHours(8))
.toLocalDateTime();
orderDb.setMealTime(mealTime);
orderDb.setMealTime(LocalDateTimeUtil.of(creation.getMealTime()));
orderDb.setCreatedBy(batchCreateOrdersRequest.getCreatedBy());
orderDb.setCreationSource(batchCreateOrdersRequest.getCreationSourceValue());
orderDb.setUpdatedBy(batchCreateOrdersRequest.getCreatedBy());
......@@ -464,9 +376,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
orderDb.setTransactionId(updateOrderRequest.getModification().getTransactionId());
}
if (updateOrderRequest.getModification().getShouldUpdateMealTime()) {
orderDb.setMealTime(Instant.ofEpochMilli(updateOrderRequest.getModification().getMealTime())
.atZone(ZoneId.systemDefault())
.toLocalDateTime());
orderDb.setMealTime(LocalDateTimeUtil.of(updateOrderRequest.getModification().getMealTime()));
}
if (updateOrderRequest.getModification().getShouldUpdateAddress()) {
orderDb.setAddress(updateOrderRequest.getModification().getAddress());
......@@ -566,9 +476,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
orderDb.setTransactionId(modification.getTransactionId());
}
if (modification.getShouldUpdateMealTime()) {
orderDb.setMealTime(Instant.ofEpochMilli(modification.getMealTime())
.atZone(ZoneId.systemDefault())
.toLocalDateTime());
orderDb.setMealTime(LocalDateTimeUtil.of(modification.getMealTime()));
}
if (modification.getShouldUpdateAddress()) {
orderDb.setAddress(modification.getAddress());
......@@ -623,129 +531,4 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
return orderDbMapper.selectList(wrapper);
}
// @Override
// public List<OrderDb> batchCreateOrdersAndDetails(
// BatchCreateClientCustomerOrderAndDetailsRpcRequest createOrdersAndDetailsRequest) {
// ObjectMapper objectMapper = new ObjectMapper();
// var orderList = createOrdersAndDetailsRequest.getOrderCreationsList().stream()
// .map(creation -> {
// OrderDb orderDb = new OrderDb();
// String orderCode = IdUtil.getSnowflake(0, 0).nextIdStr();
// orderDb.setOrderCode(orderCode);
// orderDb.setEnterpriseId(createOrdersAndDetailsRequest.getEnterpriseId());
// orderDb.setClientId(creation.getClientId());
// orderDb.setStallId(creation.getStallId());
// if (creation.getShouldCreateOpenId()) {
// orderDb.setOpenId(creation.getOpenId());
// }
// if (creation.getShouldCreateCustomerNoticeJson())
// {
// orderDb.setCustomerId(creation.getCustomerId());
// }
// orderDb.setStatus(creation.getStatusValue());
// orderDb.setMenuId(creation.getMenuId());
// orderDb.setTotalNum(creation.getTotalNum());
// if (creation.getShouldCreatePayPrice()) {
// orderDb.setPayPrice(creation.getPayPrice());
// }
// if (creation.getShouldCreatePayTime()) {
// orderDb.setPayTime(Instant.ofEpochMilli(creation.getPayTime())
// .atZone(ZoneId.systemDefault())
// .toLocalDateTime());
// }
// if (creation.getShouldCreateOnlinePay()) {
// orderDb.setOnlinePay(creation.getOnlinePay());
// }
// if (creation.getShouldCreatePayStatus()) {
// orderDb.setPayStatus(creation.getPayStatusValue());
// }
// if (creation.getShouldCreateTransactionId()) {
// orderDb.setTransactionId(creation.getTransactionId());
// }
// if (creation.getShouldCreateErrorMsg()) {
// orderDb.setErrorMsg(creation.getErrorMsg());
// }
// if (creation.getShouldCreateAddress()) {
// orderDb.setAddress(creation.getAddress());
// }
// if (creation.getShouldCreateRoomNo()) {
// orderDb.setRoomNo(creation.getRoomNo());
// }
// if (creation.getShouldCreateTableCode()) {
// orderDb.setTableCode(creation.getTableCode());
// }
// if (creation.getShouldCreatePickupCode()) {
// orderDb.setPickupCode(creation.getPickupCode());
// }
// if (creation.getShouldCreateOrderType()) {
// orderDb.setOrderType(creation.getOrderTypeValue());
// }
// if (creation.getShouldCreateRemark()) {
// orderDb.setRemark(creation.getRemark());
// }
// if (creation.getShouldCreateCustomerNoticeJson()) {
// JsonNode notice = objectMapper.valueToTree(creation.getCustomerNoticeJson());
// orderDb.setCustomerNoticeJson(notice);
// }
// LocalDateTime mealTime = Instant.ofEpochMilli(creation.getMealTime())
// .atZone(ZoneId.systemDefault())
// .toLocalDateTime();
// orderDb.setMealTime(mealTime);
// orderDb.setCreatedBy(createOrdersAndDetailsRequest.getCreatedBy());
// orderDb.setCreationSource(createOrdersAndDetailsRequest.getCreationSourceValue());
// orderDb.setUpdatedBy(createOrdersAndDetailsRequest.getCreatedBy());
// orderDb.setUpdateSource(createOrdersAndDetailsRequest.getCreationSourceValue());
// orderDb.setCloseTimeType(creation.getCloseTimeTypeValue());
// orderDb.setIsRead(creation.getIsRead());
//
// return orderDb;
// }
// )
// .collect(Collectors.toList());
//
// List<OrderDb> resOrders = SpringUtil.getBean(OrderDbServiceImpl.class)
// .saveBatch(orderList) ? orderList : Collections.emptyList();
// if (resOrders.size() != createOrdersAndDetailsRequest.getOrderCreationsCount()) {
// throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_GEN_FAIL);
// }
//
// var detailList = createOrdersAndDetailsRequest.getDetailCreationsList().stream()
// .map(creation -> {
// OrderDetailDb orderDetailDb = new OrderDetailDb();
// orderDetailDb.setCreationSource(createOrdersAndDetailsRequest.getCreationSourceValue());
// orderDetailDb.setCreatedBy(createOrdersAndDetailsRequest.getCreatedBy());
// orderDetailDb.setUpdateSource(createOrdersAndDetailsRequest.getCreationSourceValue());
// orderDetailDb.setUpdatedBy(createOrdersAndDetailsRequest.getCreatedBy());
// orderDetailDb.setOrderId(creation.getOrderId());
// orderDetailDb.setMenuDetailId(creation.getMenuDetailId());
// orderDetailDb.setCount(creation.getCount());
// orderDetailDb.setMealId(creation.getMealId());
// orderDetailDb.setCategoryId(creation.getCategoryId());
// orderDetailDb.setSkuId(creation.getSkuId());
// if (creation.getShouldCreateShowName()) {
// orderDetailDb.setShowName(creation.getShowName());
// }
// if (creation.getShouldCreatePrice()) {
// orderDetailDb.setPrice(creation.getPrice());
// }
// if (creation.getShouldCreateAdjustSkuRemark()) {
// orderDetailDb.setAdjustSkuRemark(creation.getAdjustSkuRemark());
// }
// orderDetailDb.setNotServe(creation.getNotServe());
// if (creation.getShouldCreateMealDetailJson()) {
// orderDetailDb.setMealDetailJson(objectMapper.valueToTree(creation.getMealDetailJson()));
// }
//
// return orderDetailDb;
// })
// .collect(Collectors.toList());
// List<OrderDetailDb> resOrderDetails = SpringUtil.getBean(OrderDetailDbServiceImpl.class)
// .saveBatch(detailList) ? detailList : Collections.emptyList();
//
// if (resOrderDetails.size() != createOrdersAndDetailsRequest.getDetailCreationsCount()) {
// throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_DETAIL_GEN_FAIL);
// }
// return resOrders;
// }
}
......