From eb8d4a82569e4d84afe5ee2165aaebce08c76371 Mon Sep 17 00:00:00 2001
From: clunt <clunt@vip.163.com>
Date: Mon, 11 Apr 2022 10:35:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Eadapay=E7=9A=84=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E4=BB=A5=E5=8F=8A=E5=BE=AE=E4=BF=A1=E5=85=AC?=
 =?UTF-8?q?=E4=BC=97=E5=8F=B7=E6=94=AF=E4=BB=98=E6=A8=A1=E5=9E=8B=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/pay/WxPayController.java   | 32 +++++++++++++++++++
 ghy-admin/src/main/resources/application.yaml |  7 ++++
 .../adapay/callback/DrawCashCallback.java     |  1 +
 3 files changed, 40 insertions(+)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java b/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java
index 40033f8e..d6c61f86 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java
@@ -1,14 +1,46 @@
 package com.ghy.web.controller.pay;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ghy.common.core.controller.BaseController;
+import com.ghy.common.core.domain.AjaxResult;
+import com.ghy.common.utils.WxUtils;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import javax.servlet.http.HttpServletRequest;
+
 @Controller
 @RequestMapping("/pay/wx")
 public class WxPayController extends BaseController {
 
 
+    /**
+     * 微信公众号支付.
+     * https://open.weixin.qq.com/connect/oauth2/authorize?
+     * appid=wx404f2439a8c24e15
+     * &redirect_uri=http%3A%2F%2Fwww.opsoul.com%2Fwx%2Fopenid
+     * &response_type=code
+     * &scope=snsapi_userinfo&state=STATE&connect_redirect=1#wechat_redirect
+     * */
+    @GetMapping("/pub")
+    public AjaxResult pubPay(HttpServletRequest request){
+        String code = request.getParameter("code");
 
+        String orderId = request.getParameter("orderId");
+        // 查询回订单信息。如果订单不存在，则退出.
+        try {
+            JSONObject wxUser = WxUtils.getOpenid(code);
+            String openId = wxUser.getString("openid");
+            //调用adapay微信公众号支付.
+
+            //拼接消息给前端.前端通过JSAPI调用微信支付
+        }catch (Exception e){
+
+        }
+        return AjaxResult.success();
+    }
 
 }
diff --git a/ghy-admin/src/main/resources/application.yaml b/ghy-admin/src/main/resources/application.yaml
index 23aee072..e0b6810e 100644
--- a/ghy-admin/src/main/resources/application.yaml
+++ b/ghy-admin/src/main/resources/application.yaml
@@ -146,3 +146,10 @@ qiniu:
   secretKey: 'V8SM9nkbO-dft4JmG7UaCH6RYxXdqzrvQ0zWO2W3'
   bucketName: 'gqz'
   mediaUrl: 'http://gqz.opsoul.com/'
+
+adapay:
+  appId:
+  notifyUrl:
+  apiKey:
+  mockApiKey:
+  rsaPrivateKey:
diff --git a/ghy-common/src/main/java/com/ghy/common/adapay/callback/DrawCashCallback.java b/ghy-common/src/main/java/com/ghy/common/adapay/callback/DrawCashCallback.java
index ac523059..65b2d728 100644
--- a/ghy-common/src/main/java/com/ghy/common/adapay/callback/DrawCashCallback.java
+++ b/ghy-common/src/main/java/com/ghy/common/adapay/callback/DrawCashCallback.java
@@ -10,4 +10,5 @@ import com.ghy.common.adapay.callback.model.DrawCashReply;
 public interface DrawCashCallback {
 
     void onReply(DrawCashReply reply);
+
 }