From d88c167fc5973a2c15ff1539e4cdab36e4a7842c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 28 八月 2019 14:47:15 +0800
Subject: [PATCH] 奖励券使用区分订单下单三方日期

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java |  102 ++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 77 insertions(+), 25 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 d0799a6..d17a644 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
@@ -329,8 +329,10 @@
 		SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");
 
 		// 鏄惁瀛樺湪濂栧姳鍒�
-		boolean hasRewardCoupon = userSystemCouponService.hasRewardCoupon(uid);
-		
+		//boolean hasRewardCoupon = userSystemCouponService.hasRewardCoupon(uid);
+		boolean hasRewardCoupon = userSystemCouponService.getIncludeNotExchange(uid);
+		boolean exchangeCoupon = userSystemCouponService.getIncludeExchange(uid);
+
 		// 2019.8.1寮�濮嬭繑鍥炵淮鏉冧俊鎭�
 		Date august = null;
 		try {
@@ -390,7 +392,7 @@
 			if (hongBao == null) {
 				hongBao = new BigDecimal(0);
 			}
-			
+
 			if (CommonOrder.STATE_FK == orderState) {
 				orderStateContent = "宸蹭粯娆�";
 			} else if (CommonOrder.STATE_JS == orderState) {
@@ -422,7 +424,7 @@
 							isPart = true;
 						}
 					}
-					
+
 					if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
 						if (isPart) {
 							hongBaoState = HongBaoV2.STATE_BUFENSHIXIAO; // 閮ㄥ垎澶辨晥
@@ -438,11 +440,14 @@
 							if (isPart) {
 								// 缁存潈澶辨晥閲戦=缁存潈鐨勯噾棰�*鑾峰緱鐨勭孩鍖�/缁撶畻閲戦
 								BigDecimal settlement = order.getSettlement();
-								BigDecimal wqHongbao = MoneyBigDecimalUtil.div(MoneyBigDecimalUtil.mul(hongBao, settlement), settlement);
-								weiQuanInfo.setWqHongBao("缁存潈锛�-楼" + wqHongbao.setScale(2, BigDecimal.ROUND_DOWN).toString());
+								BigDecimal wqHongbao = MoneyBigDecimalUtil
+										.div(MoneyBigDecimalUtil.mul(hongBao, settlement), settlement);
+								weiQuanInfo.setWqHongBao(
+										"缁存潈锛�-楼" + wqHongbao.setScale(2, BigDecimal.ROUND_DOWN).toString());
 								hongBao = MoneyBigDecimalUtil.sub(hongBao, wqHongbao);
 							} else {
-								weiQuanInfo.setWqHongBao("缁存潈锛�-楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
+								weiQuanInfo
+										.setWqHongBao("缁存潈锛�-楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
 								hongBao = new BigDecimal(0);
 							}
 							order.setWeiQuanInfo(weiQuanInfo);
@@ -533,7 +538,6 @@
 
 			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);
@@ -546,13 +550,13 @@
 			} else {
 				// 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
 				if (sourceType == null) {
-					setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, null, signList, acceptData);
+					setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, null, signList, acceptData);
 				} else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
-					setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, signList, acceptData);
+					setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, listRecordTB, signList, acceptData);
 				} else if (sourceType == Constant.SOURCE_TYPE_JD) {
-					setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, signList, acceptData);
+					setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, listRecordJD, signList, acceptData);
 				} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
-					setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, signList, acceptData);
+					setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, listRecordPDD, signList, acceptData);
 				}
 			}
 
@@ -574,7 +578,7 @@
 	 * @param list
 	 * @param signList
 	 */
-	public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState,
+	public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, boolean exchangeCoupon, Integer hongBaoState,
 			Integer hongBaoType, List<UserSystemCouponRecord> list, List<String> signList, AcceptData acceptData) {
 
 		// 鏄惁鍏嶅崟鍟嗗搧
@@ -595,7 +599,8 @@
 						signList.add(PIC_REWARD); // 鍔犲叆濂栧姳鎴愬姛鍥剧墖
 
 					} else if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
-							|| CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
+							|| CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)
+							|| CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) {
 
 						if (UserSystemCouponRecord.STATE_FREE_ON == state) {
 							// 鍏嶅崟涓�
@@ -621,6 +626,21 @@
 		// 璁㈠崟鏍囪瘑
 		order.setSignList(signList);
 
+		// 1.6.5 鏄惁瀛樺湪鏂板厬鎹㈢殑鍒�
+		if (!hasRewardCoupon && exchangeCoupon) {
+			try {
+				String downTime = order.getDownTime();
+				if (!StringUtil.isNullOrEmpty(downTime)) {
+					long downOrderTime = TimeUtil.convertDateToTemp2(downTime);
+					long limitDate = TimeUtil.convertDateToTemp("2019-09-01");
+					if (downOrderTime > limitDate )
+						hasRewardCoupon = true;
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		
 		boolean rewardOrder = false;
 
 		int type = 1; // 1 甯歌璺宠浆椤甸潰 2寮瑰嚭閫夐」锛堝鍔卞埜锛�
@@ -632,7 +652,7 @@
 			// 鏈夊彲鐢ㄧ殑濂栧姳鍒� 銆侀潪鍏嶅崟璁㈠崟 銆佷笖宸插埌璐︾殑 銆佽繑鍒╄鍗�
 			type = 2;
 			rewardOrder = true;
-		}
+		} 
 
 		if (rewardOrder) {
 			ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
@@ -842,9 +862,17 @@
 					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);
@@ -896,10 +924,9 @@
 		if (!StringUtil.isNullOrEmpty(commonOrder.getTradeId()))
 			oldCommonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(commonOrder.getSourceType(),
 					commonOrder.getTradeId());
-		else
-			oldCommonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(commonOrder.getOrderNo(),
-					commonOrder.getSourceType(), commonOrder.getOrderBy());
-
+		else {
+			throw new CommonOrderException(10, "浜ゆ槗ID涓虹┖");
+		}
 		if (oldCommonOrder == null)// 鏂板
 		{
 			commonOrder.setCreateTime(new Date());
@@ -911,6 +938,7 @@
 		} else {// 淇敼
 			// 宸茬粡缁撶畻锛屽凡缁忓け鏁堬紝鐘舵�佹湭鏀瑰彉鐨勮鍗曚笉澶勭悊
 			if (oldCommonOrder.getState() == CommonOrder.STATE_JS || oldCommonOrder.getState() == CommonOrder.STATE_SX
+					|| oldCommonOrder.getState() == CommonOrder.STATE_WQ
 					|| (oldCommonOrder.getState().intValue() == commonOrder.getState())) {
 				return oldCommonOrder;
 			}
@@ -1026,8 +1054,14 @@
 			Integer type, Integer orderState, String startTime, String endTime, Integer source)
 			throws CommonOrderException {
 
-		List<CommonOrderVO> list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState,
-				startTime, endTime, source);
+		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);
 
 		if (list == null) {
 			list = new ArrayList<CommonOrderVO>();
@@ -1155,9 +1189,12 @@
 						String systemCouponType = couponRecord.getCouponType();
 						Integer couponState = couponRecord.getState();
 						if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
-								|| CouponTypeEnum.welfareFreeCoupon.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);
 							}
 						}
@@ -1170,9 +1207,12 @@
 						String systemCouponType = couponRecord.getCouponType();
 						Integer couponState = couponRecord.getState();
 						if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
-								|| CouponTypeEnum.welfareFreeCoupon.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);
 							}
 						}
@@ -1185,9 +1225,12 @@
 						String systemCouponType = couponRecord.getCouponType();
 						Integer couponState = couponRecord.getState();
 						if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
-								|| CouponTypeEnum.welfareFreeCoupon.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);
 							}
 						}
@@ -1204,7 +1247,11 @@
 	@Override
 	public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
 			String startTime, String endTime, Integer source) throws CommonOrderException {
-		return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime, source);
+		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);
 	}
 
 	@Override
@@ -1382,5 +1429,10 @@
 		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);
+	}
 
 }

--
Gitblit v1.8.0