From a1a51a92fd386ff07a7f05e40076508430a3c026 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 15 十一月 2022 14:30:33 +0800
Subject: [PATCH] #feat 订单、商品、用户地址、评价 接口新增
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 206 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 206 insertions(+), 0 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 a791bf7..6d417a3 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
@@ -35,6 +35,7 @@
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO;
import com.panzhihua.common.model.vos.shop.AddShopFlowerGoodsVO;
+import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
@@ -2987,6 +2988,16 @@
*/
@GetMapping("/shopFlower/changeShopGoodsStatus")
R changeFlowerStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);
+
+ /**
+ * 修改商品状态
+ *
+ * @param goodsId
+ * @return
+ */
+ @PostMapping("/shopFlower/shopGoodsDetail")
+ R shopFlowerGoodsDetail(@RequestParam("goodsId") Long goodsId);
+
/**
@@ -10694,4 +10705,199 @@
* */
@GetMapping("comProperty/noticeList")
R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId);
+
+ /**
+ * 获取所有商品分类
+ * @return
+ */
+ @GetMapping("/goodsCategory/getAllGoodsCategories")
+ R getAllGoodsCategories();
+
+ /**
+ * 分页查询用户收货地址列表
+ *
+ * @param comShopAddressDTO
+ * 请求参数
+ * @return 用户收货地址列表
+ */
+ @PostMapping("/shopFlower/shopUserAddressList")
+ R shopFlowerUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO);
+
+ /**
+ * 用户添加收货地址
+ *
+ * @param comShopAddressDTO
+ * 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/shopFlower/shopAddUserAddress")
+ R shopFlowerAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);
+
+ /**
+ * 用户修改收货地址
+ *
+ * @param comShopAddressDTO
+ * 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/shopFlower/shopEditUserAddress")
+ R shopFlowerEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);
+
+ /**
+ * 用户删除收货地址
+ *
+ * @param addressId
+ * 收货地址id
+ * @return 删除结果
+ */
+ @PostMapping("/shopFlower/shopDelUserAddress")
+ R shopFlowerDelUserAddress(@RequestParam("addressId") Long addressId);
+
+ /**
+ * 订单预览
+ *
+ * @param orderPreviewDTO 请求参数
+ * @return 订单预览数据
+ */
+ @PostMapping("/shopFlower/orderPreview")
+ R orderPreviewFlower(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO);
+
+ /**
+ * 创建订单
+ *
+ * @param orderCreateDTO 创建订单请求参数
+ * @return 创建结果
+ */
+ @PostMapping("/shopFlower/orderCreate")
+ R orderCreateFlower(@RequestBody ComShopOrderCreateDTO orderCreateDTO);
+
+ /**
+ * 分页查询用户订单列表
+ *
+ * @param comOrderListDTO 请求参数
+ * @return 查询结果
+ */
+ @PostMapping("/shopFlower/pageOrderList")
+ R pageOrderListFlower(@RequestBody PageComFlowerOrderListDTO comOrderListDTO);
+
+ /**
+ * 根据订单id查询订单详情
+ *
+ * @param orderId 订单id
+ * @return 订单详情
+ */
+ @PostMapping("/shopFlower/orderDetail")
+ R orderDetailFlower(@RequestParam("orderId") Long orderId);
+
+ /**
+ * 根据订单id取消订单
+ *
+ * @param comShopOrderQueryDTO 请求参数
+ * @return 取消结果
+ */
+ @PostMapping("/shopFlower/orderCancel")
+ R orderCancelFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);
+
+ /**
+ * 根据订单id删除订单
+ *
+ * @param orderId 订单id
+ * @return 删除结果
+ */
+ @PostMapping("/shopFlower/orderDelete")
+ R orderDeleteFlower(@RequestParam("orderId") Long orderId);
+
+ /**
+ * 根据订单id确认收货
+ *
+ * @param comShopOrderQueryDTO 请求参数
+ * @return 确认结果
+ */
+ @PostMapping("/shopFlower/orderConfirm")
+ R orderConfirmFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);
+
+ /**
+ * 分页查询 商家订单
+ *
+ * @param pageComShopOrderSearchDTO 分页数据
+ * @return 分页订单
+ */
+ @PostMapping("/shopFlower/order/page")
+ R pageShopOrderFlower(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
+ /**
+ * 订单发货
+ *
+ * @param orderShipDTO 发货信息
+ * @return 发货结果
+ */
+ @PostMapping("/shopFlower/shipOrder")
+ R shipOrderFlower(@RequestBody ComShopOrderShipDTO orderShipDTO);
+
+ /**
+ * 订单配送
+ *
+ * @param deliverDTO 订单ID
+ * @return 配送结果
+ */
+ @PostMapping("/shopFlower/deliverOrder")
+ R deliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO);
+
+ /**
+ * 订单配送
+ *
+ * @param deliverDTO 订单ID
+ * @return 配送完成
+ */
+ @PostMapping("/shopFlower/finishDeliverOrder")
+ R finishDeliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO);
+
+ /**
+ * 获取当前商铺周围的自提点信息以及距离手机距离
+ *
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/convenient/point/findPointByMerchantId")
+ R findPointByMerchantId(@RequestParam("merchantId") Long merchantId, @RequestParam("lat") String lat, @RequestParam("lng") String lng);
+
+ /**
+ * 保存评价
+ * @param comShopFlowerEvaluateDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/saveEvaluate")
+ R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO);
+
+ /**
+ * 分页查询评价
+ * @param pageComShopFlowerEvaluateDTO
+ * @return
+ */
+ @PostMapping("/pageEvaluate")
+ R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO);
+
+ /**
+ * 评价详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/shopFlower/detailEvaluate")
+ R detailEvaluate(@RequestParam("id") Long id);
+
+ /**
+ * 删除评价
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/shopFlower/deleteEvaluate")
+ R deleteEvaluate(@RequestParam("id") Long id);
+
+ /**
+ * 取货码
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "取货码")
+ @GetMapping("/shopFlower/getQRCode")
+ R getQRCode(@RequestParam("id") Long id);
}
--
Gitblit v1.7.1