From a9f49eed5a1056e3968764ba5668c008c679d34d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 15:44:12 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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..5777cc5 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
@@ -26,7 +26,7 @@
boolean check(Order order, Integer shopId, Long userId);
- void writeOff(String code,Integer shopId);
+ void writeOff(String id,Integer shopId, String technicianId);
/**
@@ -45,11 +45,9 @@
/**
* 确认发货操作
- * @param orderId
- * @param code
* @return
*/
- R confirmDelivery(Long orderId, String code);
+ R confirmDelivery(ConfirmDelivery confirmDelivery);
/**
@@ -100,7 +98,7 @@
* @param goodsId
* @return
*/
- Integer getGoodsSaleNum(Integer goodsId, Integer type);
+ Integer getGoodsSaleNum(Integer goodsId, Integer type, Long userId);
/**
@@ -110,4 +108,9 @@
* @return
*/
Integer getShopSaleNum(Integer shopId, Integer type);
+
+ /**
+ * 定时查询快递信息
+ */
+ void taskExpress();
}
--
Gitblit v1.7.1