From 5579df31bbf0d519b35a41f2dcefe86e0d7797f7 Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Sat, 16 Dec 2023 15:02:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B5=81=E7=A8=8B=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F,=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E7=BB=93=E6=9D=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/TbUserMatchOrderAppController.java         | 14 ++++++++++++++
 .../java/com/ruoyi/web/service/AdapayService.java  |  8 ++++++++
 .../ruoyi/web/service/impl/AdapayServiceImpl.java  |  9 +++++++++
 3 files changed, 31 insertions(+)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserMatchOrderAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserMatchOrderAppController.java
index af5677ca..fca3a02a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserMatchOrderAppController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserMatchOrderAppController.java
@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.app;
 import com.huifu.adapay.core.AdapayCore;
 import com.huifu.adapay.core.util.AdapaySign;
 import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.system.domain.TbUserMatchOrder;
 import com.ruoyi.web.request.AdapayReq;
 import com.ruoyi.web.request.Event;
 import com.ruoyi.web.response.AdapayResp;
@@ -33,6 +34,19 @@ public class TbUserMatchOrderAppController {
     @Autowired
     private CallBackService callBackService;
 
+
+    @ResponseBody
+    @PostMapping(value = "/checkPayResult")
+    @ApiOperation(value = "查询用户开通结果,无返回则证明没有开通记录", response = TbUserMatchOrder.class)
+    public Result<TbUserMatchOrder> checkPayResult(@RequestBody @NotNull AdapayReq adapayReq){
+        try {
+            return Result.success(adapayService.checkPayResult(adapayReq));
+        }catch (Exception e){
+            return Result.error(e.getMessage());
+        }
+
+    }
+
     @ResponseBody
     @PostMapping(value = "/pay")
     @ApiOperation(value = "支付接口", response = AdapayResp.class)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/service/AdapayService.java b/ruoyi-admin/src/main/java/com/ruoyi/web/service/AdapayService.java
index 7dcd7c74..211ab9ce 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/service/AdapayService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/service/AdapayService.java
@@ -1,5 +1,6 @@
 package com.ruoyi.web.service;
 
+import com.ruoyi.system.domain.TbUserMatchOrder;
 import com.ruoyi.web.request.AdapayReq;
 import com.ruoyi.web.response.AdapayResp;
 
@@ -14,4 +15,11 @@ public interface AdapayService {
      */
     public AdapayResp pay(AdapayReq adapayReq) throws Exception;
 
+    /**
+     * @param adapayReq 支付查询
+     * @return 支付结果
+     * @throws Exception
+     */
+    TbUserMatchOrder checkPayResult(AdapayReq adapayReq) throws Exception;
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/service/impl/AdapayServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/web/service/impl/AdapayServiceImpl.java
index ec0ee7c6..3687ae91 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/service/impl/AdapayServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/service/impl/AdapayServiceImpl.java
@@ -74,4 +74,13 @@ public class AdapayServiceImpl implements AdapayService {
         tbUserMatchOrderService.insertTbUserMatchOrder(tbUserMatchOrder);
         return resp;
     }
+
+    @Override
+    public TbUserMatchOrder checkPayResult(AdapayReq adapayReq) {
+        return tbUserMatchOrderService.lambdaQuery()
+                .eq(TbUserMatchOrder::getUserId, adapayReq.getUserId())
+                .eq(TbUserMatchOrder::getOrderType, adapayReq.getOrderType())
+                .eq(TbUserMatchOrder::getPayStatus, "succeeded")
+                .one();
+    }
 }