From 933c5dd8ed6715290c6863a8a8d2797582f62af7 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 22 九月 2025 15:28:39 +0800
Subject: [PATCH] 调整订单页面，以及新增pvuv，订单统计接口
---
manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java b/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java
index f915edd..baa5e71 100644
--- a/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java
@@ -2,12 +2,15 @@
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.NumberUtil;
+import cn.lili.base.Result;
import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
import cn.lili.common.context.ThreadContextHolder;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.ResultMessage;
+import cn.lili.modules.lmk.domain.vo.OrderCountVO;
+import cn.lili.modules.lmk.domain.vo.SelectVO;
import cn.lili.modules.member.entity.dto.MemberAddressDTO;
import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dto.OrderExportDTO;
@@ -17,8 +20,11 @@
import cn.lili.modules.order.order.service.OrderPackageService;
import cn.lili.modules.order.order.service.OrderPriceService;
import cn.lili.modules.order.order.service.OrderService;
+import cn.lili.modules.store.entity.dos.Store;
+import cn.lili.modules.store.mapper.StoreMapper;
import cn.lili.utils.COSUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -28,6 +34,7 @@
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -40,6 +47,8 @@
@RequestMapping("/manager/order/order")
@Api(tags = "绠＄悊绔�,璁㈠崟API")
public class OrderManagerController {
+ @Autowired
+ private StoreMapper storeMapper;
/**
* 璁㈠崟
@@ -58,12 +67,36 @@
@Autowired
private COSUtil cosUtil;
+ @ApiModelProperty(value = "搴楅摵涓嬫媺")
+ @GetMapping("/storeSelect")
+ public ResultMessage<List<SelectVO>> getStoreSelect(){
+ List<Store> storeList =
+ new LambdaQueryChainWrapper<>(storeMapper)
+ .eq(Store::getDeleteFlag,Boolean.FALSE)
+ .list();
+ List<SelectVO> selectVOS = new ArrayList<>();
+ for (Store store : storeList){
+ SelectVO vo = new SelectVO();
+ vo.setId(store.getId());
+ vo.setLabel(store.getStoreName());
+ selectVOS.add(vo);
+ }
+ return ResultUtil.data(selectVOS);
+
+ }
+
@ApiOperation(value = "鏌ヨ璁㈠崟鍒楄〃鍒嗛〉")
@GetMapping
public ResultMessage<IPage<OrderSimpleVO>> queryMineOrder(OrderSearchParams orderSearchParams) {
Boolean needHide = true;
return ResultUtil.data(orderService.queryByParams(orderSearchParams,needHide));
}
+ @ApiOperation(value = "鏌ヨ璁㈠崟骞剁粺璁￠噾棰濅笌璁㈠崟鏁�")
+ @GetMapping("/countOrder/{id}")
+ public ResultMessage<OrderCountVO> countByIdOrder(@PathVariable("id") String id){
+ return ResultUtil.data(orderService.countByIdOrder(id));
+ }
+
@ApiOperation(value = "鏇存柊璁㈠崟鐘舵��")
@GetMapping("/sendMessage/{snNo}")
public ResultMessage<String> sendMqMessage(@PathVariable String snNo) {
--
Gitblit v1.8.0