From 095eb642b440c3c3b9ed2e553a666970ac1032ab Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期三, 03 九月 2025 16:15:26 +0800 Subject: [PATCH] 用户消费金额与总订单数,按标签过滤会员,订单列表会员名称与导出 --- manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 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 6f381a0..c964d0a 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 @@ -6,7 +6,9 @@ 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.member.entity.dto.MemberAddressDTO; import cn.lili.modules.order.order.entity.dos.Order; import cn.lili.modules.order.order.entity.dto.OrderExportDTO; @@ -16,6 +18,7 @@ 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.utils.COSUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; @@ -53,16 +56,31 @@ @Autowired private OrderPackageService orderPackageService; + @Autowired + private COSUtil cosUtil; @ApiOperation(value = "鏌ヨ璁㈠崟鍒楄〃鍒嗛〉") @GetMapping public ResultMessage<IPage<OrderSimpleVO>> queryMineOrder(OrderSearchParams orderSearchParams) { - return ResultUtil.data(orderService.queryByParams(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) { + return ResultUtil.data(orderService.sendMqMessage(snNo)); } @ApiOperation(value = "鏌ヨ璁㈠崟瀵煎嚭鍒楄〃") @GetMapping("/queryExportOrder") public void queryExportOrder(OrderSearchParams orderSearchParams) { + HttpServletResponse response = ThreadContextHolder.getHttpResponse(); orderService.queryExportOrder(response,orderSearchParams); } @@ -72,7 +90,15 @@ @ApiImplicitParam(name = "orderSn", value = "璁㈠崟缂栧彿", required = true, dataType = "String", paramType = "path") @GetMapping(value = "/{orderSn}") public ResultMessage<OrderDetailVO> detail(@PathVariable String orderSn) { - return ResultUtil.data(orderService.queryDetail(orderSn)); + OrderDetailVO orderDetailVO = orderService.queryDetail(orderSn); + orderDetailVO.getOrderItems().forEach(orderItem -> { + String image = orderItem.getImage(); + if (StringUtils.isNotBlank(image)&&!image.contains("http")) { + orderItem.setImage(cosUtil.getPreviewUrl(image)); + } + }); + + return ResultUtil.data(orderDetailVO); } -- Gitblit v1.8.0