From eb7a808aaf7dd0a6dd2ff70f9ef3f8ce0b1e31d1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 22 五月 2026 18:27:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/service/business/OrdersService.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/OrdersService.java b/server/services/src/main/java/com/doumee/service/business/OrdersService.java
index faf1a71..340440b 100644
--- a/server/services/src/main/java/com/doumee/service/business/OrdersService.java
+++ b/server/services/src/main/java/com/doumee/service/business/OrdersService.java
@@ -3,9 +3,12 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Orders;
+import com.doumee.dao.business.model.OrdersRefund;
import com.doumee.dao.dto.CalculateLocalPriceDTO;
import com.doumee.dao.dto.CalculateRemotePriceDTO;
import com.doumee.dao.dto.CreateOrderDTO;
+import com.doumee.dao.dto.HandleOrderExceptionDTO;
+import com.doumee.dao.dto.ManualRefundDTO;
import com.doumee.dao.dto.DispatchDTO;
import com.doumee.dao.dto.CommentOrderDTO;
import com.doumee.dao.dto.MyOrderDTO;
@@ -210,17 +213,17 @@
BigDecimal calculateInsuranceFee(BigDecimal declaredValue);
/**
- * 璁＄畻灏卞湴瀛樺彇棰勪及璐圭敤
+ * 璁＄畻灏卞湴瀵勫瓨棰勪及璐圭敤
*
- * @param dto 灏卞湴瀛樺彇璁′环璇锋眰鍙傛暟
+ * @param dto 灏卞湴瀵勫瓨璁′环璇锋眰鍙傛暟
* @return 浠锋牸璁＄畻缁撴灉
*/
PriceCalculateVO calculateLocalPrice(CalculateLocalPriceDTO dto);
/**
- * 璁＄畻寮傚湴瀛樺彇棰勪及璐圭敤
+ * 璁＄畻鍚屽煄瀵勯�侀浼拌垂鐢�
*
- * @param dto 寮傚湴瀛樺彇璁′环璇锋眰鍙傛暟
+ * @param dto 鍚屽煄瀵勯�佽浠疯姹傚弬鏁�
* @return 浠锋牸璁＄畻缁撴灉
*/
PriceCalculateVO calculateRemotePrice(CalculateRemotePriceDTO dto);
@@ -359,6 +362,16 @@
void settleOrders();
/**
+ * 鎵嬪姩閫�娆�
+ */
+ void manualRefund(ManualRefundDTO dto, Integer userId);
+
+ /**
+ * 澶勭悊鎵嬪姩閫�娆剧殑鎵ｆ閫昏緫锛堥��娆惧洖璋冩垚鍔熸椂璋冪敤锛�
+ */
+ void processManualRefundCallback(OrdersRefund refundRecord);
+
+ /**
* 璁㈠崟璇勪环
* status=7涓攃ommentStatus=0鏃跺彲璇勪环锛屾寜瀵硅薄锛堝瓨浠堕棬搴�/鍙栦欢闂ㄥ簵/鍙告満锛夊垎鍒褰曡瘎鍒�
*
@@ -438,6 +451,11 @@
int notifyArrivalPickUp();
/**
+ * 璁㈠崟寮傚父澶勭悊锛氬紓鍦版棤鍙栦欢闂ㄥ簵宸查�佽揪璁㈠崟锛屽垱寤哄氨鍦板瘎瀛樻柊璁㈠崟
+ */
+ void handleOrderException(HandleOrderExceptionDTO dto);
+
+ /**
* 鏍￠獙鎿嶄綔鍗婂緞
* @param orderId 璁㈠崟涓婚敭
* @param userId 鎿嶄綔鐢ㄦ埛涓婚敭
@@ -448,4 +466,5 @@
*/
Boolean checkOperationRadius(Integer orderId, Integer userId, Integer userType, Double lng, Double lat);
+ ManualRefundDetailVO getManualRefundDetail(Integer orderId);
}
\ No newline at end of file
--
Gitblit v1.9.3