From 8a66d7d040d10d03c32062ae7bb7e1fad836871f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 09 四月 2021 19:00:51 +0800
Subject: [PATCH] dubbo集成,订单优化

---
 src/main/java/com/yeshi/buwan/controller/AlipayController.java |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/controller/AlipayController.java b/src/main/java/com/yeshi/buwan/controller/AlipayController.java
index 8735a20..fd769bc 100644
--- a/src/main/java/com/yeshi/buwan/controller/AlipayController.java
+++ b/src/main/java/com/yeshi/buwan/controller/AlipayController.java
@@ -5,9 +5,11 @@
 import com.alipay.api.response.AlipayTradeQueryResponse;
 import com.yeshi.buwan.domain.vip.VIPOrderRecord;
 import com.yeshi.buwan.exception.vip.VIPException;
+import com.yeshi.buwan.service.inter.order.OrderService;
 import com.yeshi.buwan.service.inter.vip.VIPService;
 import com.yeshi.buwan.util.RedisManager;
 import com.yeshi.buwan.util.StringUtil;
+import com.yeshi.buwan.util.log.LoggerUtil;
 import com.yeshi.buwan.util.user.VipUtil;
 import com.yeshi.buwan.util.vip.VIPOrderUtil;
 import org.json.JSONObject;
@@ -32,13 +34,13 @@
 @Controller
 @RequestMapping("alipay")
 public class AlipayController {
-    Logger logger = LoggerFactory.getLogger(AlipayController.class);
+    Logger logger = LoggerUtil.getVIPLogger();
 
     @Resource
     private RedisManager redisManager;
 
     @Resource
-    private VIPService vipService;
+    private OrderService orderService;
 
     @RequestMapping("printPayForm")
     public void printPayForm(String formId, HttpServletResponse response) {
@@ -85,17 +87,9 @@
             if (right) {
                 //鏀粯鎴愬姛
                 if ("TRADE_SUCCESS".equalsIgnoreCase(tradeStatus)) {
-                    AlipayTradeQueryResponse res = AlipayH5PayUtil.queryOrder(app, outTradeNo, null);
-                    //鏀粯鎴愬姛
-                    if (res.isSuccess() && "TRADE_SUCCESS".equalsIgnoreCase(res.getTradeStatus())) {
-                        String id = VIPOrderUtil.getIdFromOutOrderNo(outTradeNo);
-                        try {
-                            vipService.paySuccess(id, VIPOrderRecord.PAY_WAY_ALIPAY, new BigDecimal(res.getPayAmount()), new Date());
-                        } catch (VIPException e) {
-                            e.printStackTrace();
-                            logger.error("鏀粯鎴愬姛鍥炶皟鍑洪敊 id锛歿}", id, e);
-                        }
-                    }
+                    String id = VIPOrderUtil.getIdFromOutOrderNo(outTradeNo);
+                    logger.info("璁㈠崟ID锛歿}", id);
+                    orderService.checkOrderPayState(id);
                 }
                 response.getWriter().print("success");
                 response.getWriter().close();

--
Gitblit v1.8.0