From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 14 七月 2020 12:36:48 +0800 Subject: [PATCH] 系统区分BUG修复 --- fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 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 fbc3f65..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 @@ -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; // 鏄惁瀛樺湪涓婁笅绾у叧绯� @@ -529,7 +533,7 @@ continue; // 浠樻閲戦闄愬埗 BigDecimal payment = commonOrder.getPayment(); - if (payment == null || payment.compareTo(limitPayMent) <= 0) + if (payment == null || payment.compareTo(limitPayMent) < 0) continue; // 鍟嗗搧浣ｉ噾姣斾緥闄愬埗 @@ -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 -- Gitblit v1.8.0