Merge remote-tracking branch 'origin/user_action' into user_action

zxl

2025-10-16 d17705193d41b0e7c49da3ec8f5667668bafe5da

 seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java

@@ -8,10 +8,12 @@
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.OperationalJudgment;
import cn.lili.common.security.context.UserContext;
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.service.UserCheckTemplateService;
import cn.lili.modules.member.entity.dto.MemberAddressDTO;
import cn.lili.modules.member.service.StoreLogisticsService;
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.dto.PartDeliveryParamsDTO;
import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
@@ -20,7 +22,9 @@
import cn.lili.modules.order.order.service.OrderPriceService;
import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.system.service.LogisticsService;
import cn.lili.utils.COSUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -49,7 +53,6 @@
@RequestMapping("/store/order/order")
@Api(tags = "店铺端,订单接口")
public class OrderStoreController {

    /**
     * 订单
     */
@@ -75,11 +78,16 @@
    @Autowired
    private OrderPackageService orderPackageService;

    @Autowired
    private UserCheckTemplateService userCheckTemplateService;

    @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));
    }


@@ -90,7 +98,26 @@
    @GetMapping(value = "/{orderSn}")
    public ResultMessage<OrderDetailVO> detail(@NotNull @PathVariable String orderSn) {
        OperationalJudgment.judgment(orderService.getBySn(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);
    }

    @ApiOperation(value = "修改收货人信息")