From 53ea50a0c82d776fce71369bd986396537a8d0e5 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 07 十一月 2019 16:05:18 +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 | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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..c6dc5ad 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;
@@ -97,10 +98,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());
+ } catch (BanLiShopOrderException e) {
+ e.printStackTrace();
+ }
+ }
+ } catch (WXOrderException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ }
+
List<BanLiShopOrderVO> voList = new ArrayList<>();
for (BanLiShopOrder order : orderList) {
voList.add(BanLiShopOrderGoodsVOFactory.create(order));
--
Gitblit v1.8.0