From 938d93722b6ebaf8953e1e17307ef7739affc3d0 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期日, 04 五月 2025 16:21:11 +0800
Subject: [PATCH] feat: 回调地址可配置、回调接口文档和知情同意
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java
index 2e805b7..cddada2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java
@@ -46,7 +46,6 @@
*/
@RestController
@RequestMapping("/system/order")
-//@DataSource(DataSourceType.SQLSERVER)
public class ServiceOrderController extends BaseController {
@Autowired
private IServiceOrderService serviceOrderService;
@@ -262,13 +261,20 @@
//鏀粯淇℃伅
-// List<PayInfo> payInfoList = payInfoService.selectPayInfoByServiceOrdIDDt(orderDetail.getServiceOrdID()); //1016302788
- List<PayInfo> payInfoList = payInfoService.selectPayInfoByServiceOrdIDDt("1016302788");
+// List<PayInfo> payInfoList = payInfoService.selectPayInfoByServiceOrdIDDt(orderDetail.getServiceOrdID()); //姝ｅ紡浣跨敤
+ List<PayInfo> payInfoList = payInfoService.selectPayInfoByServiceOrdIDDt("1016302788");//娴嬭瘯浣跨敤
//鍏朵粬淇℃伅
Map<String, Object> otherInfo = new HashMap<>();
//璇勪环
- otherInfo.put("serviceOrdVisit", Objects.toString(mingServiceOrder.getServiceOrdVisit(), "鏃�"));
+ otherInfo.put("serviceOrdVisit", Objects.toString(mingServiceOrder.getServiceOrdVisit(), "-"));
+
+ //鐭ユ儏鍚屾剰涔�
+ // List<String> imageUrls = dispatchOrdService.selectImageUrlsByDOrdIDDt(orderDetail.getServiceOrdID()); //姝ｅ紡浣跨敤
+ List<String> imageUrls = new ArrayList<>();//娴嬭瘯浣跨敤
+ imageUrls.add("https://sys.966120.com.cn/upload/202505/3016127678_3VhEv_VVql2K6eM9tS9uXgKv8fm7vaKtrSFCiP0SraTgz2qe1isgvIuUrqSNv-XgEvdC5kFUxeyrn_wz8Mfc2Sg.jpg");
+ imageUrls.add("https://sys.966120.com.cn/upload/202505/3016127678_3cDOPpqc_fzEJ-dHz8lq5aIx3tsnmEtossC6F5VCi2vj6sBwkuzOx4g1RcsWnQ3XNua7COADksYI1rHnbizccOw.jpg");
+ otherInfo.put("imageUrls", imageUrls);
//鍙戠エ鑾峰彇
Map<String, Object> invoiceInfo = payInfoService.selectLatestInvoiceInfo("1016302788");
--
Gitblit v1.9.1