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/pay/controller/XcxPayController.java | 5 -----
src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java | 1 -
src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesSocialServiceImpl.java | 4 ----
src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java | 5 -----
src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java | 8 --------
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 5 -----
src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java | 3 ---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesOrderServiceImpl.java | 5 -----
8 files changed, 0 insertions(+), 36 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java b/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
index d9ec3fe..2f89401 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
@@ -11,7 +11,6 @@
import cc.mrbird.febs.mall.service.IMallAchieveService;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
import cc.mrbird.febs.mall.service.IMemberProfitService;
-import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesOrderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesOrderServiceImpl.java
index ea2ca5e..ac5d72b 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesOrderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesOrderServiceImpl.java
@@ -18,7 +18,6 @@
import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
import cc.mrbird.febs.pay.service.IPayService;
import cc.mrbird.febs.pay.service.IXcxPayService;
-import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
@@ -67,7 +66,6 @@
private final MallGoodsCouponMapper mallGoodsCouponMapper;
private final MallExpressInfoMapper mallExpressInfoMapper;
- private final AgentProducer agentProducer;
private final IXcxPayService iXcxPayService;
private final IPayService payService;
private final MallMemberMapper mallMemberMapper;
@@ -568,9 +566,6 @@
BigDecimal realAmount = total.subtract(discountAmount).add(deliveryAmount).setScale(2, RoundingMode.DOWN);
orderInfo.setRealAmount(realAmount);
clothesOrderMapper.updateById(orderInfo);
-
- //过期时间修改成24小时
- agentProducer.sendClothesOrderCancelDelayMsg(orderInfo.getId(), 24 * 60 * 60 * 1000L);
ApiClothesOrderInfoVo apiClothesOrderInfoVo = new ApiClothesOrderInfoVo();
apiClothesOrderInfoVo.setOrderId(orderInfo.getId());
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesSocialServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesSocialServiceImpl.java
index 2bcd490..6854549 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesSocialServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesSocialServiceImpl.java
@@ -11,7 +11,6 @@
import cc.mrbird.febs.mall.service.ApiClothesSocialService;
import cc.mrbird.febs.mall.vo.activity.ApiScCategoryInfoVo;
import cc.mrbird.febs.mall.vo.clothes.*;
-import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -64,7 +63,6 @@
private final ClothesLocationRemarkMapper clothesLocationRemarkMapper;
private final ClothesPatternRemarkMapper clothesPatternRemarkMapper;
private final ClothesSocialCommentMapper clothesSocialCommentMapper;
- private final AgentProducer agentProducer;
@Override
@@ -421,7 +419,6 @@
clothesSocialFollow.setType(SocialTypeEnum.LIKE.getValue());
clothesSocialFollowMapper.insert(clothesSocialFollow);
- agentProducer.sendAddLike(socialId);
}
return new FebsResponse().success().message("操作成功");
}
@@ -467,7 +464,6 @@
clothesSocialFollow.setType(SocialTypeEnum.COLLECT.getValue());
clothesSocialFollowMapper.insert(clothesSocialFollow);
- agentProducer.sendAddCollect(socialId);
}
return new FebsResponse().success().message("操作成功");
}
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 e7e5c42..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;
@@ -74,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;
@@ -314,7 +312,6 @@
this.baseMapper.updateById(orderInfo);
//过期时间修改成24小时
- agentProducer.sendOrderCancelDelayMsg(orderInfo.getId(), 24 * 60 * 60 * 1000L);
return orderInfo.getId();
}
@@ -748,7 +745,6 @@
StrUtil.format(ScoreFlowTypeEnum.PAY_BALANCE.getDesc(),orderInfo.getAmount()),
2
);
- agentProducer.sendOrderCoupon(orderInfo.getId());
break;
case "4":
if (orderInfo.getOrderType() != 2) {
@@ -938,7 +934,6 @@
orderInfo.setReceivingTime(new Date());
this.baseMapper.updateById(orderInfo);
- agentProducer.sendGetScoreMsg(orderInfo.getId());
}
@Override
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
index 678c232..7b0d1d1 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
@@ -18,7 +18,6 @@
import cc.mrbird.febs.mall.vo.activity.*;
import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
import cc.mrbird.febs.pay.service.IXcxPayService;
-import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
@@ -59,7 +58,6 @@
private final IXcxPayService iXcxPayService;
private final IApiMallMemberWalletService iApiMallMemberWalletService;
private final HappyActivityCategoryMapper happyActivityCategoryMapper;
- private final AgentProducer agentProducer;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final HappyMemberLevelMapper happyMemberLevelMapper;
private final IMallMoneyFlowService mallMoneyFlowService;
@@ -1024,12 +1022,9 @@
);
// 更新会员钱包中的分数
iApiMallMemberWalletService.add(multiply, memberId, "score");
- // 发送会员等级升级消息
- agentProducer.sendVipLevelUp(memberId);
}
}
}
- agentProducer.sendCheckActivityItem(happyActivityOrderItem.getOrderId());
return new FebsResponse().success().message("操作成功");
}
diff --git a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
index b0d40a1..bb72a28 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
@@ -19,7 +19,6 @@
import cc.mrbird.febs.pay.util.Signature;
import cc.mrbird.febs.pay.util.Util;
import cc.mrbird.febs.pay.util.WechatConfigure;
-import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -73,7 +72,6 @@
private final IApiMallMemberWalletService memberWalletService;
private final IApiMallMemberService mallMemberService;
private final MallAgentRecordMapper mallAgentRecordMapper;
- private final AgentProducer agentProducer;
private final IXcxPayService iXcxPayService;
private final WxFaPiaoService wxFaPiaoService;
private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
@@ -345,9 +343,6 @@
2
);
}
-
- agentProducer.sendOrderCoupon(order.getId());
-// agentProducer.sendGetScoreMsg(order.getId());
mallMoneyFlowService.addMoneyFlow(
order.getMemberId(),
diff --git a/src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java b/src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java
index 033e393..d547298 100644
--- a/src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java
@@ -17,7 +17,6 @@
import cc.mrbird.febs.pay.model.AliPayPassbackModel;
import cc.mrbird.febs.pay.properties.AliPayProperties;
import cc.mrbird.febs.pay.service.IPayService;
-import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.alipay.api.AlipayApiException;
@@ -51,8 +50,6 @@
private MallOrderInfoMapper orderInfoMapper;
@Autowired
private ClothesTypeMapper clothesTypeMapper;
- @Autowired
- private AgentProducer agentProducer;
@Value("${spring.profiles.active}")
private String active;
diff --git a/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java b/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java
index 31a2347..3940370 100644
--- a/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java
@@ -9,7 +9,6 @@
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.IApiMallOrderInfoService;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
-import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cc.mrbird.febs.vip.entity.MallVipBenefits;
import cc.mrbird.febs.vip.entity.MallVipConfig;
import cc.mrbird.febs.vip.mapper.MallVipConfigMapper;
@@ -49,7 +48,6 @@
private final MallMemberWalletMapper mallMemberWalletMapper;
private final MallMemberMapper mallMemberMapper;
private final MallVipConfigMapper mallVipConfigMapper;
- private final AgentProducer agentProducer;
private final IApiMallGoodsService mallGoodsService;
private final HappyMemberLevelMapper happyMemberLevelMapper;
private final HappySaleLevelMapper happySaleLevelMapper;
@@ -140,8 +138,6 @@
);
// 更新会员钱包中的分数
mallMemberWalletService.add(multiply, memberId, "score");
- // 发送会员等级升级消息
- agentProducer.sendVipLevelUp(memberId);
}
// 计算推荐人获得的积分
if(StrUtil.isNotEmpty(member.getReferrerId())){
@@ -173,14 +169,10 @@
);
// 更新会员钱包中的分数
mallMemberWalletService.add(multiply, refMember.getId(), "score");
- // 发送会员等级升级消息
- agentProducer.sendVipLevelUp(refMember.getId());
}
}
}
- // 发送分销等级升级消息
- agentProducer.sendSaleLevelUp(orderId);
}
--
Gitblit v1.9.1