From db751b1fda37f52134cdc1730a4037138b7f3550 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 四月 2020 10:02:19 +0800
Subject: [PATCH] 升级消息

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java |  135 ++++++++++++++++++++++++++++----------------
 1 files changed, 85 insertions(+), 50 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
index a08b0fe..19643e6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -30,6 +30,7 @@
 import com.yeshi.fanli.dao.mybatis.order.HongBaoOrderMapper;
 import com.yeshi.fanli.dao.mybatis.order.OrderMapper;
 import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
+import com.yeshi.fanli.dto.mq.UidDateDTO;
 import com.yeshi.fanli.dto.mq.order.OrderTopicTagEnum;
 import com.yeshi.fanli.dto.mq.order.body.OrderMQMsg;
 import com.yeshi.fanli.dto.mq.order.body.OrderMoneyRecievedMQMsg;
@@ -38,6 +39,7 @@
 import com.yeshi.fanli.entity.bus.user.Order;
 import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
 import com.yeshi.fanli.entity.elme.ElmeHongBaoOrderMap;
 import com.yeshi.fanli.entity.elme.ElmeOrder;
 import com.yeshi.fanli.entity.jd.JDOrder;
@@ -87,7 +89,8 @@
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TaoBaoConstant;
 import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.cmq.PlaceOrderCMQManager;
+import com.yeshi.fanli.util.cmq.order.PlaceOrderCMQManager;
+import com.yeshi.fanli.util.cmq.order.TeamOrderCMQManager;
 import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
 import com.yeshi.fanli.util.jd.JDApiUtil;
 import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
@@ -426,6 +429,11 @@
 	public void fanli(HongBaoV2 hb1) throws TaoBaoWeiQuanException {
 		// 鏌ヨ鏈�鏂扮殑绾㈠寘鏁版嵁
 		hb1 = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hb1.getId());
+
+		if (hb1 == null || hb1.getState() != HongBaoV2.STATE_KELINGQU || hb1.getPreGetTime() == null
+				|| hb1.getPreGetTime().getTime() > System.currentTimeMillis())
+			return;
+
 		// 姝e父鐢ㄦ埛鎵嶈兘鍒拌处
 		UserInfo mainUser = userInfoMapper.selectAvailableByPrimaryKey(hb1.getUserInfo().getId());
 		if (mainUser == null || mainUser.getState() != UserInfo.STATE_NORMAL) {
@@ -588,70 +596,74 @@
 	}
 
 	@Override
-	public void fanliInvaiteAndShare() {
-		// 鏌ュ嚭閭�璇疯禋涓庡垎浜禋璇ヨ繑鍒╃殑鐢ㄦ埛ID
-		List<Long> inviteAndShareUids = hongBaoV2Mapper.listUidCanBanlanceShareAndInvite(1000);
+	public void fanliPreInvaite(Date maxTime) {
+		// 鏌ュ嚭閭�璇疯禋鐨勭敤鎴稩D
+		List<Integer> typeList = new ArrayList<>();
+		typeList.add(HongBaoV2.TYPE_YIJI);
+		typeList.add(HongBaoV2.TYPE_ERJI);
+		typeList.add(HongBaoV2.TYPE_SHARE_YIJI);
+		typeList.add(HongBaoV2.TYPE_SHARE_ERJI);
+
+		long count = hongBaoV2Mapper.countUidCanBanlanceByTypeAndMaxTime(typeList, maxTime);
+		int pageSize = 1000;
+		int page = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
 		Set<Long> uidSets = new HashSet<>();
-		if (inviteAndShareUids != null)
-			for (Long uid : inviteAndShareUids) {
-				if (userInfoMapper.selectAvailableByPrimaryKey(uid) != null)
-					uidSets.add(uid);
-			}
+		for (int i = 0; i < page; i++) {
+			List<Long> inviteAndShareUids = hongBaoV2Mapper.listUidCanBanlanceByTypeAndMaxTime(typeList, maxTime,
+					i * pageSize, pageSize);
+			if (inviteAndShareUids != null)
+				for (Long uid : inviteAndShareUids) {
+					if (userInfoMapper.selectAvailableByPrimaryKey(uid) != null)
+						uidSets.add(uid);
+				}
+		}
 		// 鏍规嵁鐢ㄦ埛ID
 		Iterator<Long> its = uidSets.iterator();
 		while (its.hasNext()) {
 			Long uid = its.next();
 			try {
 				if (Constant.ENABLE_MQ)
-					CMQManager.getInstance().addFanLiTiChengMsg(uid);
+					TeamOrderCMQManager.getInstance().addFanLiTeamIncomePreMsg(new UidDateDTO(uid, maxTime));
 			} catch (Exception e) {
 				e.printStackTrace();
 				LogHelper.error(e);
 			}
 		}
+
 	}
 
 	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public void fanliInvaiteAndShare(Long uid) throws TaoBaoWeiQuanException {
-		// 閭�璇疯禋鍒拌处
-		Date now = new Date();
-		try {
-			orderMoneySettleService.inviteSettleTB(uid, now);
-		} catch (OrderMoneySettleException e) {
-			e.printStackTrace();
+	public void fanliShare(Date maxTime) {
+		// 鏌ュ嚭閭�璇疯禋鐨勭敤鎴稩D
+		List<Integer> typeList = new ArrayList<>();
+		typeList.add(HongBaoV2.TYPE_SHARE_GOODS);
+
+		long count = hongBaoV2Mapper.countUidCanBanlanceByTypeAndMaxTime(typeList, maxTime);
+		int pageSize = 1000;
+		int page = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
+		Set<Long> uidSets = new HashSet<>();
+		for (int i = 0; i < page; i++) {
+			List<Long> inviteAndShareUids = hongBaoV2Mapper.listUidCanBanlanceByTypeAndMaxTime(typeList, maxTime,
+					i * pageSize, pageSize);
+			if (inviteAndShareUids != null)
+				for (Long uid : inviteAndShareUids) {
+					if (userInfoMapper.selectAvailableByPrimaryKey(uid) != null)
+						uidSets.add(uid);
+				}
+		}
+		// 鏍规嵁鐢ㄦ埛ID
+		Iterator<Long> its = uidSets.iterator();
+		while (its.hasNext()) {
+			Long uid = its.next();
+			try {
+				if (Constant.ENABLE_MQ)
+					CMQManager.getInstance().addFanLiShareMsg(new UidDateDTO(uid, maxTime));
+			} catch (Exception e) {
+				e.printStackTrace();
+				LogHelper.error(e);
+			}
 		}
 
-		try {
-			orderMoneySettleService.inviteSettleJD(uid, now);
-		} catch (OrderMoneySettleException e) {
-			e.printStackTrace();
-		}
-		//
-		try {
-			orderMoneySettleService.inviteSettlePDD(uid, now);
-		} catch (OrderMoneySettleException e) {
-			e.printStackTrace();
-		}
-
-		// 鍒嗕韩璧氬埌璐�
-		try {
-			orderMoneySettleService.shareSettleTB(uid);
-		} catch (OrderMoneySettleException e) {
-			e.printStackTrace();
-		}
-
-		try {
-			orderMoneySettleService.shareSettleJD(uid);
-		} catch (OrderMoneySettleException e) {
-			e.printStackTrace();
-		}
-		//
-		try {
-			orderMoneySettleService.shareSettlePDD(uid);
-		} catch (OrderMoneySettleException e) {
-			e.printStackTrace();
-		}
 	}
 
 	@Override
@@ -672,6 +684,29 @@
 
 		try {
 			orderMoneySettleService.inviteSettlePDD(uid, maxPreGetTime);
+		} catch (OrderMoneySettleException e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void fanliShare(Long uid, Date maxPreGetTime) {
+		// 閭�璇疯禋鍒拌处
+		try {
+			orderMoneySettleService.shareSettleTB(uid, maxPreGetTime);
+		} catch (OrderMoneySettleException e) {
+			e.printStackTrace();
+		}
+
+		try {
+			orderMoneySettleService.shareSettleJD(uid, maxPreGetTime);
+		} catch (OrderMoneySettleException e) {
+			e.printStackTrace();
+		}
+
+		try {
+			orderMoneySettleService.shareSettlePDD(uid, maxPreGetTime);
 		} catch (OrderMoneySettleException e) {
 			e.printStackTrace();
 		}
@@ -1226,8 +1261,8 @@
 				hongBaoV2Service.updateByPrimaryKeySelective(update);
 			}
 		// TODO 鍟嗗鍏冲簵璺戣矾闇�瑕佽禒閫侀噾甯�
-		// userSystemCouponService.systemGiveRewardCoupon(uid, 1, orderId,
-		// sourceType, "鍥犲晢瀹惰繚绾︽湭鑳界粨绠楄繑鍒╂垨鍟嗗宸茬粡鍏冲簵");
+		// userSystemCouponService.rewardCouponWin(uid,
+		// UserSystemCoupon.SOURCE_SYSTEM_PUSH, 1, true, new BigDecimal("31"));
 	}
 
 	@Transactional

--
Gitblit v1.8.0