From d46dea27b6ec3e0fb32ec7d137699e9fc7d609b0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 12 十二月 2019 14:18:11 +0800
Subject: [PATCH] 订单补贴消息修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BanLiShopController.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 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 ca35c54..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
@@ -11,6 +11,7 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.exception.WXOrderException;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
@@ -22,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;
@@ -65,6 +67,9 @@
@Resource
private BanLiShopGoodsSetService banLiShopGoodsSetService;
+
+ @Resource
+ private RedPackForbidService redPackForbidService;
/**
* 鍟嗗搧鍒楄〃
@@ -75,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,
@@ -90,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
@@ -97,10 +104,35 @@
}
@RequestMapping(value = "orderList")
- public void orderList(AcceptData acceptData, Long uid, int page, String callback, PrintWriter out) {
+ public void orderList(AcceptData acceptData, Long uid, int page, String callback, String from, PrintWriter out) {
if (page <= 0)
page = 1;
List<BanLiShopOrder> orderList = banLiShopOrderService.listByUid(uid, page, Constant.PAGE_SIZE);
+ if (!StringUtil.isNullOrEmpty("from") && from.equalsIgnoreCase("pay")) {// 浠庢敮浠樼晫闈㈣繃鏉�
+ // 鍒ゆ柇绗竴涓鍗曟槸鍚︽敮浠樻垚鍔�
+ if (orderList.size() > 0) {
+ BanLiShopOrder latestOrder = orderList.get(0);
+ if (latestOrder.getMoneyPayment() != null
+ && latestOrder.getMoneyPayment().compareTo(new BigDecimal(0)) > 0) {
+ // 鍒ゆ柇寰俊鏀粯鏄惁鎴愬姛
+ try {
+ boolean isPaySuccess = BanLiShopWXPayUtil.isPaySuccess(latestOrder.getOrderNo());
+ if (isPaySuccess) {
+ try {
+ banLiShopOrderPayService.payOrderByMoney(latestOrder.getId(),
+ latestOrder.getMoneyPayment());
+ orderList = banLiShopOrderService.listByUid(uid, page, Constant.PAGE_SIZE);
+ } catch (BanLiShopOrderException e) {
+ e.printStackTrace();
+ }
+ }
+ } catch (WXOrderException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+
List<BanLiShopOrderVO> voList = new ArrayList<>();
for (BanLiShopOrder order : orderList) {
voList.add(BanLiShopOrderGoodsVOFactory.create(order));
@@ -149,6 +181,7 @@
}
}
BigDecimal money = redPackBalanceService.getBalance(uid);
+
JSONObject data = new JSONObject();
data.put("goods", goods);
data.put("hongBaoBalance", money);
@@ -192,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