From c37e84a5bc4629475da4a38415a231f121d39c61 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 07 十一月 2019 12:28:57 +0800
Subject: [PATCH] 品牌
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java | 79 ++++++++++++++-------------------------
1 files changed, 29 insertions(+), 50 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 c17cb30..a3d4c19 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
@@ -31,6 +31,8 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;
+import com.yeshi.fanli.util.annotation.redpack.RedPackGetVersionLimit;
import com.yeshi.fanli.util.factory.RedPackDetailFactory;
import com.yeshi.fanli.vo.order.CommonOrderVO;
@@ -77,7 +79,15 @@
}
@Override
+ public BigDecimal getRewardMoney(Long uid) {
+ return redPackWinInviteMapper.getRewardMoney(uid);
+ }
+
+
+ @RedPackGetVersionLimit(uid = "#uid")
+ @RequestSerializableByKeyService(key = "#uid")
@Transactional(rollbackFor = Exception.class)
+ @Override
public void orderArriveReward(Long uid, Integer source, String orderNo) throws Exception {
if (uid == null || source == null || orderNo == null)
return;
@@ -85,58 +95,25 @@
// 涓婁竴绾х殑濂栧姳
UserInfo boss = threeSaleSerivce.getBoss(uid);
if(boss != null) {
- firstReward(uid, source, orderNo);
- firstSharedOrderRewardToBoss(boss.getId(), uid, source, orderNo);
- firstSharedOrderRewardTheMonthToBoss(boss.getId(), uid, source, orderNo);
+ bossReward(boss.getId(), uid, source, orderNo);
}
}
+
/**
- * 琚個璇蜂汉涓嬮鍗曡繑鍒╋紙涓嬪崟灏辩粰锛夛細
- * 瀹屾垚棣栫瑪璁㈠崟 锛堝凡鍒拌处锛� 棣栧崟=涓嶉檺鍒堕噾棰濄�佷笉闄愬埗鍟嗗搧銆佷笉闄愬埗鏁伴噺銆佷笉闄愬埗璁㈠崟绫诲瀷锛�
+ * 涓婄骇濂栧姳
* @param uid
+ * @param teamUid
* @param source
* @param orderNo
- * @param bossId
+ * @throws Exception
*/
+ @RedPackGetVersionLimit(uid = "#uid")
@Transactional
- private void firstReward(Long uid, Integer source, String orderNo) throws Exception{
- // 濂栧姳涓�娆�
- long total = redPackWinInviteMapper.countByUidAndType(uid, RedPackWinInviteTypeEnum.newUserReward.name());
- if (total > 1)
- return;
-
- // 1銆佸垽鏂槸鍚︾敤鎴烽涓鍗�
- CommonOrderVO order = commonOrderService.firstValidOrderByUid(uid);
- if (order == null || source == order.getSourceType() || orderNo.equals(order.getOrderNo()))
- return;
-
- // 閲戦
- BigDecimal money = new BigDecimal(redPackConfigService.getValueByKey("new_user_first_order"));
-
- // 3銆佽幏寰楃孩鍖呰褰�
- RedPackWinInvite winInvite = new RedPackWinInvite();
- winInvite.setCreateTime(new Date());
- winInvite.setUpdateTime(new Date());
- winInvite.setType(RedPackWinInviteTypeEnum.newUserReward);
- winInvite.setUid(uid);
- winInvite.setTeamUid(null);
- winInvite.setMoney(money);
- winInvite.setSource(source);
- winInvite.setOrderNo(orderNo);
- redPackWinInviteMapper.insertSelective(winInvite);
-
- // 4銆佸鍔犵孩鍖�
- redPackBalanceService.addRedPack(uid, money, RedPackDetailFactory.createNewUserReward(winInvite));
-
- //娑堟伅
- MsgRedPackAddContentDTO dto = new MsgRedPackAddContentDTO();
- dto.setTitle("绾㈠寘澧炲姞");
- dto.setMoney("楼" + money.setScale(2));
- dto.setBalance("楼" + redPackBalanceService.getBalance(uid).setScale(2));
- userMoneyMsgNotificationService.redPackMsg(uid, MsgTypeMoneyTypeEnum.redPackNewUserReward, new Gson().toJson(dto), "绾㈠寘鍙敤浜庤喘涔颁細鍛�");
+ private void bossReward(Long uid, Long teamUid, Integer source, String orderNo) throws Exception {
+ firstSharedOrderRewardToBoss(uid, teamUid, source, orderNo);
+ firstSharedOrderRewardTheMonthToBoss(uid, teamUid, source, orderNo);
}
-
/**
* 涓婄骇濂栧姳锛氳閭�璇蜂汉瀹屾垚棣栫瑪鍒嗕韩璁㈠崟 锛堝凡鍒拌处锛�
@@ -149,16 +126,17 @@
private void firstSharedOrderRewardToBoss(Long uid, Long inviteeUid, Integer source, String orderNo) throws Exception{
// 鍚屼竴闃熷憳濂栧姳涓�娆�
long totalReward = redPackWinInviteMapper.countByUidAndTeamUidAndType(uid, inviteeUid, RedPackWinInviteTypeEnum.firstSharedOrder.name());
- if (totalReward > 1)
+ if (totalReward > 0)
return;
// 1銆佸垽鏂槸鍚︽槸鏀圭敤鎴烽涓垎浜鍗�
CommonOrderVO order = commonOrderService.firstValidOrderByUidAndType(inviteeUid, 2);
- if (order == null || source == order.getSourceType() || orderNo.equals(order.getOrderNo()))
+ if (order == null || source != order.getSourceType() || !orderNo.equals(order.getOrderNo()))
return;
// 2銆佸垽鏂槸绗嚑涓汉
long total = redPackWinInviteMapper.countByUidAndType(uid, RedPackWinInviteTypeEnum.firstSharedOrder.name());
+
// 璁＄畻搴斿鍔犵孩鍖呴噾棰�
BigDecimal money = new BigDecimal(redPackConfigService.getValueByKey("first_shared_order"));
@@ -201,9 +179,9 @@
*/
@Transactional
private void firstSharedOrderRewardTheMonthToBoss(Long uid, Long inviteeUid, Integer source, String orderNo) throws Exception{
- // 1銆佸垽鏂槸鍚︽槸鏈湀棣栧崟
- CommonOrderVO order = commonOrderService.firstValidOrderTheMonthByUidAndType(inviteeUid, 2);
- if (order == null || source == order.getSourceType() || orderNo.equals(order.getOrderNo()) ||
+ // 1銆佸垽鏂槸鍚︽槸涓婁釜鏈堥鍗�
+ CommonOrderVO order = commonOrderService.firstValidOrderLastMonthByUidAndType(inviteeUid, 2);
+ if (order == null || source != order.getSourceType() || !orderNo.equals(order.getOrderNo()) ||
order.getAccountTime() == null)
return;
@@ -251,9 +229,10 @@
}
-
+ @RequestSerializableByKeyService(key = "#uid")
+ @Override
@Transactional
- private void inviteSucceedReward(Long uid) throws Exception{
+ public void inviteSucceedReward(Long uid) throws Exception{
// 楠岃瘉鏄惁瀛樺湪涓婄骇
UserInfo boss = threeSaleSerivce.getBoss(uid);
if(boss == null)
@@ -261,7 +240,7 @@
// 鍚屼竴闃熷憳濂栧姳涓�娆�
long totalReward = redPackWinInviteMapper.countByUidAndTeamUidAndType(boss.getId(), uid, RedPackWinInviteTypeEnum.inviteSucceed.name());
- if (totalReward > 1)
+ if (totalReward > 0)
return;
// 1銆佺粦瀹氱數璇濆彿鐮�
--
Gitblit v1.8.0