From 3dc4aac8aec62f2c2a1e4af699e622ac9dfaba59 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期三, 09 十月 2024 08:53:58 +0800
Subject: [PATCH] 支付

---
 src/main/java/com/mzl/flower/pay/SybConstants.java  |    2 +-
 src/main/java/com/mzl/flower/pay/SybPayService.java |    8 +++++---
 src/main/resources/application-local.yml            |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/mzl/flower/pay/SybConstants.java b/src/main/java/com/mzl/flower/pay/SybConstants.java
index 76dfde8..91a9ce8 100644
--- a/src/main/java/com/mzl/flower/pay/SybConstants.java
+++ b/src/main/java/com/mzl/flower/pay/SybConstants.java
@@ -24,7 +24,7 @@
 	public static final String SYB_MD5_APPKEY = "666888";
 	public static final String SYB_APIURL = "https://vsp.allinpay.com/apiweb";//生产环境
 	public static final String SYB_RSACUSPRIKEY = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDcvMSSSSyjeIFXpoc/aFScXgp1o9qbAO6fIGPRGFtwexSO4g3oP7sse8lL80bUNtj5Q7ysAEjVKW0fDpe/iJ0/jtqJ2CEL5aXDr6Fu7YR7zMLhbCDa531t64Iw4l0ADg3c+5jDSY3ck2rp5pX3RxYLpBb5VB2P005nMNJpG5oRuIRTMa0og07/cFMjhV3Q10eN6pBMnZ4jlXRjUUcftZhMCVUS9zAH16bcnbf6X6HJpBghuPEeIXKEwb+p8usvm4ZVcPh7Ha5dEdHeUGP7bCY9360plVfv20bZvucwlR4GuP6lDmMgqLF11jrEeGa+Fu+2e8wD0LnIfZjeenKLvlqFAgMBAAECggEAA2zmfAKor6y6DRsndCNxVK/c57BwPwGHsm51PhRrrtYqHoGBh74dcHZHTGdtDPQA7/VOIzkp6CzpZZb7YdyD3C2iVItHEAEzTlMWZTtIWAd4arkb1WnMN311Gr8YhFyzeF9rInSsv+SFvzV11E2FGQ8l0B6vCsFTsSQ/z6O/A1FbT3IaW5LTcsd6oysQr7ShT5yuCtuBuBypXI/7lmFoOn4O0/o5WFtqXr1295rpjv10WTycqZyfKh8W7CW7AKwT3SfuEodLBhmVHtu9TD+RNJRhu6ekv58vrnFAaRI7YUh/Kg3SfkvE0+Csp9meDGJJB6pbRwF8jdvTVd2kuWeM4QKBgQD+Ax/rxLRIGhc22cdw11c7anK7JkMU6J/K7i/zFJ6FJTixaz+zWOAxwyDPYSkyVeA555CSKAsXAtWd9vJHjFjgA4avPeF96C5WSZu26K+6pAz9VfyRYXw/2pZ060M+iBIinlTKu/B9SiYoiB5Y86Me9xFag4FrQvcghmV4zzhuyQKBgQDedvtm2hI7Gfna7fBOcr/69eiwxEvKhZ/1K0oRv9O2Sr0tFfUT0kSNejC1/CtRhaJN0TM4ZET7ajJZxfgK/lzyB3Utr60Sp5Vk0KaKVrwN7H3HOjQ8zE+YlbQwPRphgTM0/y0/wgq8sTmg1FKHHrHi4k7EusS4KEsD4AQ2pAl/3QKBgQCiIJBxRb3j/3MtuVcI+QlejRTpywQqBkhnmBvWxSRgy18iLtgbuvBuEqOQee13iURy8RBfmVtqto5uIr6FWFkpslZ258JTQKzCuny/BEmVkTwRPp7UlCpf/z7lJXxoHyWkHvbz530aGwe7+xWTpP5Kt1vGMAWc1sMxaVa/A1R7sQKBgQCkBZXWf3JxoPVXNZe4P2LM5gJqUlCPQXZujTxPWd/+x5wzYb0QoDdrGGxRwVsvABhqx5O8QDGcLPBywEPh1ykwSc9bn+s7ldPQQQaJeOmuWm9iNMfPC9Sj67yu1F5fBaN7r6jtGWRRO1oB+onelgMSBUmOQyZHoW2trb1tjAR1AQKBgQCJ7wwrATqy+4/1kcm1zWrwjI39Db27lyLb1TR5jPdmdOHmCMMoLrsB4fkpZhnlXIA7uIzkZX5+rNMAkGrV84ZWZ0Q5QXCCMtFypFlZPxh9q8Jb1aB1Abn3UTKgJfUalDo4H8Q+h1COlNPU/6YuWPl8gU489NI/rkopt25j0GhFqQ==";
-	public static final String SYB_RSATLPUBKEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3LzEkkkso3iBV6aHP2hUnF4KdaPamwDunyBj0RhbcHsUjuIN6D+7LHvJS/NG1DbY+UO8rABI1SltHw6Xv4idP47aidghC+Wlw6+hbu2Ee8zC4Wwg2ud9beuCMOJdAA4N3PuYw0mN3JNq6eaV90cWC6QW+VQdj9NOZzDSaRuaEbiEUzGtKINO/3BTI4Vd0NdHjeqQTJ2eI5V0Y1FHH7WYTAlVEvcwB9em3J23+l+hyaQYIbjxHiFyhMG/qfLrL5uGVXD4ex2uXRHR3lBj+2wmPd+tKZVX79tG2b7nMJUeBrj+pQ5jIKixddY6xHhmvhbvtnvMA9C5yH2Y3npyi75ahQIDAQAB";
+	public static final String SYB_RSATLPUBKEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCm9OV6zH5DYH/ZnAVYHscEELdCNfNTHGuBv1nYYEY9FrOzE0/4kLl9f7Y9dkWHlc2ocDwbrFSm0Vqz0q2rJPxXUYBCQl5yW3jzuKSXif7q1yOwkFVtJXvuhf5WRy+1X5FOFoMvS7538No0RpnLzmNi3ktmiqmhpcY/1pmt20FHQQIDAQAB";
 
 
 
diff --git a/src/main/java/com/mzl/flower/pay/SybPayService.java b/src/main/java/com/mzl/flower/pay/SybPayService.java
index 8144d60..24be56a 100644
--- a/src/main/java/com/mzl/flower/pay/SybPayService.java
+++ b/src/main/java/com/mzl/flower/pay/SybPayService.java
@@ -1,6 +1,7 @@
 package com.mzl.flower.pay;
 
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.net.URLEncoder;
@@ -175,7 +176,9 @@
 		params.put("appid", SybConstants.SYB_APPID);
 		params.put("version", "11");
 		params.put("reqsn", reqsn);
-		params.put("trxid", trxid);
+		if(StringUtils.isNotBlank(trxid)){
+			params.put("trxid", trxid);
+		}
 		params.put("randomstr", SybUtil.getValidatecode(8));
 		params.put("signtype", SybConstants.SIGN_TYPE);
 		String appkey = "";
@@ -194,8 +197,7 @@
 	
 	
 	public static Map<String,String> handleResult(String result) throws Exception{
-		System.out.println("通联支付返回结果:"+result);
-		log.info("ret:"+result);
+		log.info("通联支付返回结果:"+result);
 		Map map = SybUtil.json2Obj(result, Map.class);
 		if(map == null){
 			throw new Exception("返回数据错误");
diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
index b6c192b..d745545 100644
--- a/src/main/resources/application-local.yml
+++ b/src/main/resources/application-local.yml
@@ -54,4 +54,4 @@
   localServerPath: /data/files
 
 syb:
-  callBackUrl: http://localhost
\ No newline at end of file
+  callBackUrl: http://47.99.58.211
\ No newline at end of file

--
Gitblit v1.9.3