From f20015f5b2a2ac70dcb640d524196efe2c6786d3 Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期一, 01 九月 2025 17:14:40 +0800 Subject: [PATCH] 复用问题,以及订单列表页面相关信息新增 --- framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java index 00be1e0..bb6a433 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java +++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java @@ -1,19 +1,19 @@ package cn.lili.modules.order.order.service; +import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dto.MemberAddressDTO; import cn.lili.modules.order.cart.entity.dto.TradeDTO; 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.OrderMessage; -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.dto.*; import cn.lili.modules.order.order.entity.vo.OrderDetailVO; import cn.lili.modules.order.order.entity.vo.OrderSimpleVO; +import cn.lili.modules.order.order.entity.vo.OrderSimpleXcxVO; import cn.lili.modules.order.order.entity.vo.PaymentLog; import cn.lili.modules.system.entity.vo.Traces; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; @@ -52,7 +52,16 @@ * @param orderSearchParams 鏌ヨ鍙傛暟 * @return 绠�鐭鍗曞垎椤� */ - IPage<OrderSimpleVO> queryByParams(OrderSearchParams orderSearchParams); + IPage<OrderSimpleVO> queryByParams(OrderSearchParams orderSearchParams,Boolean needHide); + /** + * 璁㈠崟鏌ヨ + * + * @param orderSearchParams 鏌ヨ鍙傛暟 + * @return 绠�鐭鍗曞垎椤� + */ + IPage<OrderSimpleXcxVO> queryByXcxParams(OrderSearchXcxParams orderSearchParams); + + IPage<OrderSimpleXcxVO> querySupplierOrderParams(SupplierOrderSearchParams orderSearchParams); /** * 璁㈠崟淇℃伅 @@ -110,6 +119,7 @@ */ OrderDetailVO queryDetail(String orderSn); + String sendMqMessage(String snNo); /** * 鍒涘缓璁㈠崟 * 1.妫�鏌ヤ氦鏄撲俊鎭� -- Gitblit v1.8.0