From ff076ec18ccc61d9d03863d859000e4a46c19a76 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 27 十二月 2019 11:20:35 +0800
Subject: [PATCH] 自购返利维权到账修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java | 57 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
index 6a22ce6..d58447d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
@@ -93,7 +93,7 @@
public BigDecimal getRewardMoney(Long uid) {
return redPackWinInviteMapper.getRewardMoney(uid);
}
-
+
@Override
@RequestSerializableByKeyService(key = "#teamUid")
@Transactional(rollbackFor = Exception.class)
@@ -106,13 +106,13 @@
if (!VersionUtil.greaterThan_2_1("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",
activeLog.getVersionCode()))
return;
-
+
// 鍚屼竴闃熷憳鍙褰曚竴娆�
int totalReward = redPackWinInviteMapper.countByUidAndTeamUidAndType(bossId, teamUid,
RedPackWinInviteTypeEnum.zeroStageReward.name());
if (totalReward > 0)
return;
-
+
// 鑾峰緱绾㈠寘
RedPackWinInvite winInvite = new RedPackWinInvite();
winInvite.setUid(bossId);
@@ -124,14 +124,14 @@
winInvite.setUpdateTime(new Date());
redPackWinInviteMapper.insertSelective(winInvite);
}
-
@Override
@RequestSerializableByKeyService(key = "#teamUid")
@Transactional(rollbackFor = Exception.class)
public void inviteSucceedReward(Long teamUid) throws Exception {
// 鏄惁鍦ㄤ笂绾夸箣鍚庣殑閭�璇峰叧绯�
- ThreeSale threeSale = threeSaleSerivce.getByWorkerIdAndTime(teamUid, TimeUtil.convertDateToTemp(Constant.RED_PACK_ONLINE_TIME));
+ ThreeSale threeSale = threeSaleSerivce.getByWorkerIdAndTime(teamUid,
+ TimeUtil.convertDateToTemp(Constant.RED_PACK_ONLINE_TIME));
if (threeSale == null)
return;
@@ -144,6 +144,11 @@
// 灏忎簬2.0.2鐗堟湰涓嶅鍔�
if (!VersionUtil.greaterThan_2_1("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",
activeLog.getVersionCode()))
+ return;
+
+ int totalRewardZero = redPackWinInviteMapper.countByUidAndTeamUidAndType(bossId, teamUid,
+ RedPackWinInviteTypeEnum.zeroStageReward.name());
+ if (totalRewardZero <= 0)
return;
// 鍚屼竴闃熷憳濂栧姳涓�娆�
@@ -222,7 +227,8 @@
return;
// 楠岃瘉涓婁笅绾у叧绯�
- ThreeSale threeSale = threeSaleSerivce.getByWorkerIdAndTime(teamUid, TimeUtil.convertDateToTemp(Constant.RED_PACK_ONLINE_TIME));
+ ThreeSale threeSale = threeSaleSerivce.getByWorkerIdAndTime(teamUid,
+ TimeUtil.convertDateToTemp(Constant.RED_PACK_ONLINE_TIME));
if (threeSale == null || threeSale.getBoss().getId().longValue() != uid.longValue())
return;
@@ -252,7 +258,7 @@
* @param orderNo
* @param bossId
*/
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
private void twoStageRewardToBoss(Long bossId, Long teamUid, Date oneStageTime, Integer source, String orderNo)
throws Exception {
// 绗竴闃舵瀹屾垚涔嬪悗鐨�90澶╁唴 ; 闃熷弸浜х敓鐨勮鍗曚腑锛堣嚜璐�+鍒嗕韩锛夛紝閭�璇蜂汉绱浜х敓鈮�1 鍏冨閲�
@@ -305,7 +311,7 @@
* @param orderNo
* @param bossId
*/
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
private void threeStageRewardToBoss(Long bossId, Long teamUid, Date twoStageTime, Integer source, String orderNo)
throws Exception {
// 浜屻�佷笁闃舵涓嶅彲鍚屾湀
@@ -366,25 +372,24 @@
money, "绮変笣锛堝ソ鍙嬶級瀹屾垚绗笁闃舵杩炵画[绗�" + monthSpace + "涓湀]", new Gson().toJson(dto));
}
-
@Override
public List<RedPackWinProgressVO> getInviteProgressByWorkerId(Long uid, Long tid) {
List<RedPackWinProgressVO> listVO = new ArrayList<RedPackWinProgressVO>();
ThreeSale threeSale = threeSaleSerivce.getNearRelationByBossIdAndWorkerId(uid, tid);
if (threeSale == null || threeSale.getSucceedTime() == null)
return listVO;
-
+
UserInfo userInfo = userInfoService.selectByPKey(tid);
- if (userInfo == null)
+ if (userInfo == null)
return listVO;
-
+
// 濂栧姳璁板綍
List<RedPackWinInvite> listWin = redPackWinInviteMapper.getWinListByBossIdAndTeamUid(uid, tid);
- if (listWin == null || listWin.size() == 0)
+ if (listWin == null || listWin.size() == 0)
return listVO;
-
+
int month = 1;
- for (RedPackWinInvite win: listWin) {
+ for (RedPackWinInvite win : listWin) {
if (win.getType() == RedPackWinInviteTypeEnum.zeroStageReward) {
listVO.add(new RedPackWinProgressVO("鎴愬姛娉ㄥ唽", TimeUtil.formatDate(userInfo.getCreatetime())));
listVO.add(new RedPackWinProgressVO("纭珛閭�璇�", TimeUtil.formatDate(threeSale.getSucceedTime())));
@@ -394,37 +399,35 @@
if (win.getType() == RedPackWinInviteTypeEnum.oneStageReward) {
listVO.add(new RedPackWinProgressVO("绗竴闃舵", time, money.toString()));
continue;
- }
-
+ }
+
if (win.getType() == RedPackWinInviteTypeEnum.twoStageReward) {
listVO.add(new RedPackWinProgressVO("绗簩闃舵", time, money.toString()));
continue;
- }
-
+ }
+
if (win.getType() == RedPackWinInviteTypeEnum.threeStageReward) {
listVO.add(new RedPackWinProgressVO("绗笁闃舵绗�" + month + "涓湀", time, money.toString()));
- month ++;
+ month++;
continue;
}
}
return listVO;
}
-
-
+
@Override
public List<RedPackWinInvite> getWinTopListByBossId(int page, int count, Long uid) {
- return redPackWinInviteMapper.getWinTopListByBossId(count * (page-1), count, uid);
+ return redPackWinInviteMapper.getWinTopListByBossId(count * (page - 1), count, uid);
}
-
-
+
@Override
public long countWinTopListByBossId(Long uid) {
return redPackWinInviteMapper.countWinTopListByBossId(uid);
}
-
+
@Override
public long countTeamNumByTid(Long uid, Long teamUid) {
return redPackWinInviteMapper.countTeamNumByTid(uid, teamUid);
}
-
+
}
--
Gitblit v1.8.0