From be67478cae6bf9308f15949a21e7d0a57a3f0ecb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 七月 2020 15:37:31 +0800
Subject: [PATCH] dubbo集成修改

---
 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/ConsumerController.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/ConsumerController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/ConsumerController.java
index 383e4de..4357f37 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/ConsumerController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/ConsumerController.java
@@ -27,7 +27,7 @@
 import com.yeshi.fanli.entity.goods.CommonGoods;
 import com.yeshi.fanli.entity.goods.ScanHistoryV2;
 import com.yeshi.fanli.entity.jd.JDGoods;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.exception.goods.CollectionGoodsException;
 import com.yeshi.fanli.exception.taobao.TaoKeApiException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
@@ -234,7 +234,7 @@
 			}
 
 			ConfigParamsDTO paramsDTO =  orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
-					acceptData.getVersion());
+					acceptData.getVersion(),acceptData.getSystem());
 			
 
 			for (CollectionGoodsV2 collectionGoodsV2 : collectionGoodsList) {
@@ -350,7 +350,7 @@
 		if (list != null && list.size() > 0) {
 			Gson gson = gsonBuilder.create();
 			ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
-					acceptData.getVersion());
+					acceptData.getVersion(),acceptData.getSystem());
 			for (ScanHistoryV2 sh : list) {
 				CommonGoods commonGoods = sh.getCommonGoods();
 				if (commonGoods == null) {

--
Gitblit v1.8.0