From 291354e580dbe8686d3d53ac69c825df75da9098 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 17 二月 2025 15:18:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 16 +++++++++++-----
1 files changed, 11 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..5ea76b3 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
@@ -12,6 +12,7 @@
import com.doumee.dao.business.web.response.HomeResponse;
import com.doumee.dao.business.web.response.GoodsorderDetailDTO;
import com.doumee.dao.business.web.response.RidesDetailResponse;
+import com.wechat.pay.java.service.refund.model.RefundNotification;
import java.math.BigDecimal;
import java.util.List;
@@ -144,8 +145,9 @@
* @param id
* @return
*/
- void closerGoodsorder(String id);
-
+ void closeGoodsorder(Goodsorder order,int type );
+ void closeGoodsorderDone(RefundNotification param);
+ void forceCloseGoodsorder(String orderId);
/**
* 閫�娆�
@@ -172,16 +174,20 @@
/**
* 楠岃瘉鏄惁涓鸿惀涓氭椂闂�
*/
- 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();
+
+ void autoCancelRefunOrder();
}
--
Gitblit v1.9.3