From 93707c75f49a543f122349f88b53d65aac51861b Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 21 四月 2021 10:07:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 7b6f962..354ac0d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1911,6 +1911,14 @@
     R shopCartList(@RequestParam("userId") Long userId);
 
     /**
+     * 查询用户购物车数量
+     * @param userId    用户id
+     * @return  用户购物车商品数量
+     */
+    @PostMapping("/shop/shopCartUserTotal")
+    R shopCartUserTotal(@RequestParam("userId") Long userId);
+
+    /**
      * 购物车添加
      * @param comShopCartDTO    请求参数
      * @return  购物车列表
@@ -2101,4 +2109,19 @@
      */
     @PostMapping("/shop/pageShopFunds")
     R pageShopFunds(@RequestBody PageComShopFundsSearchDTO pageComShopFundsSearchDTO);
+
+    /**
+     * 微信支付订单回调
+     * @param wxPayNotifyOrderDTO   订单支付回调参数
+     */
+    @PostMapping("/shop/wxOrderPayNotify")
+    void wxOrderPayNotify(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO);
+
+    /**
+     * 点击去支付订单
+     * @param orderPayDTO   请求参数
+     * @return  支付对象
+     */
+    @PostMapping("/shop/wxPay")
+    R wxPay(@RequestBody OrderPayDTO orderPayDTO);
 }

--
Gitblit v1.7.1