From 16f0ae2b40ab76f122eb248247fd1f204c09a708 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 01 十二月 2022 09:46:15 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 189 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 176 insertions(+), 13 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 bd6807a..9d31f0c 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);
/**
* 获取商便民服务商家信息
@@ -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,17 +10992,163 @@
R wxPayFlower(@RequestBody OrderPayDTO orderPayDTO);
/**
- * 统计查询订单数量
- * @param deliveryType
- * @return
- */
- @GetMapping("/shopFlower/selectCountByDeliveryType")
- R selectCountByDeliveryType(Integer deliveryType);
-
- /**
* 获取社区动态置顶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(@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 CommonPage commonPage);
+
+
}
--
Gitblit v1.7.1