From 42521c9b51c1bd9a40036f18fd610cd46601222d Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 14:45:22 +0800
Subject: [PATCH] #feat .
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 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 b5e78e7..80ee2d1 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
@@ -6580,6 +6580,14 @@
R<ConvenientMerchantVO> getUserMerchantInfoByAccount(@RequestParam("account") String account);
/**
+ * 获取用户便民服务商家详情
+ * @param account 商家绑定账号
+ * @return
+ */
+ @GetMapping("/convenient/getMerchantInfoByAccount")
+ R<ConvenientMerchantVO> getMerchantInfoByAccount(@RequestParam("account") String account);
+
+ /**
* 获取商便民服务商家信息
* @param userId
* @return
@@ -10590,7 +10598,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 +10803,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 +10983,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
@@ -11073,4 +11088,27 @@
@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);
}
--
Gitblit v1.7.1