From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:26:55 +0800
Subject: [PATCH] 拼多多授权绑定
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java
index 086d3a9..0107b59 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java
@@ -19,7 +19,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.user.UserSystemCouponException;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -124,7 +124,7 @@
// 绂忓埄涓績鍥剧墖
String topPicture = null;
if (page == 1) {
- List<BannerVO> listswiper = swiperPictureService.getByBannerCardAndVersion("welfare_top",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
+ List<BannerVO> listswiper = swiperPictureService.getByBannerCardAndVersion("welfare_top",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
if (listswiper != null && listswiper.size() > 0) {
topPicture = listswiper.get(0).getSrc();
}
@@ -203,11 +203,11 @@
}
JSONObject dataTip = new JSONObject();
- dataTip.put("content", configService.get(ConfigKeyEnum.freeCouponTip.getKey()));
+ dataTip.put("content", configService.getValue(ConfigKeyEnum.freeCouponTip.getKey(),acceptData.getSystem()));
dataTip.put("fontColor", "#F14242");
JSONObject data = new JSONObject();
- data.put("helpLink", configService.get(ConfigKeyEnum.freeCouponHelp.getKey()));
+ data.put("helpLink", configService.getValue(ConfigKeyEnum.freeCouponHelp.getKey(),acceptData.getSystem()));
data.put("tip", dataTip);
data.put("count", resultList.size());
data.put("result_list", JsonUtil.getApiCommonGson().toJson(resultList));
@@ -227,7 +227,6 @@
* 鍏嶅崟鍒镐娇鐢ㄨ褰� 浠ュ強鐘舵�佷慨鏀�
*
* @param acceptData
- * @param page
* @param uid
* @param out
*/
@@ -277,7 +276,7 @@
}
JSONObject data = new JSONObject();
- data.put("helpLink", configService.get(ConfigKeyEnum.rewardCouponHelp.getKey()));
+ data.put("helpLink", configService.getValue(ConfigKeyEnum.rewardCouponHelp.getKey(),acceptData.getSystem()));
data.put("count", resultList.size());
data.put("result_list", JsonUtil.getApiCommonGson().toJson(resultList));
@@ -437,11 +436,11 @@
}
JSONObject dataTip = new JSONObject();
- dataTip.put("content", configService.get(ConfigKeyEnum.freeCouponTip.getKey()));
+ dataTip.put("content", configService.getValue(ConfigKeyEnum.freeCouponTip.getKey(),acceptData.getSystem()));
dataTip.put("fontColor", "#F14242");
JSONObject data = new JSONObject();
- data.put("helpLink", configService.get(ConfigKeyEnum.freeCouponHelp.getKey()));
+ data.put("helpLink", configService.getValue(ConfigKeyEnum.freeCouponHelp.getKey(),acceptData.getSystem()));
data.put("tip", dataTip);
data.put("count", list.size());
data.put("list", JsonUtil.getApiCommonGson().toJson(list));
--
Gitblit v1.8.0