From 5e5f8d4bc1e3b7764d6e69a6a4beba0383147158 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 26 六月 2019 10:58:32 +0800
Subject: [PATCH] 淘礼金相关PID修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java | 112 +++++++++++++++++++++++++++----------------------------
1 files changed, 55 insertions(+), 57 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 d86add6..37fb8a0 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
@@ -38,6 +38,7 @@
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.TaoBaoConstant;
import com.yeshi.fanli.util.factory.CommonGoodsFactory;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.taobao.TaoLiJinUtil;
@@ -49,49 +50,48 @@
@Resource(name = "taskExecutor")
private TaskExecutor executor;
-
+
@Resource
private RedisManager redisManager;
-
+
@Resource
private UserTaoLiJinRecordMapper userTaoLiJinRecordMapper;
-
+
@Resource
private CommonGoodsService commonGoodsService;
-
+
@Resource
private HongBaoManageService hongBaoManageService;
-
+
@Resource
private UserMoneyExtraService userMoneyExtraService;
-
+
@Resource
private UserTaoLiJinReportService userTaoLiJinReportService;
-
+
@Resource
private UserTaoLiJinDetailService userTaoLiJinDetailService;
-
+
@Resource
private UserTaoLiJinOriginService userTaoLiJinOriginService;
-
+
@Resource
private ConfigTaoLiJinService configTaoLiJinService;
-
+
@Resource
private UserOtherMsgNotificationService userOtherMsgNotificationService;
-
+
@Resource
private UserInfoExtraService userInfoExtraService;
-
-
+
@Override
- public UserTaoLiJinRecord selectByPrimaryKey(Long id){
+ public UserTaoLiJinRecord selectByPrimaryKey(Long id) {
return userTaoLiJinRecordMapper.selectByPrimaryKey(id);
}
-
-
+
@Override
- public UserTaoLiJinRecord createSelfBuyTaoLiJin(Long uid, int totalNum, TaoBaoGoodsBrief goods) throws UserTaoLiJinRecordException{
+ public UserTaoLiJinRecord createSelfBuyTaoLiJin(Long uid, int totalNum, TaoBaoGoodsBrief goods)
+ throws UserTaoLiJinRecordException {
Date date = new Date();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -114,14 +114,17 @@
}
// 鏂颁汉绾㈠寘 鑷喘涓�鍏�
BigDecimal perface = new BigDecimal(1);
-
- return createUserTaoLiJin(1, uid, goods.getAuctionId(), perface, 1, name, sendStartTime,
- sendEndTime, null, useEndTime);
+
+ 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);
}
-
-
+
@Override
- public UserTaoLiJinRecord createShareTaoLiJin(Long uid, int totalNum, TaoBaoGoodsBrief goods) throws UserTaoLiJinRecordException{
+ public UserTaoLiJinRecord createShareTaoLiJin(Long uid, int totalNum, TaoBaoGoodsBrief goods)
+ throws UserTaoLiJinRecordException {
Date date = new Date();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -142,7 +145,7 @@
} catch (ParseException e2) {
e2.printStackTrace();
}
-
+
boolean isNewUser = userInfoExtraService.isNewUser(uid);
if (isNewUser) {
// 鍒ゅ畾涓鸿�佺敤鎴凤細 鏂颁汉鍙浣跨敤浜嗘柊浜虹孩鍖咃紝涔熷氨鏄偅1鍧楅挶锛岄偅涔堬紝浠栫湅鍒扮殑鍒嗕韩鐖嗘涓殑鍟嗗搧-灏卞彧鑳藉垎浜��
@@ -151,7 +154,7 @@
isNewUser = false;
}
}
-
+
BigDecimal perface = null;
if (isNewUser) {
perface = new BigDecimal(1);
@@ -159,17 +162,16 @@
// 璁＄畻鎺ㄥ箍绾㈠寘
String warningRate = configTaoLiJinService.getValueByKey("warning_value");
perface = TaoLiJinUtil.getSpreadMoney(warningRate, goods);
- }
-
- return createUserTaoLiJin(2, uid, goods.getAuctionId(), perface, totalNum, name, sendStartTime,
- sendEndTime, null, useEndTime);
+ }
+
+ return createUserTaoLiJin(2, uid, goods.getAuctionId(), perface, totalNum, name, sendStartTime, sendEndTime,
+ null, useEndTime, TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT);
}
-
-
+
@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) throws UserTaoLiJinRecordException{
+ Date sendStartTime, Date sendEndTime, Date useStartTime, Date useEndTime,String pid) throws UserTaoLiJinRecordException{
// 鐢ㄦ埛鍓╀綑鍙互娣樼ぜ閲戦獙璇�
UserMoneyExtra userMoneyExtra = userMoneyExtraService.selectByPrimaryKey(uid);
@@ -187,7 +189,7 @@
}
// 鍒涘缓娣樼ぜ閲戠孩鍖�
- TaoLiJinDTO taoLiJinDTO = TaoKeApiUtil.createTaoLiJin(auctionId, name, perface, totalNum, sendStartTime, sendEndTime, useStartTime, useEndTime);
+ TaoLiJinDTO taoLiJinDTO = TaoKeApiUtil.createTaoLiJin(auctionId, name, perface, totalNum, sendStartTime, sendEndTime, useStartTime, useEndTime, pid);
if (taoLiJinDTO == null) {
throw new UserTaoLiJinRecordException(101, "绾㈠寘鍒涘缓澶辫触");
}
@@ -313,42 +315,39 @@
return record;
}
-
@Override
- public List<UserTaoLiJinRecordVO> getRecordByUid(long start, int count, Long uid){
+ public List<UserTaoLiJinRecordVO> getRecordByUid(long start, int count, Long uid) {
List<UserTaoLiJinRecordVO> list = userTaoLiJinRecordMapper.getRecordByUid(start, count, uid);
if (list == null || list.size() == 0) {
return list;
}
-
-
+
List<Long> listGoodsId = new ArrayList<Long>();
- for (UserTaoLiJinRecordVO userTaoLiJinRecordVO: list) {
+ for (UserTaoLiJinRecordVO userTaoLiJinRecordVO : list) {
listGoodsId.add(userTaoLiJinRecordVO.getAuctionId());
}
-
+
if (listGoodsId.size() == 0) {
return null;
}
-
+
List<CommonGoods> listGoods = commonGoodsService.getByListGoodsId(listGoodsId);
if (listGoods == null || listGoods.size() == 0) {
return null;
}
-
-
+
// 缁勭粐鐩稿叧鏁版嵁
- for (UserTaoLiJinRecordVO userTaoLiJinRecordVO: list) {
+ for (UserTaoLiJinRecordVO userTaoLiJinRecordVO : list) {
long auctionId = userTaoLiJinRecordVO.getAuctionId().longValue();
-
+
// 鍟嗗搧淇℃伅
- for (int i = 0; i< listGoods.size(); i++) {
+ for (int i = 0; i < listGoods.size(); i++) {
CommonGoods commonGoods = listGoods.get(i);
long goodsId = commonGoods.getGoodsId().longValue();
if (auctionId == goodsId) {
userTaoLiJinRecordVO.setTitle(commonGoods.getTitle());
userTaoLiJinRecordVO.setPictUrl(commonGoods.getPicture());
- if(CommonGoods.SHOP_TYPE_TB == commonGoods.getShopType()) {
+ if (CommonGoods.SHOP_TYPE_TB == commonGoods.getShopType()) {
userTaoLiJinRecordVO.setUserType(0);
} else {
userTaoLiJinRecordVO.setUserType(1);
@@ -356,22 +355,22 @@
break;
}
}
-
+
// 璁＄畻鍓╀綑鏈鍙栨暟閲�
int winNum = userTaoLiJinRecordVO.getWinNum();
int totalNum = userTaoLiJinRecordVO.getTotalNum();
userTaoLiJinRecordVO.setSurplusNum(totalNum - winNum);
-
-
+
// 璁＄畻鍒嗕韩濂栭噾
BigDecimal shareMoney = new BigDecimal(0);
BigDecimal commission = userTaoLiJinRecordVO.getCommission();
if (commission != null && commission.compareTo(shareMoney) > 1) {
BigDecimal shareRate = hongBaoManageService.getShareRate();
- shareMoney = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil.mul(commission, new BigDecimal("0.01")), MoneyBigDecimalUtil.div(shareRate, new BigDecimal(100)));
+ shareMoney = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil.mul(commission, new BigDecimal("0.01")),
+ MoneyBigDecimalUtil.div(shareRate, new BigDecimal(100)));
shareMoney = BigDecimalUtil.getWithNoZera(shareMoney);
}
-
+
ClientTextStyleVO desc = new ClientTextStyleVO();
desc.setColor("#FFFFFF");
desc.setContent("棰勪及鍒嗕韩濂栭噾锛氾骏" + shareMoney);
@@ -380,26 +379,25 @@
}
return list;
}
-
+
@Override
public long countRecordByUid(Long uid) {
return userTaoLiJinRecordMapper.countRecordByUid(uid);
}
-
+
@Override
public long countTodayNum(Long uid) {
return userTaoLiJinRecordMapper.countTodayNum(uid);
}
-
-
+
@Override
public BigDecimal getShareHongBaoByUidAndGoodsId(Long uid, Long goodsId) {
return userTaoLiJinRecordMapper.getShareHongBaoByUidAndGoodsId(uid, goodsId);
}
-
+
@Override
public UserTaoLiJinRecord getByRightsId(String rightsId) {
return userTaoLiJinRecordMapper.getByRightsId(rightsId);
}
-
+
}
--
Gitblit v1.8.0