From 3d6d4bf23411591bdbf923dedfcc890c5675a934 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期三, 16 十一月 2022 13:26:51 +0800
Subject: [PATCH] #feat 订单列表查询接口
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java | 117 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 90 insertions(+), 27 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
index a70aac5..59f1adb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
@@ -1,10 +1,8 @@
package com.panzhihua.service_community.api;
-import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.AddShopFlowerGoodsVO;
-import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.service.*;
import com.panzhihua.service_community.util.QRCodeUtil;
import io.swagger.annotations.ApiOperation;
@@ -24,7 +22,7 @@
// @Resource
// private ComShopOperLogService comShopOperLogService;
@Resource
- private ComShopFlowerOrderService comShopOrderService;
+ private ComShopFlowerOrderService comShopFlowerOrderService;
// @Resource
// private ComShopCartService comShopCartService;
@Resource
@@ -34,6 +32,8 @@
private ConvenientMerchantService convenientMerchantService;
@Resource
private ComShopFlowerEvaluateService comShopFlowerEvaluateService;
+ @Resource
+ private ComShopFlowerOrderDeliveryService comShopFlowerOrderDeliveryService;
/**
@@ -167,7 +167,7 @@
*/
@PostMapping("orderPreview")
public R orderPreviewFlower(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO) {
- return comShopOrderService.orderPreview(orderPreviewDTO);
+ return comShopFlowerOrderService.orderPreview(orderPreviewDTO);
}
/**
@@ -178,7 +178,7 @@
*/
@PostMapping("orderCreate")
public R orderCreateFlower(@RequestBody ComShopOrderCreateDTO orderCreateDTO) {
- return comShopOrderService.orderCreate(orderCreateDTO);
+ return comShopFlowerOrderService.orderCreate(orderCreateDTO);
}
/**
@@ -189,7 +189,7 @@
*/
@PostMapping("pageOrderList")
public R pageOrderListFlower(@RequestBody PageComFlowerOrderListDTO comOrderListDTO) {
- return comShopOrderService.pageOrderList(comOrderListDTO);
+ return comShopFlowerOrderService.pageOrderList(comOrderListDTO);
}
/**
@@ -200,7 +200,7 @@
*/
@PostMapping("orderDetail")
public R orderDetailFlower(@RequestParam("orderId") Long orderId) {
- return comShopOrderService.orderDetail(orderId);
+ return comShopFlowerOrderService.orderDetail(orderId);
}
/**
@@ -211,7 +211,7 @@
*/
@PostMapping("orderCancel")
public R orderCancelFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
- return comShopOrderService.orderCancel(comShopOrderQueryDTO);
+ return comShopFlowerOrderService.orderCancel(comShopOrderQueryDTO);
}
/**
@@ -222,7 +222,7 @@
*/
@PostMapping("orderDelete")
public R orderDeleteFlower(@RequestParam("orderId") Long orderId) {
- return comShopOrderService.orderDelete(orderId);
+ return comShopFlowerOrderService.orderDelete(orderId);
}
/**
@@ -233,7 +233,7 @@
*/
@PostMapping("orderConfirm")
public R orderConfirmFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
- return comShopOrderService.orderConfirm(comShopOrderQueryDTO.getOrderId(), comShopOrderQueryDTO.getPhone());
+ return comShopFlowerOrderService.orderConfirm(comShopOrderQueryDTO.getOrderId(), comShopOrderQueryDTO.getPhone());
}
/**
@@ -244,7 +244,7 @@
*/
@PostMapping("/order/page")
public R pageShopOrderFlower(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO) {
- return comShopOrderService.pageShopOrder(pageComShopOrderSearchDTO);
+ return comShopFlowerOrderService.pageShopOrder(pageComShopOrderSearchDTO);
}
/**
@@ -255,7 +255,7 @@
*/
@PostMapping("/shipOrder")
public R shipOrderFlower(@RequestBody ComShopOrderShipDTO orderShipDTO) {
- return comShopOrderService.shipOrder(orderShipDTO);
+ return comShopFlowerOrderService.shipOrder(orderShipDTO);
}
/**
@@ -266,7 +266,7 @@
*/
@PostMapping("/deliverOrder")
public R deliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
- return comShopOrderService.deliverOrder(deliverDTO);
+ return comShopFlowerOrderService.deliverOrder(deliverDTO);
}
/**
@@ -276,60 +276,130 @@
* @return 配送完成
*/
@PostMapping("/finishDeliverOrder")
- public R finishDeliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
- return comShopOrderService.finishDeliverOrder(deliverDTO);
+ public R finishDeliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
+ return comShopFlowerOrderService.finishDeliverOrder(deliverDTO);
}
/**
* 保存评价
+ *
* @param comShopFlowerEvaluateDTO
* @return
*/
@PostMapping("/saveEvaluate")
- public R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO){
+ public R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO) {
return comShopFlowerEvaluateService.saveEvaluate(comShopFlowerEvaluateDTO);
}
/**
* 分页查询评价
+ *
* @param pageComShopFlowerEvaluateDTO
* @return
*/
@PostMapping("/pageEvaluate")
- public R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO){
+ public R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO) {
return comShopFlowerEvaluateService.pageEvaluate(pageComShopFlowerEvaluateDTO);
}
/**
* 评价详情
+ *
* @param id
* @return
*/
@GetMapping("/detailEvaluate")
- public R detailEvaluate(@RequestParam("id") Long id){
+ public R detailEvaluate(@RequestParam("id") Long id) {
return comShopFlowerEvaluateService.detailEvaluate(id);
}
/**
* 删除评价
+ *
* @param id
* @return
*/
@DeleteMapping("deleteEvaluate")
- public R deleteEvaluate(@RequestParam("id") Long id){
+ public R deleteEvaluate(@RequestParam("id") Long id) {
return comShopFlowerEvaluateService.deleteEvaluate(id);
}
/**
* 取货码
+ *
* @param id
* @return
*/
@ApiOperation(value = "取货码")
@GetMapping("getQRCode")
- public R getQRCode(@RequestParam("id") Long id){
+ public R getQRCode(@RequestParam("id") Long id) {
return R.ok(QRCodeUtil.getBase64QRCode(id.toString()));
+ }
+
+
+ /**
+ * 保存配送单
+ *
+ * @param comShopFlowerOrderDeliveryDTO
+ */
+ @PostMapping("saveDelivery")
+ public R saveDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
+ return comShopFlowerOrderDeliveryService.saveDelivery(comShopFlowerOrderDeliveryDTO);
+ }
+
+ /**
+ * 更新配送单
+ *
+ * @param comShopFlowerOrderDeliveryDTO
+ */
+ @PostMapping("updateDelivery")
+ public R updateDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
+ return comShopFlowerOrderDeliveryService.updateDelivery(comShopFlowerOrderDeliveryDTO);
+ }
+
+ /**
+ * 已配送、已送达 分页查询
+ *
+ * @param pageComFlowerOrderDeliveryDTO
+ * @return
+ */
+ @PostMapping("pageDelivery")
+ public R pageDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO) {
+ return comShopFlowerOrderDeliveryService.pageDelivery(pageComFlowerOrderDeliveryDTO);
+ }
+
+ /**
+ * 未配送 分页查询
+ *
+ * @param pageComFlowerOrderDeliveryDTO
+ * @return
+ */
+ @PostMapping("pageNoDelivery")
+ public R pageNoDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO) {
+ return comShopFlowerOrderDeliveryService.pageNoDelivery(pageComFlowerOrderDeliveryDTO);
+ }
+
+ /**
+ * 未配送-开始配送-订单列表
+ *
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @PostMapping("pageNoDeliveryOrderList")
+ public R pageNoDeliveryOrderList(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
+ return comShopFlowerOrderDeliveryService.pageNoDeliveryOrderList(pageComFlowerOrderListDTO);
+ }
+
+ /**
+ * 根据商家id查询商家的订单
+ *
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @PostMapping("pageOrderByStoreId")
+ public R pageOrderByStoreId(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
+ return comShopFlowerOrderService.pageOrderByStoreId(pageComFlowerOrderListDTO);
}
/**
@@ -510,11 +580,4 @@
}*/
- /**
- * 保存评价
- * @return
- */
- public R saveEvaluate(){
- return R.ok();
- }
}
--
Gitblit v1.7.1