From 48934b8c3da5a6791d0805ff0c1d327da834cc2d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 29 六月 2020 16:39:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java | 301 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 299 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 d58447d..eaeedc7 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,17 +19,25 @@
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;
+import com.yeshi.fanli.exception.user.UserSystemCouponException;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;
+import com.yeshi.fanli.service.inter.order.CommonOrderGoodsService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.redpack.RedPackBalanceService;
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;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
@@ -66,6 +74,9 @@
@Resource
private UserInfoService userInfoService;
+
+ @Resource
+ private UserInfoRegisterService userInfoRegisterService;
@Resource
private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
@@ -78,6 +89,13 @@
@Resource
private HongBaoV2CountService hongBaoV2CountService;
+
+ @Resource
+ private CommonOrderGoodsService commonOrderGoodsService;
+
+ @Resource
+ private UserSystemCouponService userSystemCouponService;
+
@Override
public List<RedPackWinInvite> getRewardList(int start, int count, Long uid) {
@@ -103,7 +121,7 @@
return;
// 灏忎簬2.0.5鐗堟湰涓嶅鍔�
- if (!VersionUtil.greaterThan_2_1("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",
+ if (!VersionUtil.greaterThan_2_0_5("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",
activeLog.getVersionCode()))
return;
@@ -142,7 +160,7 @@
return;
// 灏忎簬2.0.2鐗堟湰涓嶅鍔�
- if (!VersionUtil.greaterThan_2_1("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",
+ if (!VersionUtil.greaterThan_2_0_5("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",
activeLog.getVersionCode()))
return;
@@ -430,4 +448,283 @@
return redPackWinInviteMapper.countTeamNumByTid(uid, teamUid);
}
+
+ @Override
+ public List<RedPackWinInvite> query(long page, int count, String key, String type){
+ return redPackWinInviteMapper.query(count * (page - 1), count, key, type);
+ }
+
+ @Override
+ public long count(String key, String type){
+ Long count = redPackWinInviteMapper.count(key, type);
+ if (count == null) {
+ count = 0L;
+ }
+ return count;
+ }
+
+
+ @Override
+ @RequestSerializableByKeyService(key = "#orderUid")
+ @Transactional(rollbackFor = Exception.class)
+ public void winRedPackByOrder(Long orderUid, String orderNo, Integer source, Date downTime) {
+ if (orderUid == null || StringUtil.isNullOrEmpty(orderNo)) {
+ return;
+ }
+
+ // 娉ㄥ唽鏃堕棿
+ UserInfoRegister register = userInfoRegisterService.selectByPrimaryKey(orderUid);
+ if (register == null)
+ return;
+ // 娉ㄥ唽48灏忔椂 浠ュ唴 :鏂颁汉
+ long registerTime = register.getCreateTime().getTime();
+ // 48灏忔椂闄愬埗
+ if (downTime.getTime() < registerTime || downTime.getTime() > registerTime + 1000*60*60*48)
+ return;
+
+ // 鏄惁瀛樺湪涓婁笅绾у叧绯�
+ ThreeSale threeSale = threeSaleSerivce.getByWorkerId(orderUid);
+ if (threeSale == null)
+ return;
+ Long bossId = threeSale.getBoss().getId();
+ if (bossId == null)
+ return;
+
+ // 灏忎簬2.1.3鐗堟湰涓嶅鍔�
+ UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(bossId);
+ if (activeLog == null)
+ return;
+ if (!VersionUtil.greaterThan_2_1_3("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",
+ activeLog.getVersionCode()))
+ return;
+
+ // 璇ラ個璇锋槸鍚﹀凡娣诲姞
+ RedPackWinInvite threeStage = redPackWinInviteMapper.getByUidAndTeamUid(bossId, orderUid);
+ if (threeStage != null)
+ return;
+
+ // 鏌ヨ璁㈠崟
+ List<CommonOrder> list = commonOrderService.getByOrderNo(orderUid, orderNo);
+ if (list == null || list.size() ==0) {
+ return;
+ }
+
+ // 鍟嗗搧姣斾緥闄愬埗
+ BigDecimal limitRate = new BigDecimal(redPackConfigService.getValueByKey("goods_reate_limit"));
+ BigDecimal limitPayMent = new BigDecimal(redPackConfigService.getValueByKey("goods_pay_ment_limit"));
+ boolean satisfy = false;
+ // 閬嶅巻鏄惁瀛樺湪绗﹀悎鐩稿簲鍟嗗搧
+ for (CommonOrder commonOrder: list) {
+ // 閭�璇峰叧绯讳箣鍚�
+ long thirdTime = commonOrder.getThirdCreateTime().getTime();
+ if (thirdTime < threeSale.getCreateTime())
+ continue;
+ // 浠樻閲戦闄愬埗
+ BigDecimal payment = commonOrder.getPayment();
+ if (payment == null || payment.compareTo(limitPayMent) < 0)
+ continue;
+
+ // 鍟嗗搧浣ｉ噾姣斾緥闄愬埗
+ BigDecimal eIncome = commonOrder.geteIncome();
+ BigDecimal settlement = commonOrder.getSettlement();
+ if(eIncome == null || settlement == null) {
+ continue;
+ }
+ BigDecimal rete = MoneyBigDecimalUtil.div(eIncome, settlement);
+ if (rete.compareTo(limitRate) >= 0) {
+ satisfy = true;
+ break;
+ }
+ }
+
+ if (!satisfy) {
+ return;
+ }
+
+ // 鑾峰緱绾㈠寘璁板綍
+ RedPackWinInvite winInvite = new RedPackWinInvite();
+ winInvite.setUid(bossId);
+ winInvite.setTeamUid(orderUid);
+ winInvite.setMoney(null);
+ winInvite.setSource(source);
+ winInvite.setOrderNo(orderNo);
+ winInvite.setCreateTime(new Date());
+ winInvite.setUpdateTime(new Date());
+ winInvite.setType(RedPackWinInviteTypeEnum.inviteDownOrder);
+ winInvite.setIdentifyCode(StringUtil.Md5(RedPackWinInviteTypeEnum.inviteDownOrder.name() + ":" + orderUid));
+ redPackWinInviteMapper.insertSelective(winInvite);
+ }
+
+ @Override
+ @RequestSerializableByKeyService(key = "#orderUid")
+ public boolean verifyOrder(Long orderUid, String orderNo, Integer source, Date downTime) {
+ boolean satisfy = false;
+ // 娉ㄥ唽鏃堕棿
+ UserInfoRegister register = userInfoRegisterService.selectByPrimaryKey(orderUid);
+ if (register == null)
+ return satisfy;
+ // 娉ㄥ唽48灏忔椂 浠ュ唴:鏂颁汉
+ long registerTime = register.getCreateTime().getTime();
+ // 48灏忔椂闄愬埗
+ if (downTime.getTime() < registerTime || downTime.getTime() > registerTime + 1000*60*60*48)
+ return satisfy;
+
+ // 鏄惁宸插鍔�
+ List<UserSystemCoupon> coupons = userSystemCouponService.getUserCouponBySource(orderUid, UserSystemCoupon.SOURCE_PULL_NEW);
+ if (coupons != null && coupons.size() > 0) {
+ return satisfy;
+ }
+
+ // 鏄惁瀛樺湪涓婁笅绾у叧绯�
+ ThreeSale threeSale = threeSaleSerivce.getByWorkerId(orderUid);
+ if (threeSale == null)
+ return satisfy;
+ Long bossId = threeSale.getBoss().getId();
+ if (bossId == null)
+ return satisfy;
+
+ // 灏忎簬2.1.3鐗堟湰涓嶅鍔�
+ UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(orderUid);
+ if (activeLog == null)
+ return satisfy;
+ if (!VersionUtil.greaterThan_2_1_3("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",
+ activeLog.getVersionCode()))
+ return satisfy;
+
+ // 鏌ヨ璁㈠崟
+ List<CommonOrder> list = commonOrderService.getByOrderNo(orderUid, orderNo);
+ if (list == null || list.size() ==0)
+ return satisfy;
+
+ // 鍟嗗搧姣斾緥闄愬埗
+ BigDecimal limitRate = new BigDecimal(redPackConfigService.getValueByKey("goods_reate_limit"));
+ BigDecimal limitPayMent = new BigDecimal(redPackConfigService.getValueByKey("goods_pay_ment_limit"));
+ // 閬嶅巻鏄惁瀛樺湪绗﹀悎鐩稿簲鍟嗗搧
+ for (CommonOrder commonOrder: list) {
+ // 閭�璇峰叧绯讳箣鍚�
+ long thirdTime = commonOrder.getThirdCreateTime().getTime();
+ if (thirdTime < threeSale.getCreateTime())
+ continue;
+ // 浠樻閲戦闄愬埗
+ BigDecimal payment = commonOrder.getPayment();
+ if (payment == null || payment.compareTo(limitPayMent) < 0)
+ continue;
+
+ // 鍟嗗搧浣ｉ噾姣斾緥闄愬埗
+ BigDecimal eIncome = commonOrder.geteIncome();
+ BigDecimal settlement = commonOrder.getSettlement();
+ if(eIncome == null || settlement == null) {
+ continue;
+ }
+ BigDecimal rete = MoneyBigDecimalUtil.div(eIncome, settlement);
+ if (rete.compareTo(limitRate) >= 0) {
+ satisfy = true;
+ break;
+ }
+ }
+
+ return satisfy;
+ }
+
+ @Override
+ @RequestSerializableByKeyService(key = "#orderUid")
+ @Transactional(rollbackFor = Exception.class)
+ public void winFreeCoupon(Long orderUid, String orderNo, Integer source, Date downTime) {
+ if (orderUid == null || StringUtil.isNullOrEmpty(orderNo)) {
+ return;
+ }
+
+ // 娉ㄥ唽鏃堕棿
+ UserInfoRegister register = userInfoRegisterService.selectByPrimaryKey(orderUid);
+ if (register == null)
+ return;
+ // 娉ㄥ唽48灏忔椂 浠ュ唴:鏂颁汉
+ long registerTime = register.getCreateTime().getTime();
+ // 48灏忔椂闄愬埗
+ if (downTime.getTime() < registerTime || downTime.getTime() > registerTime + 1000*60*60*48)
+ return;
+
+ // 鏄惁宸插鍔�
+ List<UserSystemCoupon> coupons = userSystemCouponService.getUserCouponBySource(orderUid, UserSystemCoupon.SOURCE_PULL_NEW);
+ if (coupons != null && coupons.size() > 0) {
+ return;
+ }
+
+ // 鏌ヨ璁㈠崟
+ List<CommonOrder> list = commonOrderService.getByOrderNo(orderUid, orderNo);
+ if (list == null || list.size() ==0) {
+ return;
+ }
+
+ // 鍟嗗搧姣斾緥闄愬埗
+ BigDecimal limitRate = new BigDecimal(redPackConfigService.getValueByKey("goods_reate_limit"));
+ BigDecimal limitPayMent = new BigDecimal(redPackConfigService.getValueByKey("goods_pay_ment_limit"));
+
+ boolean satisfy = false;
+ // 閬嶅巻鏄惁瀛樺湪绗﹀悎鐩稿簲鍟嗗搧
+ for (CommonOrder commonOrder: list) {
+ // 浠樻閲戦闄愬埗
+ BigDecimal payment = commonOrder.getPayment();
+ if (payment == null || payment.compareTo(limitPayMent) < 0)
+ continue;
+
+ // 鍟嗗搧浣ｉ噾姣斾緥闄愬埗
+ BigDecimal eIncome = commonOrder.geteIncome();
+ BigDecimal settlement = commonOrder.getSettlement();
+ if(eIncome == null || settlement == null) {
+ continue;
+ }
+ BigDecimal rete = MoneyBigDecimalUtil.div(eIncome, settlement);
+ if (rete.compareTo(limitRate) >= 0) {
+ satisfy = true;
+ break;
+ }
+ }
+
+ if (!satisfy) {
+ return;
+ }
+
+ // 璧犻�佽喘涔拌�呬竴寮犲厤鍗曞埜
+ try {
+ userSystemCouponService.freeCouponWinBySystem(orderUid, CouponTypeEnum.freeCouponBuy,
+ UserSystemCoupon.SOURCE_PULL_NEW, 1, true, 2);
+ } catch (UserSystemCouponException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public List<Long> listWinUid(int start, int count) {
+ return redPackWinInviteMapper.listWinUid(start, count);
+ }
+
+
+ @Override
+ public List<RedPackWinInvite> listLastMonthByUid(int start, int count, Long uid) {
+ return redPackWinInviteMapper.listLastMonthByUid(start, count, uid);
+ }
+
+
+ @Override
+ public long countLastMonthByUid(Long uid) {
+ Long count = redPackWinInviteMapper.countLastMonthByUid(uid);
+ if (count == null)
+ count = 0L;
+ return count;
+ }
+
+ @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