From 4f97bdbaadcdc19df9dfb0971b930d799c4aeddc Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期四, 13 三月 2025 14:52:26 +0800
Subject: [PATCH] 迭代版本：2.28
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
index 9233416..e2f5c92 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
@@ -6,8 +6,7 @@
import com.ruoyi.order.model.Order;
import com.ruoyi.order.util.payment.model.RefundCallbackResult;
import com.ruoyi.order.vo.*;
-import org.omg.CORBA.INTERNAL;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -26,7 +25,7 @@
boolean check(Order order, Integer shopId, Long userId);
- void writeOff(String code,Integer shopId);
+ void writeOff(String id,Integer shopId, String technicianId);
/**
@@ -37,6 +36,13 @@
PageInfo<OrderPageListVo> getOrderPageList(OrderPageList orderPageList);
/**
+ * 获取导出订单列表数据
+ */
+ List<OrderExport> getOrderExportList(OrderPageList orderPageList);
+
+
+
+ /**
* 小程序取消订单
* @param orderId
* @return
@@ -45,11 +51,9 @@
/**
* 确认发货操作
- * @param orderId
- * @param code
* @return
*/
- R confirmDelivery(Long orderId, String code);
+ R confirmDelivery(ConfirmDelivery confirmDelivery);
/**
@@ -100,7 +104,7 @@
* @param goodsId
* @return
*/
- Integer getGoodsSaleNum(Integer goodsId, Integer type);
+ Integer getGoodsSaleNum(Integer goodsId, Integer type, Long userId);
/**
@@ -110,4 +114,16 @@
* @return
*/
Integer getShopSaleNum(Integer shopId, Integer type);
+
+ /**
+ * 定时查询快递信息
+ */
+ void taskExpress();
+
+ /**
+ * 导入物流信息
+ */
+ void importExpress(String url);
+
+ Integer getShopSaleNumByShopIds(List<Integer> shopIds, Integer type);
}
--
Gitblit v1.7.1