From 9d67b4462bf494a0b25c1b40be8198f71666131e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 二月 2025 14:39:26 +0800
Subject: [PATCH] jtt808初始化

---
 server/services/src/main/java/com/doumee/service/business/GoodsorderService.java |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 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 96bceda..d7bd238 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,17 @@
 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.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;
@@ -144,15 +149,17 @@
      * @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
@@ -172,18 +179,21 @@
     /**
      * 楠岃瘉鏄惁涓鸿惀涓氭椂闂�
      */
-    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