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 | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 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 ee1b6c0..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,9 +29,9 @@
* @param model 鏈嶅姟鍗曞簲鐢ㄥ�煎璞�
* @return 鏈嶅姟鍗曟帴鍙ｈ皟鐢ㄧ粨鏋�
*/
- public static ServiceOrderAppResultVo CreateServiceOrder(ServiceOrderAppVo model) {
+ public static ServiceOrderAppResultVo CreateServiceOrder(ServiceOrderAppVo model,String appSecret) {
if (AddServiceOrederAPI.isEmpty()) {
- log.info("AddServiceOrederAPI 鏈缃紝璇峰厛璁剧疆鎺ュ彛鍦板潃銆�");
+ // log.info("AddServiceOrederAPI 鏈缃紝璇峰厛璁剧疆鎺ュ彛鍦板潃銆�");
return null;
}
@@ -50,11 +50,11 @@
params.put(field.getName(), value.toString());
}
} catch (IllegalAccessException e) {
- log.error("鑾峰彇瀵硅薄灞炴�у�兼椂鍑洪敊", e);
+ // log.error("鑾峰彇瀵硅薄灞炴�у�兼椂鍑洪敊", e);
}
}
- model.setSign(ServiceOrderSign.generateSign(params)); // 鐢熸垚绛惧悕骞惰缃埌妯″瀷涓�
+ model.setSign(ServiceOrderSign.generateSign(params,appSecret)); // 鐢熸垚绛惧悕骞惰缃埌妯″瀷涓�
// 鏇挎崲涓�
@@ -76,7 +76,7 @@
.append(value.toString());
}
} catch (Exception e) {
- log.error("鎷兼帴琛ㄥ崟鏁版嵁鏃跺嚭閿�", e);
+ // log.error("鎷兼帴琛ㄥ崟鏁版嵁鏃跺嚭閿�", e);
}
}
@@ -84,15 +84,15 @@
if (responseData != null && !responseData.isEmpty()) {
- log.info("鎺ュ彛鍝嶅簲: " + responseData);
+ // log.info("鎺ュ彛鍝嶅簲: " + responseData);
try {
// 浣跨敤 FastJSON 灏嗗搷搴旀暟鎹浆鎹负 ServiceOrderAppResultVo 瀵硅薄
return JSON.parseObject(responseData, ServiceOrderAppResultVo.class);
} catch (Exception e) {
- log.info("瑙ｆ瀽鎺ュ彛鍝嶅簲鏁版嵁澶辫触: " + e.getMessage());
+ // log.info("瑙ｆ瀽鎺ュ彛鍝嶅簲鏁版嵁澶辫触: " + e.getMessage());
}
} else {
- log.info("鎺ュ彛璋冪敤澶辫触锛屾湭鑾峰彇鍒版湁鏁堝搷搴旀暟鎹�");
+ // log.info("鎺ュ彛璋冪敤澶辫触锛屾湭鑾峰彇鍒版湁鏁堝搷搴旀暟鎹�");
}
return null;
@@ -105,9 +105,9 @@
* @param model 鏈嶅姟璁㈠崟鍒犻櫎璇锋眰鍊煎璞�
* @return 鏈嶅姟璁㈠崟鍒犻櫎鎺ュ彛璋冪敤缁撴灉
*/
- public static ServiceOrderAppResultVo CancelServiceOrder(ServiceOrderDelVo model) {
+ public static ServiceOrderAppResultVo CancelServiceOrder(ServiceOrderDelVo model,String appSecret) {
if (AddServiceOrederAPI.isEmpty()) {
- log.info("AddServiceOrederAPI 鏈缃紝璇峰厛璁剧疆鎺ュ彛鍦板潃銆�");
+ // log.info("AddServiceOrederAPI 鏈缃紝璇峰厛璁剧疆鎺ュ彛鍦板潃銆�");
return null;
}
@@ -126,11 +126,11 @@
params.put(field.getName(), value.toString());
}
} catch (IllegalAccessException e) {
- log.error("鑾峰彇瀵硅薄灞炴�у�兼椂鍑洪敊", e);
+ // log.error("鑾峰彇瀵硅薄灞炴�у�兼椂鍑洪敊", e);
}
}
- model.setSign(ServiceOrderSign.generateSign(params));
+ model.setSign(ServiceOrderSign.generateSign(params,appSecret));
// 鏋勫缓琛ㄥ崟鏁版嵁
StringBuilder formData = new StringBuilder();
@@ -150,21 +150,21 @@
.append(value.toString());
}
} catch (Exception e) {
- log.error("鎷兼帴琛ㄥ崟鏁版嵁鏃跺嚭閿�", e);
+ // log.error("鎷兼帴琛ㄥ崟鏁版嵁鏃跺嚭閿�", e);
}
}
String responseData = HttpUtils.sendPost(AddServiceOrederAPI, formData.toString(), "application/x-www-form-urlencoded");
if (responseData != null && !responseData.isEmpty()) {
- log.info("鎺ュ彛鍝嶅簲: " + responseData);
+ // log.info("鎺ュ彛鍝嶅簲: " + responseData);
try {
return JSON.parseObject(responseData, ServiceOrderAppResultVo.class);
} catch (Exception e) {
- log.info("瑙ｆ瀽鎺ュ彛鍝嶅簲鏁版嵁澶辫触: " + e.getMessage());
+ // log.info("瑙ｆ瀽鎺ュ彛鍝嶅簲鏁版嵁澶辫触: " + e.getMessage());
}
} else {
- log.info("鎺ュ彛璋冪敤澶辫触锛屾湭鑾峰彇鍒版湁鏁堝搷搴旀暟鎹�");
+ // log.info("鎺ュ彛璋冪敤澶辫触锛屾湭鑾峰彇鍒版湁鏁堝搷搴旀暟鎹�");
}
return null;
@@ -173,9 +173,9 @@
public static void main(String[] args) {
// 鍒涘缓鏈嶅姟鍗曞簲鐢ㄥ�煎璞″苟璁剧疆鐩稿叧妯℃嫙灞炴��
-// test();
+ test();
- testCancelServiceOrder();
+// testCancelServiceOrder();
}
//娴嬭瘯鍙栨秷鏈嶅姟鍗�
@@ -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()
@@ -211,8 +211,8 @@
model.setPtAge((int) (Math.random() * 100) + "宀�"); // 闅忔満鐢熸垚鎮ｈ�呭勾榫�
model.setPtSex(Math.random() > 0.5 ? "鐢�" : "濂�"); // 闅忔満鐢熸垚鎮ｈ�呮�у埆
model.setPtNat("涓浗"); // 闅忔満璁剧疆鎮ｈ�呭浗绫�
- model.setOutHosp("闅忔満杞嚭鍖婚櫌" + (int) (Math.random() * 10)); // 闅忔満璁剧疆杞嚭鍖婚櫌
- model.setInHosp("闅忔満杞叆鍖婚櫌" + (int) (Math.random() * 10)); // 闅忔満璁剧疆杞叆鍖婚櫌
+ model.setOutHosp("骞垮窞澶╂渤"); // 闅忔満璁剧疆杞嚭鍖婚櫌
+ model.setInHosp("骞垮窞娴风彔"); // 闅忔満璁剧疆杞叆鍖婚櫌
model.setPtServices("绉戝" + (int) (Math.random() * 10)); // 闅忔満璁剧疆鎮ｈ�呮墍鍦ㄧ瀹�
model.setPtDiagnosis("闅忔満璇婃柇淇℃伅"); // 闅忔満璁剧疆璇婃柇淇℃伅
model.setCondition("闅忔満澶囨敞淇℃伅"); // 闅忔満璁剧疆澶囨敞淇℃伅
@@ -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