From 89dcb50d30b6509b80375db8ce21e3864d3858cf Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 17 Mar 2026 13:46:48 +0800
Subject: [PATCH] refactor(service): 移除订单服务中的 RabbitMQ 消息生产者依赖
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 f4121ca..cfe6bb7 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
@@ -19,7 +19,6 @@
import cc.mrbird.febs.pay.service.IPayService;
import cc.mrbird.febs.pay.service.IXcxPayService;
import cc.mrbird.febs.pay.util.WeixinServiceUtil;
-import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cc.mrbird.febs.vip.service.IMallVipConfigBenefitsService;
import cc.mrbird.febs.vip.service.IMallVipConfigService;
import cn.hutool.core.collection.CollUtil;
@@ -34,6 +33,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
@@ -73,7 +73,6 @@
private final IMallMoneyFlowService mallMoneyFlowService;
private final RedisUtils redisUtils;
- private final AgentProducer agentProducer;
private final IPayService payService;
private final IXcxPayService iXcxPayService;
private final IMallAchieveService mallAchieveService;
@@ -313,7 +312,6 @@
this.baseMapper.updateById(orderInfo);
//过期时间修改成24小时
- agentProducer.sendOrderCancelDelayMsg(orderInfo.getId(), 24 * 60 * 60 * 1000L);
return orderInfo.getId();
}
@@ -747,7 +745,6 @@
StrUtil.format(ScoreFlowTypeEnum.PAY_BALANCE.getDesc(),orderInfo.getAmount()),
2
);
- agentProducer.sendOrderCoupon(orderInfo.getId());
break;
case "4":
if (orderInfo.getOrderType() != 2) {
@@ -871,8 +868,15 @@
}
}
- MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
- if(ObjectUtil.isNotEmpty(expressInfo)){
+ MallExpressInfo expressInfo = expressInfoMapper.selectOne(
+ Wrappers.lambdaQuery(MallExpressInfo.class)
+ .eq(MallExpressInfo::getOrderId, orderInfo.getId())
+ .eq(MallExpressInfo::getOrderNo, orderInfo.getOrderNo())
+ .last("limit 1")
+ );
+
+// MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
+ if(ObjectUtil.isNotNull(expressInfo)){
orderDetailVo.setExpressNo(expressInfo.getExpressNo());
orderDetailVo.setExpressCom(expressInfo.getExpressCom());
}
@@ -910,7 +914,7 @@
if (orderInfo.getStatus() != OrderStatusEnum.WAIT_FINISH.getValue()) {
throw new FebsException("该状态不能确认收货");
}
- if(ObjectUtil.isNotEmpty(orderInfo.getDeliveryType()) && 1 == orderInfo.getDeliveryType()){
+ if(orderInfo.getDeliveryType().equals(1)){
List<MallOrderItem> mallOrderItems = mallOrderItemMapper.selectList(
new LambdaQueryWrapper<MallOrderItem>()
.eq(MallOrderItem::getOrderId, id)
@@ -930,7 +934,6 @@
orderInfo.setReceivingTime(new Date());
this.baseMapper.updateById(orderInfo);
- agentProducer.sendGetScoreMsg(orderInfo.getId());
}
@Override
--
Gitblit v1.9.1