From 15ec9481bb9768378a512530a8facb4dccdd62f6 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 18 二月 2025 14:51:07 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 7468652..452593d 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
@@ -6,12 +6,18 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.Goodsorder;
+import com.doumee.dao.business.model.MemberRides;
import com.doumee.dao.business.vo.GoodsorderExportVO;
import com.doumee.dao.business.vo.GoodsorderTotalDataVO;
+import com.doumee.dao.business.web.request.BackElecBikeRequest;
+import com.doumee.dao.business.web.request.GoodsorderBackDTO;
import com.doumee.dao.business.web.request.GoodsorderCanBanlanceDTO;
+import com.doumee.dao.business.web.response.GoodsorderDetailVO;
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 io.swagger.models.auth.In;
import java.math.BigDecimal;
import java.util.List;
@@ -138,21 +144,28 @@
*/
GoodsorderDetailDTO getGoodsorderDetailDTO(String id);
-
+ /**
+ * 濂楅鍗¤鍗曡鎯�
+ * @param id
+ * @return
+ */
+ GoodsorderDetailVO getGoodsorderDetailForDisCount(String id);
/**
* 寮哄埗缁撶畻璁㈠崟
* @param id
* @return
*/
- void closeGoodsorder(Goodsorder order,int type );
+ void closeGoodsorder(Goodsorder order,int type );
+ void dealCloseGoodsorderBiz(Goodsorder goodsorder, int type, List<MemberRides> memberRides) ;
+ void closeGoodsorderDone(RefundNotification param);
void forceCloseGoodsorder(String orderId);
/**
* 閫�娆�
* @param orderId
*/
- void backGoodsorder(String orderId, BigDecimal money ,String reason);
-
+ void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO);
+ List<MemberRides> getMemberRidesForClose(String orderid );
/**
* 鑾峰彇鍙��娆句俊鎭�
* @param orderId
@@ -186,4 +199,7 @@
void goodsOrderSettlement(String memberId);
void autoCloseOrder();
+
+ void autoCancelRefunOrder();
+
}
--
Gitblit v1.9.3