From cdbed525ab8395e916b2874ff9e7d59742f320b1 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期六, 11 十月 2025 17:45:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java | 81 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 79 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 db3c267..653f5c3 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,20 +2,32 @@
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.entity.UserCheckTemplate;
+import cn.lili.modules.lmk.domain.vo.OrderCountVO;
+import cn.lili.modules.lmk.domain.vo.SelectVO;
+import cn.lili.modules.lmk.service.UserCheckTemplateService;
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;
import cn.lili.modules.order.order.entity.dto.OrderSearchParams;
import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
import cn.lili.modules.order.order.entity.vo.OrderSimpleVO;
+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.entity.enums.StoreStatusEnum;
+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.*;
@@ -25,6 +37,7 @@
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -37,6 +50,8 @@
@RequestMapping("/manager/order/order")
@Api(tags = "绠＄悊绔�,璁㈠崟API")
public class OrderManagerController {
+ @Autowired
+ private StoreMapper storeMapper;
/**
* 璁㈠崟
@@ -49,16 +64,55 @@
@Autowired
private OrderPriceService orderPriceService;
+ @Autowired
+ private OrderPackageService orderPackageService;
+
+ @Autowired
+ private COSUtil cosUtil;
+ @Autowired
+ private UserCheckTemplateService userCheckTemplateService;
+
+ @ApiModelProperty(value = "搴楅摵涓嬫媺")
+ @GetMapping("/storeSelect")
+ public ResultMessage<List<SelectVO>> getStoreSelect(){
+ List<Store> storeList =
+ new LambdaQueryChainWrapper<>(storeMapper)
+ .eq(Store::getDeleteFlag,Boolean.FALSE)
+ .eq(Store::getStoreDisable, StoreStatusEnum.OPEN.name())
+ .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) {
- 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);
}
@@ -68,7 +122,26 @@
@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));
+ }
+ });
+
+
+ List<UserCheckTemplate> list = new LambdaQueryChainWrapper<>(userCheckTemplateService.getBaseMapper())
+ .eq(UserCheckTemplate::getOrderSn, orderSn)
+ .eq(UserCheckTemplate::getDeleteFlag, Boolean.FALSE)
+ .list();
+ for (UserCheckTemplate userCheckTemplate : list) {
+ if (StringUtils.isNotBlank(userCheckTemplate.getContent()) && userCheckTemplate.getContent().startsWith("image")){
+ userCheckTemplate.setContent(cosUtil.getPreviewUrl(userCheckTemplate.getContent()));
+ }
+ }
+ orderDetailVO.setUserCheckTemplates(list);
+ return ResultUtil.data(orderDetailVO);
}
@@ -128,6 +201,10 @@
return ResultUtil.data(orderService.getTraces(orderSn));
}
+ @GetMapping(value = "/getPackage/{orderSn}")
+ public ResultMessage<Object> getPackage(@NotBlank(message = "璁㈠崟缂栧彿涓嶈兘涓虹┖") @PathVariable String orderSn) {
+ return ResultUtil.data(orderPackageService.getOrderPackageVOList(orderSn));
+ }
@ApiOperation(value = "鍗栧璁㈠崟澶囨敞")
@PutMapping("/{orderSn}/sellerRemark")
public ResultMessage<Object> sellerRemark(@PathVariable String orderSn, @RequestParam String sellerRemark) {
--
Gitblit v1.8.0