From dc5be7d38446f70e6ff86df311119c32b41fe7f8 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期六, 28 十一月 2020 16:37:05 +0800 Subject: [PATCH] 大淘客搜索接口升级 --- fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 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..6f84731 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,11 +40,12 @@ 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; +import org.yeshi.utils.MoneyBigDecimalUtil; import com.yeshi.fanli.util.StringUtil; -import com.yeshi.fanli.util.TimeUtil; +import org.yeshi.utils.TimeUtil; import com.yeshi.fanli.util.VersionUtil; import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService; import com.yeshi.fanli.util.annotation.redpack.RedPackGetVersionLimit; @@ -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