From f7b2baec57a19039ca85880bbba4e17fe27f0511 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 三月 2021 18:21:13 +0800
Subject: [PATCH] 删除冗余代码,初步优化首页的推荐专题,3.8.7之后在我的里面添加VIP分类

---
 src/main/java/com/yeshi/buwan/controller/AlipayController.java |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/controller/AlipayController.java b/src/main/java/com/yeshi/buwan/controller/AlipayController.java
index 808982d..5f9c11b 100644
--- a/src/main/java/com/yeshi/buwan/controller/AlipayController.java
+++ b/src/main/java/com/yeshi/buwan/controller/AlipayController.java
@@ -2,14 +2,21 @@
 
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.internal.util.AlipaySignature;
+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.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;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.yeshi.utils.alipay.AlipayH5PayUtil;
 import org.yeshi.utils.entity.alipay.AlipayAppInfo;
 
 import javax.annotation.Resource;
@@ -17,6 +24,8 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -24,10 +33,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;
 
     @RequestMapping("printPayForm")
     public void printPayForm(String formId, HttpServletResponse response) {
@@ -65,10 +77,6 @@
         String outTradeNo = map.get("out_trade_no");
         String tradeStatus = map.get("trade_status");
 
-        //鏀粯鎴愬姛
-        if ("TRADE_SUCCESS".equalsIgnoreCase(tradeStatus)) {
-
-        }
 
         logger.info("鏀粯鍥炶皟锛�" + new JSONObject(map).toString());
         AlipayAppInfo app = VipUtil.getAlipayApp();
@@ -76,6 +84,12 @@
         try {
             boolean right = AlipaySignature.rsaCheckV1(map, app.getAlipayPublicKey(), "GBK", map.get("sign_type"));
             if (right) {
+                //鏀粯鎴愬姛
+                if ("TRADE_SUCCESS".equalsIgnoreCase(tradeStatus)) {
+                    String id = VIPOrderUtil.getIdFromOutOrderNo(outTradeNo);
+                    logger.info("璁㈠崟ID锛歿}", id);
+                    vipService.checkOrderPayState(id);
+                }
                 response.getWriter().print("success");
                 response.getWriter().close();
             }

--
Gitblit v1.8.0