From 43362240e4f061f137729a7fb8cf4d1b0e899241 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 19 十月 2019 18:20:08 +0800
Subject: [PATCH] 淘宝双11预售商品添加修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 e13ab17..c2afbb7 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
@@ -543,6 +543,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);
@@ -649,7 +653,7 @@
 				Date thirdCreateTime = order.getThirdCreateTime();
 				if (thirdCreateTime != null) {
 					long downOrderTime = thirdCreateTime.getTime();
-					long limitDate = TimeUtil.convertDateToTemp("2019-09-05");
+					long limitDate = TimeUtil.convertDateToTemp("2019-09-10");
 					if (downOrderTime > limitDate)
 						hasRewardCoupon = true;
 				}

--
Gitblit v1.8.0