From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 603a9d8..b5c8b9e 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
@@ -25,8 +25,10 @@
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinRecord;
import com.yeshi.fanli.entity.bus.user.TokenRecord;
import com.yeshi.fanli.entity.bus.user.TokenRecord.TokenTypeEnum;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.entity.bus.user.UserMoneyExtra;
import com.yeshi.fanli.entity.goods.CommonGoods;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
@@ -124,9 +126,9 @@
return userTaoLiJinRecordMapper.selectByPrimaryKey(id);
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
- public UserTaoLiJinRecord createSelfBuyTaoLiJin(Long uid, int totalNum, TaoBaoGoodsBrief goods)
+ public UserTaoLiJinRecord createSelfBuyTaoLiJin(Long uid, BigDecimal couplePrice, TaoBaoGoodsBrief goods)
throws UserTaoLiJinRecordException {
Date date = new Date();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
@@ -148,8 +150,6 @@
} catch (ParseException e2) {
e2.printStackTrace();
}
- // 鏂颁汉绾㈠寘 鑷喘涓�鍏�
- BigDecimal perface = new BigDecimal(1);
if (!TaoBaoUtil.isSpecialGoods(goods.getMaterialLibType())) {// 闈炶繑鍒╁簱鍟嗗搧
String relationId = null;
@@ -162,7 +162,7 @@
if (StringUtil.isNullOrEmpty(relationId)) {
throw new UserTaoLiJinRecordException(101, "娓犻亾鏈妗�");
}
- UserTaoLiJinRecord record = createUserTaoLiJin(1, uid, goods.getAuctionId(), perface, 1, name,
+ UserTaoLiJinRecord record = createUserTaoLiJin(1, uid, goods.getAuctionId(), couplePrice, 1, name,
sendStartTime, sendEndTime, null, useEndTime, TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID);
record.setSendUrl(record.getSendUrl() + "&relationId=" + relationId);
UserTaoLiJinRecord updateRecoed = new UserTaoLiJinRecord();
@@ -171,13 +171,13 @@
userTaoLiJinRecordMapper.updateByPrimaryKeySelective(record);
return record;
} else {// 杩斿埄搴撳晢鍝�
- return createUserTaoLiJin(1, uid, goods.getAuctionId(), perface, 1, name, sendStartTime, sendEndTime, null,
+ return createUserTaoLiJin(1, uid, goods.getAuctionId(), couplePrice, 1, name, sendStartTime, sendEndTime, null,
useEndTime, TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT);
}
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public UserTaoLiJinRecord createShareTaoLiJin(Long uid, int totalNum, TaoBaoGoodsBrief goods)
throws UserTaoLiJinRecordException {
@@ -236,7 +236,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public UserTaoLiJinRecord createUserTaoLiJin(int origin, Long uid, Long auctionId, BigDecimal perface, int totalNum,
String name, Date sendStartTime, Date sendEndTime, Date useStartTime, Date useEndTime, String pid)
throws UserTaoLiJinRecordException {
@@ -400,7 +400,7 @@
content.setSource(time + " 鍒涘缓鐨勫垎浜褰�");
content.setMoney(totalMoney);
- userOtherMsgNotificationService.taoLiJinMsg(uid, beizhu, content);
+ //userOtherMsgNotificationService.taoLiJinMsg(uid, beizhu, content);
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -474,7 +474,7 @@
BigDecimal shareMoney = new BigDecimal(0);
BigDecimal commission = userTaoLiJinRecordVO.getCommission();
if (commission != null && commission.compareTo(shareMoney) > 0) {
- BigDecimal shareRate = hongBaoManageService.getShareRate();
+ BigDecimal shareRate = hongBaoManageService.getShareRate(UserLevelEnum.daRen);
shareMoney = MoneyBigDecimalUtil.mul(commission,
MoneyBigDecimalUtil.div(shareRate, new BigDecimal(100)));
shareMoney = BigDecimalUtil.getWithNoZera(shareMoney);
@@ -569,7 +569,7 @@
while (tips.contains("{APP鍚嶇О}")) {
tips = tips.replace("{APP鍚嶇О}", projectChineseName);
}
- tips = tips.replace("{鍙ｄ护}", token).replace("{涓嬭浇閾炬帴}", configService.get("app_down_link")).replace("{闈㈤}",
+ tips = tips.replace("{鍙ｄ护}", token).replace("{涓嬭浇閾炬帴}", configService.get(ConfigKeyEnum.appDownLink.getKey())).replace("{闈㈤}",
amount.setScale(0).toString());
executor.execute(new Runnable() {
--
Gitblit v1.8.0