From c459808efab29dc1b8439fbb90556bdb16f4c88b Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期三, 01 四月 2026 22:40:59 +0800
Subject: [PATCH] feat: 优化支付时显示任务ID

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ServiceOrderServiceImpl.java |   66 ++++++++++++++++++++++++++++-----
 1 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ServiceOrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ServiceOrderServiceImpl.java
index ddac2e4..d31909e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ServiceOrderServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ServiceOrderServiceImpl.java
@@ -1,25 +1,35 @@
 package com.ruoyi.system.service.impl;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.ServiceOrderMapper;
 import com.ruoyi.system.domain.ServiceOrder;
 import com.ruoyi.system.service.IServiceOrderService;
+import com.ruoyi.common.utils.PageUtils;
 
 /**
- * 鏈嶅姟璁㈠崟Service涓氬姟灞傚鐞�
+ * 鏈嶅姟璁㈠崟 鏈嶅姟灞傚疄鐜�
+ * 
+ * @author ruoyi
  */
+
+@DataSource(DataSourceType.SQLSERVER)
 @Service
 public class ServiceOrderServiceImpl implements IServiceOrderService {
     @Autowired
     private ServiceOrderMapper serviceOrderMapper;
 
     /**
-     * 鏌ヨ鏈嶅姟璁㈠崟
+     * 鏌ヨ鏈嶅姟璁㈠崟淇℃伅
      * 
      * @param serviceOrdId 鏈嶅姟璁㈠崟涓婚敭
-     * @return 鏈嶅姟璁㈠崟
+     * @return 鏈嶅姟璁㈠崟淇℃伅
      */
     @Override
     public ServiceOrder selectServiceOrderById(Long serviceOrdId) {
@@ -29,18 +39,25 @@
     /**
      * 鏌ヨ鏈嶅姟璁㈠崟鍒楄〃
      * 
-     * @param serviceOrder 鏈嶅姟璁㈠崟
-     * @return 鏈嶅姟璁㈠崟
+     * @param serviceOrder 鏈嶅姟璁㈠崟淇℃伅
+     * @return 鏈嶅姟璁㈠崟闆嗗悎
      */
     @Override
     public List<ServiceOrder> selectServiceOrderList(ServiceOrder serviceOrder) {
-        return serviceOrderMapper.selectServiceOrderList(serviceOrder);
+        // 璁＄畻鍋忕Щ閲�
+        int offset = (serviceOrder.getPageNum() - 1) * serviceOrder.getPageSize();
+        return serviceOrderMapper.selectServiceOrderList(serviceOrder, offset, serviceOrder.getPageSize());
+    }
+
+    @Override
+    public int selectServiceOrderCount(ServiceOrder serviceOrder) {
+        return serviceOrderMapper.selectServiceOrderCount(serviceOrder);
     }
 
     /**
      * 鏂板鏈嶅姟璁㈠崟
      * 
-     * @param serviceOrder 鏈嶅姟璁㈠崟
+     * @param serviceOrder 鏈嶅姟璁㈠崟淇℃伅
      * @return 缁撴灉
      */
     @Override
@@ -51,7 +68,7 @@
     /**
      * 淇敼鏈嶅姟璁㈠崟
      * 
-     * @param serviceOrder 鏈嶅姟璁㈠崟
+     * @param serviceOrder 鏈嶅姟璁㈠崟淇℃伅
      * @return 缁撴灉
      */
     @Override
@@ -60,9 +77,9 @@
     }
 
     /**
-     * 鎵归噺鍒犻櫎鏈嶅姟璁㈠崟
+     * 鍒犻櫎鏈嶅姟璁㈠崟瀵硅薄
      * 
-     * @param serviceOrdIds 闇�瑕佸垹闄ょ殑鏈嶅姟璁㈠崟涓婚敭
+     * @param serviceOrdIds 闇�瑕佸垹闄ょ殑鏁版嵁ID
      * @return 缁撴灉
      */
     @Override
@@ -80,4 +97,33 @@
     public int deleteServiceOrderById(Long serviceOrdId) {
         return serviceOrderMapper.deleteServiceOrderById(serviceOrdId);
     }
+    
+    /**
+     * 鏇存柊鏈嶅姟璁㈠崟鍙栨秷淇℃伅
+     * 
+     * @param serviceOrdId 鏈嶅姟璁㈠崟ID
+     * @param cancelReason 鍙栨秷鍘熷洜ID
+     * @param cancelReasonText 鍙栨秷鍘熷洜鏂囨湰
+     * @return 褰卞搷琛屾暟
+     */
+    @Override
+    public int updateServiceOrderCancelInfo(Long serviceOrdId, Integer cancelReason, String cancelReasonText) {
+        return serviceOrderMapper.updateServiceOrderCancelInfo(serviceOrdId, cancelReason, cancelReasonText);
+    }
+    
+    /**
+     * 鏍规嵁鏈嶅姟璁㈠崟ID鏌ヨ璁㈠崟鐘舵��
+     * 
+     * @param serviceOrdId 鏈嶅姟璁㈠崟ID
+     * @return 璁㈠崟鐘舵�佺爜
+     */
+    @Override
+    public Integer selectServiceOrderStateById(Long serviceOrdId) {
+        return serviceOrderMapper.selectServiceOrderStateById(serviceOrdId);
+    }
+
+    @Override
+    public Map<String, Object> selectCancelInfoById(Long serviceOrdId) {
+        return serviceOrderMapper.selectServiceCancelInfoById(serviceOrdId);
+    }
 } 
\ No newline at end of file

--
Gitblit v1.9.1