From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java | 208 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 152 insertions(+), 56 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 37fb8a0..71152cc 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
@@ -24,20 +24,26 @@
import com.yeshi.fanli.entity.bus.user.UserMoneyExtra;
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
+import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.exception.tlj.UserTaoLiJinRecordException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;
+import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoBuyRelationMapService;
import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinDetailService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinReportService;
+import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserMoneyExtraService;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
+import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.factory.CommonGoodsFactory;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -84,11 +90,22 @@
@Resource
private UserInfoExtraService userInfoExtraService;
+ @Resource
+ private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
+
+ @Resource
+ private TaoBaoBuyRelationMapService taoBaoBuyRelationMapService;
+
+ @Resource
+ private ShareHotGoodsService shareHotGoodsService;
+
@Override
public UserTaoLiJinRecord selectByPrimaryKey(Long id) {
return userTaoLiJinRecordMapper.selectByPrimaryKey(id);
}
+
+ @Transactional
@Override
public UserTaoLiJinRecord createSelfBuyTaoLiJin(Long uid, int totalNum, TaoBaoGoodsBrief goods)
throws UserTaoLiJinRecordException {
@@ -115,16 +132,40 @@
// 鏂颁汉绾㈠寘 鑷喘涓�鍏�
BigDecimal perface = new BigDecimal(1);
- String pid = TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT;
- if (goods.getMaterialLibType() == null || goods.getMaterialLibType() == 0)
- pid = TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID;
- return createUserTaoLiJin(1, uid, goods.getAuctionId(), perface, 1, name, sendStartTime, sendEndTime, null,
- useEndTime, pid);
+ if (goods.getMaterialLibType() == null || goods.getMaterialLibType() == 0) {// 闈炶繑鍒╁簱鍟嗗搧
+ String relationId = null;
+ try {
+ relationId = taoBaoBuyRelationMapService.getRelationId(uid);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e, "uid:" + uid, null);
+ }
+
+ if (StringUtil.isNullOrEmpty(relationId)) {
+ throw new UserTaoLiJinRecordException(101, "娓犻亾鏈妗�");
+ }
+ UserTaoLiJinRecord record = createUserTaoLiJin(1, uid, goods.getAuctionId(), perface, 1, name,
+ sendStartTime, sendEndTime, null, useEndTime, TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID);
+ record.setSendUrl(record.getSendUrl() + "&relationId=" + relationId);
+ UserTaoLiJinRecord updateRecoed=new UserTaoLiJinRecord();
+ updateRecoed.setId(record.getId());
+ updateRecoed.setSendUrl(record.getSendUrl());
+ userTaoLiJinRecordMapper.updateByPrimaryKeySelective(record);
+ return record;
+ } else {// 杩斿埄搴撳晢鍝�
+ return createUserTaoLiJin(1, uid, goods.getAuctionId(), perface, 1, name, sendStartTime, sendEndTime, null,
+ useEndTime, TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT);
+ }
+
}
+ @Transactional
@Override
public UserTaoLiJinRecord createShareTaoLiJin(Long uid, int totalNum, TaoBaoGoodsBrief goods)
throws UserTaoLiJinRecordException {
+ String relationId = userExtraTaoBaoInfoService.getRelationIdByUid(uid);
+ if (StringUtil.isNullOrEmpty(relationId))
+ throw new UserTaoLiJinRecordException(101, "娓犻亾鏈巿鏉�");
+
Date date = new Date();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -164,37 +205,75 @@
perface = TaoLiJinUtil.getSpreadMoney(warningRate, goods);
}
- return createUserTaoLiJin(2, uid, goods.getAuctionId(), perface, totalNum, name, sendStartTime, sendEndTime,
- null, useEndTime, TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT);
+ UserTaoLiJinRecord record = createUserTaoLiJin(2, uid, goods.getAuctionId(), perface, totalNum, name,
+ sendStartTime, sendEndTime, null, useEndTime, TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT);
+ String sendUrl = record.getSendUrl() + "&relationId=" + relationId;
+ record.setSendUrl(sendUrl);
+ UserTaoLiJinRecord updateRecoed=new UserTaoLiJinRecord();
+ updateRecoed.setId(record.getId());
+ updateRecoed.setSendUrl(sendUrl);
+ userTaoLiJinRecordMapper.updateByPrimaryKeySelective(record);
+ return record;
}
@Override
@Transactional
- 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{
-
+ 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 {
+
// 鐢ㄦ埛鍓╀綑鍙互娣樼ぜ閲戦獙璇�
UserMoneyExtra userMoneyExtra = userMoneyExtraService.selectByPrimaryKey(uid);
if (userMoneyExtra == null || userMoneyExtra.getTlj() == null) {
throw new UserTaoLiJinRecordException(101, "绾㈠寘浣欓涓嶈冻");
}
+
+ // 杩囨湡 -鍙栨秷鏀跺洖
+ // userTaoLiJinOriginService.overdueHongBao(uid);
- // 杩囨湡
- userTaoLiJinOriginService.overdueHongBao(uid);
-
- BigDecimal tlj = userMoneyExtra.getTlj();
+ // 鎬绘帹骞跨孩鍖�
BigDecimal totalMoney = MoneyBigDecimalUtil.mul(perface, new BigDecimal(totalNum));
- if (totalMoney.compareTo(tlj) > 0) {
- throw new UserTaoLiJinRecordException(101, "绾㈠寘浣欓涓嶈冻");
+
+ // 鑷喘鏃剁殑绾㈠寘浣欓
+ if (origin == 1) {
+ BigDecimal tljSelf = userMoneyExtra.getTljSelf();
+ if (tljSelf == null || tljSelf.compareTo(totalMoney) < 0) {
+ throw new UserTaoLiJinRecordException(101, "鑷喘绾㈠寘浣欓涓嶈冻");
+ }
+ }
+
+ // 鍒嗕韩鏃剁殑绾㈠寘浣欓
+ BigDecimal tlj = userMoneyExtra.getTlj();
+ if (tlj == null || tlj.compareTo(totalMoney) < 0) {
+ throw new UserTaoLiJinRecordException(101, "鍒嗕韩绾㈠寘浣欓涓嶈冻");
}
+
// 鍒涘缓娣樼ぜ閲戠孩鍖�
- TaoLiJinDTO taoLiJinDTO = TaoKeApiUtil.createTaoLiJin(auctionId, name, perface, totalNum, sendStartTime, sendEndTime, useStartTime, useEndTime, pid);
- if (taoLiJinDTO == null) {
- throw new UserTaoLiJinRecordException(101, "绾㈠寘鍒涘缓澶辫触");
+ TaoLiJinDTO taoLiJinDTO = null;
+ try {
+ taoLiJinDTO = TaoKeApiUtil.createTaoLiJin(auctionId, name, perface, totalNum, sendStartTime,
+ sendEndTime, useStartTime, useEndTime, new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET, pid));
+ } catch (TaoKeApiException e) {
+ LogHelper.errorDetailInfo(e);
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ if (e.getCode() == TaoKeApiException.CODE_TLJ_FORBIDDEN) {
+ // 璇ュ晢鍝佷笉鏀寔鍒涘缓娣樼ぜ閲戠孩鍖�
+ shareHotGoodsService.deleteByGoodsId(auctionId);
+ } else if (e.getCode() == TaoKeApiException.CODE_TLJ_NO_MONEY) {
+ // 瀹樻柟鐜╂硶閽卞寘浣欓涓嶈冻 TODO
+ }
+ }
+ });
}
- // 淇濆瓨璁板綍
+ if (taoLiJinDTO == null) {
+ throw new UserTaoLiJinRecordException(101, "娣樺疂API鎺ㄥ箍绾㈠寘鍒涘缓澶辫触");
+ }
+
+ // 淇濆瓨璁板綍
UserTaoLiJinRecord record = new UserTaoLiJinRecord();
record.setUid(uid);
record.setGoodsId(auctionId);
@@ -208,18 +287,27 @@
record.setRightsId(taoLiJinDTO.getRightsId());
record.setSendUrl(taoLiJinDTO.getSendUrl());
record.setCreateTime(new Date());
- userTaoLiJinRecordMapper.insertSelective(record);
+ if (origin == 1) { // 鑷喘
+ record.setUseType(1);
+ } else { // 鍒嗕韩
+ record.setUseType(2);
+ }
- // 鍓╀綑娣樼ぜ閲�
- BigDecimal surplusTlj = MoneyBigDecimalUtil.sub(tlj, totalMoney);
+ userTaoLiJinRecordMapper.insertSelective(record);
+
+ BigDecimal surplusTlj = MoneyBigDecimalUtil.sub(tlj, totalMoney);
+
UserMoneyExtra updateExtra = new UserMoneyExtra();
updateExtra.setUid(uid);
+ if (origin == 1) { // 鍓╀綑娣樼ぜ閲�-- 鑷喘
+ updateExtra.setTljSelf(MoneyBigDecimalUtil.sub(userMoneyExtra.getTljSelf(), totalMoney));
+ }
updateExtra.setTlj(surplusTlj);
updateExtra.setUpdateTime(new Date());
userMoneyExtraService.updateByPrimaryKeySelective(updateExtra);
-
+
record.setSurplusMoney(surplusTlj);
-
+
// 寮傛
String rightsId = taoLiJinDTO.getRightsId();
executor.execute(new Runnable() {
@@ -237,30 +325,29 @@
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
-
-
+
// 鎴愬姛浣跨敤绾㈠寘
try {
BigDecimal total = totalMoney;
BigDecimal lastMoney = null;
BigDecimal zero = new BigDecimal(0);
-
+
// 淇敼浣欓
List<UserTaoLiJinOrigin> list = userTaoLiJinOriginService.getSurplusLiJin(uid);
if (list != null && list.size() > 0) {
- for (UserTaoLiJinOrigin taoLiJinOrigin: list) {
- if (total.compareTo(zero) < 1 ) {
+ for (UserTaoLiJinOrigin taoLiJinOrigin : list) {
+ if (total.compareTo(zero) < 1) {
break;
}
BigDecimal moneySurplus = taoLiJinOrigin.getMoneySurplus();
lastMoney = total;
total = MoneyBigDecimalUtil.sub(total, moneySurplus);
- if (total.compareTo(zero) >= 0 ) {
+ if (total.compareTo(zero) >= 0) {
moneySurplus = zero;
} else {
moneySurplus = MoneyBigDecimalUtil.sub(moneySurplus, lastMoney);
}
-
+
UserTaoLiJinOrigin usertlj = new UserTaoLiJinOrigin();
usertlj.setId(taoLiJinOrigin.getId());
usertlj.setMoneySurplus(moneySurplus);
@@ -271,25 +358,7 @@
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
-
-
-
- // 浣跨敤鎴愬姛娑堟伅
- try {
- String beizhu = "鏈棰嗗彇/浣跨敤鐨勯儴鍒嗗皢浼氶��鍥�";
-
- SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd hh.mm");
- String time = sd.format(new Date());
- MsgOtherTaoLiJinContentDTO content = new MsgOtherTaoLiJinContentDTO();
- content.setState("绾㈠寘鎵ｉ櫎");
- content.setSource(time + " 鍒涘缓鐨勫垎浜褰�");
- content.setMoney(totalMoney);
-
- userOtherMsgNotificationService.taoLiJinMsg(uid, beizhu, content);
- } catch (Exception e) {
- LogHelper.errorDetailInfo(e);
- }
-
+
// 鍒涘缓鎶ュ憡
try {
userTaoLiJinReportService.insertDefault(rightsId);
@@ -297,9 +366,31 @@
LogHelper.errorDetailInfo(e);
}
+
+ if (origin == 1) {
+ return; // 鑷喘涓嶆帹閫佹秷鎭�
+ }
+
+
+ // 浣跨敤鎴愬姛娑堟伅
+ try {
+ String beizhu = "鏈棰嗗彇鎴栭鍙栧悗鏈娇鐢ㄩ儴鍒嗛��鍥�";
+ SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH.mm");
+ String time = sd.format(new Date());
+ MsgOtherTaoLiJinContentDTO content = new MsgOtherTaoLiJinContentDTO();
+ content.setState("绾㈠寘鎵ｉ櫎");
+ content.setSource(time + " 鍒涘缓鐨勫垎浜褰�");
+ content.setMoney(totalMoney);
+
+ userOtherMsgNotificationService.taoLiJinMsg(uid, beizhu, content);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+
// 妫�娴嬪晢鍝佹槸鍚﹀瓨鍦�
try {
- CommonGoods commonGoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(auctionId, CommonGoods.GOODS_TYPE_TB);
+ CommonGoods commonGoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(auctionId,
+ CommonGoods.GOODS_TYPE_TB);
if (commonGoods == null) {
TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);
if (taoBaoGoodsBrief != null) {
@@ -311,7 +402,7 @@
}
}
});
-
+
return record;
}
@@ -364,10 +455,9 @@
// 璁＄畻鍒嗕韩濂栭噾
BigDecimal shareMoney = new BigDecimal(0);
BigDecimal commission = userTaoLiJinRecordVO.getCommission();
- if (commission != null && commission.compareTo(shareMoney) > 1) {
+ if (commission != null && commission.compareTo(shareMoney) > 0) {
BigDecimal shareRate = hongBaoManageService.getShareRate();
- shareMoney = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil.mul(commission, new BigDecimal("0.01")),
- MoneyBigDecimalUtil.div(shareRate, new BigDecimal(100)));
+ shareMoney = MoneyBigDecimalUtil.mul(commission, MoneyBigDecimalUtil.div(shareRate, new BigDecimal(100)));
shareMoney = BigDecimalUtil.getWithNoZera(shareMoney);
}
@@ -386,6 +476,12 @@
}
@Override
+ public long countShareRecordByUid(Long uid) {
+ return userTaoLiJinRecordMapper.countShareRecordByUid(uid);
+ }
+
+
+ @Override
public long countTodayNum(Long uid) {
return userTaoLiJinRecordMapper.countTodayNum(uid);
}
--
Gitblit v1.8.0