From c007868c62c7da5c9ce1bf0e77d9e5f8619826e4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 12 六月 2019 12:24:09 +0800
Subject: [PATCH] 查询默认有效调整

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java |   61 ++++++++++++++++++------------
 1 files changed, 37 insertions(+), 24 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 8be2cde..6ab12bd 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
@@ -85,7 +85,6 @@
 	@Resource
 	private TaoBaoOrderService taoBaoOrderService;
 
-
 	@Resource
 	private LostOrderService lostOrderService;
 
@@ -115,7 +114,7 @@
 
 	@Resource
 	private TaoBaoBuyRelationMapService taoBaoBuyRelationMapService;
-	
+
 	@Resource
 	private CommonOrderService commonOrderService;
 
@@ -123,7 +122,7 @@
 	private HongBaoV2Service hongBaoV2Service;
 
 	@Override
-	public void processOrder(Map<String, List<TaoBaoOrder>> orders) {
+	public synchronized void processOrder(Map<String, List<TaoBaoOrder>> orders) {
 		List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
 
 		// 鍒嗙鍑鸿繑鍒╄鍗曚笌鍒嗕韩璧氳鍗�
@@ -144,18 +143,19 @@
 				} else if (!StringUtil.isNullOrEmpty(list.get(0).getRelationId())) {
 					shareOrderMap.put(orderId, list);
 				} else {
+					// 閫氳繃绾㈠寘鏌ヨ
+					CommonOrder commonOrder = commonOrderService
+							.selectBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO, list.get(0).getTradeId());
 
-					PidUser pidUser = null;//pidUserMapper.selectByPid(pid);
-					if (pidUser != null && pidUser.getType() == PidUser.TYPE_SHARE_GOODS) {// 鍟嗗搧鍒嗕韩璁㈠崟
-						// List<PidOrder> pidOrderList = new ArrayList<>();
-						// for (TaoBaoOrder order : list) {
-						// pidOrderList.add(TaoBaoOrderUtil.convertToPidOrder(order));
-						// }
-						// sharePidOrderMap.put(orderId, pidOrderList);
-						shareOrderMap.put(orderId, list);
-					} else {// 鏅�氳繑鍒╄鍗�
-						fanliOrderMap.put(orderId, list);
+					if (commonOrder != null) {
+						HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());
+						if (hongBaoOrder != null && hongBaoOrder.getHongBaoV2() != null
+								&& hongBaoOrder.getHongBaoV2().getType() == HongBaoV2.TYPE_SHARE_GOODS) {
+							shareOrderMap.put(orderId, list);
+							continue;
+						}
 					}
+					fanliOrderMap.put(orderId, list);
 				}
 			}
 		}
@@ -282,7 +282,6 @@
 		}
 	}
 
-
 	@Resource
 	private HongBaoOrderMapper hongBaoOrderMapper;
 
@@ -387,7 +386,7 @@
 			}
 
 			// 绔欏唴淇�+鎺ㄩ��
-			UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
+			UserInfo user = userInfoMapper.selectByPKey(uid);
 			try {
 				userNotificationService.orderFanliRecieved(uid, hongBaoOrder.getCommonOrder().getOrderNo(),
 						userGoodsCount.get(uid), user.getMyHongBao(), money);
@@ -641,7 +640,6 @@
 
 		// 閭�璇疯禋鍒拌处
 		if (invitemoney.compareTo(new BigDecimal(0)) > 0) {
-			userInfoMapper.addHongBaoByUid(uid, invitemoney);
 
 			// 娣诲姞鏂扮増璇︽儏璁板綍
 			try {
@@ -662,7 +660,9 @@
 
 				UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid, (int) validCount,
 						(int) weiQuanCount, (int) invalidCount, invitemoney, new Date());
-				userMoneyDetailMapper.insert(userMoneyDetail);
+
+				// 澧炲姞璧勯噾
+				userMoneyService.addUserMoney(uid, invitemoney, userMoneyDetail);
 				// 娣诲姞鍒扮孩鍖呰繑鍒╄褰曢泦鍚�
 				accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(hbIdList, userMoneyDetail.getId());
 			} catch (UserMoneyDetailException e) {
@@ -739,7 +739,6 @@
 		 */
 
 		if (sharemoney.compareTo(new BigDecimal(0)) > 0) {
-			userInfoMapper.addHongBaoByUid(uid, sharemoney);
 			// 娣诲姞鏂扮増璇︽儏璁板綍
 			try {
 				// 璁$畻鏈湀鐨勬湁鏁堣鍗曪紝澶辨晥璁㈠崟锛岀淮鏉冭鍗�
@@ -760,7 +759,9 @@
 
 				UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, (int) validCount,
 						(int) weiQuanCount, (int) invalidCount, sharemoney, new Date());
-				userMoneyDetailMapper.insert(userMoneyDetail);
+				// 娣诲姞璧勯噾
+				userMoneyService.addUserMoney(uid, sharemoney, userMoneyDetail);
+
 				// 娣诲姞鍒扮孩鍖呰繑鍒╄褰曢泦鍚�
 				accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(hbIdList, userMoneyDetail.getId());
 			} catch (UserMoneyDetailException e) {
@@ -790,8 +791,6 @@
 
 	}
 
-
-
 	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 	@Override
 	public void processShopingFanliOrderNew(String orderId, List<TaoBaoOrder> orderList)
@@ -811,7 +810,7 @@
 			// 鍘熸潵涓嶅瓨鍦ㄨ鍗�
 			Long uid = null;
 			if (oldOrder == null) {
-				PidUser pidUser =null;// pidUserMapper.selectByPid(pid);
+				PidUser pidUser = null;// pidUserMapper.selectByPid(pid);
 				if (pidUser != null) {
 					uid = pidUser.getUid();
 
@@ -829,7 +828,6 @@
 					orderMapper.insertSelective(order);
 					oldOrder = order;
 				} else {
-
 					Long targetUid = null;
 					if (pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID)
 							&& !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {
@@ -897,6 +895,7 @@
 			try {
 				commonOrderList = commonOrderService.addTaoBaoOrder(orderList, uid);
 				hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_ZIGOU);
+
 			} catch (CommonOrderException e) {
 				try {
 					LogHelper.errorDetailInfo(e, "addTaoBaoOrder鎴朼ddHongBao鍑洪敊", "璁㈠崟鍙�:" + orderId);
@@ -915,7 +914,7 @@
 					orderList.get(0).getSourceMediaId(), orderList.get(0).getAdPositionId());
 			// 鍘熸潵涓嶅瓨鍦ㄨ鍗�
 			Long uid = null;
-			PidUser pidUser =null; //pidUserMapper.selectByPid(pid);-PID鏈哄埗绉婚櫎
+			PidUser pidUser = null; // pidUserMapper.selectByPid(pid);-PID鏈哄埗绉婚櫎
 			if (pidUser != null)
 				uid = pidUser.getUid();
 			else {
@@ -925,6 +924,20 @@
 			}
 
 			// 灏氭湭鎵惧埌鍜孭ID瀵瑰簲鐨勭敤鎴�
+			if (uid == null) {
+				// 閫氳繃绾㈠寘鏌ヨ
+				CommonOrder commonOrder = commonOrderService.selectBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO,
+						orderList.get(0).getTradeId());
+
+				if (commonOrder != null) {
+					HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());
+					if (hongBaoOrder != null && hongBaoOrder.getHongBaoV2() != null
+							&& hongBaoOrder.getHongBaoV2().getType() == HongBaoV2.TYPE_SHARE_GOODS) {
+						uid = hongBaoOrder.getHongBaoV2().getUserInfo().getId();
+					}
+				}
+			}
+			
 			if (uid == null)
 				return;
 

--
Gitblit v1.8.0