From 1be32ab61d7ed248f190eead478bdd7f8b83edbe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 29 七月 2019 18:26:19 +0800
Subject: [PATCH] 添加判断京东/拼多多是否参与推广

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 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 a15ab82..de252c8 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
@@ -269,6 +269,8 @@
 						e.printStackTrace();
 					}
 
+					commonGoodsVO.setGoodsType(sourceType2);
+					
 					String picture = commonGoodsVO.getPicture();
 					if (!StringUtil.isNullOrEmpty(picture) && !picture.contains("320x320")) {
 						commonGoodsVO.setPicture(TbImgUtil.getTBSize320Img(picture));
@@ -855,9 +857,9 @@
 					commonOrder.getTradeId(), new Date(), commonOrder.getSourceType()));
 			return commonOrder;
 		} else {// 淇敼
-			// 宸茬粡缁撶畻鎴栬�呭凡缁忓け鏁堢殑璁㈠崟涓嶅鐞�
-			if (oldCommonOrder.getState() == CommonOrder.STATE_JS
-					|| oldCommonOrder.getState() == CommonOrder.STATE_SX) {
+			// 宸茬粡缁撶畻锛屽凡缁忓け鏁堬紝鐘舵�佹湭鏀瑰彉鐨勮鍗曚笉澶勭悊
+			if (oldCommonOrder.getState() == CommonOrder.STATE_JS || oldCommonOrder.getState() == CommonOrder.STATE_SX
+					|| (oldCommonOrder.getState().intValue() == commonOrder.getState())) {
 				return oldCommonOrder;
 			}
 			// 浜ゆ槗ID涓�鑷存墠淇敼

--
Gitblit v1.8.0