From c9cbad5f5d18c6b2ac5a063e41007933d7028329 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 07 七月 2020 15:24:17 +0800
Subject: [PATCH] 返利配置文件加入系统区分
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
index 88042a4..04aaf2a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -292,7 +292,7 @@
GoodsDetailVOFactory.convertCommonGoods(goods,
orderHongBaoMoneyComputeService.getShowComputeRate(
acceptData.getPlatform(),
- acceptData.getVersion()))));
+ acceptData.getVersion(),acceptData.getSystem()))));
// 璺宠浆璇︽儏
if (VersionUtil.greaterThan_2_1_3(acceptData.getPlatform(),
acceptData.getVersion())) {
@@ -312,7 +312,7 @@
GoodsDetailVOFactory.convertCommonGoods(goods,
orderHongBaoMoneyComputeService.getShowComputeRate(
acceptData.getPlatform(),
- acceptData.getVersion()))));
+ acceptData.getVersion(),acceptData.getSystem()))));
// if
// (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(),
// acceptData.getVersion())) {
@@ -696,7 +696,7 @@
List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
for (TaoBaoGoodsBrief goods : taoBaoGoodsBriefs) {
list.add(GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO));
@@ -717,14 +717,14 @@
BrandInfoVO brandInfoVO = null;
try {
brandInfoVO = brandInfoService.listByAlikeName(key, acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
} catch (Exception e) {
}
if (brandInfoVO != null)
data.put("shop", JsonUtil.getApiCommonGson().toJson(brandInfoVO));
} else {
List<TaoBaoShopVO> listShop = taoBaoShopService.getShopByKeyV2(key, acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
if (listShop != null && listShop.size() > 0 && listShop.get(0).getListGoodsVO() != null
&& listShop.get(0).getListGoodsVO().size() > 2) {
TaoBaoShopVO taoBaoShop = listShop.get(0);
@@ -912,7 +912,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
for (JDGoods goods : goodsList) {
GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);
if (hasCoupon) {
@@ -994,7 +994,7 @@
List<PDDGoodsDetail> goodsList = result.getGoodsList();
if (goodsList != null && goodsList.size() > 0) {
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
for (PDDGoodsDetail goods : goodsList) {
GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO);
@@ -1072,7 +1072,7 @@
List<VIPGoodsInfo> goodsList = result.getGoodsList();
if (goodsList != null && goodsList.size() > 0) {
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
for (VIPGoodsInfo goods : goodsList) {
GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertVIPGoods(goods, paramsDTO);
@@ -1176,7 +1176,7 @@
Gson gson = JsonUtil.getApiCommonGson();
if (resultList != null && resultList.size() > 0) {
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
for (SuningGoodsInfo goods : resultList) {
GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertSuningGoods(goods, paramsDTO);
--
Gitblit v1.8.0