From 62a447d89331aee1feae7724c7616aa1bb2cfe79 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 16 十月 2024 14:28:37 +0800
Subject: [PATCH] 将CMQ替换为rabbitmq
---
fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java
index 7a4a4ca..5107517 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java
@@ -10,7 +10,9 @@
import javax.annotation.Resource;
import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.entity.SystemPIDInfo;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.manger.PIDManager;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -131,6 +133,9 @@
return userTaoLiJinRecordMapper.selectByPrimaryKey(id);
}
+ @Resource
+ private PIDManager pidManager;
+
@Transactional(rollbackFor = Exception.class)
@Override
public UserTaoLiJinRecord createSelfBuyTaoLiJin(Long uid, BigDecimal couplePrice, TaoBaoGoodsBrief goods)
@@ -168,7 +173,7 @@
throw new UserTaoLiJinRecordException(101, "娓犻亾鏈妗�");
}
UserTaoLiJinRecord record = createUserTaoLiJin(1, uid, goods.getAuctionId(), couplePrice, 1, name,
- sendStartTime, sendEndTime, null, useEndTime, TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID);
+ sendStartTime, sendEndTime, null, useEndTime, pidManager.getPidCache(SystemEnum.blks, Constant.SOURCE_TYPE_TAOBAO, SystemPIDInfo.PidType.fanliChannel));
record.setSendUrl(record.getSendUrl() + "&relationId=" + relationId);
UserTaoLiJinRecord updateRecoed = new UserTaoLiJinRecord();
updateRecoed.setId(record.getId());
@@ -177,7 +182,7 @@
return record;
} else {// 杩斿埄搴撳晢鍝�
return createUserTaoLiJin(1, uid, goods.getAuctionId(), couplePrice, 1, name, sendStartTime, sendEndTime, null,
- useEndTime, TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT);
+ useEndTime, pidManager.getPidCache(SystemEnum.blks, Constant.SOURCE_TYPE_TAOBAO, SystemPIDInfo.PidType.fanli));
}
}
@@ -242,7 +247,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public UserTaoLiJinRecord createUserTaoLiJin(int origin, Long uid, Long auctionId, BigDecimal perface, int totalNum,
+ public UserTaoLiJinRecord createUserTaoLiJin(int origin, Long uid, String auctionId, BigDecimal perface, int totalNum,
String name, Date sendStartTime, Date sendEndTime, Date useStartTime, Date useEndTime, String pid)
throws UserTaoLiJinRecordException {
@@ -436,7 +441,7 @@
return list;
}
- List<Long> listGoodsId = new ArrayList<Long>();
+ List<String> listGoodsId = new ArrayList<>();
for (UserTaoLiJinRecordVO userTaoLiJinRecordVO : list) {
listGoodsId.add(userTaoLiJinRecordVO.getAuctionId());
}
@@ -452,13 +457,13 @@
// 缁勭粐鐩稿叧鏁版嵁
for (UserTaoLiJinRecordVO userTaoLiJinRecordVO : list) {
- long auctionId = userTaoLiJinRecordVO.getAuctionId().longValue();
+ String auctionId = userTaoLiJinRecordVO.getAuctionId();
// 鍟嗗搧淇℃伅
for (int i = 0; i < listGoods.size(); i++) {
CommonGoods commonGoods = listGoods.get(i);
- long goodsId = commonGoods.getGoodsId().longValue();
- if (auctionId == goodsId) {
+ String goodsId = commonGoods.getGoodsId();
+ if (TaoBaoUtil.isEqual(auctionId , goodsId)) {
userTaoLiJinRecordVO.setTitle(commonGoods.getTitle());
userTaoLiJinRecordVO.setPictUrl(commonGoods.getPicture());
if (CommonGoods.SHOP_TYPE_TB == commonGoods.getShopType()) {
@@ -480,7 +485,7 @@
BigDecimal shareMoney = new BigDecimal(0);
BigDecimal commission = userTaoLiJinRecordVO.getCommission();
if (commission != null && commission.compareTo(shareMoney) > 0) {
- BigDecimal shareRate = hongBaoManageService.getShareRate(UserLevelEnum.daRen,system);
+ BigDecimal shareRate = hongBaoManageService.getShareRate(UserLevelEnum.daRen, system);
shareMoney = MoneyBigDecimalUtil.mul(commission,
MoneyBigDecimalUtil.div(shareRate, new BigDecimal(100)));
shareMoney = BigDecimalUtil.getWithNoZera(shareMoney);
--
Gitblit v1.8.0