jiujian / client-customer-order-service

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
3a41bfc6 1 parent 618faf84

fix

Inline Side-by-side
Showing 1 changed file with 9 additions and 20 deletions
......@@ -10,8 +10,6 @@ import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustome
import com.infoloop.tianting.clientcustomerorderservice.BatchUpdateClientCustomerOrdersRpcRequest;
import com.infoloop.tianting.clientcustomerorderservice.ClientCustomerOrderCreation;
import com.infoloop.tianting.clientcustomerorderservice.CreateClientCustomerOrderRpcRequest;
import com.infoloop.tianting.clientcustomerorderservice.OnlinePayEnum;
import com.infoloop.tianting.clientcustomerorderservice.PayStatusEnum;
import com.infoloop.tianting.clientcustomerorderservice.ServeStatusEnum;
import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderRpcRequest;
import com.tianting.infoloop.mapper.OrderDbMapper;
......@@ -20,13 +18,13 @@ import com.tianting.infoloop.model.db.OrderDetailDb;
import com.tianting.infoloop.model.dto.CustomerNoticeDto;
import com.tianting.infoloop.model.dto.MealDetailJson;
import com.tianting.infoloop.service.OrderDbService;
import com.tianting.infoloop.service.OrderDetailDbService;
import com.tianting.infoloop.utils.exception.ErrorCodeConstants;
import com.tianting.infoloop.utils.exception.ServiceExceptionUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.Instant;
import java.time.LocalDateTime;
......@@ -42,9 +40,9 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor(onConstructor_ = @Autowired)
public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> implements OrderDbService {
private final OrderDbMapper orderDbMapper;
private final OrderDetailDbService orderDetailDbService;
@Override
@Transactional(rollbackFor = Exception.class)
public OrderDb createOrderDb(CreateClientCustomerOrderRpcRequest createOrderRpcRequest) {
OrderDb orderDb = new OrderDb();
//生成分布式唯一值
......@@ -69,9 +67,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
orderDb.setPayPrice(createOrderRpcRequest.getCreation().getPayPrice());
}
if (createOrderRpcRequest.getCreation().getShouldCreatePayTime()) {
orderDb.setPayTime(Instant.ofEpochMilli(createOrderRpcRequest.getCreation().getPayTime())
.atZone(ZoneId.systemDefault())
.toLocalDateTime());
orderDb.setPayTime(Instant.ofEpochMilli(createOrderRpcRequest.getCreation().getPayTime()).atZone(ZoneId.systemDefault()).toLocalDateTime());
}
if (createOrderRpcRequest.getCreation().getShouldCreateOnlinePay()) {
orderDb.setOnlinePay(createOrderRpcRequest.getCreation().getOnlinePayValue());
......@@ -111,12 +107,9 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
.build());
orderDb.setCustomerNoticeJson(notice);
}
LocalDateTime mealTime = Instant.ofEpochMilli(createOrderRpcRequest.getCreation().getMealTime())
// .atZone(ZoneId.systemDefault())
.atOffset(ZoneOffset.UTC)
.toLocalDateTime();
LocalDateTime mealTime = Instant.ofEpochMilli(createOrderRpcRequest.getCreation().getMealTime()).atOffset(ZoneOffset.UTC).toLocalDateTime();
orderDb.setMealTime(mealTime);
orderDb.setPayStatus(createOrderRpcRequest.getCreation().getOnlinePay() == OnlinePayEnum.ONLINE ? PayStatusEnum.TO_PAY_VALUE : PayStatusEnum.SUCCEED_VALUE);
orderDb.setPayStatus(createOrderRpcRequest.getCreation().getPayStatusValue());
orderDb.setCreatedBy(createOrderRpcRequest.getCreatedBy());
orderDb.setCreationSource(createOrderRpcRequest.getCreationSourceValue());
orderDb.setUpdatedBy(createOrderRpcRequest.getCreatedBy());
......@@ -126,7 +119,6 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
orderDb.setIsDeleted(false);
orderDb.setIsConfirm(false);
orderDb.setIsAllocation(false);
boolean res = this.save(orderDb);
if (!res) {
throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_GEN_FAIL);
......@@ -170,14 +162,12 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
.protein(detailCreation.getMealDetailJson().getProtein())
.skus(detailCreation.getMealDetailJson().getSkusList())
.tastes(detailCreation.getMealDetailJson().getTastesList())
.build()));//detailCreation.getMealDetailJson()
.build()));
}
return orderDetailDb;
})
.collect(Collectors.toList());
List<OrderDetailDb> resOrderDetails = SpringUtil.getBean(OrderDetailDbServiceImpl.class)
.saveBatch(detailList) ? detailList : Collections.emptyList();
List<OrderDetailDb> resOrderDetails = SpringUtil.getBean(OrderDetailDbServiceImpl.class).saveBatch(detailList) ? detailList : Collections.emptyList();
if (resOrderDetails.size() != createOrderRpcRequest.getCreation().getOrderDetailsCount()) {
throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_DETAIL_GEN_FAIL);
}
......@@ -273,7 +263,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
// throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_GEN_FAIL);
// }
List<OrderDb> resOrders = new ArrayList<>();
for(ClientCustomerOrderCreation creation: batchCreateOrdersRequest.getCreationsList()){
for (ClientCustomerOrderCreation creation : batchCreateOrdersRequest.getCreationsList()) {
OrderDb orderDb = new OrderDb();
String orderCode = IdUtil.getSnowflake(0, 0).nextIdStr();
orderDb.setOrderCode(orderCode);
......@@ -283,8 +273,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
if (creation.getShouldCreateOpenId()) {
orderDb.setOpenId(creation.getOpenId());
}
if (creation.getShouldCreateCustomerNoticeJson())
{
if (creation.getShouldCreateCustomerNoticeJson()) {
orderDb.setCustomerId(creation.getCustomerId());
}
orderDb.setStatus(creation.getStatusValue());
......