From 626741ec94f3a30cdd5f6221831596c09aa5de8d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 17 十月 2023 09:41:42 +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 af806e8..486f330 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,14 +144,14 @@
* @param id
* @return
*/
- void closerGoodsorder(String id);
-
+ void closeGoodsorder(Goodsorder order,int type );
+ void forceCloseGoodsorder(String orderId);
/**
* 閫�娆�
* @param orderId
*/
- void backGoodsorder(String orderId, BigDecimal money);
+ void backGoodsorder(String orderId, BigDecimal money ,String reason);
/**
* 鑾峰彇鍙��娆句俊鎭�
@@ -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 autoCloseOrder();
}
--
Gitblit v1.9.3