From 3c5771460c280139a53e0c451e6ceb8742680b5c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 13 十月 2025 09:39:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/OrdersService.java | 64 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 2 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 9aac0f9..f2695ea 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
@@ -1,8 +1,14 @@
package com.doumee.service.business;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Orders;
+import com.doumee.dao.dto.*;
+import com.doumee.dao.vo.OrderReleaseVO;
+import com.wechat.pay.java.service.refund.model.RefundNotification;
+
import java.util.List;
/**
@@ -18,7 +24,7 @@
* @param orders 瀹炰綋瀵硅薄
* @return Integer
*/
- Integer create(Orders orders);
+ OrderReleaseVO create(Orders orders);
/**
* 涓婚敭鍒犻櫎
@@ -46,8 +52,9 @@
*
* @param orders 瀹炰綋瀵硅薄
*/
- void updateById(Orders orders);
+// void updateById(Orders orders);
+ void update(Orders orders);
/**
* 鎵归噺涓婚敭鏇存柊
*
@@ -94,4 +101,57 @@
* @return long
*/
long count(Orders orders);
+
+ void accept(Integer orderId, Member member);
+
+ void begin(Integer orderId,Member member);
+
+// void updOrderData(UpdOrderDataDTO updOrderDataDTO);
+//
+ void confirmUpd(ConfirmUpdOrderDTO confirmUpdOrderDTO);
+
+ /**
+ * 璁㈠崟鍙栨秷鍓嶇疆鎻愮ず
+ * @param orderId
+ * @param member
+ * @return
+ */
+ String cancelTips(Integer orderId,Member member);
+
+ void cancelOrder(Integer orderId,Member member);
+
+ OrderReleaseVO doneOrder(DoneOrderDTO doneOrderDTO);
+
+ void comment(CommentDTO commentDTO);
+
+ /**
+ * 鏀粯鍥炶皟涓氬姟
+ * @param preOrderId
+ * @return
+ */
+ String payNotify(String preOrderId,String paymentNo);
+
+ void platformCancel(Integer orderId, LoginUserInfo loginUserInfo);
+
+ PageData<Orders> findPageForMini(PageWrap<Orders> pageWrap);
+
+ Orders getDetail(Integer id,Member member);
+
+ void refundCallback(RefundNotification refundNotification);
+
+ void autoComment();
+
+ void autoConfirm();
+
+ Long getTotal(Orders orders);
+
+ void autoGrabOrders();
+
+ void initializeCode();
+
+ OrderReleaseVO reusePay(ReusePayDTO reusePayDTO);
+
+ void confirmFee(ConfirmFeeOrderDTO orders);
+
+ void autoCancelWaitPay();
}
--
Gitblit v1.9.3