From 09d1fb5dcfa7a8c5fae1c570ec4256d05b82617d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 27 May 2025 10:37:09 +0800
Subject: [PATCH] fix(mall): 修复确认收货功能
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 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 9321b44..2160e22 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
@@ -281,10 +281,21 @@
mallMemberCoupon.setState(2);
mallMemberCouponMapper.updateById(mallMemberCoupon);
- //运费
- BigDecimal delivaryAmount = addOrderDto.getDeliveryAmount() == null ? BigDecimal.ZERO : addOrderDto.getDeliveryAmount();
- orderInfo.setCarriage(delivaryAmount);
+ BigDecimal delivaryAmount = BigDecimal.ZERO;
+ if(StrUtil.isEmpty(addOrderDto.getTakeUniqueCode())){
+ delivaryAmount = addOrderDto.getDeliveryAmount() == null ? BigDecimal.ZERO : addOrderDto.getDeliveryAmount();
+ orderInfo.setCarriage(delivaryAmount);
+ }else{
+ MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(addOrderDto.getTakeUniqueCode());
+ if(ObjectUtil.isEmpty(mallTeamLeader)){
+ throw new FebsException("自提点信息异常");
+ }
+ orderInfo.setCarriage(delivaryAmount);
+ orderInfo.setTakeCode(ShareCodeUtil.toSerialCode(orderInfo.getId()) + MallUtils.getRandomNum(10));
+ orderInfo.setTakeUniqueCode(mallTeamLeader.getUniqueCode());
+ orderInfo.setDeliveryType(1);
+ }
total = total.add(delivaryAmount);
orderInfo.setAmount(total);
orderInfo.setScoreAmount(totalScoreAmount);
@@ -300,6 +311,7 @@
orderInfo.setLatitude(address.getLatitude());
orderInfo.setLongitude(address.getLongitude());
this.baseMapper.updateById(orderInfo);
+
//过期时间修改成24小时
agentProducer.sendOrderCancelDelayMsg(orderInfo.getId(), 24 * 60 * 60 * 1000L);
return orderInfo.getId();
@@ -699,7 +711,7 @@
orderInfo.setPayOrderNo(payResultStr);
orderInfo.setPayMethod("支付宝支付");
- agentProducer.sendOrderReturn(orderInfo.getId());
+// agentProducer.sendOrderReturn(orderInfo.getId());
break;
case "3":
@@ -843,7 +855,21 @@
// }
// }
+
OrderDetailVo orderDetailVo = MallOrderInfoConversion.INSTANCE.entityToDetailVo(orderInfo);
+ if(StrUtil.isNotEmpty(orderInfo.getTakeUniqueCode())){
+ MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(orderInfo.getTakeUniqueCode());
+
+ if(ObjectUtil.isNotEmpty(mallTeamLeader)){
+ orderDetailVo.setLeaderName(mallTeamLeader.getName());
+ orderDetailVo.setLeaderPhone(mallTeamLeader.getPhone());
+ orderDetailVo.setAddressPic(mallTeamLeader.getAddressPic());
+ orderDetailVo.setAddressArea(mallTeamLeader.getAddressArea());
+ orderDetailVo.setDetailAddress(mallTeamLeader.getDetailAddress());
+ orderDetailVo.setLeaderLongitude(mallTeamLeader.getLongitude());
+ orderDetailVo.setLeaderLatitude(mallTeamLeader.getLatitude());
+ }
+ }
MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
if(ObjectUtil.isNotEmpty(expressInfo)){
@@ -878,6 +904,16 @@
if (orderInfo.getStatus() != OrderStatusEnum.WAIT_FINISH.getValue()) {
throw new FebsException("该状态不能确认收货");
}
+ if(1 == orderInfo.getDeliveryType()){
+ List<MallOrderItem> mallOrderItems = mallOrderItemMapper.selectList(
+ new LambdaQueryWrapper<MallOrderItem>()
+ .eq(MallOrderItem::getOrderId, id)
+ .eq(MallOrderItem::getLeaderState, 0)
+ );
+ if(CollUtil.isNotEmpty(mallOrderItems)){
+ throw new FebsException("请先核销"+mallOrderItems.get(0).getGoodsName());
+ }
+ }
List<MallRefundEntity> mallRefundEntities = mallRefundMapper.selectByItemIdAndOrderIdAndState(null, orderInfo.getId(), 3);
if(CollUtil.isNotEmpty(mallRefundEntities)){
--
Gitblit v1.9.1