From 69283b5a4559509187516355602e32e4bdac9d5d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 二月 2025 11:54:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java b/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
index 91f0931..9a570bf 100644
--- a/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
+++ b/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
@@ -209,5 +209,7 @@
void autoCancelRefunOrder();
- DiscountMember getUseDiscount(String memberId, Integer driveTime);
+ DiscountMember getUseDiscount(String memberId, Integer driveTime,Integer type);
+
+ void autCancel();
}
--
Gitblit v1.9.3