From dd865e62a9e687aeb2436a59a76bbe461bd83eaf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 27 十二月 2018 09:45:00 +0800
Subject: [PATCH] 返回字段结构调整

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java
index 8855334..009b7d9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java
@@ -14,6 +14,7 @@
 import com.yeshi.fanli.entity.admin.ReslutOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
+import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
@@ -35,11 +36,13 @@
 		Iterator<String> its = map.keySet().iterator();
 		while (its.hasNext()) {
 			String orderId = its.next();
-			String key = "doorder-" + orderId;
+			String key = "addorder-" + orderId;
 			// redis鍋氶鐜囬檺鍒�
 			try {
-				if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
-					continue;
+				if (Constant.IS_OUTNET) {
+					if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
+						continue;
+					}
 				}
 
 			} catch (Exception e) {
@@ -48,7 +51,8 @@
 			addTaoBaoOrder(orderId, map.get(orderId));
 			try {
 				// 6灏忔椂鍐呬笉鍐嶅鐞�
-				redisManager.cacheCommonString(key, "1", 60 * 60 * 6);
+				if (Constant.IS_OUTNET)
+					redisManager.cacheCommonString(key, "1", 60 * 60 * 6);
 			} catch (Exception e) {
 
 			}
@@ -66,6 +70,10 @@
 				taoBaoOrderMapper.insertSelective(taoBaoOrder);
 			}
 		} else {
+			//娴嬭瘯
+			if(1>0)
+				return;
+			
 			boolean hasPayOrder = false;
 			for (TaoBaoOrder order : oldOrderList)
 				if (order.getOrderState().equalsIgnoreCase("璁㈠崟浠樻")) {

--
Gitblit v1.8.0