From 26cd8c7b2bc7a725a3de28d3ed883a6f54da84f1 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 20 四月 2021 16:59:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
index d93dacc..3a701af 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
@@ -468,5 +468,22 @@
         return comShopOrderService.pageShopFunds(pageComShopFundsSearchDTO);
     }
 
+    /**
+     * 微信支付订单回调
+     * @param wxPayNotifyOrderDTO   订单支付回调参数
+     */
+    @PostMapping("/wxOrderPayNotify")
+    public void wxOrderPayNotify(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO){
+        comShopOrderService.wxOrderPayNotify(wxPayNotifyOrderDTO);
+    }
 
+    /**
+     * 点击去支付订单
+     * @param orderPayDTO   请求参数
+     * @return  支付对象
+     */
+    @PostMapping("/wxPay")
+    public R wxPay(@RequestBody OrderPayDTO orderPayDTO){
+        return  comShopOrderService.wxPay(orderPayDTO);
+    }
 }

--
Gitblit v1.7.1