From 8f9845717f6989792e2a6003adf5fe12ff0a9540 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 23 十一月 2022 16:14:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java |   77 +++++++++++++++++++++++++++++++++++---
 1 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
index cd76cd9..0fb5e13 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
@@ -34,6 +34,8 @@
     private ComShopFlowerEvaluateService comShopFlowerEvaluateService;
     @Resource
     private ComShopFlowerOrderDeliveryService comShopFlowerOrderDeliveryService;
+    @Resource
+    private ComShopFlowerRefundOrderService comShopFlowerRefundOrderService;
 
 
     /**
@@ -85,12 +87,12 @@
     /**
      * 删除商品
      *
-     * @param id
+     * @param goodsId
      * @return
      */
-    @PostMapping("deleteShopGoods")
-    public R deleteFlowerShopGoods(@RequestBody Long[] id) {
-        return comShopFlowerGoodsService.deleteShopFlowerGoods(id);
+    @DeleteMapping("deleteShopGoods")
+    public R deleteFlowerShopGoods(@RequestParam("goodsId") Long goodsId) {
+        return comShopFlowerGoodsService.deleteShopFlowerGoods(goodsId);
     }
 
     /**
@@ -99,7 +101,7 @@
      * @param goodsId 商品id
      * @return 商品信息
      */
-    @PostMapping("shopGoodsDetail")
+    @GetMapping("shopGoodsDetail")
     public R shopFlowerGoodsDetail(@RequestParam("goodsId") Long goodsId) {
         return comShopFlowerGoodsService.shopFlowerGoodsDetail(goodsId);
     }
@@ -409,7 +411,7 @@
      *            订单支付回调参数
      */
     @PostMapping("/wxOrderPayNotify")
-    public void wxOrderPayNotify(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO) {
+    public void wxOrderPayNotifyFlower(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO) {
         comShopFlowerOrderService.wxOrderPayNotify(wxPayNotifyOrderDTO);
     }
 
@@ -421,10 +423,71 @@
      * @return 支付对象
      */
     @PostMapping("/wxPay")
-    public R wxPay(@RequestBody OrderPayDTO orderPayDTO) {
+    public R wxPayFlower(@RequestBody OrderPayDTO orderPayDTO) {
         return comShopFlowerOrderService.wxPay(orderPayDTO);
     }
 
+    /**
+     * 查询订单总数
+     * @param deliveryType
+     * @return
+     */
+    @GetMapping("/selectCountByDeliveryType")
+    public R selectCountByDeliveryType(@RequestParam("deliveryType") Integer deliveryType,@RequestParam("storeId")  Long storeId){
+        return comShopFlowerOrderService.selectCountByDeliveryType(deliveryType,storeId);
+    }
+
+    /**
+     * 查询我的店铺各类统计数据
+     * @param storeId
+     * @return
+     */
+    @GetMapping("/selectCountByStoreId")
+    public R selectCountByStoreId(Long storeId){
+        return comShopFlowerOrderService.selectCountByStoreId(storeId);
+    }
+
+    /**
+     * 创建退款订单
+     * @param comShopFlowerRefundOrderDTO
+     * @return
+     */
+    @PostMapping("createRefundOrder")
+    public R createRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO){
+        return comShopFlowerRefundOrderService.createRefundOrder(comShopFlowerRefundOrderDTO);
+    }
+
+    /**
+     * 分页查询
+     * @param pageComOrderRefundDTO
+     * @return
+     */
+    @PostMapping("pageRefundOrder")
+    public R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO){
+        return comShopFlowerRefundOrderService.pageRefundOrder(pageComOrderRefundDTO);
+    }
+
+    /**
+     * 修改退款订单
+     * @param comShopFlowerRefundOrderDTO
+     * @return
+     */
+    @PostMapping("updateRefundOrder")
+    public R updateRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO){
+        return comShopFlowerRefundOrderService.updateRefundOrder(comShopFlowerRefundOrderDTO);
+    }
+
+
+    /**
+     * 商家后台-退款申请统计
+     * @param storeId
+     * @return
+     */
+    @GetMapping("selectCountGroupStatus")
+    public R selectCountGroupStatus(Long storeId){
+        return comShopFlowerRefundOrderService.selectCountGroupStatus(storeId);
+    }
+
 
     /**
      * 统计用户订单数量

--
Gitblit v1.7.1