From 66c803bc7a0bafcf507be0e2f80b1eccbce9661a Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 01 九月 2025 17:00:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 93d229d..616e2c3 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,11 +1,10 @@
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.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;
@@ -14,6 +13,7 @@
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;
@@ -59,7 +59,9 @@
* @param orderSearchParams 鏌ヨ鍙傛暟
* @return 绠�鐭鍗曞垎椤�
*/
- IPage<OrderSimpleXcxVO> queryByXcxParams(OrderSearchParams orderSearchParams);
+ IPage<OrderSimpleXcxVO> queryByXcxParams(OrderSearchXcxParams orderSearchParams);
+
+ IPage<OrderSimpleXcxVO> querySupplierOrderParams(SupplierOrderSearchParams orderSearchParams);
/**
* 璁㈠崟淇℃伅
@@ -117,6 +119,7 @@
*/
OrderDetailVO queryDetail(String orderSn);
+ String sendMqMessage(String snNo);
/**
* 鍒涘缓璁㈠崟
* 1.妫�鏌ヤ氦鏄撲俊鎭�
--
Gitblit v1.8.0