From 72438ed5f691fa53fec5d8fa4f9ac61678d1f70a Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 24 Oct 2021 23:46:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20pay.html=20=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=EF=BC=8C=E5=AF=B9=E6=8E=A5=E5=BE=AE=E4=BF=A1=20JS=20S?=
 =?UTF-8?q?DK?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/dto/PayOrderCreateReqDTO.java       |  2 +-
 .../order/dto/PayOrderSubmitRespDTO.java      |  2 +-
 .../order/impl/PayOrderCoreServiceImpl.java   |  2 +-
 .../order/vo/PayOrderSubmitRespVO.java        |  2 +-
 .../src/main/resources/static/pay.html        | 74 +++++++++++++++++--
 5 files changed, 72 insertions(+), 10 deletions(-)

diff --git a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/pay/service/order/dto/PayOrderCreateReqDTO.java b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/pay/service/order/dto/PayOrderCreateReqDTO.java
index 15d8bb48d..a5d2b0f4e 100644
--- a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/pay/service/order/dto/PayOrderCreateReqDTO.java
+++ b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/pay/service/order/dto/PayOrderCreateReqDTO.java
@@ -18,7 +18,7 @@ public class PayOrderCreateReqDTO implements Serializable {
     /**
      * 应用编号
      */
-    @NotEmpty(message = "应用编号不能为空")
+    @NotNull(message = "应用编号不能为空")
     private Long appId;
     /**
      * 用户 IP
diff --git a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/pay/service/order/dto/PayOrderSubmitRespDTO.java b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/pay/service/order/dto/PayOrderSubmitRespDTO.java
index b1a5d2e10..2bcb504e8 100644
--- a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/pay/service/order/dto/PayOrderSubmitRespDTO.java
+++ b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/pay/service/order/dto/PayOrderSubmitRespDTO.java
@@ -18,6 +18,6 @@ public class PayOrderSubmitRespDTO implements Serializable {
     /**
      * 调用支付渠道的响应结果
      */
-    private String invokeResponse;
+    private Object invokeResponse;
 
 }
diff --git a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/pay/service/order/impl/PayOrderCoreServiceImpl.java b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/pay/service/order/impl/PayOrderCoreServiceImpl.java
index 7edbeacbb..3c86c5593 100644
--- a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/pay/service/order/impl/PayOrderCoreServiceImpl.java
+++ b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/pay/service/order/impl/PayOrderCoreServiceImpl.java
@@ -134,7 +134,7 @@ public class PayOrderCoreServiceImpl implements PayOrderCoreService {
         // TODO 轮询三方接口，是否已经支付的任务
         // 返回成功
         return new PayOrderSubmitRespDTO().setExtensionId(orderExtension.getId())
-                .setInvokeResponse(JsonUtils.toJsonString(unifiedOrderResult));
+                .setInvokeResponse(unifiedOrderResult.getData());
     }
 
     private String generateOrderExtensionNo() {
diff --git a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/pay/controller/order/vo/PayOrderSubmitRespVO.java b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/pay/controller/order/vo/PayOrderSubmitRespVO.java
index cddc79c98..907a97946 100644
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/pay/controller/order/vo/PayOrderSubmitRespVO.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/pay/controller/order/vo/PayOrderSubmitRespVO.java
@@ -18,6 +18,6 @@ public class PayOrderSubmitRespVO {
     /**
      * 调用支付渠道的响应结果
      */
-    private String invokeResponse;
+    private Object invokeResponse;
 
 }
diff --git a/yudao-user-server/src/main/resources/static/pay.html b/yudao-user-server/src/main/resources/static/pay.html
index d7e36a719..89e95849b 100644
--- a/yudao-user-server/src/main/resources/static/pay.html
+++ b/yudao-user-server/src/main/resources/static/pay.html
@@ -13,10 +13,14 @@
 </div>
 </body>
 <script>
+    let shopOrderId = undefined;
+    let payOrderId = undefined;
+    let server = 'http://127.0.0.1:28080';
     $(function() {
         // 获得 JsapiTicket
+        // 参考 https://developers.weixin.qq.com/doc/offiaccount/OA_Web_Apps/JS-SDK.html 文档
         $.ajax({
-            url: "http://127.0.0.1:28080/api/wx/mp/create-jsapi-signature?url=" + document.location.href,
+            url: server + "/api/wx/mp/create-jsapi-signature?url=" + document.location.href,
             method: 'POST',
             success: function( result ) {
                 if (result.code !== 0) {
@@ -24,19 +28,77 @@
                     return;
                 }
                 var jsapiTicket = result.data;
-                jsapiTicket.jsApiList = [];
-                jsapiTicket.debug = true;
+                jsapiTicket.jsApiList = ['chooseWXPay'];
+                jsapiTicket.debug = false;
 
                 // 初始化 JS
                 wx.config(jsapiTicket);
             }
         });
+
+        // 自动发起商城订单编号
+        $.ajax({
+            url: server + "/api/shop/order/create",
+            method: 'POST',
+            success: function( result ) {
+                if (result.code !== 0) {
+                    alert('创建商城订单失败，原因：' + result.msg)
+                    return;
+                }
+                shopOrderId = result.data.id;
+                payOrderId = result.data.payOrderId;
+                console.log("商城订单：" + shopOrderId)
+                console.log("支付订单：" + payOrderId)
+            }
+        })
     })
 
+    // 微信公众号
     $( "#wx_pub").on( "click", function() {
-        wx.ready(function(){
-            alert('ok');
-        });
+        if (typeof WeixinJSBridge == "undefined") {
+            if (document.addEventListener) {
+                document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false);
+            } else if (document.attachEvent) {
+                document.attachEvent('WeixinJSBridgeReady', onBridgeReady);
+                document.attachEvent('onWeixinJSBridgeReady', onBridgeReady);
+            }
+        } else {
+            onBridgeReady()
+        }
+
+        function onBridgeReady() {
+            $.ajax({
+                url: server + "/api/pay/order/submit",
+                method: 'POST',
+                dataType: "json",
+                contentType: "application/json",
+                data: JSON.stringify({
+                    "id": payOrderId,
+                    "channelCode": 'wx_pub',
+                }),
+                success: function( result ) {
+                    if (result.code !== 0) {
+                        alert('提交支付订单失败，原因：' + result.msg)
+                        return;
+                    }
+                    alert('开始调用微信支付');
+                    let data = result.data.invokeResponse;
+                    wx.chooseWXPay({
+                        timestamp: data.timeStamp,
+                        nonceStr: data.nonceStr,
+                        package: data.package,
+                        signType: data.signType,
+                        paySign: data.paySign,
+                        success: function (res) {
+                            alert(JSON.stringify(res));
+                        },
+                        error: function(e) {
+                            alert(JSON.stringify(e));
+                        }
+                    });
+                }
+            })
+        }
     });
 </script>
 </html>