From 2a93320d3adf8c72ea127df59d0bdd043917dd79 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 十一月 2019 15:12:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 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 c85b54a..babb29d 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
@@ -36,7 +36,6 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.VersionUtil;
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;
@@ -140,19 +139,23 @@
*/
@Transactional
private void firstSharedOrderRewardToBoss(Long uid, Long inviteeUid, Integer source, String orderNo) throws Exception{
- // 鍚屼竴闃熷憳濂栧姳涓�娆�
+ // 1銆佸悓涓�闃熷憳濂栧姳涓�娆�
long totalReward = redPackWinInviteMapper.countByUidAndTeamUidAndType(uid, inviteeUid, RedPackWinInviteTypeEnum.firstSharedOrder.name());
if (totalReward > 0)
return;
- // 1銆佸垽鏂槸鍚︽槸鏀圭敤鎴烽涓垎浜鍗�
- CommonOrderVO order = commonOrderService.firstValidOrderByUidAndType(inviteeUid, 2);
- if (order == null || source != order.getSourceType() || !orderNo.equals(order.getOrderNo()))
+ // 2銆佹槸鍚︿笅绾х殑棣栦釜鍒嗕韩璁㈠崟
+ CommonOrder commonOrder = commonOrderService.getFirstShareOrderByUid(inviteeUid);
+ if (commonOrder == null || !orderNo.equals(commonOrder.getOrderNo()) || source != commonOrder.getSourceType())
+ return ;
+
+ // 3銆佸埌璐﹀鍔遍噾棰� 鏄惁澶т簬5
+ BigDecimal totalRewardMoney = commonOrderService.getTotalRewardMoneyByOrderNoAndSourceType(orderNo, source);
+ if (totalRewardMoney == null || totalRewardMoney.compareTo(Constant.RED_PACK_ORDER_REWARD_MIN) < 0)
return;
// 2銆佸垽鏂槸绗嚑涓汉
long total = redPackWinInviteMapper.countByUidAndType(uid, RedPackWinInviteTypeEnum.firstSharedOrder.name());
-
// 璁＄畻搴斿鍔犵孩鍖呴噾棰�
BigDecimal money = new BigDecimal(redPackConfigService.getValueByKey("first_shared_order"));
@@ -186,7 +189,7 @@
new Gson().toJson(dto), "璇峰埌鈥滄垜鐨�-绾㈠寘鈥濅腑鏌ョ湅");
}
-
+
/**
* 涓婄骇濂栧姳锛氭鏈堝紑濮嬩骇鐢熸弧瓒虫潯浠剁殑鍒嗕韩璁㈠崟锛堝垎浜鍗曞疄浠樻鈮�10鍏冿級 杩炵画15涓湀 鑷劧鏈堣幏寰楋紙宸插埌璐︼級姣忔湀鏈�楂�2鍏�
* @param uid
@@ -196,6 +199,7 @@
*/
@Transactional
private void firstSharedOrderRewardTheMonthToBoss(Long uid, Long inviteeUid, Integer source, String orderNo) throws Exception{
+
// 1銆佸垽鏂槸鍚︽槸涓婁釜鏈堥鍗�
CommonOrderVO order = commonOrderService.firstValidOrderLastMonthByUidAndType(inviteeUid, 2);
if (order == null || source != order.getSourceType() || !orderNo.equals(order.getOrderNo()) ||
@@ -206,15 +210,15 @@
if (order.getPayment() == null || order.getPayment().compareTo(Constant.RED_PACK_PAY_MIN) < 0)
return;
- // 鏌ヨ棣栧崟濂栧姳鏃堕棿
- CommonOrderVO firstorder = commonOrderService.firstValidOrderByUidAndType(inviteeUid, 2);
- if (firstorder == null || firstorder.getAccountTime() == null)
- return;
+ // 2銆佹槸鍚︿笅绾х殑棣栦釜鍒嗕韩璁㈠崟
+// CommonOrder firstorder = commonOrderService.getFirstShareOrderByUid(inviteeUid);
+// if (firstorder == null || (orderNo.equals(firstorder.getOrderNo()) && source == firstorder.getSourceType()));
+// return;
// 绗竴娆″埌璐︾殑娆℃湀寮�濮嬭繛缁�15涓湀 鑷劧鏈堣幏寰楋紙宸插埌璐︼級
- int monthSpace = DateUtil.getMonthSpace( order.getAccountTime(), firstorder.getAccountTime());
- if (monthSpace == 0 || monthSpace > Constant.RED_PACK_REWARD_MONTH)
- return;
+// int monthSpace = DateUtil.getMonthSpace(order.getThirdCreateTime(), firstorder.getThirdCreateTime());
+// if (monthSpace == 0 || monthSpace > Constant.RED_PACK_REWARD_MONTH)
+// return;
// 璁＄畻闅忔満濂栧姳
--
Gitblit v1.8.0