From f537abe9f3646c739beaf15076246a2f71a347e9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 20 二月 2025 16:57:55 +0800
Subject: [PATCH] IOS广告增加区域屏蔽
---
src/main/java/com/yeshi/buwan/controller/AlipayController.java | 28 +++++++---------------------
1 files changed, 7 insertions(+), 21 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..1700347 100644
--- a/src/main/java/com/yeshi/buwan/controller/AlipayController.java
+++ b/src/main/java/com/yeshi/buwan/controller/AlipayController.java
@@ -2,20 +2,16 @@
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.service.inter.order.OrderService;
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;
@@ -23,8 +19,6 @@
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;
@@ -32,13 +26,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 +79,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