From d085ca89e39b4cda025a9a53d3797fbe8b242ae7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 21 十月 2019 17:11:30 +0800
Subject: [PATCH] 订单补偿 +  奖励券使用倒计时

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
index a9c0c5c..c2b39a8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
@@ -148,7 +148,7 @@
 			buffer.append("         ");
 			buffer.append("鏃╁畨锝瀄n");
 			buffer.append("鎴戠殑閭�璇风爜锛氥�愰個璇风爜銆慭n");
-			buffer.append("璐墿鐪侀挶杩斿埄鍒窤pp锛氥�愰個璇烽摼鎺ャ��");
+			buffer.append("璐墿鐪侀挶鏉挎牀蹇渷App锛氥�愰個璇烽摼鎺ャ��");
 
 			content = content.replaceAll("\\,", "\\锛�").replaceAll("\\.", "\\銆�").replaceAll("\\;", "\\锛�")
 					.replaceAll("\\!", "\\锛�").replaceAll("\\?", "\\锛�").replaceAll("\\:", "\\锛�");
@@ -1107,10 +1107,10 @@
 						continue;
 					}
 
-					Integer state = oldExtra.getState();
-					if (state != null && state == 1) {
-						continue;
-					}
+					/*
+					 * Integer state = oldExtra.getState(); if (state != null && state == 1) {
+					 * continue; }
+					 */
 
 					TaoBaoGoodsBrief goodsBrief = null;
 					try {

--
Gitblit v1.8.0