From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java | 72 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 36 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 6be1907..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;
@@ -35,9 +37,9 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.money.UserMoneyExtraService;
import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoBuyRelationMapService;
import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;
@@ -47,8 +49,8 @@
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinReportService;
import com.yeshi.fanli.service.inter.user.TokenRecordService;
-import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
+import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
@@ -56,6 +58,7 @@
import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.TokenUtil;
import com.yeshi.fanli.util.factory.CommonGoodsFactory;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.taobao.TaoLiJinUtil;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
@@ -69,7 +72,7 @@
@Resource
private RedisManager redisManager;
-
+
@Resource
private ConfigService configService;
@@ -111,21 +114,21 @@
@Resource
private ShareHotGoodsService shareHotGoodsService;
-
+
@Resource
private TokenRecordService tokenRecordService;
-
+
@Resource
private UserTaoLiJinGiveRecordService userTaoLiJinGiveRecordService;
-
+
@Override
public UserTaoLiJinRecord selectByPrimaryKey(Long id) {
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");
@@ -147,10 +150,8 @@
} catch (ParseException e2) {
e2.printStackTrace();
}
- // 鏂颁汉绾㈠寘 鑷喘涓�鍏�
- BigDecimal perface = new BigDecimal(1);
- if (goods.getMaterialLibType() == null || goods.getMaterialLibType() == 0) {// 闈炶繑鍒╁簱鍟嗗搧
+ if (!TaoBaoUtil.isSpecialGoods(goods.getMaterialLibType())) {// 闈炶繑鍒╁簱鍟嗗搧
String relationId = null;
try {
relationId = taoBaoBuyRelationMapService.getRelationId(uid);
@@ -161,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();
@@ -170,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 {
@@ -235,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 {
@@ -399,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);
}
@@ -473,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);
@@ -512,25 +513,25 @@
public UserTaoLiJinRecord getByRightsId(String rightsId) {
return userTaoLiJinRecordMapper.getByRightsId(rightsId);
}
-
+
@Override
- public String giveTaolijin(Long uid, BigDecimal amount) throws UserTaoLiJinRecordException{
- if (uid == null || amount == null)
- throw new UserTaoLiJinRecordException(1,"鍙傛暟涓嶆纭�");
-
+ public String giveTaolijin(Long uid, BigDecimal amount) throws UserTaoLiJinRecordException {
+ if (uid == null || amount == null)
+ throw new UserTaoLiJinRecordException(1, "鍙傛暟涓嶆纭�");
+
String giveMin = configTaoLiJinService.getValueByKey("give_min_amount");
if (amount.compareTo(new BigDecimal(giveMin)) < 0)
- throw new UserTaoLiJinRecordException(1,"璧犻�佹帹骞跨孩鍖呴噾棰濊嚦灏�" + giveMin + "鍏�");
-
+ throw new UserTaoLiJinRecordException(1, "璧犻�佹帹骞跨孩鍖呴噾棰濊嚦灏�" + giveMin + "鍏�");
+
// 鐢ㄦ埛鍓╀綑鍙互娣樼ぜ閲戦獙璇�
UserMoneyExtra userMoneyExtra = userMoneyExtraService.selectByPrimaryKey(uid);
if (userMoneyExtra == null || userMoneyExtra.getTlj() == null)
throw new UserTaoLiJinRecordException(1, "绾㈠寘浣欓涓嶈冻");
-
+
BigDecimal tlj = userMoneyExtra.getTlj();
if (amount.compareTo(tlj) > 0)
throw new UserTaoLiJinRecordException(1, "绾㈠寘浣欓涓嶈冻");
-
+
Date nowDate = new Date();
// 璧犻�佽褰�
UserTaoLiJinGiveRecord giveRecord = new UserTaoLiJinGiveRecord();
@@ -540,7 +541,7 @@
giveRecord.setGiveTime(nowDate);
giveRecord.setEndTime(DateUtil.plusDayDate(Constant.GIVE_DAYS, new Date()));
userTaoLiJinGiveRecordService.insertSelective(giveRecord);
-
+
// 鍙ｄ护璁板綍
TokenRecord tokenRecord = new TokenRecord();
tokenRecord.setUid(uid);
@@ -550,27 +551,27 @@
tokenRecord.setEndTime(DateUtil.plusDayDate(Constant.TOKEN_DAYS, new Date()));
tokenRecord.setState(0);
tokenRecordService.insertSelective(tokenRecord);
-
+
// 鍒涘缓鍙ｄ护
String token = TokenUtil.createToken(tokenRecord.getId());
tokenRecord.setToken(token);
tokenRecordService.updateByPrimaryKeySelective(tokenRecord);
-
+
// 鏇存柊浣欓
UserMoneyExtra updateExtra = new UserMoneyExtra();
updateExtra.setUid(uid);
updateExtra.setTlj(MoneyBigDecimalUtil.sub(tlj, amount));
updateExtra.setUpdateTime(new Date());
userMoneyExtraService.updateByPrimaryKeySelective(updateExtra);
-
+
String tips = configTaoLiJinService.getValueByKey("give_taolijin_tips");
String projectChineseName = Constant.systemCommonConfig.getProjectChineseName();
- while(tips.contains("{APP鍚嶇О}")) {
+ while (tips.contains("{APP鍚嶇О}")) {
tips = tips.replace("{APP鍚嶇О}", projectChineseName);
}
- tips = tips.replace("{鍙ｄ护}", token).replace("{涓嬭浇閾炬帴}", configService.get("app_down_link"))
- .replace("{闈㈤}", amount.setScale(0).toString());
-
+ tips = tips.replace("{鍙ｄ护}", token).replace("{涓嬭浇閾炬帴}", configService.get(ConfigKeyEnum.appDownLink.getKey())).replace("{闈㈤}",
+ amount.setScale(0).toString());
+
executor.execute(new Runnable() {
@Override
public void run() {
@@ -620,9 +621,8 @@
}
}
});
-
+
return tips;
}
-
}
--
Gitblit v1.8.0