From 2e2bcc55ea6eb6fd63dae451bdd26f4b9875db40 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期一, 06 二月 2023 16:57:49 +0800
Subject: [PATCH] #add 普达大屏接口

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |  274 ++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 254 insertions(+), 20 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 411a6d5..16421e7 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
@@ -2974,11 +2974,11 @@
     /**
      * 删除商品
      *
-     * @param id
+     * @param goodsId
      * @return
      */
-    @PostMapping("/shopFlower/deleteShopGoods")
-    R deleteFlowerShopGoods(@RequestBody Long[] id);
+    @DeleteMapping("/shopFlower/deleteShopGoods")
+    R deleteFlowerShopGoods(@RequestParam("goodsId") Long goodsId);
 
     /**
      * 修改商品状态
@@ -2990,12 +2990,12 @@
     R changeFlowerStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);
 
     /**
-     * 修改商品状态
+     * 商品详情
      *
      * @param goodsId
      * @return
      */
-    @PostMapping("/shopFlower/shopGoodsDetail")
+    @GetMapping("/shopFlower/shopGoodsDetail")
     R shopFlowerGoodsDetail(@RequestParam("goodsId") Long goodsId);
 
 
@@ -3520,6 +3520,15 @@
     @PostMapping("/neighbor/pageNeighborByAdmin")
     R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
 
+    /**
+     * 统计大屏查询清单列表
+     *
+     * @param comActNeighborCircleAdminDTO
+     *            请求参数
+     * @return 邻里圈列表
+     */
+    @PostMapping("/neighbor/pageNeighborByBigScreen")
+    R pageNeighborByBigScreen(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
     /**
      * 后台修改邻里圈
      *
@@ -6578,6 +6587,14 @@
      */
     @GetMapping("/convenient/getUserMerchantInfoByAccount")
     R<ConvenientMerchantVO> getUserMerchantInfoByAccount(@RequestParam("account") String account);
+
+    /**
+     * 获取用户便民服务商家详情
+     * @param account 商家绑定账号
+     * @return
+     */
+    @GetMapping("/convenient/getMerchantInfoByAccount")
+    R<ConvenientMerchantVO> getMerchantInfoByAccount(@RequestParam("account") String account);
 
     /**
      * 获取商便民服务商家信息
@@ -10590,7 +10607,7 @@
 
     @GetMapping("/sanshuo/expert/backstageList2")
     R expertBackStageList(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "page",required = false)Integer page,
-                          @RequestParam(value = "size",required = false)Integer size);
+                          @RequestParam(value = "size",required = false)Integer size,@RequestParam(value = "keyWord",required = false)String  keyWord);
 
     /**
      * 查询社区id集合
@@ -10651,7 +10668,7 @@
      * @param operator
      * @return
      */
-    @DeleteMapping("/point/delete")
+    @DeleteMapping("/convenient/point/delete")
     R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator);
 
     /**
@@ -10659,7 +10676,7 @@
      * @param pointId
      * @return
      */
-    @GetMapping("/point/detail")
+    @GetMapping("/convenient/point/detail")
     R detailPoint(@RequestParam("pointId") Long pointId);
 
     /**
@@ -10667,7 +10684,7 @@
      * @param convenientGoodsCategoryDTO
      * @return
      */
-    @PostMapping("/goodsCategory/add")
+    @PostMapping("/convenient/goodsCategory/add")
     R addGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);
 
     /**
@@ -10675,7 +10692,7 @@
      * @param convenientGoodsCategoryDTO
      * @return
      */
-    @PutMapping("/goodsCategory/put")
+    @PutMapping("/convenient/goodsCategory/put")
     R putGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);
 
     /**
@@ -10683,7 +10700,7 @@
      * @param categoryId
      * @return
      */
-    @DeleteMapping("/goodsCategory/delete")
+    @DeleteMapping("/convenient/goodsCategory/delete")
     R deleteGoodsCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);
 
     /**
@@ -10691,7 +10708,7 @@
      * @param categoryId
      * @return
      */
-    @GetMapping("/goodsCategory/get")
+    @GetMapping("/convenient/goodsCategory/get")
     R getGoodsCategory(@RequestParam("categoryId") Long categoryId);
 
     /**
@@ -10699,7 +10716,7 @@
      * @param pageConvenientGoodsCategoryDTO
      * @return
      */
-    @PostMapping("/goodsCategory/page")
+    @PostMapping("/convenient/goodsCategory/page")
      R pageGoodsCategory(@RequestBody PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO);
 
     @GetMapping("/dataCount")
@@ -10718,7 +10735,7 @@
      * 获取所有商品分类
      * @return
      */
-    @GetMapping("/goodsCategory/getAllGoodsCategories")
+    @GetMapping("/convenient/goodsCategory/getAllGoodsCategories")
     R getAllGoodsCategories();
 
     /**
@@ -10758,7 +10775,7 @@
      *            收货地址id
      * @return 删除结果
      */
-    @PostMapping("/shopFlower/shopDelUserAddress")
+    @DeleteMapping("/shopFlower/shopDelUserAddress")
     R shopFlowerDelUserAddress(@RequestParam("addressId") Long addressId);
 
     /**
@@ -10794,8 +10811,8 @@
      * @param orderId 订单id
      * @return 订单详情
      */
-    @PostMapping("/shopFlower/orderDetail")
-    R orderDetailFlower(@RequestParam("orderId") Long orderId);
+    @GetMapping("/shopFlower/orderDetail")
+    R orderDetailFlower(@RequestParam("orderId") Long orderId,@RequestParam(value = "phone",required = false) String phone);
 
     /**
      * 根据订单id取消订单
@@ -10812,7 +10829,7 @@
      * @param orderId 订单id
      * @return 删除结果
      */
-    @PostMapping("/shopFlower/orderDelete")
+    @DeleteMapping("/shopFlower/orderDelete")
     R orderDeleteFlower(@RequestParam("orderId") Long orderId);
 
     /**
@@ -10881,7 +10898,7 @@
      * @param pageComShopFlowerEvaluateDTO
      * @return
      */
-    @PostMapping("/pageEvaluate")
+    @PostMapping("/shopFlower/pageEvaluate")
     R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO);
 
     /**
@@ -10975,10 +10992,227 @@
     R wxPayFlower(@RequestBody OrderPayDTO orderPayDTO);
 
     /**
+     * 获取社区动态置顶banner
+     * @param communityId  社区id
+     * */
+    @PostMapping("/easyphoto/getUserRewardsNew")
+    R getUserRewardsNew(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
+
+    /**
      * 统计查询订单数量
      * @param deliveryType
+     * @param userId
      * @return
      */
     @GetMapping("/shopFlower/selectCountByDeliveryType")
-    R selectCountByDeliveryType(Integer deliveryType);
+    R selectCountByDeliveryType(@RequestParam("deliveryType") Integer deliveryType,@RequestParam("userId")  Long userId);
+
+    /**
+     * 查询我的店铺各类统计数据
+     * @param userId
+     * @return
+     */
+    @GetMapping("/shopFlower/selectCountByUserId")
+    R selectCountByUserId(@RequestParam("userId") Long userId);
+
+
+    /**
+     * 创建退款订单
+     * @param comShopFlowerRefundOrderDTO
+     * @return
+     */
+    @PostMapping("/shopFlower/createRefundOrder")
+    R createRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO);
+
+    /**
+     * 分页查询
+     * @param pageComOrderRefundDTO
+     * @return
+     */
+    @PostMapping("/shopFlower/pageRefundOrder")
+    R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO);
+
+    /**
+     * 修改退款订单
+     * @param comShopFlowerRefundOrderDTO
+     * @return
+     */
+    @PostMapping("/shopFlower/updateRefundOrder")
+    R updateRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO);
+
+
+    /**
+     * 商家后台-退款申请统计
+     * @param storeId
+     * @return
+     */
+    @GetMapping("/shopFlower/selectCountGroupStatus")
+    R selectCountGroupStatus(@RequestParam("storeId") Long storeId);
+
+    /**
+     * 新增商品浏览量
+     * @param goodsId
+     * @return
+     */
+    @GetMapping("/shopFlower/incrGoodsView")
+    R incrGoodsView(@RequestParam("goodsId") Long goodsId);
+
+    /**
+     * 出入账分页
+     * @param pageComShopFlowerOrderPayDTO
+     * @return
+     */
+    @PostMapping("/shopFlower/pageOrderPay")
+    R pageOrderPay(@RequestBody PageComShopFlowerOrderPayDTO pageComShopFlowerOrderPayDTO);
+
+    /**
+     * 获取商家的营业额和可结算金额
+     * @param storeId
+     * @return
+     */
+    @GetMapping("/shopFlower/getQuota")
+    R getQuota(@RequestParam("storeId") Long storeId);
+
+    /**
+     * 取消退款
+     * @param id
+     * @return
+     */
+    @GetMapping("/shopFlower/refundOrderCancel")
+    R refundOrderCancel(@RequestParam("id") Long id);
+
+    /**
+     * 退款订单详情
+     * @param id
+     * @return
+     */
+    @GetMapping("/shopFlower/refundOrderDetail")
+    R refundOrderDetail(@RequestParam("id") Long id);
+
+    /**
+     * 清点商品 确认送达详情
+     * @param pageComFlowerOrderListDTO
+     * @return
+     */
+    @PostMapping("/shopFlower/pageOrderByDeliveryNo")
+    R pageOrderByDeliveryNo(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);
+
+    /**
+     * 商家后台经营数据统计-上
+     * @param storeId
+     * @return
+     */
+    @GetMapping("/shopFlower/selectSumOrderAndAmountByStoreId")
+    R selectSumOrderAndAmountByStoreId(@RequestParam("storeId") Long storeId);
+
+    /**
+     * 统计时间区域的订单量 15天 30天 一年
+     * @param storeId
+     * @param type
+     * @return
+     */
+    @GetMapping("/shopFlower/selectOrderLineChart") R selectOrderLineChart(@RequestParam("storeId") Long storeId,@RequestParam("type")  Integer type,@RequestParam("tab")  Integer tab);
+
+    /**
+     * 统计上架的上下架商品数量
+     * @param userId
+     * @return
+     */
+    @GetMapping("/shopFlower/countSaleByUserId")
+    R countSaleByUserId(@RequestParam("userId") Long userId);
+
+    /**
+     * 查询统计基础数据
+     * @return
+     */
+    @GetMapping("/selectBasicData")
+    R selectBasicData();
+
+    /**
+     * 统计在职干部特长
+     * @return
+     */
+    @GetMapping("/statisticsPbMemberType")
+    R statisticsPbMemberType();
+
+
+    /**
+     * 统计单位
+     * @return
+     */
+    @GetMapping("/selectUnitByNatureName")
+    R selectUnitByNatureName();
+
+    /**
+     * 大屏-社区活动分页
+     * @return
+     */
+    @PostMapping("pageActivityBigScreen")
+    R pageActivityBigScreen(@RequestBody PageBaseDTO pageBaseDTO);
+
+    /**
+     * 疫情防控 健康码统计
+     * @return
+     */
+    @GetMapping("/comActAcidRecord/selectColorMarkGroup")
+    R selectColorMarkGroup();
+
+
+    @GetMapping("easyphoto/selectStatisticsPhoto")
+    R selectStatisticsPhoto();
+
+    /**
+     * 获取商家周围 n(km)的自提点数量
+     *
+     * @param distance
+     * @return
+     */
+    @GetMapping("/convenient/point/findPointNumByDistance")
+    R findPointNumByDistance(@RequestParam("distance") Integer distance, @RequestParam("lat") String lat, @RequestParam("lng") String lng);
+
+
+    /**
+     * 普达大屏-自治动态
+     * */
+    @GetMapping("/pudaScreen/autonomyDynamic")
+    R autonomyDynamic();
+
+    /**
+     * 普达大屏-红色物业
+     * */
+    @GetMapping("/pudaScreen/propertyDynamic")
+    R propertyDynamic();
+
+    /**
+     * 普达大屏-党建数据
+     **/
+    @GetMapping("/pudaScreen/partyData")
+    R partyData();
+
+    /**
+     *
+     * 普达大屏-居民信息
+     * */
+    @GetMapping("/pudaScreen/peopleInfo")
+    R peopleInfo();
+
+
+    /**
+     * 普达大屏-小区院落
+     * */
+    @GetMapping("/pudaScreen/countryard")
+    R countryard();
+
+    /**
+     * 普达大屏-基础数据
+     * */
+    @GetMapping("/pudaScreen/basicData")
+    R basicData();
+
+    /**
+     * 普达大屏-特殊人群
+     * */
+    @GetMapping("/pudaScreen/specialPeople")
+    R specialPeople();
+
 }

--
Gitblit v1.7.1