From d311a95dbe476ed4c0783a409d8eaaa8e0aeb4b7 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期一, 10 五月 2021 16:06:51 +0800
Subject: [PATCH] fix:修改bug

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 52 insertions(+), 5 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 df9f375..8fe40d8 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
@@ -64,6 +64,16 @@
     }
 
     /**
+     * 新增店铺
+     * @param storeVO   店铺信息
+     * @return  新增结果
+     */
+    @PostMapping("/addStore")
+    public R addStore(@RequestBody ShopStoreVO storeVO) {
+        return comShopStoreService.addStore(storeVO);
+    }
+
+    /**
      * 编辑店铺、启用、禁用
      *
      * @param storeVO
@@ -107,6 +117,16 @@
     @GetMapping("/getUserStoreInfo")
     public R getUserStoreInfo(@RequestParam("userId") Long userId) {
         return comShopStoreService.getUserStoreInfo(userId);
+    }
+    /**
+     * 获取用户商铺详细
+     *
+     * @param account 用户账号
+     * @return
+     */
+    @GetMapping("/getUserStoreInfoByAccount")
+    public R<ShopStoreVO> getUserStoreInfoByAccount(@RequestParam("account") String account) {
+        return comShopStoreService.getUserStoreInfo(account);
     }
 
     /**
@@ -158,6 +178,7 @@
      */
     @PostMapping("/pageShopGoods")
     public R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO) {
+
         return comShopGoodsService.pageShopGoods(comShopGoodsDTO);
     }
 
@@ -179,6 +200,16 @@
     @PostMapping("shopCartList")
     public R shopCartList(@RequestParam("userId") Long userId) {
         return comShopCartService.shopCartList(userId);
+    }
+
+    /**
+     * 查询用户购物车数量
+     * @param userId    用户id
+     * @return  用户购物车商品数量
+     */
+    @PostMapping("shopCartUserTotal")
+    public R shopCartUserTotal(@RequestParam("userId") Long userId) {
+        return comShopCartService.shopCartUserTotal(userId);
     }
 
     /**
@@ -298,7 +329,7 @@
      */
     @PostMapping("orderCancel")
     public R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
-        return comShopOrderService.orderCancel(comShopOrderQueryDTO.getOrderId(),comShopOrderQueryDTO.getPhone());
+        return comShopOrderService.orderCancel(comShopOrderQueryDTO);
     }
 
     /**
@@ -360,6 +391,7 @@
      * @param id 商铺Id
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
     @PostMapping("editShopGoods/{id}")
     public R editShopGoods(@PathVariable("id") Long id,@RequestBody AddShopGoodsVO addShopGoodsVO) {
         return comShopGoodsService.editShopGoods(id, addShopGoodsVO);
@@ -412,8 +444,7 @@
      */
     @PostMapping("/deliverOrder")
     R deliverOrder(@RequestBody  ComShopOrderDeliverDTO deliverDTO){
-        Long orderId = deliverDTO.getOrderId();
-        return comShopOrderService.deliverOrder(orderId);
+        return comShopOrderService.deliverOrder(deliverDTO);
     }
     /**
      * 订单配送
@@ -422,8 +453,7 @@
      */
     @PostMapping("/finishDeliverOrder")
     R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
-        Long orderId = deliverDTO.getOrderId();
-        return comShopOrderService.finishDeliverOrder(orderId);
+        return comShopOrderService.finishDeliverOrder(deliverDTO);
     }
 
     /**
@@ -467,5 +497,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