From 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 15:33:00 +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, 9 insertions(+), 2 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 a85bdff..bf1d4e8 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
@@ -23,6 +23,7 @@
import com.yeshi.fanli.exception.shop.BanLiShopOrderException;
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
import com.yeshi.fanli.service.inter.redpack.RedPackBalanceService;
+import com.yeshi.fanli.service.inter.redpack.RedPackForbidService;
import com.yeshi.fanli.service.inter.shop.BanLiShopGoodsService;
import com.yeshi.fanli.service.inter.shop.BanLiShopGoodsSetPayService;
import com.yeshi.fanli.service.inter.shop.BanLiShopGoodsSetService;
@@ -66,6 +67,9 @@
@Resource
private BanLiShopGoodsSetService banLiShopGoodsSetService;
+
+ @Resource
+ private RedPackForbidService redPackForbidService;
/**
* 鍟嗗搧鍒楄〃
@@ -76,7 +80,7 @@
* @param out
*/
@RequestMapping(value = "goodsList")
- public void goodsList(AcceptData acceptData, int page, 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,
@@ -91,6 +95,8 @@
}
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
@@ -175,6 +181,7 @@
}
}
BigDecimal money = redPackBalanceService.getBalance(uid);
+
JSONObject data = new JSONObject();
data.put("goods", goods);
data.put("hongBaoBalance", money);
@@ -218,7 +225,7 @@
if (order.getMoneyPayment() != null && order.getMoneyPayment().compareTo(new BigDecimal(0)) > 0) {
// 璧板井淇℃敮浠�
String payUrl = BanLiShopWXPayUtil.getWXH5PayUrl(order.getOrderNo(), request.getRemoteAddr(),
- order.getOrderGoods().getGoodsName(), order.getMoneyPayment());
+ order.getOrderGoods().getGoodsName(), order.getMoneyPayment(), acceptData.getPlatform());
if (StringUtil.isNullOrEmpty(payUrl)) {
if (!StringUtil.isNullOrEmpty(callback))
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(102, "寰俊鏀粯鍒涘缓澶辫触")));
--
Gitblit v1.8.0