From b19d2e730b0ea707b500b307f58c46ba0cef695f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 18 九月 2019 18:41:21 +0800
Subject: [PATCH] 抖音广告监测修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java |    7 ++++---
 1 files changed, 4 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 31065ae..e13ab17 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
@@ -681,7 +681,7 @@
 			Map<String, Object> jumpLink = new HashMap<String, Object>();
 			jumpLink.put("orderNo", order.getOrderNo());
 			if (VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
-				jumpLink.put("goodsType", order.getSourceType());
+				jumpLink.put("goodsType", order.getSourceType()+"");
 			}
 
 			Map<String, Object> jump = new HashMap<String, Object>();
@@ -706,7 +706,7 @@
 			Map<String, Object> jumpLink = new HashMap<String, Object>();
 			jumpLink.put("orderNo", order.getOrderNo());
 			if (VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
-				jumpLink.put("goodsType", order.getSourceType());
+				jumpLink.put("goodsType", order.getSourceType()+"");
 			}
 
 			Map<String, Object> jump = new HashMap<String, Object>();
@@ -1372,7 +1372,7 @@
 	}
 
 	@Override
-	public JSONObject getRewardJumpInfo(String orderNo) {
+	public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType) {
 
 		JSONObject map = new JSONObject();
 		// 璁㈠崟鏍囪瘑
@@ -1389,6 +1389,7 @@
 
 		Map<String, Object> jumpLink = new HashMap<String, Object>();
 		jumpLink.put("orderNo", orderNo);
+		jumpLink.put("goodsType", goodsType == null? goodsType: goodsType +"");
 
 		Map<String, Object> jump = new HashMap<String, Object>();
 		jump.put("type", 1);

--
Gitblit v1.8.0