From 7e51ff02bba60c1577e321d6a0d0f31474e0a2fa Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 17 十二月 2019 15:16:31 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BanLiShopController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BanLiShopController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BanLiShopController.java
index bf1d4e8..58f555d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BanLiShopController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BanLiShopController.java
@@ -67,7 +67,7 @@
@Resource
private BanLiShopGoodsSetService banLiShopGoodsSetService;
-
+
@Resource
private RedPackForbidService redPackForbidService;
@@ -80,14 +80,15 @@
* @param out
*/
@RequestMapping(value = "goodsList")
- public void goodsList(AcceptData acceptData, int page,Long uid, String callback, PrintWriter out) {
+ public void goodsList(AcceptData acceptData, int page, Long uid, String callback, PrintWriter out) {
if (page <= 0)
page = 1;
List<BanLiShopGoods> goodsList = banLiShopGoodsService.listGoods(null, BanLiShopGoods.STATE_ONLINE, page,
Constant.PAGE_SIZE);
long count = banLiShopGoodsService.countGoods(null, BanLiShopGoods.STATE_ONLINE);
// 鑾峰彇banner
- List<SwiperPicture> pictureList = swiperPictureService.getByBannerCard("hongbao_exchange_goods_list");
+ List<SwiperPicture> pictureList = swiperPictureService.getByBannerCardAndVersion("hongbao_exchange_goods_list",
+ acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
JSONObject data = new JSONObject();
if (pictureList != null && pictureList.size() > 0) {
@@ -96,7 +97,7 @@
data.put("data", goodsList);
data.put("count", count);
data.put("redPackLock", redPackForbidService.verifyForbid(uid));
-
+
if (!StringUtil.isNullOrEmpty(callback))
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
else
@@ -181,7 +182,7 @@
}
}
BigDecimal money = redPackBalanceService.getBalance(uid);
-
+
JSONObject data = new JSONObject();
data.put("goods", goods);
data.put("hongBaoBalance", money);
--
Gitblit v1.8.0