From 94ff46df856f6d4f8d8393e22001351c793f4e5b Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期一, 05 五月 2025 16:44:36 +0800
Subject: [PATCH] feat: 新增payInfo测试和部分优化appsecret
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/civilAviation/ServiceOrderUtil.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/civilAviation/ServiceOrderUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/civilAviation/ServiceOrderUtil.java
index e0bafdf..4e7498f 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/civilAviation/ServiceOrderUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/civilAviation/ServiceOrderUtil.java
@@ -29,7 +29,7 @@
* @param model 鏈嶅姟鍗曞簲鐢ㄥ�煎璞�
* @return 鏈嶅姟鍗曟帴鍙ｈ皟鐢ㄧ粨鏋�
*/
- public static ServiceOrderAppResultVo CreateServiceOrder(ServiceOrderAppVo model) {
+ public static ServiceOrderAppResultVo CreateServiceOrder(ServiceOrderAppVo model,String appSecret) {
if (AddServiceOrederAPI.isEmpty()) {
// log.info("AddServiceOrederAPI 鏈缃紝璇峰厛璁剧疆鎺ュ彛鍦板潃銆�");
return null;
@@ -54,7 +54,7 @@
}
}
- model.setSign(ServiceOrderSign.generateSign(params)); // 鐢熸垚绛惧悕骞惰缃埌妯″瀷涓�
+ model.setSign(ServiceOrderSign.generateSign(params,appSecret)); // 鐢熸垚绛惧悕骞惰缃埌妯″瀷涓�
// 鏇挎崲涓�
@@ -105,7 +105,7 @@
* @param model 鏈嶅姟璁㈠崟鍒犻櫎璇锋眰鍊煎璞�
* @return 鏈嶅姟璁㈠崟鍒犻櫎鎺ュ彛璋冪敤缁撴灉
*/
- public static ServiceOrderAppResultVo CancelServiceOrder(ServiceOrderDelVo model) {
+ public static ServiceOrderAppResultVo CancelServiceOrder(ServiceOrderDelVo model,String appSecret) {
if (AddServiceOrederAPI.isEmpty()) {
// log.info("AddServiceOrederAPI 鏈缃紝璇峰厛璁剧疆鎺ュ彛鍦板潃銆�");
return null;
@@ -130,7 +130,7 @@
}
}
- model.setSign(ServiceOrderSign.generateSign(params));
+ model.setSign(ServiceOrderSign.generateSign(params,appSecret));
// 鏋勫缓琛ㄥ崟鏁版嵁
StringBuilder formData = new StringBuilder();
@@ -188,8 +188,8 @@
model.setDELRemarks("娴嬭瘯");
// 璋冪敤 CancelServiceOrder 鏂规硶鍙栨秷鏈嶅姟鍗�
- ServiceOrderAppResultVo result = CancelServiceOrder(model);
- System.out.println("1");
+// ServiceOrderAppResultVo result = CancelServiceOrder(model);
+// System.out.println("1");
}
public static void test()
@@ -224,7 +224,7 @@
model.setPayQRcodeURL("https://example.com/qrcode/" + (int) (Math.random() * 100)); // 闅忔満鐢熸垚澶栭儴鏀粯浜岀淮鐮侀摼鎺�
// 璋冪敤 CreateServiceOrder 鏂规硶鍒涘缓鏈嶅姟鍗�
- ServiceOrderAppResultVo result = CreateServiceOrder(model);
+// ServiceOrderAppResultVo result = CreateServiceOrder(model);
}
}
--
Gitblit v1.9.1