From 05bc0e7b6898dc56f45d2ac51d770883c68dadb1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 21 二月 2025 09:00:06 +0800
Subject: [PATCH] jtt808初始化
---
server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 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..ff655b5 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;
@@ -122,9 +128,16 @@
*/
Object createGoodsOrderPay(String memberId);
+ /**
+ * 濂楅璐拱
+ * @param discountId
+ * @param memberId
+ * @return
+ */
+ Object createDiscountOrderPay(String discountId,String memberId);
/**
- * 鎶奸噾鏀粯鍥炶皟涓氬姟
+ * 鏀粯鍥炶皟涓氬姟
* @param preOrderId
* @return
*/
@@ -138,21 +151,27 @@
*/
GoodsorderDetailDTO getGoodsorderDetailDTO(String id);
-
+ Integer getVoltageStatus(Bikes bikes);
/**
- * 寮哄埗缁撶畻璁㈠崟
+ * 濂楅鍗¤鍗曡鎯�
* @param id
* @return
*/
- void closeGoodsorder(Goodsorder order,int type );
+ GoodsorderDetailVO getGoodsorderDetailForDisCount(String id);
+ /**
+ * 寮哄埗缁撶畻璁㈠崟
+ * @return
+ */
+ 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 +191,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