From 7ee466ebc953bb5640bcf42f2b8e2a87aa471c21 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 15 四月 2026 20:12:21 +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 | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 164 insertions(+), 0 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 c33fe57..cb9f676 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,7 +3,21 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Orders;
+import com.doumee.dao.dto.CalculateLocalPriceDTO;
+import com.doumee.dao.dto.CalculateRemotePriceDTO;
+import com.doumee.dao.dto.CreateOrderDTO;
+import com.doumee.dao.dto.DispatchDTO;
+import com.doumee.dao.dto.MyOrderDTO;
+import com.doumee.dao.vo.MyOrderDetailVO;
+import com.doumee.dao.vo.MyOrderVO;
+import com.doumee.dao.vo.OrderDetailVO;
+import com.doumee.dao.vo.OrderDispatchVO;
+import com.doumee.dao.vo.OrderSummaryVO;
+import com.doumee.dao.vo.OverdueFeeVO;
+import com.doumee.dao.vo.PayResponse;
+import com.doumee.dao.vo.PriceCalculateVO;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -96,4 +110,154 @@
*/
long count(Orders orders);
+ /**
+ * 鏌ヨ璁㈠崟璇︽儏
+ *
+ * @param id 涓婚敭
+ * @return OrderDetailVO
+ */
+ OrderDetailVO findDetail(Integer id);
+
+ /**
+ * 浼氬憳绔鍗曡鎯�
+ *
+ * @param id 璁㈠崟涓婚敭
+ * @param memberId 浼氬憳涓婚敭
+ * @return MyOrderDetailVO
+ */
+ MyOrderDetailVO findMyOrderDetail(Integer id, Integer memberId);
+
+ /**
+ * 浼氬憳鍙栨秷璁㈠崟锛堜粎寮傚湴瀵勫瓨锛�
+ *
+ * @param orderId 璁㈠崟涓婚敭
+ * @param memberId 浼氬憳涓婚敭
+ * @param reason 鍙栨秷鍘熷洜
+ */
+ void cancelOrder(Integer orderId, Integer memberId, String reason);
+
+ /**
+ * 瀵勫瓨璁㈠崟鏀粯鍥炶皟澶勭悊
+ *
+ * @param outTradeNo 鍟嗘埛璁㈠崟鍙�
+ * @param wxTradeNo 寰俊璁㈠崟鍙�
+ */
+ void handleStorageOrderPayNotify(String outTradeNo, String wxTradeNo);
+
+ /**
+ * 闂ㄥ簵鏍搁攢鏀朵欢
+ *
+ * @param verifyCode 鏍搁攢鐮�
+ * @param shopId 闂ㄥ簵涓婚敭
+ * @param images 鍥剧墖鍦板潃鍒楄〃锛堟渶澶�3寮狅級
+ * @param remark 澶囨敞
+ */
+ void shopVerifyOrder(String verifyCode, Integer shopId, List<String> images, String remark);
+
+ /**
+ * 闂ㄥ簵绔煡璇㈣鍗曡鎯�
+ * 鏀寔鎸夎鍗曚富閿垨鏍搁攢鐮佹煡璇紝澶嶇敤浼氬憳绔鎯呴�昏緫
+ *
+ * @param orderId 璁㈠崟涓婚敭锛堜笌verifyCode浜岄�変竴锛�
+ * @param verifyCode 鏍搁攢鐮侊紙涓巓rderId浜岄�変竴锛�
+ * @return 璁㈠崟璇︽儏
+ */
+ MyOrderDetailVO findShopOrderDetail(Integer orderId, String verifyCode);
+
+ /**
+ * 鏌ヨ鎵嬪姩娲惧崟淇℃伅
+ *
+ * @param id 璁㈠崟涓婚敭
+ * @return OrderDispatchVO
+ */
+ OrderDispatchVO findDispatchInfo(Integer id);
+
+ /**
+ * 璁㈠崟娲惧崟
+ *
+ * @param dto 娲惧崟鍙傛暟
+ */
+ void dispatch(DispatchDTO dto);
+
+ /**
+ * 鏍规嵁鍒嗛〉鏌ヨ鏉′欢缁熻璁㈠崟姹囨��
+ *
+ * @param pageWrap 鍒嗛〉鏌ヨ鏉′欢
+ * @return OrderSummaryVO
+ */
+ OrderSummaryVO findSummary(PageWrap<Orders> pageWrap);
+
+ /**
+ * 璁＄畻淇濅环璐圭敤
+ * @param declaredValue 鎶ヤ环閲戦
+ * @return 淇濅环璐圭敤
+ */
+ BigDecimal calculateInsuranceFee(BigDecimal declaredValue);
+
+ /**
+ * 璁＄畻灏卞湴瀛樺彇棰勪及璐圭敤
+ * @param dto 灏卞湴瀛樺彇璁′环璇锋眰鍙傛暟
+ * @return 浠锋牸璁＄畻缁撴灉
+ */
+ PriceCalculateVO calculateLocalPrice(CalculateLocalPriceDTO dto);
+
+ /**
+ * 璁＄畻寮傚湴瀛樺彇棰勪及璐圭敤
+ * @param dto 寮傚湴瀛樺彇璁′环璇锋眰鍙傛暟
+ * @return 浠锋牸璁＄畻缁撴灉
+ */
+ PriceCalculateVO calculateRemotePrice(CalculateRemotePriceDTO dto);
+
+ /**
+ * 鍒涘缓璁㈠崟骞跺敜璧峰井淇℃敮浠�
+ * @param dto 鍒涘缓璁㈠崟璇锋眰鍙傛暟
+ * @param memberId 褰撳墠鐧诲綍浼氬憳ID
+ * @return 鏀粯鍝嶅簲
+ */
+ PayResponse createOrder(CreateOrderDTO dto, Integer memberId);
+
+ /**
+ * 缁х画鏀粯锛堝緟鏀粯璁㈠崟閲嶆柊鍞よ捣寰俊鏀粯锛�
+ * @param orderId 璁㈠崟涓婚敭
+ * @param memberId 褰撳墠鐧诲綍浼氬憳ID
+ * @return 鏀粯鍝嶅簲
+ */
+ PayResponse continuePay(Integer orderId, Integer memberId);
+
+ /**
+ * 灏忕▼搴忕-鏌ヨ鎴戠殑璁㈠崟鍒嗛〉
+ * @param pageWrap 鍒嗛〉鏌ヨ鍙傛暟锛坢odel鍚玸tatus锛�
+ * @param memberId 浼氬憳涓婚敭
+ * @return 鍒嗛〉缁撴灉
+ */
+ PageData<MyOrderVO> findMyOrderPage(PageWrap<MyOrderDTO> pageWrap, Integer memberId);
+
+ /**
+ * 鏌ヨ璁㈠崟瓒呮椂璐圭敤
+ * @param orderId 璁㈠崟涓婚敭
+ * @return 瓒呮椂璐圭敤璁＄畻缁撴灉
+ */
+ OverdueFeeVO calculateOverdueFee(Integer orderId);
+
+ /**
+ * 鍙告満鏍搁攢锛堝紓鍦板瘎瀛樹笖鏈夊彇浠堕棬搴楋級
+ * 娲鹃�佷腑(4) 鈫� 宸插埌搴�(5)锛屾牎楠屽徃鏈烘牳閿�鐮�
+ *
+ * @param verifyCode 鍙告満鏍搁攢鐮�
+ * @param images 鍥剧墖鍦板潃鍒楄〃锛堟渶澶�3寮狅級
+ * @param remark 澶囨敞
+ * @param driverId 鍙告満锛堜細鍛橈級涓婚敭
+ */
+ void driverVerifyOrder(String verifyCode, List<String> images, String remark, Integer driverId);
+
+ /**
+ * 纭椤惧宸插埌搴�
+ * 灏卞湴瀵勫瓨/寮傚湴瀵勫瓨锛屼笖瀛樺湪鍙栦欢闂ㄥ簵锛岀姸鎬佷负寰呭彇浠�(5)
+ * 妫�鏌ラ�炬湡鐘舵�侊細閫炬湡鍒欐爣璁伴�炬湡锛屾湭閫炬湡鍒欏畬鎴愯鍗�
+ *
+ * @param orderId 璁㈠崟涓婚敭
+ * @param shopId 褰撳墠鎿嶄綔闂ㄥ簵涓婚敭
+ */
+ void confirmCustomerArrived(Integer orderId, Integer shopId);
+
}
--
Gitblit v1.9.3