From a8e38a794fa221d25b4b5d1d47f131419add63e4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十月 2023 18:16:24 +0800
Subject: [PATCH] aa

---
 server/services/src/main/java/com/doumee/service/business/GoodsorderService.java |   19 ++++++++++++++-----
 1 files changed, 14 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 213dd1d..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
@@ -8,6 +8,7 @@
 import com.doumee.dao.business.model.Goodsorder;
 import com.doumee.dao.business.vo.GoodsorderExportVO;
 import com.doumee.dao.business.vo.GoodsorderTotalDataVO;
+import com.doumee.dao.business.web.request.GoodsorderCanBanlanceDTO;
 import com.doumee.dao.business.web.response.HomeResponse;
 import com.doumee.dao.business.web.response.GoodsorderDetailDTO;
 import com.doumee.dao.business.web.response.RidesDetailResponse;
@@ -143,14 +144,20 @@
      * @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);
+
+    /**
+     * 鑾峰彇鍙��娆句俊鎭�
+     * @param orderId
+     */
+    GoodsorderCanBanlanceDTO getGoodsorderCanBanlanceDTO(String orderId);
 
 
     /**
@@ -165,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