From fe646416d8d46de7b896ddbf65a3ad0cd30b729b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 七月 2020 16:05:56 +0800
Subject: [PATCH] 大淘客与好单库与主包剥离
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 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 df12626..fe7ab64 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
@@ -40,6 +40,7 @@
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRecordService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.user.invite.UserInviteMsgNotificationService;
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
@@ -95,6 +96,9 @@
@Resource
private UserSystemCouponService userSystemCouponService;
+
+ @Resource
+ private UserInviteMsgNotificationService userInviteMsgNotificationService;
@Override
@@ -473,7 +477,7 @@
}
// 楠岃瘉鏄惁鏈鍗�
CommonOrder firstOrder = commonOrderService.getFirstOrder(orderUid);
- if (!firstOrder.getOrderNo().equals(orderNo) && firstOrder.getSourceType() != source)
+ if (!firstOrder.getOrderNo().equals(orderNo) || firstOrder.getSourceType() != source)
return;
Date downTime = firstOrder.getThirdCreateTime();
@@ -483,7 +487,7 @@
return;
long registerTime = register.getCreateTime().getTime();
// 娉ㄥ唽48灏忔椂鍐呬笅鍗曢檺鍒�
- if (downTime.getTime() < registerTime || downTime.getTime() > registerTime + 1000*60*60*48)
+ if (downTime.getTime() < registerTime || downTime.getTime() > registerTime + 1000*60*60*48L)
return;
// 鏄惁瀛樺湪涓婁笅绾у叧绯�
@@ -538,7 +542,7 @@
if(eIncome == null || settlement == null) {
continue;
}
- BigDecimal rete = MoneyBigDecimalUtil.div(eIncome, settlement);
+ BigDecimal rete =MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil.div(eIncome, settlement), BigDecimal.valueOf(100)) ;
if (rete.compareTo(limitRate) >= 0) {
satisfy = true;
break;
@@ -561,6 +565,10 @@
winInvite.setType(RedPackWinInviteTypeEnum.inviteDownOrder);
winInvite.setIdentifyCode(StringUtil.Md5(RedPackWinInviteTypeEnum.inviteDownOrder.name() + ":" + orderUid));
redPackWinInviteMapper.insertSelective(winInvite);
+
+ // 娑堟伅鎻愰啋
+ UserInfo userInfo = userInfoService.selectByPKey(orderUid);
+ userInviteMsgNotificationService.pullNewRedPack(bossId, userInfo.getNickName(), userInfo.getPortrait());
}
@Override
@@ -574,13 +582,14 @@
// 娉ㄥ唽48灏忔椂 浠ュ唴:鏂颁汉
long registerTime = register.getCreateTime().getTime();
// 48灏忔椂闄愬埗
- if (downTime.getTime() < registerTime || downTime.getTime() > registerTime + 1000*60*60*48)
+ if (downTime.getTime() > registerTime || downTime.getTime() < registerTime + 1000*60*60*48)
return satisfy;
+ // 楠岃瘉鏄惁鏈鍗�
CommonOrder firstOrder = commonOrderService.getFirstOrder(orderUid);
- if (!firstOrder.getOrderNo().equals(orderNo) && firstOrder.getSourceType() != source)
+ if (!firstOrder.getOrderNo().equals(orderNo) || firstOrder.getSourceType() != source)
return satisfy;
-
+
// 鏄惁宸插鍔�
List<UserSystemCoupon> coupons = userSystemCouponService.getUserCouponBySource(orderUid, UserSystemCoupon.SOURCE_PULL_NEW);
if (coupons != null && coupons.size() > 0) {
@@ -623,7 +632,7 @@
// 浠樻閲戦闄愬埗
BigDecimal payment = commonOrder.getPayment();
- if (payment == null || payment.compareTo(limitPayMent) < 0)
+ if (payment == null || payment.compareTo(limitPayMent) <= 0)
continue;
// 鍟嗗搧浣ｉ噾姣斾緥闄愬埗
@@ -657,7 +666,7 @@
// 娉ㄥ唽48灏忔椂 浠ュ唴:鏂颁汉
long registerTime = register.getCreateTime().getTime();
// 48灏忔椂闄愬埗
- if (downTime.getTime() < registerTime || downTime.getTime() > registerTime + 1000*60*60*48)
+ if (downTime.getTime() > registerTime || downTime.getTime() < registerTime + 1000*60*60*48)
return;
// 鏄惁宸插鍔�
@@ -684,7 +693,7 @@
continue;
// 浠樻閲戦闄愬埗
BigDecimal payment = commonOrder.getPayment();
- if (payment == null || payment.compareTo(limitPayMent) < 0)
+ if (payment == null || payment.compareTo(limitPayMent) <= 0)
continue;
// 鍟嗗搧浣ｉ噾姣斾緥闄愬埗
--
Gitblit v1.8.0