From 9088209cdd7e3158d2a04caae05e6726ba3b3ad6 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 12 十二月 2023 18:26:17 +0800
Subject: [PATCH] Merge branch 'devPartner' of http://139.186.142.91:10010/r/productDev/parkBike into devPartner
---
server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 486f330..4724ede 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,7 +145,8 @@
* @param id
* @return
*/
- void closeGoodsorder(Goodsorder order,int type );
+ void closeGoodsorder(Goodsorder order,int type );
+ void closeGoodsorderDone(RefundNotification param);
void forceCloseGoodsorder(String orderId);
/**
@@ -183,7 +185,7 @@
List<GoodsorderExportVO> findExportAccountDetailPage(Goodsorder model);
- void goodsOrderSettlement(String orderId);
+ void goodsOrderSettlement(String memberId);
void autoCloseOrder();
}
--
Gitblit v1.9.3