From 99f77c0fd2ee8ed8840be5e5f99309b184a09e9f Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:27:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
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