From 13e710cac7ce8ac3438aee3123d964cfe0ad4055 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 06 Apr 2023 17:11:40 +0800
Subject: [PATCH] 测试环境
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 3797798..9e6f74b 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -14,6 +14,7 @@
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.*;
+import cc.mrbird.febs.mall.vo.ApiShopApplyVo;
import cc.mrbird.febs.mall.vo.OrderDetailVo;
import cc.mrbird.febs.mall.vo.OrderListVo;
import cc.mrbird.febs.mall.vo.OrderRefundVo;
@@ -75,6 +76,7 @@
private final MallMemberBankSignMapper mallMemberBankSignMapper;
private final MallMemberBankMapper mallMemberBankMapper;
+ private final MallShopApplyMapper mallShopApplyMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -102,6 +104,22 @@
if (CollUtil.isEmpty(addOrderDto.getItems())) {
throw new FebsException("参数错误");
+ }
+
+ int deliverType = ObjectUtil.isEmpty(addOrderDto.getDeliverType()) ? 1 : addOrderDto.getDeliverType();
+ if(2 == deliverType){
+ if(ObjectUtil.isEmpty(addOrderDto.getShopId())){
+ throw new FebsException("请选择门店");
+ }
+ Long shopId = addOrderDto.getShopId();
+ MallShopApply mallShopApply = mallShopApplyMapper.selectById(shopId);
+ if(ObjectUtil.isEmpty(mallShopApply)){
+ throw new FebsException("请选择门店");
+ }
+ if(MallShopApply.APPLY_AGREE != mallShopApply.getStatus()){
+ throw new FebsException("请选择门店");
+ }
+ orderInfo.setShopId(shopId);
}
this.baseMapper.insert(orderInfo);
@@ -186,7 +204,13 @@
}
orderInfo.setAmount(total);
- orderInfo.setCarriage(carriage);
+ if(2 == deliverType){
+ orderInfo.setDeliverType(2);
+ orderInfo.setCarriage(BigDecimal.ZERO);
+ }else{
+ orderInfo.setDeliverType(1);
+ orderInfo.setCarriage(carriage);
+ }
this.baseMapper.updateById(orderInfo);
agentProducer.sendOrderCancelDelayMsg(orderInfo.getId(), 15 * 60 * 1000L);
@@ -489,7 +513,8 @@
OrderDetailVo orderDetailVo = MallOrderInfoConversion.INSTANCE.entityToDetailVo(orderInfo);
- if (orderInfo.getStatus() == OrderStatusEnum.WAIT_FINISH.getValue()) {
+ Integer deliverType = (ObjectUtil.isEmpty(orderInfo.getDeliverType()) ? new Integer(0):orderInfo.getDeliverType());
+ if (orderInfo.getStatus() == OrderStatusEnum.WAIT_FINISH.getValue() && 2 != deliverType) {
MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
orderDetailVo.setExpressNo(expressInfo.getExpressNo());
orderDetailVo.setExpressCom(expressInfo.getExpressCom());
@@ -507,6 +532,20 @@
long remainTime = DateUtil.between(new Date(), endTime, DateUnit.SECOND, false);
orderDetailVo.setRemainTime(remainTime);
}
+ if(2 == deliverType){
+ MallShopApply mallShopApply = mallShopApplyMapper.selectById(orderInfo.getShopId());
+ if(ObjectUtil.isNotEmpty(mallShopApply)){
+ ApiShopApplyVo apiShopApplyVo = new ApiShopApplyVo();
+ apiShopApplyVo.setName(mallShopApply.getName());
+ apiShopApplyVo.setPhone(mallShopApply.getPhone());
+ apiShopApplyVo.setSaleArea(mallShopApply.getSaleArea());
+ apiShopApplyVo.setLatitude(mallShopApply.getLatitude());
+ apiShopApplyVo.setLongitude(mallShopApply.getLongitude());
+ apiShopApplyVo.setShopName(mallShopApply.getShopName());
+ apiShopApplyVo.setAddress(mallShopApply.getAddress());
+ orderDetailVo.setApiShopApplyVo(apiShopApplyVo);
+ }
+ }
return orderDetailVo;
}
--
Gitblit v1.9.1