From c5fa5bec9805565103bb27069148a11a80dba7a1 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 17:19:08 +0800
Subject: [PATCH] #feat 路径添加
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 89 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 85 insertions(+), 4 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 6d417a3..7bab635 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
@@ -6541,6 +6541,14 @@
R getMerchant(@RequestParam("merchantId") Long merchantId);
/**
+ * 获取便民服务商家详情
+ * @param userId
+ * @return
+ */
+ @GetMapping("/convenient/merchant/getMerchantByUserId")
+ R getMerchantByUserId(@RequestParam("userId") Long userId);
+
+ /**
* 禁用/启用便民服务商家
* @param disableOrEnableConvenientMerchantDTO
* @return
@@ -10643,7 +10651,7 @@
* @param operator
* @return
*/
- @DeleteMapping("/point/delete")
+ @DeleteMapping("/convenient/point/delete")
R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator);
/**
@@ -10651,7 +10659,7 @@
* @param pointId
* @return
*/
- @GetMapping("/point/detail")
+ @GetMapping("/convenient/point/detail")
R detailPoint(@RequestParam("pointId") Long pointId);
/**
@@ -10691,7 +10699,7 @@
* @param pageConvenientGoodsCategoryDTO
* @return
*/
- @PostMapping("/goodsCategory/page")
+ @PostMapping("/convenient/goodsCategory/page")
R pageGoodsCategory(@RequestBody PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO);
@GetMapping("/dataCount")
@@ -10710,7 +10718,7 @@
* 获取所有商品分类
* @return
*/
- @GetMapping("/goodsCategory/getAllGoodsCategories")
+ @GetMapping("/convenient/goodsCategory/getAllGoodsCategories")
R getAllGoodsCategories();
/**
@@ -10900,4 +10908,77 @@
@ApiOperation(value = "取货码")
@GetMapping("/shopFlower/getQRCode")
R getQRCode(@RequestParam("id") Long id);
+
+ /**
+ * 保存配送单
+ * @param comShopFlowerOrderDeliveryDTO
+ */
+ @PostMapping("/shopFlower/saveDelivery")
+ R saveDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO);
+
+ /**
+ * 更新配送单
+ * @param comShopFlowerOrderDeliveryDTO
+ */
+ @PostMapping("/shopFlower/updateDelivery")
+ R updateDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO);
+
+ /**
+ * 已配送、已送达 分页查询
+ * @param pageComFlowerOrderDeliveryDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageDelivery")
+ R pageDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO);
+
+ /**
+ * 未配送 分页查询
+ * @param pageComFlowerOrderDeliveryDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageNoDelivery")
+ R pageNoDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO);
+
+ /**
+ * 未配送-开始配送-订单列表
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageNoDeliveryOrderList")
+ R pageNoDeliveryOrderList(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);
+
+ /**
+ * 根据商家id查询商家的订单
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageOrderByStoreId")
+ R pageOrderByStoreId(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);
+
+ /**
+ * 微信支付订单回调
+ *
+ * @param wxPayNotifyOrderDTO
+ * 订单支付回调参数
+ */
+ @PostMapping("/shopFlower/wxOrderPayNotify")
+ void wxOrderPayNotifyFlower(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO);
+
+ /**
+ * 点击去支付订单
+ *
+ * @param orderPayDTO
+ * 请求参数
+ * @return 支付对象
+ */
+ @PostMapping("/shopFlower/wxPay")
+ R wxPayFlower(@RequestBody OrderPayDTO orderPayDTO);
+
+ /**
+ * 统计查询订单数量
+ * @param deliveryType
+ * @return
+ */
+ @GetMapping("/shopFlower/selectCountByDeliveryType")
+ R selectCountByDeliveryType(Integer deliveryType);
}
--
Gitblit v1.7.1