From 880238957a973ecd9676237672276b0e99d31115 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 29 六月 2020 13:55:28 +0800
Subject: [PATCH] 免单
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 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 791a108..6db986e 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
@@ -19,8 +19,10 @@
import com.yeshi.fanli.entity.bus.user.UserActiveLog;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.UserInfoRegister;
import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
import com.yeshi.fanli.entity.order.CommonOrder;
+import com.yeshi.fanli.entity.redpack.RedPackDetail;
import com.yeshi.fanli.entity.redpack.RedPackWinInvite;
import com.yeshi.fanli.entity.redpack.RedPackWinInvite.RedPackWinInviteTypeEnum;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
@@ -33,6 +35,7 @@
import com.yeshi.fanli.service.inter.redpack.RedPackConfigService;
import com.yeshi.fanli.service.inter.redpack.RedPackWinInviteService;
import com.yeshi.fanli.service.inter.user.UserActiveLogService;
+import com.yeshi.fanli.service.inter.user.UserInfoRegisterService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRecordService;
@@ -71,6 +74,9 @@
@Resource
private UserInfoService userInfoService;
+
+ @Resource
+ private UserInfoRegisterService userInfoRegisterService;
@Resource
private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
@@ -466,6 +472,14 @@
return;
}
+ // 娉ㄥ唽鏃堕棿
+ UserInfoRegister register = userInfoRegisterService.selectByPrimaryKey(orderUid);
+ if (register == null)
+ return;
+ // 娉ㄥ唽48灏忔椂 + 浠ュ唴
+ long registerTime = register.getCreateTime().getTime();
+
+
// 鏄惁瀛樺湪涓婁笅绾у叧绯�
ThreeSale threeSale = threeSaleSerivce.getByWorkerId(orderUid);
if (threeSale == null)
@@ -501,6 +515,13 @@
boolean satisfy = false;
// 閬嶅巻鏄惁瀛樺湪绗﹀悎鐩稿簲鍟嗗搧
for (CommonOrder commonOrder: list) {
+ // 閭�璇峰叧绯讳箣鍚�
+ long downTime = commonOrder.getThirdCreateTime().getTime();
+ if (downTime < threeSale.getCreateTime())
+ continue;
+ // 48灏忔椂闄愬埗
+ if (downTime < registerTime || downTime > registerTime + 1000*60*60*48)
+ continue;
// 浠樻閲戦闄愬埗
BigDecimal payment = commonOrder.getPayment();
if (payment == null || payment.compareTo(limitPayMent) < 0)
@@ -569,11 +590,13 @@
return count;
}
-// @Override
-// public void arriveMoney(Long uid, ) {
-// // 4銆佸鍔犵孩鍖�
-// redPackBalanceService.addRedPack(bossId, money, RedPackDetailFactory.createSeriesReward(winInvite));
-// }
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void arriveMoney(Long uid, BigDecimal money, Date date) throws Exception {
+ RedPackDetail detail = RedPackDetailFactory.createByMonth(uid, money, date);
+ redPackBalanceService.addRedPack(uid, money, detail);
+
+ }
--
Gitblit v1.8.0