From a3e1aec60d2f886b8c48966c889b567719d0c5ea Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 16 十月 2019 16:50:25 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 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 8813e1c..603a9d8 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
@@ -56,6 +56,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 +70,7 @@
@Resource
private RedisManager redisManager;
-
+
@Resource
private ConfigService configService;
@@ -111,13 +112,13 @@
@Resource
private ShareHotGoodsService shareHotGoodsService;
-
+
@Resource
private TokenRecordService tokenRecordService;
-
+
@Resource
private UserTaoLiJinGiveRecordService userTaoLiJinGiveRecordService;
-
+
@Override
public UserTaoLiJinRecord selectByPrimaryKey(Long id) {
return userTaoLiJinRecordMapper.selectByPrimaryKey(id);
@@ -150,7 +151,7 @@
// 鏂颁汉绾㈠寘 鑷喘涓�鍏�
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);
@@ -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("app_down_link")).replace("{闈㈤}",
+ amount.setScale(0).toString());
+
executor.execute(new Runnable() {
@Override
public void run() {
@@ -620,9 +621,8 @@
}
}
});
-
+
return tips;
}
-
}
--
Gitblit v1.8.0