From 8c04d27e5cebb7e654c208533e9567c4df2c8acc Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 12 十二月 2019 14:21:44 +0800
Subject: [PATCH] 券时间限制

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 1013 ++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 760 insertions(+), 253 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 2ca9257..77af2a5 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
@@ -13,12 +13,15 @@
 import org.apache.commons.beanutils.PropertyUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.yeshi.utils.DateUtil;
+import org.yeshi.utils.entity.DateInfo;
 import org.yeshi.utils.taobao.TbImgUtil;
 
 import com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper;
 import com.yeshi.fanli.dao.mybatis.order.CommonOrderMapper;
 import com.yeshi.fanli.dao.mybatis.order.CommonOrderTradeIdMapMapper;
 import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
+import com.yeshi.fanli.dto.order.CommonOrderAddResultDTO;
 import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
 import com.yeshi.fanli.entity.accept.AcceptData;
 import com.yeshi.fanli.entity.bus.user.HongBaoV2;
@@ -31,6 +34,8 @@
 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.HongBaoOrder;
+import com.yeshi.fanli.entity.order.InviteOrderSubsidy;
 import com.yeshi.fanli.entity.pdd.PDDOrder;
 import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -43,17 +48,23 @@
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.config.SystemCouponService;
 import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
 import com.yeshi.fanli.service.inter.order.CommonOrderService;
+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.UserSystemCouponRecordService;
 import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.MoneyBigDecimalUtil;
 import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
 import com.yeshi.fanli.util.VersionUtil;
+import com.yeshi.fanli.util.account.UserUtil;
 import com.yeshi.fanli.util.factory.CommonOrderGoodsFactory;
 import com.yeshi.fanli.util.factory.goods.CommonOrderFactory;
 import com.yeshi.fanli.util.jd.JDApiUtil;
+import com.yeshi.fanli.util.jd.JDUtil;
 import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
 import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@@ -61,6 +72,8 @@
 import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
 import com.yeshi.fanli.vo.order.CommonOrderGoodsVO;
 import com.yeshi.fanli.vo.order.CommonOrderVO;
+import com.yeshi.fanli.vo.order.OrderCountVO;
+import com.yeshi.fanli.vo.order.WeiQuanInfo;
 
 import net.sf.json.JSONObject;
 
@@ -99,6 +112,15 @@
 
 	@Resource
 	private CommonGoodsService commonGoodsService;
+
+	@Resource
+	private HongBaoOrderService hongBaoOrderService;
+
+	@Resource
+	private InviteOrderSubsidyService inviteOrderSubsidyService;
+
+	@Resource
+	private UserVIPInfoService userVIPInfoService;
 
 	// 濂栧姳璁㈠崟鍥剧墖
 	public final static String PIC_REWARD = "http://img.flqapp.com/resource/order/order_state_reward.png";
@@ -149,12 +171,14 @@
 	@Override
 	public long countGroupOrderNoByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
 			String startTime, String endTime, Integer dateType, Integer source) throws CommonOrderException {
-		return commonOrderMapper.countUserOrder(uid, state, type, orderState, orderNo, startTime, endTime, dateType, source);
+		return commonOrderMapper.countUserOrder(uid, state, type, orderState, orderNo, startTime, endTime, dateType,
+				source);
 	}
 
 	@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 {
+	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 {
 
 		int pageSize = Constant.PAGE_SIZE;
 
@@ -175,79 +199,123 @@
 		}
 
 		// 鏁版嵁鍔犲伐閲嶆柊缁勭粐
-		listDataFactory(acceptData, listOrder, listGoods, uid);
-
+		orderVOFactory(acceptData, listOrder, listGoods, uid);
+		
 		return listOrder;
 	}
 
-	@Override
-	public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day, Integer source) {
-		return commonOrderMapper.countHistoryOrder(uid, day, source);
-	}
 
-	@Override
-	public long countBonusOrderNumber(Long uid, Integer type, Integer day, String startTime, String endTime, Integer source) {
-		return commonOrderMapper.countBonusOrderNumber(uid, type, day, startTime, endTime, source);
-	}
-
-	@Override
-	public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer day, String startTime, String endTime, Integer source) {
-		return commonOrderMapper.countBonusOrderMoney(uid, type, day, startTime, endTime, source);
-	}
-
-	@Override
-	public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, String startTime,
-			String endTime) {
-		return commonOrderMapper.countBonusOrderMoneyAndNumber(uid, type, day, startTime, endTime);
-	}
-
-	@Override
-	public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, String endTime,
-			Integer day, Integer source) {
-		return commonOrderMapper.countByUidAndOrderState(uid, type, startTime, endTime, day, source);
-	}
-
-	public void listDataFactory(AcceptData acceptData, List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods, Long uid) {
-
-		List<String> listNo = new ArrayList<String>();
+	/**
+	 * 璁㈠崟淇℃伅鍔犲伐
+	 * 
+	 * @param acceptData
+	 * @param listOrder
+	 * @param listGoods
+	 * @param uid
+	 */
+	private void orderVOFactory(AcceptData acceptData, 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) {
-			listNo.add(commonOrderVO.getOrderNo());
+			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> couponRecordList = userSystemCouponRecordService.getRecordByOrderNoList(listNo);
+		List<UserSystemCouponRecord> listRecordTB = null;
+		if (listTB.size() > 0) {
+			listRecordTB = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_TAOBAO, listTB);
+		}
 
-		/* 缁勫悎鍟嗗搧淇℃伅 */
-		for (CommonOrderVO commonOrder : listGoods) {
+		List<UserSystemCouponRecord> listRecordJD = null;
+		if (listJD.size() > 0) {
+			listRecordJD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_JD, listJD);
+		}
 
-			CommonOrderGoods goods = commonOrder.getCommonOrderGoods();
-			if (goods == null) {
-				continue;
-			}
+		List<UserSystemCouponRecord> listRecordPDD = null;
+		if (listPDD.size() > 0) {
+			listRecordPDD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_PDD, listPDD);
+		}
 
-			String orderNo1 = commonOrder.getOrderNo();
-			Integer sourceType = commonOrder.getSourceType();
+		// 闇�瑕佹煡璇㈡槸鍚︿负VIP鐨勭敤鎴稩D,鍙湁閭�璇疯鍗曟墠闇�瑕佹煡璇�
+		List<Long> needSelectVIPUidList = new ArrayList<>();
 
-			for (CommonOrderVO order : listOrder) {
-				String orderNo2 = order.getOrderNo();
-				Integer sourceType2 = order.getSourceType();
+		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);
 
-				// 鏉ユ簮銆佽鍗曞彿鐩稿悓
-				if (sourceType.equals(sourceType2) && orderNo1.equals(orderNo2)) {
-					// 鍔犲叆鍟嗗搧淇℃伅
-					List<CommonOrderGoodsVO> listOrderGoods = order.getListOrderGoods();
+		// 璁剧疆鏄惁涓簐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();
-					try {
-						PropertyUtils.copyProperties(commonGoodsVO, goods);
-					} catch (Exception e) {
-						e.printStackTrace();
-					}
+					PropertyUtils.copyProperties(commonGoodsVO, goods);
+					commonGoodsVO.setGoodsType(sourceType);
 
+					// 娣樺疂鍟嗗搧鍥剧墖澶勭悊
 					String picture = commonGoodsVO.getPicture();
-					if (!StringUtil.isNullOrEmpty(picture) && !picture.contains("320x320")) {
+					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();
 					// 閭�璇疯鍗曚俊鎭繚鎶�
@@ -262,18 +330,7 @@
 						commonGoodsVO.setGoodsTitle(titleMap);
 					}
 
-					// 璐拱鏁伴噺
-					commonGoodsVO.setActualCount(commonOrder.getTotalCount() + "浠�");
-
-					BigDecimal totalSettlement = commonOrder.getTotalSettlement();
-					if (totalSettlement == null || totalSettlement.compareTo(new BigDecimal(0)) <= 0) {
-						totalSettlement = commonOrder.getTotalPayment();
-					}
-					// 瀹炰粯娆�
-					commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
-
-					listOrderGoods.add(commonGoodsVO);
-
+					// 璁㈠崟绫诲瀷涓虹┖鏃� 宸插晢鍝佺被涓哄噯
 					Integer orderType = order.getOrderType();
 					if (orderType == null) {
 						String shopType = commonGoodsVO.getShopType();
@@ -281,28 +338,12 @@
 							order.setOrderType(1);
 						} else if (CommonOrderGoodsVO.TYPE_TMALL.equalsIgnoreCase(shopType)) {
 							order.setOrderType(2);
-						} 
-						
-						if (Constant.SOURCE_TYPE_JD == sourceType2) {
-							order.setOrderType(3);
-						} else if (Constant.SOURCE_TYPE_PDD == sourceType2) {
-							order.setOrderType(4);
 						}
 					}
 
-					break;
+					order.getListOrderGoods().add(commonGoodsVO);
 				}
 			}
-		}
-
-		SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
-		SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");
-
-		// 鏄惁瀛樺湪濂栧姳鍒�
-		boolean hasRewardCoupon = userSystemCouponService.hasRewardCoupon(uid);
-
-		/* 缁勭粐璁㈠崟鐘舵�� 绛変俊鎭� */
-		for (CommonOrderVO order : listOrder) {
 
 			Date thirdCreateTime = order.getThirdCreateTime();
 			if (thirdCreateTime != null) {
@@ -315,10 +356,20 @@
 				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();
 			// 绾㈠寘鐘舵��
@@ -336,6 +387,11 @@
 				}
 			}
 
+			BigDecimal hongBao = order.getHongBao();
+			if (hongBao == null) {
+				hongBao = new BigDecimal(0);
+			}
+
 			if (CommonOrder.STATE_FK == orderState) {
 				orderStateContent = "宸蹭粯娆�";
 			} else if (CommonOrder.STATE_JS == orderState) {
@@ -343,32 +399,33 @@
 			} else if (CommonOrder.STATE_SX == orderState) {
 				orderStateContent = "鏈粯娆�/宸查��娆�";
 			} else if (CommonOrder.STATE_WQ == orderState) {
-				orderStateContent = "宸茬淮鏉�";
+				orderStateContent = "宸插敭鍚�";
+				if (sourceType != null && sourceType == Constant.SOURCE_TYPE_TAOBAO) {
+					/* 璁㈠崟缁存潈 鍒ゆ柇鏄惁鍏ㄩ儴缁存潈 */
+					List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper
+							.selectListByOrderIdAndState(order.getOrderNo(), "缁存潈鎴愬姛");
 
-				/* 璁㈠崟缁存潈 鍒ゆ柇鏄惁鍏ㄩ儴缁存潈 */
-				List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper
-						.selectListByOrderIdAndState(order.getOrderNo(), "缁存潈鎴愬姛");
+					boolean isPart = false;// 榛樿澶辨晥
+					BigDecimal weiQuanMoney = getWeiQuanMoney(listWQ, sourceType, uid);
 
-				boolean isPart = false;// 榛樿澶辨晥
-
-				if (listWQ != null && listWQ.size() > 0) {
-					BigDecimal fanTotalMoney = new BigDecimal(0);
-					for (TaoBaoWeiQuanOrder weiQuanOrder : listWQ) {
-						BigDecimal fanMoney = weiQuanOrder.getFanMoney();
-						if (fanMoney != null) {
-							fanTotalMoney = MoneyBigDecimalUtil.add(fanTotalMoney, fanMoney);
+					if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
+						if (isPart) {
+							hongBaoState = HongBaoV2.STATE_BUFENSHIXIAO; // 閮ㄥ垎澶辨晥
+						} else {
+							hongBaoState = HongBaoV2.STATE_SHIXIAO; // 鍏ㄩ儴澶辨晥
+						}
+					} else {
+						// 2019.8.1 杩斿洖缁存潈淇℃伅
+						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);
 						}
 					}
-
-					if (fanTotalMoney.compareTo(order.getHongBao()) < 0) {
-						isPart = true;
-					}
-				}
-
-				if (isPart) {
-					hongBaoState = HongBaoV2.STATE_BUFENSHIXIAO; // 閮ㄥ垎澶辨晥
-				} else {
-					hongBaoState = HongBaoV2.STATE_SHIXIAO; // 鍏ㄩ儴澶辨晥
 				}
 			}
 			orderStateMap.put("content", orderStateContent);
@@ -393,16 +450,46 @@
 				order.setHongBaoTypePic(CommonOrder.TYPE_SHARE);
 				signList.add(CommonOrder.TYPE_SHARE);
 
-			} else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
-					|| HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
-					|| HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
-				// 閭�璇�
+			} 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);
+
+				// 鐗堟湰鍖哄垎锛�2-0-2
+				if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+					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";
@@ -447,6 +534,10 @@
 			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);
@@ -454,128 +545,325 @@
 
 			hongbaoInfo = hongBaoState_Str + hongbaoInfo;
 
-			BigDecimal hongBao = order.getHongBao();
-			if (hongBao == null) {
-				hongBao = new BigDecimal(0);
-			}
 			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) {
-				// 璁㈠崟鏍囪瘑
-				order.setSignList(signList);
-
-			} else {
-
-				// 鏄惁鍏嶅崟鍟嗗搧
-				boolean freeOrder = false;
-				// 鏄惁濂栧姳鎴愬姛
-				boolean rewardSuccess = false;
-
+			
+			// 鏄剧ず杩斿埄銆佸厤鍗曡鎯�
+			if (HongBaoV2.TYPE_ZIGOU == hongBaoType) {
 				// 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
-				if (couponRecordList != null && couponRecordList.size() > 0) {
+				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);
+				} else if (sourceType == Constant.SOURCE_TYPE_JD) {
+					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);
+				}
+			}
 
-					for (UserSystemCouponRecord couponRecord : couponRecordList) {
-						// 璁㈠崟鍙峰尮閰�
-						if (order.getOrderNo().equals(couponRecord.getOrderNo())) {
+			// 鍒嗕韩銆侀個璇� 闅愯棌璁㈠崟鍙�
+			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 couponFactory(CommonOrderVO order, boolean hasRewardCoupon,	Integer hongBaoState,
+			Integer hongBaoType, List<UserSystemCouponRecord> list, Long uid, boolean vip, AcceptData acceptData) throws Exception{
 
-							String systemCouponType = couponRecord.getCouponType();
-							Integer state = couponRecord.getState();
+		// 鏄惁鍏嶅崟鍟嗗搧
+		boolean freeOrder = false;
+		// 鏄惁濂栧姳鎴愬姛
+		boolean rewardSuccess = false;
+		boolean version2_1 = VersionUtil.greaterThan_2_1(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();
+					if (CouponTypeEnum.rebatePercentCoupon.name().equals(systemCouponType)
+							&& UserSystemCouponRecord.STATE_SUCCESS == state) {
+						rewardSuccess = true;
+						if (!version2_1) {
+							// 濂栧姳鎴愬姛
+							order.getSignList().add(PIC_REWARD);
+						}
+					} else if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
+							|| CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)
+							|| CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) {
 
-							// 濂栧姳璁㈠崟: 涓旀垚鍔�
-							if (CouponTypeEnum.rebatePercentCoupon.name().equals(systemCouponType)
-									&& UserSystemCouponRecord.STATE_SUCCESS == state) {
-								rewardSuccess = true;
-								signList.add(PIC_REWARD); // 鍔犲叆濂栧姳鎴愬姛鍥剧墖
-
-							} else if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
-									|| CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
-
-								if (UserSystemCouponRecord.STATE_FREE_ON == state) {
-									// 鍏嶅崟涓�
-									freeOrder = true;
-									signList.add(PIC_FREE_ON);
-								} else if (UserSystemCouponRecord.STATE_SUCCESS == state) {
-									// 鍏嶅崟鎴愬姛
-									freeOrder = true;
-									signList.add(PIC_FREE_SUCCEED);
-								} else if (UserSystemCouponRecord.STATE_FAIL_RULE == state
-										|| UserSystemCouponRecord.STATE_FAIL_DRAWBACK == state) {
-									// 瑙勫垯涓嶅尮閰嶃�侀��娆�
-									freeOrder = true;
-									signList.add(PIC_FREE_FAIL);
-								}
-							}
-
-							break;
+						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);
 						}
 					}
-				}
-
-				// 璁㈠崟鏍囪瘑
-				order.setSignList(signList);
-
-				boolean rewardOrder = false;
-
-				int type = 1; // 1 甯歌璺宠浆椤甸潰 2寮瑰嚭閫夐」锛堝鍔卞埜锛�
-				if (rewardSuccess) {
-					// 濂栧姳鎴愬姛
-					rewardOrder = true;
-				} else if (hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
-						&& HongBaoV2.STATE_YILINGQU == hongBaoState) {
-					// 鏈夊彲鐢ㄧ殑濂栧姳鍒� 銆侀潪鍏嶅崟璁㈠崟 銆佷笖宸插埌璐︾殑 銆佽繑鍒╄鍗�
-					type = 2;
-					rewardOrder = true;
-				}
-
-				if (rewardOrder) {
-					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());
-
-					Map<String, Object> jump = new HashMap<String, Object>();
-					jump.put("type", type);
-					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);
-				}
-
-				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());
-
-					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);
+					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());
+			if (VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
+				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");
+			
+			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>();
+			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.parse(Constant.COUPON_REWARD_TIME).getTime();
+			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);
+			}
+		}
+	}
+
+	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;
+		DateInfo dateInfo = DateUtil.dateDiff3(currentTime, endDay.getTime());
+
+		if (dateInfo.getDay() > 0) {
+			canUse = true;
+			unit = "澶�";
+			num = dateInfo.getDay().toString();
+		}
+
+		if (!canUse && dateInfo.getHour() > 0) {
+			canUse = true;
+			unit = "灏忔椂";
+			num = dateInfo.getHour().toString();
+		}
+
+		if (!canUse && dateInfo.getMinute() > 0) {
+			canUse = true;
+			unit = "鍒�";
+			num = dateInfo.getMinute().toString();
+		}
+
+		if (!canUse && dateInfo.getSecond() > 0) {
+			canUse = true;
+			unit = "绉�";
+			num = dateInfo.getSecond().toString();
+		}
+
+		// 宸茬粡瓒呮椂
+		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");
+		txt1.setBottomColor("#FFDCEA");
+
+		ClientTextStyleVO txt2 = new ClientTextStyleVO();
+		txt2.setContent(num);
+		txt2.setColor("#E5005C");
+		txt2.setBottomColor("#FFDCEA");
+		txt2.setFontSize("1.33");
+
+		ClientTextStyleVO txt3 = new ClientTextStyleVO();
+		txt3.setContent(unit + "鍏抽棴 >");
+		txt3.setColor("#666666");
+		txt3.setBottomColor("#FFDCEA");
+
+		List<ClientTextStyleVO> ticking = new ArrayList<ClientTextStyleVO>();
+		ticking.add(txt1);
+		ticking.add(txt2);
+		ticking.add(txt3);
+		rewardMap.put("ticking", ticking);
+		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"));
+		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);
+	}
+
+	@Override
+	public long countBonusOrderNumber(Long uid, Integer type, Integer day, String startTime, String endTime,
+			Integer source) {
+		return commonOrderMapper.countBonusOrderNumber(uid, type, day, startTime, endTime, source);
+	}
+
+	@Override
+	public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer day, String startTime, String endTime,
+			Integer source) {
+		return commonOrderMapper.countBonusOrderMoney(uid, type, day, startTime, endTime, source);
+	}
+
+	@Override
+	public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, String startTime,
+			String endTime, Integer source) {
+		return commonOrderMapper.countBonusOrderMoneyAndNumber(uid, type, day, startTime, endTime, source);
+	}
+
+	@Override
+	public Long countUserOrderToApp(Long uid, Integer type, String startTime, String endTime, Integer day,
+			Integer source, Integer state, Integer stateOrder) {
+		return commonOrderMapper.countUserOrderToApp(uid, type, startTime, endTime, day, source, state, stateOrder);
+	}
+
+	private BigDecimal getWeiQuanMoney(List<TaoBaoWeiQuanOrder> listWQ, int sourceType, Long uid) {
+		BigDecimal weiQuanMoney = new BigDecimal(0);
+		if (listWQ != null && listWQ.size() > 0) {
+			for (TaoBaoWeiQuanOrder weiQuanOrder : listWQ) {
+				String tradeId = weiQuanOrder.getOrderItemId();
+				// 鏌ヨ绾㈠寘
+				List<String> tradeList = new ArrayList<>();
+				tradeList.add(tradeId);
+				List<HongBaoV2> hongBaoList = hongBaoV2Service.listBySourceTypeAndTradeIdListAndUid(sourceType, uid,
+						tradeList);
+				if (hongBaoList != null && hongBaoList.size() > 0) {
+					CommonOrder commonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(sourceType, tradeId);
+					if (commonOrder != null && commonOrder.getSettlement().compareTo(new BigDecimal(0)) > 0) {
+						BigDecimal wqMoney = MoneyBigDecimalUtil
+								.mul(hongBaoList.get(0).getMoney(), weiQuanOrder.getMoney())
+								.divide(commonOrder.getSettlement(), 2, BigDecimal.ROUND_UP);
+						if (wqMoney.compareTo(hongBaoList.get(0).getMoney()) > 0)
+							wqMoney = hongBaoList.get(0).getMoney();
+						weiQuanMoney = weiQuanMoney.add(wqMoney);
+					}
+				}
+			}
+		}
+		return weiQuanMoney;
 	}
 
 	@Override
@@ -585,8 +873,9 @@
 
 	@Transactional
 	@Override
-	public List<CommonOrder> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrders, Long uid) throws CommonOrderException {
-		List<CommonOrder> commonOrderList = new ArrayList<>();
+	public List<CommonOrderAddResultDTO> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrders, Long uid)
+			throws CommonOrderException {
+		List<CommonOrderAddResultDTO> commonOrderList = new ArrayList<>();
 		// 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵��
 		int invalidCount = 0;
 		for (TaoBaoOrder tb : taoBaoOrders) {
@@ -646,8 +935,9 @@
 
 	@Transactional
 	@Override
-	public List<CommonOrder> addPDDOrder(List<PDDOrder> pddOrderList, Long uid) throws CommonOrderException {
-		List<CommonOrder> commonOrderList = new ArrayList<>();
+	public List<CommonOrderAddResultDTO> addPDDOrder(List<PDDOrder> pddOrderList, Long uid)
+			throws CommonOrderException {
+		List<CommonOrderAddResultDTO> commonOrderList = new ArrayList<>();
 		// 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵��
 		int invalidCount = 0;
 		for (PDDOrder order : pddOrderList) {
@@ -685,6 +975,7 @@
 				cog.setUpdateTime(new Date());
 				commonOrderGoodsMapper.insertSelective(cog);
 				newCommonOrder.setCommonOrderGoods(cog);
+			} else {
 			}
 			newCommonOrder.setUserInfo(new UserInfo(uid));
 			commonOrderList.add(addCommonOrder(newCommonOrder));
@@ -694,8 +985,8 @@
 
 	@Transactional
 	@Override
-	public List<CommonOrder> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException {
-		List<CommonOrder> commonOrderList = new ArrayList<>();
+	public List<CommonOrderAddResultDTO> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException {
+		List<CommonOrderAddResultDTO> commonOrderList = new ArrayList<>();
 		// 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵��
 		int invalidCount = 0;
 		for (JDOrderItem tb : jdOrder.getOrderItemList()) {
@@ -730,13 +1021,26 @@
 			if (commonGoodsList.size() <= 0)// 涓嶅瓨鍦ㄥ氨鎻掑叆鍟嗗搧
 			{
 				JDGoods goods = JDApiUtil.getGoodsDetail(itemOrder.getSkuId());
+				if (goods == null) {
+					goods = JDUtil.getGoodsFromWeb(itemOrder.getSkuId());
+				}
+
+				if (goods == null) {
+					goods = new JDGoods();
+					goods.setSkuName(itemOrder.getSkuName());
+					goods.setPrice(itemOrder.getPrice());
+					goods.setSkuId(itemOrder.getSkuId());
+				}
 
 				if (goods != null) {
 					cog = CommonOrderGoodsFactory.create(goods);
 				}
+
 				cog.setCreateTime(new Date());
 				cog.setUpdateTime(new Date());
 				commonOrderGoodsMapper.insertSelective(cog);
+			} else {
+
 			}
 			newCommonOrder.setUserInfo(new UserInfo(uid));
 			commonOrderList.add(addCommonOrder(newCommonOrder));
@@ -750,7 +1054,7 @@
 	 * @param commonOrder
 	 */
 	@Transactional
-	private CommonOrder addCommonOrder(CommonOrder commonOrder) throws CommonOrderException {
+	private CommonOrderAddResultDTO addCommonOrder(CommonOrder commonOrder) throws CommonOrderException {
 		// 鍒ゆ柇鍟嗗搧鏄惁瀛樺湪
 		if (commonOrder == null)
 			throw new CommonOrderException(1, "璁㈠崟涓虹┖");
@@ -778,9 +1082,14 @@
 			commonOrder.setCommonOrderGoods(goods);
 		}
 
-		CommonOrder oldCommonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(commonOrder.getOrderNo(),
-				commonOrder.getSourceType(), commonOrder.getOrderBy());
+		CommonOrder oldCommonOrder = null;
 
+		if (!StringUtil.isNullOrEmpty(commonOrder.getTradeId()))
+			oldCommonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(commonOrder.getSourceType(),
+					commonOrder.getTradeId());
+		else {
+			throw new CommonOrderException(10, "浜ゆ槗ID涓虹┖");
+		}
 		if (oldCommonOrder == null)// 鏂板
 		{
 			commonOrder.setCreateTime(new Date());
@@ -788,11 +1097,15 @@
 			// 鎻掑叆鏄犲皠锛屼繚璇佷氦鏄揑D鐨勫畬鏁存��
 			commonOrderTradeIdMapMapper.insertSelective(new CommonOrderTradeIdMap(commonOrder.getId(),
 					commonOrder.getTradeId(), new Date(), commonOrder.getSourceType()));
-			return commonOrder;
+			return new CommonOrderAddResultDTO(commonOrder, CommonOrderAddResultDTO.TYPE_ADD);
 		} else {// 淇敼
-			// 宸茬粡缁撶畻鎴栬�呭凡缁忓け鏁堢殑璁㈠崟涓嶅鐞�
-			if (oldCommonOrder.getState() == CommonOrder.STATE_JS || oldCommonOrder.getState() == CommonOrder.STATE_SX) {
-				return oldCommonOrder;
+			// 闈炰含涓滃凡缁忕粨绠楋紝宸茬粡澶辨晥锛岀姸鎬佹湭鏀瑰彉鐨勮鍗曚笉澶勭悊
+			if ((oldCommonOrder.getState() == CommonOrder.STATE_JS
+					&& oldCommonOrder.getSourceType() != Constant.SOURCE_TYPE_JD)
+					|| oldCommonOrder.getState() == CommonOrder.STATE_SX
+					|| oldCommonOrder.getState() == CommonOrder.STATE_WQ
+					|| (oldCommonOrder.getState().intValue() == commonOrder.getState())) {
+				return new CommonOrderAddResultDTO(oldCommonOrder, CommonOrderAddResultDTO.TYPE_NOUPDATE);
 			}
 			// 浜ゆ槗ID涓�鑷存墠淇敼
 			if (commonOrder.getTradeId() != null
@@ -808,9 +1121,10 @@
 				updateCommonOrder.setUpdateTime(new Date());
 				updateCommonOrder.setTradeId(commonOrder.getTradeId());
 				commonOrderMapper.updateByPrimaryKeySelective(updateCommonOrder);
-				return commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId());
+				return new CommonOrderAddResultDTO(commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId()),
+						CommonOrderAddResultDTO.TYPE_UPDATE);
 			} else
-				return oldCommonOrder;
+				return new CommonOrderAddResultDTO(oldCommonOrder, CommonOrderAddResultDTO.TYPE_NOUPDATE);
 		}
 	}
 
@@ -903,10 +1217,18 @@
 
 	@Override
 	public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state,
-			Integer type, Integer orderState, String startTime, String endTime) throws CommonOrderException {
+			Integer type, Integer orderState, String startTime, String endTime, Integer source, List<Long> listShopId,
+			List<Long> listGoodsId, Date minTime, BigDecimal money) throws CommonOrderException {
 
-		List<CommonOrderVO> list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState,
-				startTime, endTime);
+		List<CommonOrderVO> list = null;
+
+		if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 鎼滅储妗嗘棤鍊兼垨鑰呮寜璁㈠崟鍙锋悳绱㈡椂閮藉彧鎼滅储涓昏鍗�
+			list = commonOrderMapper.listQueryWithNoChild(start, count, keyType, key, state, type, orderState,
+					startTime, endTime, source);
+		} else {
+			list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState, startTime, endTime,
+					source, listShopId, listGoodsId, minTime, money);
+		}
 
 		if (list == null) {
 			list = new ArrayList<CommonOrderVO>();
@@ -914,6 +1236,37 @@
 
 		if (list.size() == 0) {
 			return list;
+		}
+
+		List<String> listTB = new ArrayList<String>();
+		List<String> listJD = new ArrayList<String>();
+		List<String> listPDD = new ArrayList<String>();
+		for (CommonOrderVO commonOrderVO : list) {
+			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);
 		}
 
 		SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
@@ -993,6 +1346,65 @@
 				}
 			}
 
+			Integer sourceType = order.getSourceType();
+			// 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
+			if (sourceType == null) {
+
+			} else if (sourceType == Constant.SOURCE_TYPE_TAOBAO && listRecordTB != null && listRecordTB.size() > 0) {
+				for (UserSystemCouponRecord couponRecord : listRecordTB) {
+					if (order.getOrderNo().equals(couponRecord.getOrderNo())) {
+						String systemCouponType = couponRecord.getCouponType();
+						Integer couponState = couponRecord.getState();
+						if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
+								|| CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)
+								|| CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) {
+							if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
+								// 鍏嶅崟鎴愬姛
+								order.setOtherState(2);
+							} else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {
+								order.setOtherState(1);
+							}
+						}
+						break;
+					}
+				}
+			} else if (sourceType == Constant.SOURCE_TYPE_JD && listRecordJD != null && listRecordJD.size() > 0) {
+				for (UserSystemCouponRecord couponRecord : listRecordJD) {
+					if (order.getOrderNo().equals(couponRecord.getOrderNo())) {
+						String systemCouponType = couponRecord.getCouponType();
+						Integer couponState = couponRecord.getState();
+						if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
+								|| CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)
+								|| CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) {
+							if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
+								// 鍏嶅崟鎴愬姛
+								order.setOtherState(2);
+							} else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {
+								order.setOtherState(1);
+							}
+						}
+						break;
+					}
+				}
+			} else if (sourceType == Constant.SOURCE_TYPE_PDD && listRecordPDD != null && listRecordPDD.size() > 0) {
+				for (UserSystemCouponRecord couponRecord : listRecordPDD) {
+					if (order.getOrderNo().equals(couponRecord.getOrderNo())) {
+						String systemCouponType = couponRecord.getCouponType();
+						Integer couponState = couponRecord.getState();
+						if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
+								|| CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)
+								|| CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) {
+							if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
+								// 鍏嶅崟鎴愬姛
+								order.setOtherState(2);
+							} else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {
+								order.setOtherState(1);
+							}
+						}
+						break;
+					}
+				}
+			}
 		}
 
 		return list;
@@ -1001,16 +1413,26 @@
 
 	@Override
 	public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
-			String startTime, String endTime) throws CommonOrderException {
-		return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime);
+			String startTime, String endTime, Integer source, List<Long> listShopId, List<Long> listGoodsId,
+			Date minTime, BigDecimal money) throws CommonOrderException {
+		if (StringUtil.isNullOrEmpty(key) || keyType == 1) {// 鎼滅储妗嗘棤鍊兼垨鑰呮寜璁㈠崟鍙锋悳绱㈡椂閮藉彧鎼滅储涓昏鍗�
+			return commonOrderMapper.countQueryWithNoChild(keyType, key, state, type, orderState, startTime, endTime,
+					source);
+		} else {
+			return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime, source,
+					listShopId, listGoodsId, minTime, money);
+		}
 	}
 
-
 	@Override
-	public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState)
+	public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState, Integer sourceType)
 			throws CommonOrderException {
 
-		CommonOrderVO commonOrderVO = commonOrderMapper.getCommonOrderByOrderNo(uid, orderNo, orderState);
+		if (sourceType == null) {
+			sourceType = Constant.SOURCE_TYPE_TAOBAO;
+		}
+
+		CommonOrderVO commonOrderVO = commonOrderMapper.getCommonOrderByOrderNo(uid, orderNo, orderState, sourceType);
 		// 璁㈠崟淇℃伅涓虹┖
 		if (commonOrderVO == null) {
 			return null;
@@ -1035,13 +1457,13 @@
 			}
 
 			String orderNo1 = commonOrder.getOrderNo();
-			Integer sourceType = commonOrder.getSourceType();
+			Integer sourceType1 = commonOrder.getSourceType();
 
 			String orderNo2 = commonOrderVO.getOrderNo();
 			Integer sourceType2 = commonOrderVO.getSourceType();
 
 			// 鏉ユ簮銆佽鍗曞彿鐩稿悓
-			if (sourceType.equals(sourceType2) && orderNo1.equals(orderNo2)) {
+			if (sourceType1.equals(sourceType2) && orderNo1.equals(orderNo2)) {
 				// 鍔犲叆鍟嗗搧淇℃伅
 				List<CommonOrderGoodsVO> listOrderGoods = commonOrderVO.getListOrderGoods();
 
@@ -1099,9 +1521,8 @@
 		return commonOrderVO;
 	}
 
-
 	@Override
-	public JSONObject getRewardJumpInfo(String orderNo) {
+	public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType) {
 
 		JSONObject map = new JSONObject();
 		// 璁㈠崟鏍囪瘑
@@ -1118,6 +1539,7 @@
 
 		Map<String, Object> jumpLink = new HashMap<String, Object>();
 		jumpLink.put("orderNo", orderNo);
+		jumpLink.put("goodsType", goodsType == null ? goodsType : goodsType + "");
 
 		Map<String, Object> jump = new HashMap<String, Object>();
 		jump.put("type", 1);
@@ -1135,8 +1557,93 @@
 
 	@Override
 	public CommonOrder selectBySourceTypeAndTradeId(int sourceType, String tradeId) {
-
 		return commonOrderMapper.selectBySourceTypeAndTradeId(sourceType, tradeId);
 	}
 
+	@Transactional
+	@Override
+	public void deleteErrorCommonOrder(Long coId) {
+		// 鏌ヨ鏄惁杩斿埄鍒拌处
+		HongBaoOrder hongBaoOrder = hongBaoOrderService.selectDetailByCommonOrderId(coId);
+		if (hongBaoOrder.getHongBaoV2().getState() == HongBaoV2.STATE_YILINGQU)
+			return;
+		List<HongBaoV2> hongBaoList = hongBaoV2Service.listChildrenById(hongBaoOrder.getHongBaoV2().getId());
+		boolean canDelete = true;
+		for (HongBaoV2 child : hongBaoList)
+			if (child.getState() == HongBaoV2.STATE_YILINGQU) {
+				canDelete = false;
+				break;
+			}
+		// 涓嶈兘鍒犻櫎
+		if (!canDelete)
+			return;
+
+		// 鍒犻櫎child
+		for (HongBaoV2 child : hongBaoList)
+			hongBaoV2Service.deleteByPrimaryKey(child.getId());
+		// 鍒犻櫎涓荤孩鍖�
+		hongBaoV2Service.deleteByPrimaryKey(hongBaoOrder.getHongBaoV2().getId());
+		// 鍒犻櫎hongbaoOrder
+		hongBaoOrderService.deleteByPrimaryKey(hongBaoOrder.getId());
+		// 鍒犻櫎CommonOrder
+		commonOrderMapper.deleteByPrimaryKey(hongBaoOrder.getCommonOrder().getId());
+	}
+
+	@Override
+	public List<CommonOrder> listBySourceTypeAndTradeId(int sourceType, String tradeId) {
+		return commonOrderMapper.listBySourceTypeAndTradeId(sourceType, tradeId);
+	}
+
+	@Override
+	public List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(int sourceType, Integer state, Long minTime,
+			Long maxTime, int page, int pageSize) {
+		return commonOrderMapper.listBySourceTypeAndStateAndThirdCrateTime(sourceType, state, minTime, maxTime,
+				(page - 1) * pageSize, pageSize);
+	}
+
+	@Override
+	public List<CommonOrder> getByOrderNo(Long uid, String orderNO) {
+		return commonOrderMapper.getByOrderNo(uid, orderNO);
+	}
+
+	@Override
+	public CommonOrder selectLatestValidByUid(Long uid) {
+		List<Integer> stateList = new ArrayList<>();
+		stateList.add(CommonOrder.STATE_FK);
+		stateList.add(CommonOrder.STATE_JS);
+		List<CommonOrder> commonOrderList = commonOrderMapper.listByUid(uid, stateList, 0, 1);
+		if (commonOrderList == null || commonOrderList.size() == 0)
+			return null;
+		return commonOrderList.get(0);
+	}
+
+	@Override
+	public CommonOrderVO firstValidOrderByUid(Long uid) {
+		return commonOrderMapper.firstValidOrderByUid(uid, null, null);
+	}
+
+	@Override
+	public CommonOrderVO firstValidOrderByUidAndType(Long uid, Integer type) {
+		return commonOrderMapper.firstValidOrderByUid(uid, type, null);
+	}
+
+	@Override
+	public CommonOrderVO firstValidOrderLastMonthByUidAndType(Long uid, Integer type) {
+		return commonOrderMapper.firstValidOrderByUid(uid, type, 4);
+	}
+
+	@Override
+	public CommonOrder getFirstShareOrderByUid(Long uid) {
+		return commonOrderMapper.getFirstShareOrderByUid(uid);
+	}
+
+	@Override
+	public BigDecimal getTotalRewardMoneyByOrderNoAndSourceType(String orderNo, Integer sourceType) {
+		return commonOrderMapper.getTotalRewardMoneyByOrderNoAndSourceType(orderNo, sourceType);
+	}
+
+	@Override
+	public long count24HValidOrderByUid(Long uid, Date minTime) {
+		return commonOrderMapper.count24HValidOrderByUid(uid, minTime);
+	}
 }

--
Gitblit v1.8.0