From cc3bbf14c5fde619c23e5502c8583889e94deacc Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期三, 25 十月 2023 09:58:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 6 +++--- 1 files changed, 3 insertions(+), 3 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 96bceda..7468652 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 @@ -172,18 +172,18 @@ /** * 楠岃瘉鏄惁涓鸿惀涓氭椂闂� */ - void checkBusiness(); + Boolean checkBusiness(); /** * 楠岃瘉鏄惁澶勪簬鍋滄杩愯惀鏃堕棿 */ - void checkTemporaryStop(); + Boolean checkTemporaryStop(); Goodsorder findOneByWrapper(QueryWrapper<Goodsorder> wrapper); List<GoodsorderExportVO> findExportAccountDetailPage(Goodsorder model); - void goodsOrderSettlement(String orderId); + void goodsOrderSettlement(String memberId); void autoCloseOrder(); } -- Gitblit v1.9.3