From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java |  654 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 597 insertions(+), 57 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index 166faa4..774e7bd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -34,6 +34,7 @@
 import com.yeshi.fanli.entity.order.CommonOrder;
 import com.yeshi.fanli.entity.order.CommonOrderGoods;
 import com.yeshi.fanli.entity.order.CommonOrderTradeIdMap;
+import com.yeshi.fanli.entity.order.ESOrder;
 import com.yeshi.fanli.entity.order.HongBaoOrder;
 import com.yeshi.fanli.entity.order.InviteOrderSubsidy;
 import com.yeshi.fanli.entity.pdd.PDDOrder;
@@ -44,6 +45,8 @@
 import com.yeshi.fanli.exception.order.CommonOrderException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.log.LogManager;
+import com.yeshi.fanli.log.LogType;
 import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.config.SystemCouponService;
@@ -52,6 +55,7 @@
 import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
 import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
 import com.yeshi.fanli.service.inter.order.InviteOrderSubsidyService;
+import com.yeshi.fanli.service.inter.user.UserInfoService;
 import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
 import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
 import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
@@ -122,6 +126,9 @@
 	@Resource
 	private UserVIPInfoService userVIPInfoService;
 
+	@Resource
+	private UserInfoService userInfoService;
+
 	// 濂栧姳璁㈠崟鍥剧墖
 	public final static String PIC_REWARD = "http://img.flqapp.com/resource/order/order_state_reward.png";
 
@@ -164,26 +171,30 @@
 	public List<CommonOrderVO> listGroupOrderNoByUid(long start, int count, Long uid, Integer state, Integer type,
 			Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, Integer source)
 			throws CommonOrderException {
+		List<Integer> listSource = new ArrayList<>();
+		if (source != null) {
+			listSource.add(source);
+		}
+
 		return commonOrderMapper.listUserOrder(start, count, uid, state, type, orderState, orderNo, startTime, endTime,
-				dateType, source);
+				dateType, listSource);
 	}
 
 	@Override
 	public long countGroupOrderNoByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
-			String startTime, String endTime, Integer dateType, Integer source) throws CommonOrderException {
+			String startTime, String endTime, Integer dateType, List<Integer> listSource) throws CommonOrderException {
 		return commonOrderMapper.countUserOrder(uid, state, type, orderState, orderNo, startTime, endTime, dateType,
-				source);
+				listSource);
 	}
 
 	@Override
 	public List<CommonOrderVO> getOrderByUid(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type,
-			Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, Integer source)
-			throws CommonOrderException, Exception {
+			Integer orderState, String orderNo, String startTime, String endTime, Integer dateType,
+			List<Integer> listSource) throws CommonOrderException, Exception {
 
 		int pageSize = Constant.PAGE_SIZE;
-
-		List<CommonOrderVO> listOrder = listGroupOrderNoByUid((page - 1) * pageSize, pageSize, uid, state, type,
-				orderState, orderNo, startTime, endTime, dateType, source);
+		List<CommonOrderVO> listOrder = commonOrderMapper.listUserOrder((page - 1) * pageSize, pageSize, uid, state,
+				type, orderState, orderNo, startTime, endTime, dateType, listSource);
 
 		// 璁㈠崟淇℃伅涓虹┖
 		if (listOrder == null || listOrder.size() == 0) {
@@ -200,10 +211,9 @@
 
 		// 鏁版嵁鍔犲伐閲嶆柊缁勭粐
 		orderVOFactory(acceptData, listOrder, listGoods, uid);
-		
+
 		return listOrder;
 	}
-
 
 	/**
 	 * 璁㈠崟淇℃伅鍔犲伐
@@ -269,11 +279,11 @@
 					order.setVipOrder(false);
 			} else
 				order.setVipOrder(false);
-			
-			if(order.isVipOrder())
+
+			if (order.isVipOrder())
 				order.setVipOrderDesc("璁㈠崟鏉ユ簮锛氱敱瓒呯骇浼氬憳鐨勭矇涓濅骇鐢�");
 		}
-		
+
 		SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
 		SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");
 		// 2019.8.1寮�濮嬭繑鍥炵淮鏉冧俊鎭�
@@ -466,7 +476,7 @@
 				signList.add(CommonOrder.TYPE_INVITE);
 
 				// 鐗堟湰鍖哄垎锛�2-0-2
-				if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+				if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
 					InviteOrderSubsidy orderSubsidy = inviteOrderSubsidyService.getByOrderNoAndType(uid,
 							order.getOrderNo(), sourceType);
 					if (orderSubsidy != null) {
@@ -489,7 +499,7 @@
 				}
 			}
 			order.setSignList(signList);
-			
+
 			String hongBaoDate = null;
 			String hongBaoState_Str = "";
 			String hongbaoInfoFontColor = "#E5005C";
@@ -549,21 +559,21 @@
 			hongBaoMap.put("content", hongbaoInfo + " 楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
 			hongBaoMap.put("fontColor", hongbaoInfoFontColor);
 			order.setHongBaoInfo(hongBaoMap);
-			
+
 			// 鏄剧ず杩斿埄銆佸厤鍗曡鎯�
 			if (HongBaoV2.TYPE_ZIGOU == hongBaoType) {
 				// 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
 				if (sourceType == null) {
 					couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, null, uid, vip, acceptData);
 				} else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
-					couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType,
-							listRecordTB, uid, vip, acceptData);
+					couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, uid, vip,
+							acceptData);
 				} else if (sourceType == Constant.SOURCE_TYPE_JD) {
-					couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType,
-							listRecordJD, uid, vip, acceptData);
+					couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, uid, vip,
+							acceptData);
 				} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
-					couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType,
-							listRecordPDD, uid, vip, acceptData);
+					couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, uid, vip,
+							acceptData);
 				}
 			}
 
@@ -575,8 +585,7 @@
 			}
 		}
 	}
-	
-	
+
 	/**
 	 * 璁㈠崟锛� 鍏嶅崟鏍囪瘑 濂栧姳鏍囪瘑
 	 * 
@@ -586,21 +595,21 @@
 	 * @param list
 	 * @param signList
 	 */
-	private void couponFactory(CommonOrderVO order, boolean hasRewardCoupon,	Integer hongBaoState,
-			Integer hongBaoType, List<UserSystemCouponRecord> list, Long uid, boolean vip, AcceptData acceptData) throws Exception{
+	private void couponFactory(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState, Integer hongBaoType,
+			List<UserSystemCouponRecord> list, Long uid, boolean vip, AcceptData acceptData) throws Exception {
 
 		// 鏄惁鍏嶅崟鍟嗗搧
 		boolean freeOrder = false;
 		// 鏄惁濂栧姳鎴愬姛
 		boolean rewardSuccess = false;
-		boolean version2_1 = VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion());
-		
+		boolean version2_1 = VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion());
+
 		if (list != null && list.size() > 0) {
 			for (UserSystemCouponRecord couponRecord : list) {
 				int goodSource = couponRecord.getGoodSource();
 				if (goodSource == 0)
 					goodSource = 1;
-					
+
 				if (order.getOrderNo().equals(couponRecord.getOrderNo()) && goodSource == order.getSourceType()) {
 					Integer state = couponRecord.getState();
 					String systemCouponType = couponRecord.getCouponType();
@@ -634,7 +643,7 @@
 				}
 			}
 		}
-		
+
 		// 鍏嶅崟璇︽儏
 		if (freeOrder) {
 			ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
@@ -658,19 +667,19 @@
 			rewardMap.put("jump", jump);
 			order.setRewardDetail(rewardMap);
 		}
-		
+
 		// 宸蹭娇鐢ㄥ鍔卞埜
 		if (rewardSuccess) {
 			ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
 			rewardStyleVO.setColor("#E5005C");
 			rewardStyleVO.setBottomColor("#FFDCEA");
-			
+
 			if (version2_1) {
 				rewardStyleVO.setContent("宸蹭娇鐢ㄥ鍔卞埜 >");
 			} else {
 				rewardStyleVO.setContent("杩斿埄濂栧姳 >");
 			}
-			
+
 			Map<String, Object> rewardMap = new HashMap<String, Object>();
 			rewardMap.put("text", rewardStyleVO);
 			Map<String, Object> jumpLink = new HashMap<String, Object>();
@@ -678,15 +687,15 @@
 			jumpLink.put("goodsType", order.getSourceType() + "");
 
 			Map<String, Object> jump = new HashMap<String, Object>();
-			jump.put("type", 1); // 1 甯歌璺宠浆椤甸潰 
+			jump.put("type", 1); // 1 甯歌璺宠浆椤甸潰
 			jump.put("params", jumpLink);
 			jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
 			rewardMap.put("jump", jump);
 			order.setRewardDetail(rewardMap);
 		}
-				
+
 		// 鏄惁鍙娇鐢ㄥ鍔卞埜
-		if (!rewardSuccess && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType 
+		if (!rewardSuccess && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
 				&& HongBaoV2.STATE_YILINGQU == hongBaoState && !vip && CommonOrder.STATE_WQ != order.getState()) {
 			// 涓嬪崟鏃堕棿
 			Date thirdCreateTime = order.getThirdCreateTime();
@@ -694,11 +703,11 @@
 			Date accountTime = order.getAccountTime();
 			if (thirdCreateTime == null || accountTime == null)
 				return;
-			
+
 			// 涓嬪崟鏃ユ湡鏄惁鏄鍚堜笂绾挎棩鏈�
 			long downOrderTime = thirdCreateTime.getTime();
 			long limitDate = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);
-			if (downOrderTime > limitDate)  {
+			if (downOrderTime > limitDate) {
 				// 2.1 寮�濮嬫柊鐗�
 				rewardCounponLimitTime(order, accountTime);
 			} else if (hasRewardCoupon) {
@@ -707,16 +716,16 @@
 				rewardStyleVO.setColor("#E5005C");
 				rewardStyleVO.setBottomColor("#FFDCEA");
 				rewardStyleVO.setContent("杩斿埄濂栧姳 >");
-				
+
 				Map<String, Object> jumpLink = new HashMap<String, Object>();
 				jumpLink.put("orderNo", order.getOrderNo());
 				jumpLink.put("goodsType", order.getSourceType() + "");
-				
+
 				Map<String, Object> jump = new HashMap<String, Object>();
 				jump.put("type", 2); // 寮规
 				jump.put("params", jumpLink);
 				jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
-				
+
 				Map<String, Object> rewardMap = new HashMap<String, Object>();
 				rewardMap.put("text", rewardStyleVO);
 				rewardMap.put("jump", jump);
@@ -725,13 +734,13 @@
 		}
 	}
 
-	private void rewardCounponLimitTime(CommonOrderVO order,Date accountTime) throws Exception {
+	private void rewardCounponLimitTime(CommonOrderVO order, Date accountTime) throws Exception {
 		// 鍊掕鏃堕獙璇�
 		Date endDay = DateUtil.plusDayDate(Constant.COUPON_REWARD_LIMIT_DAY, accountTime);
 		long currentTime = java.lang.System.currentTimeMillis();
 		if (endDay.getTime() <= currentTime)
 			return;
-					
+
 		String num = null;
 		String unit = null;
 		boolean canUse = false;
@@ -762,16 +771,16 @@
 		}
 
 		// 宸茬粡瓒呮椂
-		if (!canUse) 
+		if (!canUse)
 			return;
-		
+
 		Map<String, Object> rewardMap = new HashMap<String, Object>();
 		ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
 		rewardStyleVO.setColor("#E5005C");
 		rewardStyleVO.setBottomColor("#FFDCEA");
 		rewardStyleVO.setContent("浣跨敤濂栧姳鍒�");
 		rewardMap.put("text", rewardStyleVO);
-		
+
 		ClientTextStyleVO txt1 = new ClientTextStyleVO();
 		txt1.setContent("鍓�");
 		txt1.setColor("#666666");
@@ -804,16 +813,15 @@
 		rewardMap.put("jump", jump);
 		order.setRewardDetail(rewardMap);
 	}
-	
-	
+
 	@Override
 	public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day, Integer source) {
 		return commonOrderMapper.countHistoryOrder(uid, day, source);
 	}
-	
+
 	@Override
-	public OrderCountVO getOrderCount(Long uid, Integer day, Integer source) {
-		return commonOrderMapper.getOrderCount(uid, day, source);
+	public OrderCountVO getOrderCount(Long uid, Integer day, List<Integer> listSource) {
+		return commonOrderMapper.getOrderCount(uid, day, listSource);
 	}
 
 	@Override
@@ -871,7 +879,7 @@
 		return commonOrderMapper.listBySourceTypeAndOrderNo(sourceType, orderId);
 	}
 
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public List<CommonOrderAddResultDTO> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrders, Long uid)
 			throws CommonOrderException {
@@ -908,11 +916,15 @@
 				TaoBaoGoodsBrief taoBaoGoods = null;
 				try {
 					taoBaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(taoBaoOrder.getAuctionId());
+					LogManager.getLogger(LogType.taobaoGoods).info(String.format("璁㈠崟鍟嗗搧鍒嗙被:%s#%s#%s",
+							taoBaoGoods.getAuctionId(), taoBaoGoods.getRootCategoryName(), taoBaoGoods.getLeafName()));
 				} catch (TaobaoGoodsDownException e) {
 					e.printStackTrace();
 					LogHelper.errorDetailInfo(e, "AUCTIONID:" + taoBaoOrder.getAuctionId(), "");
 					try {
 						taoBaoGoods = TaoBaoUtil.getSimpleGoodsBrief(taoBaoOrder.getAuctionId());
+						// 璁板綍鍟嗗搧鍒嗙被
+
 					} catch (Exception e1) {
 						CommonGoods commonGoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(
 								taoBaoOrder.getAuctionId(), Constant.SOURCE_TYPE_TAOBAO);
@@ -933,7 +945,7 @@
 		return commonOrderList;
 	}
 
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public List<CommonOrderAddResultDTO> addPDDOrder(List<PDDOrder> pddOrderList, Long uid)
 			throws CommonOrderException {
@@ -983,7 +995,7 @@
 		return commonOrderList;
 	}
 
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public List<CommonOrderAddResultDTO> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException {
 		List<CommonOrderAddResultDTO> commonOrderList = new ArrayList<>();
@@ -1053,7 +1065,7 @@
 	 * 
 	 * @param commonOrder
 	 */
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	private CommonOrderAddResultDTO addCommonOrder(CommonOrder commonOrder) throws CommonOrderException {
 		// 鍒ゆ柇鍟嗗搧鏄惁瀛樺湪
 		if (commonOrder == null)
@@ -1093,6 +1105,16 @@
 		if (oldCommonOrder == null)// 鏂板
 		{
 			commonOrder.setCreateTime(new Date());
+			// 鏌ヨ鏄惁涓簐ip
+			boolean isVIP = userVIPInfoService.isVIP(commonOrder.getUserInfo().getId());
+			if (isVIP)
+				commonOrder.setUrank(100);// VIP璁㈠崟
+			else {
+				UserInfo user = userInfoService.selectAvailableByPrimaryKey(commonOrder.getUserInfo().getId());
+				if (user != null)
+					commonOrder.setUrank(user.getRank());
+			}
+
 			commonOrderMapper.insertSelective(commonOrder);
 			// 鎻掑叆鏄犲皠锛屼繚璇佷氦鏄揑D鐨勫畬鏁存��
 			commonOrderTradeIdMapMapper.insertSelective(new CommonOrderTradeIdMap(commonOrder.getId(),
@@ -1527,8 +1549,8 @@
 		JSONObject map = new JSONObject();
 		// 璁㈠崟鏍囪瘑
 		List<String> signList = new ArrayList<String>();
-		//signList.add(CommonOrder.TYPE_FANLI);
-		//signList.add(PIC_REWARD); // 鍔犲叆濂栧姳鎴愬姛鍥剧墖
+		// signList.add(CommonOrder.TYPE_FANLI);
+		// signList.add(PIC_REWARD); // 鍔犲叆濂栧姳鎴愬姛鍥剧墖
 		map.put("signList", signList);
 
 		ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
@@ -1644,4 +1666,522 @@
 	public long count24HValidOrderByUid(Long uid, Date minTime) {
 		return commonOrderMapper.count24HValidOrderByUid(uid, minTime);
 	}
+
+	@Override
+	public long countSearchOrderByUid(Long uid, List<ESOrder> list) {
+		return commonOrderMapper.countSearchOrderByUid(uid, list);
+	}
+
+	@Override
+	public List<CommonOrderVO> searchOrderByUid(int page, int size, Long uid, List<ESOrder> list) throws Exception {
+		List<CommonOrderVO> listVO = commonOrderMapper.searchOrderByUid((page - 1) * size, size, uid, list);
+
+		// 璁㈠崟淇℃伅涓虹┖
+		if (listVO == null || listVO.size() == 0) {
+			listVO = new ArrayList<CommonOrderVO>();
+			return listVO;
+		}
+
+		// 鍟嗗搧淇℃伅
+		List<CommonOrderVO> listGoods = commonOrderMapper.listOrderGoodsInfo(listVO);
+		// 璁㈠崟鍟嗗搧涓虹┖
+		if (listGoods == null || listGoods.size() == 0) {
+			return listVO;
+		}
+
+		// 鏁版嵁鍔犲伐閲嶆柊缁勭粐
+		orderVOFactoryNew(listVO, listGoods, uid);
+
+		return listVO;
+	}
+
+	/**
+	 * 璁㈠崟淇℃伅鍔犲伐
+	 * 
+	 * @param acceptData
+	 * @param listOrder
+	 * @param listGoods
+	 * @param uid
+	 */
+	private void orderVOFactoryNew(List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods, Long uid)
+			throws Exception {
+		List<String> listTB = new ArrayList<String>();
+		List<String> listJD = new ArrayList<String>();
+		List<String> listPDD = new ArrayList<String>();
+		for (CommonOrderVO commonOrderVO : listOrder) {
+			Integer sourceType = commonOrderVO.getSourceType();
+			if (sourceType == null) {
+				continue;
+			} else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
+				listTB.add(commonOrderVO.getOrderNo());
+			} else if (sourceType == Constant.SOURCE_TYPE_JD) {
+				listJD.add(commonOrderVO.getOrderNo());
+			} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
+				listPDD.add(commonOrderVO.getOrderNo());
+			}
+		}
+
+		List<UserSystemCouponRecord> listRecordTB = null;
+		if (listTB.size() > 0) {
+			listRecordTB = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_TAOBAO, listTB);
+		}
+
+		List<UserSystemCouponRecord> listRecordJD = null;
+		if (listJD.size() > 0) {
+			listRecordJD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_JD, listJD);
+		}
+
+		List<UserSystemCouponRecord> listRecordPDD = null;
+		if (listPDD.size() > 0) {
+			listRecordPDD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_PDD, listPDD);
+		}
+
+		// 闇�瑕佹煡璇㈡槸鍚︿负VIP鐨勭敤鎴稩D,鍙湁閭�璇疯鍗曟墠闇�瑕佹煡璇�
+		List<Long> needSelectVIPUidList = new ArrayList<>();
+
+		for (CommonOrderVO order : listOrder) {
+			if (order.getHongBaoType() == HongBaoV2.TYPE_YIJI || order.getHongBaoType() == HongBaoV2.TYPE_ERJI
+					|| order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI
+					|| order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI)
+				needSelectVIPUidList.add(Long.parseLong(order.getUserId()));
+		}
+		Map<Long, Boolean> vipUserMap = userVIPInfoService.listByUids(needSelectVIPUidList);
+
+		// 璁剧疆鏄惁涓簐ip璁㈠崟
+		for (CommonOrderVO order : listOrder) {
+			if (order.getHongBaoType() == HongBaoV2.TYPE_YIJI || order.getHongBaoType() == HongBaoV2.TYPE_ERJI
+					|| order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI
+					|| order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI) {
+				if (vipUserMap.get(Long.parseLong(order.getUserId())) != null
+						&& vipUserMap.get(Long.parseLong(order.getUserId())) == true)
+					order.setVipOrder(true);
+				else
+					order.setVipOrder(false);
+			} else
+				order.setVipOrder(false);
+
+			if (order.isVipOrder())
+				order.setVipOrderDesc("璁㈠崟鏉ユ簮锛氱敱瓒呯骇浼氬憳鐨勭矇涓濅骇鐢�");
+		}
+
+		SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+		SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");
+		// 2019.8.1寮�濮嬭繑鍥炵淮鏉冧俊鎭�
+		Date august = TimeUtil.parse("2019-08-01");
+
+		// 褰撳墠鐢ㄦ埛鏄惁VIP
+		boolean vip = userVIPInfoService.isVIP(uid);
+		// 鏄惁瀛樺湪濂栧姳鍒�
+		boolean hasRewardCoupon = userSystemCouponService.getValidRebateCoupon(uid);
+
+		for (CommonOrderVO order : listOrder) {
+			String orderNo = order.getOrderNo();
+			Integer sourceType = order.getSourceType();
+
+			// 鍟嗗搧淇℃伅缁勫悎
+			for (CommonOrderVO commonOrder : listGoods) {
+				CommonOrderGoods goods = commonOrder.getCommonOrderGoods();
+				if (goods == null) {
+					continue;
+				}
+
+				if (sourceType.equals(commonOrder.getSourceType()) && orderNo.equals(commonOrder.getOrderNo())) {
+					CommonOrderGoodsVO commonGoodsVO = new CommonOrderGoodsVO();
+					PropertyUtils.copyProperties(commonGoodsVO, goods);
+					commonGoodsVO.setGoodsType(sourceType);
+
+					// 娣樺疂鍟嗗搧鍥剧墖澶勭悊
+					String picture = commonGoodsVO.getPicture();
+					if (sourceType == Constant.SOURCE_TYPE_TAOBAO && !StringUtil.isNullOrEmpty(picture)
+							&& !picture.contains("320x320")) {
+						commonGoodsVO.setPicture(TbImgUtil.getTBSize320Img(picture));
+					}
+
+					// 璐拱鏁伴噺
+					commonGoodsVO.setActualCount(commonOrder.getTotalCount() + "浠�");
+
+					// 瀹炰粯娆�
+					BigDecimal totalSettlement = commonOrder.getTotalSettlement();
+					if (totalSettlement == null || totalSettlement.compareTo(new BigDecimal(0)) <= 0) {
+						totalSettlement = commonOrder.getTotalPayment();
+					}
+					commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
+
+					Integer hongBaoType = order.getHongBaoType();
+					// 閭�璇疯鍗曚俊鎭繚鎶�
+					if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
+							|| HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
+							|| HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
+						Map<String, String> titleMap = new HashMap<String, String>();
+						titleMap.put("content", "涓轰繚闅滅敤鎴烽殣绉侊紝鍟嗗搧淇℃伅宸查殣钘�!");
+						titleMap.put("fontColor", "#888888");
+						titleMap.put("bottomColor", "#E9E9E9");
+						commonGoodsVO.setTitle(null);
+						commonGoodsVO.setGoodsTitle(titleMap);
+					}
+
+					// 璁㈠崟绫诲瀷涓虹┖鏃� 宸插晢鍝佺被涓哄噯
+					Integer orderType = order.getOrderType();
+					if (orderType == null) {
+						String shopType = commonGoodsVO.getShopType();
+						if (CommonOrderGoodsVO.TYPE_TAOBAO.equalsIgnoreCase(shopType)) {
+							order.setOrderType(1);
+						} else if (CommonOrderGoodsVO.TYPE_TMALL.equalsIgnoreCase(shopType)) {
+							order.setOrderType(2);
+						}
+					}
+
+					order.getListOrderGoods().add(commonGoodsVO);
+				}
+			}
+
+			Date thirdCreateTime = order.getThirdCreateTime();
+			if (thirdCreateTime != null) {
+				order.setDownTime("涓嬪崟鏃堕棿锛�" + format.format(thirdCreateTime));
+				order.setObtainTime(thirdCreateTime.getTime());
+			}
+
+			Date settleTime = order.getSettleTime();
+			if (settleTime != null) {
+				order.setReceiveTime("鏀惰揣鏃堕棿锛�" + format.format(settleTime));
+			}
+
+			// 璁㈠崟绫诲瀷
+			if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
+				Integer orderType = order.getOrderType();
+				if (orderType == null)
+					order.setOrderType(1);
+			} else if (sourceType == Constant.SOURCE_TYPE_JD) {
+				order.setOrderType(3);
+			} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
+				order.setOrderType(4);
+			}
+
+			/* 璁㈠崟鐘舵�� 杞崲澶勭悊 */
+			String orderStateContent = "";
+			Map<String, String> orderStateMap = new HashMap<String, String>();
+			// 璁㈠崟鐘舵��
+			Integer orderState = order.getState();
+			// 绾㈠寘鐘舵��
+			Integer hongBaoState = order.getHongBaoState();
+
+			Integer stateWholeOrder = order.getStateWholeOrder();
+			if (CommonOrder.STATE_WHOLE_ORDER_BUFENYOUXIAO == stateWholeOrder) {
+				// 鏁翠釜璁㈠崟閮ㄥ垎澶辨晥锛氬垽鏂湡瀹炵姸鎬� 璁㈠崟銆佺孩鍖�
+				CommonOrderVO buFenOrder = commonOrderMapper.getBuFenOrderState(uid, order.getOrderNo());
+				if (buFenOrder != null) {
+					// 鏈夋晥鐨勮鍗曠姸鎬�
+					orderState = buFenOrder.getState();
+					// 鏈夋晥鐨勭孩鍖呯姸鎬�
+					hongBaoState = buFenOrder.getHongBaoState();
+				}
+			}
+
+			BigDecimal hongBao = order.getHongBao();
+			if (hongBao == null) {
+				hongBao = new BigDecimal(0);
+			}
+
+			if (CommonOrder.STATE_FK == orderState) {
+				orderStateContent = "宸蹭粯娆�";
+			} else if (CommonOrder.STATE_JS == orderState) {
+				orderStateContent = "宸叉敹璐�";
+			} else if (CommonOrder.STATE_SX == orderState) {
+				orderStateContent = "鏈粯娆�/宸查��娆�";
+			} else if (CommonOrder.STATE_WQ == orderState) {
+				orderStateContent = "宸插敭鍚�";
+				if (sourceType != null && sourceType == Constant.SOURCE_TYPE_TAOBAO) {
+					/* 璁㈠崟缁存潈 鍒ゆ柇鏄惁鍏ㄩ儴缁存潈 */
+					List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper
+							.selectListByOrderIdAndState(order.getOrderNo(), "缁存潈鎴愬姛");
+
+					boolean isPart = false;// 榛樿澶辨晥
+					BigDecimal weiQuanMoney = getWeiQuanMoney(listWQ, sourceType, uid);
+					if (settleTime != null && august != null && settleTime.getTime() > august.getTime()) {
+						orderStateContent = "鍞悗鎴愬姛";
+						WeiQuanInfo weiQuanInfo = new WeiQuanInfo();
+						weiQuanInfo.setOldHongBao("楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
+						weiQuanInfo.setWqHongBao("鍞悗锛�-楼" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
+						hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);
+						order.setWeiQuanInfo(weiQuanInfo);
+					}
+				}
+			}
+			orderStateMap.put("content", orderStateContent);
+			orderStateMap.put("fontColor", "#666666");
+			order.setOrderState(orderStateMap);
+
+			String hongbaoInfo = "";
+			// 璁㈠崟鏍囪瘑
+			List<String> signList = new ArrayList<String>();
+			/* 璁㈠崟杩斿埄绫诲瀷 杞崲 */
+			Integer hongBaoType = order.getHongBaoType();
+			if (HongBaoV2.TYPE_ZIGOU == hongBaoType || 2 == hongBaoType) {
+				// 鑷喘
+				hongbaoInfo = "杩斿埄";
+				order.setOrderOrigin("1");
+				order.setHongBaoTypePic(CommonOrder.TYPE_FANLI);
+				signList.add(CommonOrder.TYPE_FANLI);
+			} else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {
+				// 鍒嗕韩
+				hongbaoInfo = "濂栭噾";
+				order.setOrderOrigin("2");
+				order.setHongBaoTypePic(CommonOrder.TYPE_SHARE);
+				signList.add(CommonOrder.TYPE_SHARE);
+
+			} else if (HongBaoV2.TYPE_SHARE_YIJI == hongBaoType || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
+				// 涓嬬骇鐨勫垎浜鍗曪細 鏄剧ず閭�璇�
+				hongbaoInfo = "濂栭噾";
+				order.setOrderOrigin("3");
+				order.setHongBaoTypePic(CommonOrder.TYPE_INVITE);
+				signList.add(CommonOrder.TYPE_INVITE);
+
+			} else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
+					|| HongBaoV2.TYPE_ERJI == hongBaoType) {
+				// 閭�璇疯鍗�
+				hongbaoInfo = "濂栭噾";
+				order.setOrderOrigin("3");
+				order.setHongBaoTypePic(CommonOrder.TYPE_INVITE);
+				signList.add(CommonOrder.TYPE_INVITE);
+
+				// 瓒呯骇浼氬憳琛ヨ创淇℃伅
+				InviteOrderSubsidy orderSubsidy = inviteOrderSubsidyService.getByOrderNoAndType(uid, order.getOrderNo(),
+						sourceType);
+				if (orderSubsidy != null) {
+					ClientTextStyleVO subsidyInfo = new ClientTextStyleVO();
+					subsidyInfo.setContent("(琛ヨ创楼" + orderSubsidy.getMoney() + ")");
+					if (orderSubsidy.getState() == InviteOrderSubsidy.STATE_SUBSIDIZED) {
+						subsidyInfo.setColor("#E5005C");
+					} else {
+						subsidyInfo.setColor("#888888");
+					}
+					order.setSubsidy(subsidyInfo);
+
+					// 瑙ｉ噴淇℃伅锛堥棶鍙凤級
+					List<String> subsidyList = new ArrayList<String>();
+					subsidyList.add("棰濆琛ヨ创鑳藉惁鑾峰緱鐢辩郴缁熺畻娉曡嚜鍔ㄥ垽鏂紝浜轰负鏃犳硶骞叉秹锛�");
+					subsidyList.add("棰濆琛ヨ创鍒拌处鏃堕棿浠ュ強閲戦璇蜂互瀹為檯鍒拌处涓哄噯锛�");
+					subsidyList.add("棰濆琛ヨ创浜х敓鍚庡皢浼氬湪娑堟伅-璧勯噾娑堟伅涓彁閱掍綘銆�");
+					order.setSubsidyList(subsidyList);
+				}
+			}
+			order.setSignList(signList);
+
+			String hongBaoDate = null;
+			String hongBaoState_Str = "";
+			String hongbaoInfoFontColor = "#E5005C";
+
+			/* 绾㈠寘鐘舵�� 杞崲 */
+			String stateContent = "";
+			String stateFontColor = "#E5005C";
+			Integer orderHongBaoState = null;
+
+			if (HongBaoV2.STATE_KELINGQU == hongBaoState || HongBaoV2.STATE_BUKELINGQU == hongBaoState) {
+				orderHongBaoState = 1;
+				stateContent = "鏈埌璐�";
+				hongBaoState_Str = "棰勪及";
+
+				Date preAccountTime = order.getPreAccountTime();
+				if (preAccountTime != null) {
+					hongBaoDate = "棰勮鍒拌处鏃堕棿锛�" + formatday.format(preAccountTime);
+				}
+
+			} else if (HongBaoV2.STATE_YILINGQU == hongBaoState) {
+				orderHongBaoState = 3;
+				stateContent = "宸插埌璐�";
+
+				Date accountTime = order.getAccountTime();
+				if (accountTime != null) {
+					hongBaoDate = "鍒拌处鏃堕棿锛�" + formatday.format(accountTime);
+				}
+
+			} else if (HongBaoV2.STATE_BUFENSHIXIAO == hongBaoState) {
+				stateContent = "閮ㄥ垎澶辨晥";
+				orderHongBaoState = 3;
+				Date accountTime = order.getAccountTime();
+				if (accountTime != null) {
+					hongBaoDate = "鍒拌处鏃堕棿锛�" + formatday.format(accountTime);
+				}
+
+			} else if (HongBaoV2.STATE_SHIXIAO == hongBaoState) {
+				orderHongBaoState = 4;
+				stateContent = "宸插け鏁�";
+				hongbaoInfoFontColor = "#888888";
+			}
+			order.setHongBaoState(orderHongBaoState);
+			order.setHongBaoDate(hongBaoDate);
+
+			if (!StringUtil.isNullOrEmpty(order.getStateDesc())) {
+				stateContent = stateContent + "-" + order.getStateDesc();
+			}
+
+			Map<String, String> stateMap = new HashMap<String, String>();
+			stateMap.put("content", stateContent);
+			stateMap.put("fontColor", stateFontColor);
+			order.setAccountState(stateMap);
+
+			hongbaoInfo = hongBaoState_Str + hongbaoInfo;
+
+			Map<String, String> hongBaoMap = new HashMap<String, String>();
+			hongBaoMap.put("content", hongbaoInfo + " 楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
+			hongBaoMap.put("fontColor", hongbaoInfoFontColor);
+			order.setHongBaoInfo(hongBaoMap);
+
+			// 鏄剧ず杩斿埄銆佸厤鍗曡鎯�
+			if (HongBaoV2.TYPE_ZIGOU == hongBaoType) {
+				// 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
+				if (sourceType == null) {
+					couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, null, uid, vip);
+				} else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
+					couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, uid, vip);
+				} else if (sourceType == Constant.SOURCE_TYPE_JD) {
+					couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, uid, vip);
+				} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
+					couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, uid, vip);
+				}
+			}
+
+			// 鍒嗕韩銆侀個璇� 闅愯棌璁㈠崟鍙�
+			if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType || HongBaoV2.TYPE_YAOQING == hongBaoType
+					|| HongBaoV2.TYPE_YIJI == hongBaoType || HongBaoV2.TYPE_ERJI == hongBaoType
+					|| HongBaoV2.TYPE_SHARE_YIJI == hongBaoType || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
+				order.setOrderNo(UserUtil.filterOrderId(order.getOrderNo()));
+			}
+		}
+	}
+
+	/**
+	 * 璁㈠崟锛� 鍏嶅崟鏍囪瘑 濂栧姳鏍囪瘑
+	 * 
+	 * @param order
+	 * @param hasRewardCoupon
+	 * @param hongBaoState
+	 * @param list
+	 * @param signList
+	 */
+	private void couponFactoryNew(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState,
+			Integer hongBaoType, List<UserSystemCouponRecord> list, Long uid, boolean vip) throws Exception {
+		// 鏄惁鍏嶅崟鍟嗗搧
+		boolean freeOrder = false;
+		// 鏄惁濂栧姳鎴愬姛
+		boolean rewardSuccess = false;
+		if (list != null && list.size() > 0) {
+			for (UserSystemCouponRecord couponRecord : list) {
+				int goodSource = couponRecord.getGoodSource();
+				if (goodSource == 0)
+					goodSource = 1;
+
+				if (order.getOrderNo().equals(couponRecord.getOrderNo()) && goodSource == order.getSourceType()) {
+					Integer state = couponRecord.getState();
+					String systemCouponType = couponRecord.getCouponType();
+					if (CouponTypeEnum.rebatePercentCoupon.name().equals(systemCouponType)
+							&& UserSystemCouponRecord.STATE_SUCCESS == state) {
+						rewardSuccess = true;
+					} else if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
+							|| CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)
+							|| CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) {
+
+						if (UserSystemCouponRecord.STATE_FREE_ON == state) {
+							// 鍏嶅崟涓�
+							freeOrder = true;
+							order.getSignList().add(PIC_FREE_ON);
+						} else if (UserSystemCouponRecord.STATE_SUCCESS == state) {
+							// 鍏嶅崟鎴愬姛
+							freeOrder = true;
+							order.getSignList().add(PIC_FREE_SUCCEED);
+						} else if (UserSystemCouponRecord.STATE_FAIL_RULE == state
+								|| UserSystemCouponRecord.STATE_FAIL_DRAWBACK == state) {
+							// 瑙勫垯涓嶅尮閰嶃�侀��娆�
+							freeOrder = true;
+							order.getSignList().add(PIC_FREE_FAIL);
+						}
+					}
+					break;
+				}
+			}
+		}
+
+		// 鍏嶅崟璇︽儏
+		if (freeOrder) {
+			ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
+			rewardStyleVO.setContent("鍏嶅崟璇︽儏 >");
+			rewardStyleVO.setColor("#E5005C");
+			rewardStyleVO.setBottomColor("#FFDCEA");
+
+			Map<String, Object> jumpLink = new HashMap<String, Object>();
+			jumpLink.put("orderNo", order.getOrderNo());
+			jumpLink.put("goodsType", order.getSourceType() + "");
+
+			Map<String, Object> jump = new HashMap<String, Object>();
+			jump.put("type", 1); // 椤甸潰璺宠浆
+			jump.put("params", jumpLink);
+			jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("freeCouponDetail"));
+
+			Map<String, Object> rewardMap = new HashMap<String, Object>();
+			rewardMap.put("text", rewardStyleVO);
+			rewardMap.put("jump", jump);
+			order.setRewardDetail(rewardMap);
+		}
+
+		// 宸蹭娇鐢ㄥ鍔卞埜
+		if (rewardSuccess) {
+			ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
+			rewardStyleVO.setColor("#E5005C");
+			rewardStyleVO.setBottomColor("#FFDCEA");
+			rewardStyleVO.setContent("宸蹭娇鐢ㄥ鍔卞埜 >");
+
+			Map<String, Object> rewardMap = new HashMap<String, Object>();
+			rewardMap.put("text", rewardStyleVO);
+			Map<String, Object> jumpLink = new HashMap<String, Object>();
+			jumpLink.put("orderNo", order.getOrderNo());
+			jumpLink.put("goodsType", order.getSourceType() + "");
+
+			Map<String, Object> jump = new HashMap<String, Object>();
+			jump.put("type", 1); // 1 甯歌璺宠浆椤甸潰
+			jump.put("params", jumpLink);
+			jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
+			rewardMap.put("jump", jump);
+			order.setRewardDetail(rewardMap);
+		}
+
+		// 鏄惁鍙娇鐢ㄥ鍔卞埜
+		if (!rewardSuccess && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
+				&& HongBaoV2.STATE_YILINGQU == hongBaoState && !vip && CommonOrder.STATE_WQ != order.getState()) {
+			// 涓嬪崟鏃堕棿
+			Date thirdCreateTime = order.getThirdCreateTime();
+			// 鍒拌处鏃堕棿
+			Date accountTime = order.getAccountTime();
+			if (thirdCreateTime == null || accountTime == null)
+				return;
+
+			// 涓嬪崟鏃ユ湡鏄惁鏄鍚堜笂绾挎棩鏈�
+			long downOrderTime = thirdCreateTime.getTime();
+			long limitDate = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);
+			if (downOrderTime > limitDate) {
+				// 2.1 寮�濮嬫柊鐗�
+				rewardCounponLimitTime(order, accountTime);
+			} else if (hasRewardCoupon) {
+				// 鍦�2.1鏂扮増涓婄嚎涔嬪墠璁㈠崟-瀛樺湪鍒欐樉绀哄鍔卞埜鍙娇鐢�
+				ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
+				rewardStyleVO.setColor("#E5005C");
+				rewardStyleVO.setBottomColor("#FFDCEA");
+				rewardStyleVO.setContent("浣跨敤濂栧姳鍒�");
+
+				Map<String, Object> jumpLink = new HashMap<String, Object>();
+				jumpLink.put("orderNo", order.getOrderNo());
+				jumpLink.put("goodsType", order.getSourceType() + "");
+
+				Map<String, Object> jump = new HashMap<String, Object>();
+				jump.put("type", 2); // 寮规
+				jump.put("params", jumpLink);
+				jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
+
+				Map<String, Object> rewardMap = new HashMap<String, Object>();
+				rewardMap.put("text", rewardStyleVO);
+				rewardMap.put("jump", jump);
+				order.setRewardDetail(rewardMap);
+			}
+		}
+	}
+
 }

--
Gitblit v1.8.0