From 60f70f7409ec1ece8905e088fb43e0cb0258a70b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 19 十二月 2024 10:10:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java |   69 +++++++++++++++++++++++++++++++++-
 1 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 05397e6..fa009b9 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -8,21 +8,24 @@
 import com.ruoyi.account.api.model.UserAddress;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.PageInfo;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.order.enums.OrderStatus;
+import com.ruoyi.order.mapper.OrderMapper;
 import com.ruoyi.order.model.Order;
 import com.ruoyi.order.service.CommissionService;
 import com.ruoyi.order.service.OrderService;
-import com.ruoyi.order.vo.OrderDetailVO;
-import com.ruoyi.order.vo.OrderVO;
+import com.ruoyi.order.vo.*;
 import com.ruoyi.other.api.domain.BaseSetting;
 import com.ruoyi.other.api.feignClient.BaseSettingClient;
 import com.ruoyi.system.api.model.LoginUser;
 import io.swagger.annotations.*;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.NotBlank;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -48,6 +51,8 @@
     private CommissionService commissionService;
     @Resource
     private BaseSettingClient baseSettingClient;
+    @Resource
+    private OrderMapper orderMapper;
 
 
     /**
@@ -213,5 +218,65 @@
     }
 
 
+    @PostMapping("/byUserId")
+    public R<List<Order>> byUserId(@RequestParam("appUserId") Long appUserId){
+        return R.ok(orderService.lambdaQuery().eq(Order::getAppUserId, appUserId).list());
+    }
+    @PostMapping("/byShopId")
+    public R<List<Order>> byShopId(@RequestParam("shopId") Integer shopId){
+        return R.ok(orderService.lambdaQuery().isNotNull(Order::getEndTime).eq(Order::getShopId, shopId).groupBy(Order::getAppUserId).list());
+    }
+
+    
+    
+    
+    
+    
+    @PutMapping("/confirmDelivery/{orderId}")
+    @ApiOperation(value = "已发货操作", tags = {"管理后台-订单管理"})
+    public R confirmDelivery(@PathVariable("orderId") String orderId, String code){
+        return orderService.confirmDelivery(orderId, code);
+    }
+    
+    
+    @PutMapping("/cancelOrder/{orderId}")
+    @ApiOperation(value = "取消订单操作", tags = {"管理后台-订单管理"})
+    public R cancelOrder(@PathVariable("orderId") Long orderId){
+        return orderService.cancelOrder(orderId);
+    }
+    
+    @PutMapping("/receivingOperation/{orderId}")
+    @ApiOperation(value = "收货操作", tags = {"管理后台-订单管理"})
+    public R receivingOperation(@PathVariable("orderId") Long orderId){
+        return orderService.receivingOperation(orderId);
+    }
+    
+    
+    @GetMapping("/getOrderInfo/{orderId}")
+    @ApiOperation(value = "查询订单详情", tags = {"管理后台-订单管理"})
+    public R<OrderInfoVo> getOrderInfo(@PathVariable("orderId") Long orderId){
+        OrderInfoVo orderInfo = orderService.getOrderInfo(orderId);
+        return R.ok(orderInfo);
+    }
+    
+    
+    @GetMapping("/getOrderPageList")
+//    @ApiOperation(value = "获取订单列表", tags = {"管理后台-订单管理", "门店后台-订单管理"})
+    public R<PageInfo<OrderPageListVo>> getOrderPageList(OrderPageList orderPageList){
+        return R.ok(orderService.getOrderPageList(orderPageList));
+    }
+
+    /**
+     * 订单统计
+     */
+    @GetMapping("/getOrderStatistics")
+    @ApiOperation(value = "订单统计", tags = {"管理后台-首页统计"})
+    public R<OrderStatistics> getOrderStatistics(@RequestParam("startTime") String startTime,
+                                                 @RequestParam("endTime") String endTime){
+        OrderStatistics orderStatistics = orderMapper.getOrderStatistics(LocalDateTime.parse(startTime), LocalDateTime.parse(endTime));
+        return R.ok(orderStatistics);
+    }
+
+
 }
 

--
Gitblit v1.7.1