From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +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 | 89 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 86 insertions(+), 3 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 e5baa77..e97688b 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
@@ -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集合
@@ -10795,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取消订单
@@ -10975,6 +10992,13 @@
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
@@ -11087,5 +11111,64 @@
* @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);
+
+
}
--
Gitblit v1.7.1