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/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java |   87 ++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 81 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
index fc1db3b..65d69d6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
@@ -4,6 +4,7 @@
 import com.panzhihua.common.model.dtos.shop.*;
 import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
 import com.panzhihua.common.model.vos.shop.*;
 import com.panzhihua.common.service.community.CommunityService;
 import io.swagger.annotations.Api;
@@ -200,60 +201,134 @@
 
     /**
      * 保存评价
+     *
      * @param comShopFlowerEvaluateDTO
      * @return
      */
     @ApiOperation(value = "保存评价")
     @PostMapping("/saveEvaluate")
-    public R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO){
+    public R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO) {
         return communityService.saveEvaluate(comShopFlowerEvaluateDTO);
     }
 
     /**
      * 分页查询评价
+     *
      * @param pageComShopFlowerEvaluateDTO
      * @return
      */
-    @ApiOperation(value = "分页查询评价",response = ComShopFlowerEvaluateVO.class)
+    @ApiOperation(value = "分页查询评价", response = ComShopFlowerEvaluateVO.class)
     @PostMapping("/pageEvaluate")
-    public R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO){
+    public R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO) {
         return communityService.pageEvaluate(pageComShopFlowerEvaluateDTO);
     }
 
     /**
      * 评价详情
+     *
      * @param id
      * @return
      */
     @ApiOperation(value = "评价详情")
     @GetMapping("/detailEvaluate")
-    public R detailEvaluate(@RequestParam("id") Long id){
+    public R detailEvaluate(@RequestParam("id") Long id) {
         return communityService.detailEvaluate(id);
     }
 
     /**
      * 删除评价
+     *
      * @param id
      * @return
      */
     @ApiOperation(value = "删除评价")
     @DeleteMapping("deleteEvaluate")
-    public R deleteEvaluate(@RequestParam("id") Long id){
+    public R deleteEvaluate(@RequestParam("id") Long id) {
         return communityService.deleteEvaluate(id);
     }
 
     /**
      * 取货码
+     *
      * @param orderId
      * @return
      */
     @ApiOperation(value = "取货码")
     @GetMapping("getQRCode")
     @ApiImplicitParam(name = "orderId", value = "订单id", required = true)
-    public R getQRCode(@RequestParam("orderId") Long orderId){
+    public R getQRCode(@RequestParam("orderId") Long orderId) {
         return communityService.getQRCode(orderId);
     }
 
+    /**
+     * 保存配送单
+     *
+     * @param comShopFlowerOrderDeliveryDTO
+     */
+    @PostMapping("saveDelivery")
+    @ApiOperation(value = "保存配送单")
+    public R saveDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
+        return communityService.saveDelivery(comShopFlowerOrderDeliveryDTO);
+    }
+
+    /**
+     * 更新配送单
+     *
+     * @param comShopFlowerOrderDeliveryDTO
+     */
+    @PostMapping("updateDelivery")
+    @ApiOperation(value = "更新配送单")
+    public R updateDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
+        return communityService.updateDelivery(comShopFlowerOrderDeliveryDTO);
+    }
+
+    /**
+     * 已配送、已送达 分页查询
+     *
+     * @param pageComFlowerOrderDeliveryDTO
+     * @return
+     */
+    @PostMapping("pageDelivery")
+    @ApiOperation(value = "已配送、已送达 分页查询", response = ComShopFlowerOrderDeliveryVO.class)
+    public R pageDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO) {
+        return communityService.pageDelivery(pageComFlowerOrderDeliveryDTO);
+    }
+
+    /**
+     * 未配送 分页查询
+     *
+     * @param pageComFlowerOrderDeliveryDTO
+     * @return
+     */
+    @ApiOperation(value = "未配送 分页查询", response = ConvenientElevatingPointVO.class)
+    @PostMapping("pageNoDelivery")
+    public R pageNoDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO) {
+        return communityService.pageNoDelivery(pageComFlowerOrderDeliveryDTO);
+    }
+
+    /**
+     * 未配送-开始配送-订单列表
+     *
+     * @param pageComFlowerOrderListDTO
+     * @return
+     */
+    @ApiOperation(value = "未配送-开始配送-订单列表", response = ComShopFlowerOrderPageVO.class)
+    @PostMapping("pageNoDeliveryOrderList")
+    public R pageNoDeliveryOrderList(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
+        return communityService.pageNoDeliveryOrderList(pageComFlowerOrderListDTO);
+    }
+
+    /**
+     * 根据商家id查询商家的订单
+     *
+     * @param pageComFlowerOrderListDTO
+     * @return
+     */
+    @ApiOperation(value = "根据商家id分页查询商家的订单", response = ComShopFlowerOrderStoreListVO.class)
+    @PostMapping("pageOrderByStoreId")
+    public R pageOrderByStoreId(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
+        return communityService.pageOrderByStoreId(pageComFlowerOrderListDTO);
+    }
 
 
 }

--
Gitblit v1.7.1