From 1147614053efae0314a36c15293a6a5ed4e6d737 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 21 二月 2025 11:28:02 +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 | 2 ++ 1 files changed, 2 insertions(+), 0 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 ff655b5..91f0931 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 @@ -5,6 +5,7 @@ import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.dao.business.model.Bikes; +import com.doumee.dao.business.model.DiscountMember; import com.doumee.dao.business.model.Goodsorder; import com.doumee.dao.business.model.MemberRides; import com.doumee.dao.business.vo.GoodsorderExportVO; @@ -208,4 +209,5 @@ void autoCancelRefunOrder(); + DiscountMember getUseDiscount(String memberId, Integer driveTime); } -- Gitblit v1.9.3