From fceab50a74c8300d142b50a6f7630085f846a1c2 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 07 二月 2023 17:36:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 114 insertions(+), 2 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 6628d96..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
@@ -3521,6 +3521,15 @@
R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
/**
+ * 统计大屏查询清单列表
+ *
+ * @param comActNeighborCircleAdminDTO
+ * 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("/neighbor/pageNeighborByBigScreen")
+ R pageNeighborByBigScreen(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
+ /**
* 后台修改邻里圈
*
* @param editNeighborCircleAdminVO
@@ -10803,7 +10812,7 @@
* @return 订单详情
*/
@GetMapping("/shopFlower/orderDetail")
- R orderDetailFlower(@RequestParam("orderId") Long orderId);
+ R orderDetailFlower(@RequestParam("orderId") Long orderId,@RequestParam(value = "phone",required = false) String phone);
/**
* 根据订单id取消订单
@@ -11102,5 +11111,108 @@
* @param type
* @return
*/
- @GetMapping("/shopFlower/selectOrderLineChart") R selectOrderLineChart(@RequestParam("storeId") Long storeId,@RequestParam("type") Integer type);
+ @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