From c6d20c6e1db82b204cf59e058bc3ba2a9cd84a1e Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 24 十月 2023 09:24:17 +0800 Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev --- server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 12 +++++++----- 1 files changed, 7 insertions(+), 5 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 3906278..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 @@ -144,8 +144,8 @@ * @param id * @return */ - void closerGoodsorder(String id); - + void closeGoodsorder(Goodsorder order,int type ); + void forceCloseGoodsorder(String orderId); /** * 閫�娆� @@ -172,16 +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