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 | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 6b224fc..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;
@@ -202,9 +202,9 @@
}
List<CollectionGoodsV2> collectionGoodsList = collectionGoodsV2Service.getCollectionGoodsList(uid, page,
- Constant.PAGE_SIZE, goodsType);
+ Constant.PAGE_SIZE, goodsType, false);
- long count = collectionGoodsV2Service.getCollectionGoodsCount(uid, goodsType);
+ long count = collectionGoodsV2Service.getCollectionGoodsCount(uid, goodsType, false);
JSONObject data = new JSONObject();
List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();
@@ -234,7 +234,7 @@
}
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
for (CollectionGoodsV2 collectionGoodsV2 : collectionGoodsList) {
@@ -329,7 +329,7 @@
}
List<ScanHistoryV2> list = scanHistoryV2Service.getScanHistoryByDeviceOrUid(uid, acceptData.getDevice(), page,
- 20, goodsType);
+ 20, goodsType, false);
GsonBuilder gsonBuilder = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder());
gsonBuilder.excludeFieldsWithoutExposeAnnotation();
@@ -344,13 +344,13 @@
}
});
- long count = scanHistoryV2Service.getCountByDeviceOrUid(uid, acceptData.getDevice(), goodsType);
+ long count = scanHistoryV2Service.getCountByDeviceOrUid(uid, acceptData.getDevice(), goodsType, false);
JSONArray array = new JSONArray();
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