From 231aef7d74bb6d8b9be8430c36de08e3c14ee203 Mon Sep 17 00:00:00 2001 From: zk Date: Tue, 16 Jun 2026 21:39:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9offerpai=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jiayunet/service/MemberProductService.java | 6 +++++- .../service/WxPayNotifyMessageAbstractImpl.java | 2 +- client-api/src/main/resources/application-dev.yml | 14 +++++++------- client-api/src/main/resources/application-prod.yml | 14 +++++++------- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/client-api/src/main/java/org/jiayunet/service/MemberProductService.java b/client-api/src/main/java/org/jiayunet/service/MemberProductService.java index 1a35227..0a82f04 100644 --- a/client-api/src/main/java/org/jiayunet/service/MemberProductService.java +++ b/client-api/src/main/java/org/jiayunet/service/MemberProductService.java @@ -49,7 +49,7 @@ public class MemberProductService { @Autowired private MessageService messageService; - //@Autowired + @Autowired(required = false) private WxNativePayAbility wxNativePayAbility; @Autowired @@ -151,6 +151,10 @@ public class MemberProductService { * 微信Native支付下单 */ private String prepayWechat(String orderNo, MemberProduct product) { + if (wxNativePayAbility == null) { + throw new BusinessException(BusinessExpCodeEnum.UNKNOWN_ERROR, "微信支付未开启，请联系管理员"); + } + PayWechatFlow flow = new PayWechatFlow(); flow.setOrderType("member"); flow.setOrderNo(orderNo); diff --git a/client-api/src/main/java/org/jiayunet/service/WxPayNotifyMessageAbstractImpl.java b/client-api/src/main/java/org/jiayunet/service/WxPayNotifyMessageAbstractImpl.java index 6501575..1fbc4c1 100644 --- a/client-api/src/main/java/org/jiayunet/service/WxPayNotifyMessageAbstractImpl.java +++ b/client-api/src/main/java/org/jiayunet/service/WxPayNotifyMessageAbstractImpl.java @@ -22,7 +22,7 @@ import java.time.Instant; * * @author zk */ -//@Service +@Service @Primary @Slf4j @AllArgsConstructor diff --git a/client-api/src/main/resources/application-dev.yml b/client-api/src/main/resources/application-dev.yml index fd59481..54bc7c0 100644 --- a/client-api/src/main/resources/application-dev.yml +++ b/client-api/src/main/resources/application-dev.yml @@ -24,13 +24,13 @@ email: wx_pay: # status close:关闭 open:打开 status: open - app_id: wx7d75957cbd35e36b - merchant_id: ${MERCHANT_ID:1705334978} - private_key: ${WX_PRIVATE_KEY:MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDHGsNMkfKw1Nd7rysxEirZmVV76X6ejLS2D3y19RV8lZkSHI6W5TDvN1P8WJxAgAvenhBYfjbObKJSWkjnj2qfagU0DKVzMYuWWPXosl8g99pW3U6WpRUzhRbhOzwNUs1dXOTgp6L8GF4gWyAK0Co4zH8x4PdlsyLR+ObIYO6mvSfcM0t5oRWddrIeTWsRESozy9A0DuP0OzfljsOPrZL0Fri22XEsllvEL4bfzBsDM3t3bPkk+pTNrgqCw9fVLd5OEfKf4N/w6VjNqEjDcVogkS5UzU2olCPuKB7bwkBQ51eyaLGUS4fdGM/KuxhIpQ4I44cmCh2I2M0vkSIFwEmDAgMBAAECggEBAJ9nQNarvmZucPpX+rd1uRKvXS4weSwMsJ1V9t1ik0pEJuHGNS5/3daXMElG1AobueUIHUQMAGrxtF9EYzvoqU9pvTK3sTpxfzTmkjIzpE+rv4Vt9v5KupedxPybxO9RzJMjzSZDcAxuoeU7r4KYuETzDB5t4wPsEEOVB4eDe23Hd145vl3oD5aY3mMhdr+XvpVgXCwCAXQENFKN8BQ1pxY8c1zDK72AyIRLvcDCMHGD5nLhQcY1YAPYSOK3eZtpxsLwulAJh2tmo/Vj3+f2AbhYL8hKf/Jo194+t5s8EA7L2MNo1UZBKw/l2DkRCx9eWKPtgv69kH1cmZszRIAm2nkCgYEA6CNZFMk7uChj3GU9vnRpDjhGg0WaNBQi0gQLtTJQs2DQY4ACTH+xZIjgNRP3zNeV8Hf5Fic6E8Bhl3d/T0ywCR592zuanKrPcwu8CYh/N/YTm2VRo+EP0aH5ASlzEMGh/YRSsfpV174ee8OcbbluU3XCzEV9k56cUAg/Da5PCOcCgYEA25Ila++hqwCHo9CbvQUdfTjIWJX1VgvzN8FeCla4A1Cl/TCaM4Jj54pKfm6xaMSDmeKOLUNXaGbcvo6xiPuLBSEFlkwocc5OFlBaf3gKv/uS5ldDsHgRLc08zXIfMt0MdGYegROvfcEIIqqreu7MIXzVqnU06NPywGrd+oE9WwUCgYAV9DHai2WAdyFqmJCMUIoW9C+G/rAkuLrKTeOlkUqcjE1o+5Q8E998+IzruCW5U7I0ecQu2ird71XLc1uw7jm/wwh4EVz/8A+Ke9Oeuy/85OLZ0W01KHXMh5r7ByaAsS9WwIrplhlEPBC597f1kJHkhsCTfQbxTRDPaNg9vPxwhQKBgG1C2GRRpn1VkimuURFKTlZVvzx1wtPCtpD0JDu403Cy3SaU3Obs55H8ev1XT+j2gRY+asmTTReiuA4LK8UihxdSS1lzJF0dcDYiXiY4MgE+yubcXc6esM2955fERkolPWFev6cziIxnVgkKLLLLycCQQjLEiEOj1JRzmWpijYmRAoGASkgx6OS/Ugi4EMiElELJ6omfe8Ztyzey0EOTSQDrPL1c26DwZcF+OO4q57Jdtv/n4ruJwb+l8upwZANMenUFKbgEvQ/6qQAWM59Y8LU/iKP2FnCT7iNBAFaQe/TkTLJkPUZw8p+eIm5iOioE+UiqUV6oGtT3mD+MPOCTjkgX/D0=} - merchant_serial_number: ${MERCHANT_SERIAL_NUMBER:71AAD02CC3730F87AE3412AD19BCD933C86F4F25} - api_v3_key: ${API_V3_KEY:bVVydoGs9LIJBjmZzaQwx7ETEc642Pte} - public_key: ${WX_PUBLIC_KEY:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1YzMZ3sYbTm/ZNOvqX16bmuE4RS/GXK0ZuWxhYdjveyOFmZkcJEzweslC7bWD835SmaJ6Bxyzcyvwyh+3cV2K/Mw7AH9+6Rp5zopcXyY939x7KUfwrWQOQ3zY/na8iPWGwDUgODyID5VDgMf6PEfPLjL0yZxwUtibxDVkY4NSOWmtKRH6booj+T8lS7bCI672PEkorfPY8JKMaoQsga3AymgXfkudl9hdwoDhaEZPPBY5T47tZjiHsq0Xxpi4I+xG3oTVYua0pcm3VdRNnui4sw6EnI6YZ/LBjlpkzetPbqGegxknvG/5HkOojBBzS4uaXcKH2mxT8kC/8JE3otnBwIDAQAB} - public_key_id: ${PUBLIC_KEY_ID:PUB_KEY_ID_0117053349782025013000337100001480} + app_id: wx12cee9ea7c6a2069 + merchant_id: ${MERCHANT_ID:1374348102} + private_key: ${WX_PRIVATE_KEY:MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDQcL1GGv5kr4KVacUwUAZzz7Zh2wsn5rJZyTm8MiRlR3P/3kkiZqT4gHkyhLjfS80LJh4vm5mslY2N4ZeJR0KNmRX4Zl17AzIcxpfp1790Dsbc6YBJw5UCaalJRmf8Wg4Dy9VfcUpOTwfxNz2QsiL18mtrEk69oF/7V/E1rlI1zYRoi+zei12LftYnBATKIW3/yqKZpCmPHHjG2l5wmrUDlOfEZhKaFc4wTyXJOum6kGwBFv+QxsYH7qDaTfUFGqww1n0wX5ItTDqUN/ETNgANkRMp3TUyd65ch1eWUA26Hy693e+GZ6wdSzam7xl8m6nsiVM143NBrW1PNvEZ5mFhAgMBAAECggEAF5/vk/aTRs4tusmWM/eeA5pTTZwKE6euJ0cLaC02utPybdm/6EpCAHhvRC6O1aA9yTm0yiiUrl71AFPFXSXagToMp27SwZKHJ4PKzBJL/Nd/6qH8jF/Cj9dx/IAiYRPD6uI7eOnaRi3m9IwSSkgmdkHXsvcMPanjtxUsnaz4XGiOLN9JjrAM/vk4lrgzQaDqagxPkM1+mXuFYB6RJsd8IS2tOBwUIVGkadSLZcqtEJw29Bku/QtsJiBE/Xk7kCY+Le8Jrtw2QH0BthbfZuKQvGChulK6BBqaVaEZDohO82rn3Fovqcag2V0za1FoJa1sAHKkQMfTajQZiWHNFf/IwQKBgQD/VcPNfqPG7ilPxFOaEQoV4iACA6WxEWwiqixsouW2WZ4iXJZd4OczbCAqkd9QjJ3CZtZJMS8Zmyx9W1o26Tre/y9v4A0vYmb8ldSsxoCIbTh4Un4+tT9KeXhznfV+bOq7eqZNY8UJ8pEw99WdriOLS0EtoyChiN48vIVT08k8HQKBgQDQ+7WQ5okHjYrAs3Is5nCshRpfnfQDn6qV87ztWIG/6o54AZ1hRZjVGRH9NB2aK0jWiHbr7ELZufGXgt+UbbLq9wV/QYF+nZDvlZi0LcLaOvlpP7Z9fcAYVVxpSlTbRSUsSrqYwyjQw0NwOrhQIzJxsXUzp5MdMo23e9UYqZ3PFQKBgQDUcYd4cuXRnlbBB5iHl6XMj1gSVPaHXPeb3/sWaHK4RdhMvrxdX8L+Bfi9cqFbY6PfG7EvNLz7kSBzLI7jISraX3gYnVJbGoSVpBRPrNlEqZtSgVCI3ETMskSF7edUSUsEsgesXFaU8D3dgFc72qe4PeT9E70Sqc4+upw0IwJMAQKBgDQD8pU2TDUNDdQY1fpHARRvrLjP38RnIVZhbEzHEsRp5TwJatqjL/8aVlfneNa+n0qGfNML4ze+CFvlvzB6fWXuRff+nfSd001Otsth+HXI5/tCWHGzsvRbirzKO4S4GSCFGRyctrP/ZfGxK98GY6/Ys4s/0mYaBxv8PnX9AcJhAoGAF6AWpeB1+IlNj+M2FZAZigGBsIsS4PMTOp5oBHqjh4RpPJa8haESaNMDbAkLIlBwWsqzchQQOvVap8hv9ft8cyoQ/995xADQHJTSn5wkZzpDXQiNPwRoxmd852Kln0WQ88XmbbgZfeYMlDN3ovA3JC3NNBZRflAmVYAQrKsF+fM=} + merchant_serial_number: ${MERCHANT_SERIAL_NUMBER:50425CBE34C658C6E9A2F4F9DD0E85DC5F00DDD9} + api_v3_key: ${API_V3_KEY:Youlibao201508Youlibao2015082022} + public_key: ${WX_PUBLIC_KEY:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw7q/wZEL3ecfOGD9DfhEEoSS8TsLm+PLqHe5YbYfuRsk+Umdv7zfpncPcXa7xjXCiy9Y5bSFH0U6qnz0IChkl8hbYcwNQ6WWDFfSuYBsglPZcbDbDCk8cMRSmbusHKBfKTSJS5JBzaD3G2d7b9QkTOejOJNb4eYC7JkjTC/cPiWZztFtDP3tIismqvg6UHPw4AkHc+YX2yPF+e6sVlsPbn2xwzKZW+NU+JkQTi2uUeC1icSeF0uDVxvK3SZMQqkhw75h8zBhAZ+F9B30u4ExYBJtIMubaruSUERUFLb2JiQK4tECqX9lJa43nfXP3pHw6tDJicoA4yJ5AypkWI2+xwIDAQAB} + public_key_id: ${PUBLIC_KEY_ID:PUB_KEY_ID_0113743481022025060400112207001600} notify_domain: ${API_NOTIFY_DOMAIN:http://127.0.0.1:8080/api} # 支付宝支付 diff --git a/client-api/src/main/resources/application-prod.yml b/client-api/src/main/resources/application-prod.yml index 85effad..a6f17c2 100644 --- a/client-api/src/main/resources/application-prod.yml +++ b/client-api/src/main/resources/application-prod.yml @@ -24,13 +24,13 @@ email: wx_pay: # status close:关闭 open:打开 status: open - app_id: wx7d75957cbd35e36b - merchant_id: ${MERCHANT_ID:1705334978} - private_key: ${WX_PRIVATE_KEY:MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDHGsNMkfKw1Nd7rysxEirZmVV76X6ejLS2D3y19RV8lZkSHI6W5TDvN1P8WJxAgAvenhBYfjbObKJSWkjnj2qfagU0DKVzMYuWWPXosl8g99pW3U6WpRUzhRbhOzwNUs1dXOTgp6L8GF4gWyAK0Co4zH8x4PdlsyLR+ObIYO6mvSfcM0t5oRWddrIeTWsRESozy9A0DuP0OzfljsOPrZL0Fri22XEsllvEL4bfzBsDM3t3bPkk+pTNrgqCw9fVLd5OEfKf4N/w6VjNqEjDcVogkS5UzU2olCPuKB7bwkBQ51eyaLGUS4fdGM/KuxhIpQ4I44cmCh2I2M0vkSIFwEmDAgMBAAECggEBAJ9nQNarvmZucPpX+rd1uRKvXS4weSwMsJ1V9t1ik0pEJuHGNS5/3daXMElG1AobueUIHUQMAGrxtF9EYzvoqU9pvTK3sTpxfzTmkjIzpE+rv4Vt9v5KupedxPybxO9RzJMjzSZDcAxuoeU7r4KYuETzDB5t4wPsEEOVB4eDe23Hd145vl3oD5aY3mMhdr+XvpVgXCwCAXQENFKN8BQ1pxY8c1zDK72AyIRLvcDCMHGD5nLhQcY1YAPYSOK3eZtpxsLwulAJh2tmo/Vj3+f2AbhYL8hKf/Jo194+t5s8EA7L2MNo1UZBKw/l2DkRCx9eWKPtgv69kH1cmZszRIAm2nkCgYEA6CNZFMk7uChj3GU9vnRpDjhGg0WaNBQi0gQLtTJQs2DQY4ACTH+xZIjgNRP3zNeV8Hf5Fic6E8Bhl3d/T0ywCR592zuanKrPcwu8CYh/N/YTm2VRo+EP0aH5ASlzEMGh/YRSsfpV174ee8OcbbluU3XCzEV9k56cUAg/Da5PCOcCgYEA25Ila++hqwCHo9CbvQUdfTjIWJX1VgvzN8FeCla4A1Cl/TCaM4Jj54pKfm6xaMSDmeKOLUNXaGbcvo6xiPuLBSEFlkwocc5OFlBaf3gKv/uS5ldDsHgRLc08zXIfMt0MdGYegROvfcEIIqqreu7MIXzVqnU06NPywGrd+oE9WwUCgYAV9DHai2WAdyFqmJCMUIoW9C+G/rAkuLrKTeOlkUqcjE1o+5Q8E998+IzruCW5U7I0ecQu2ird71XLc1uw7jm/wwh4EVz/8A+Ke9Oeuy/85OLZ0W01KHXMh5r7ByaAsS9WwIrplhlEPBC597f1kJHkhsCTfQbxTRDPaNg9vPxwhQKBgG1C2GRRpn1VkimuURFKTlZVvzx1wtPCtpD0JDu403Cy3SaU3Obs55H8ev1XT+j2gRY+asmTTReiuA4LK8UihxdSS1lzJF0dcDYiXiY4MgE+yubcXc6esM2955fERkolPWFev6cziIxnVgkKLLLLycCQQjLEiEOj1JRzmWpijYmRAoGASkgx6OS/Ugi4EMiElELJ6omfe8Ztyzey0EOTSQDrPL1c26DwZcF+OO4q57Jdtv/n4ruJwb+l8upwZANMenUFKbgEvQ/6qQAWM59Y8LU/iKP2FnCT7iNBAFaQe/TkTLJkPUZw8p+eIm5iOioE+UiqUV6oGtT3mD+MPOCTjkgX/D0=} - merchant_serial_number: ${MERCHANT_SERIAL_NUMBER:71AAD02CC3730F87AE3412AD19BCD933C86F4F25} - api_v3_key: ${API_V3_KEY:bVVydoGs9LIJBjmZzaQwx7ETEc642Pte} - public_key: ${WX_PUBLIC_KEY:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1YzMZ3sYbTm/ZNOvqX16bmuE4RS/GXK0ZuWxhYdjveyOFmZkcJEzweslC7bWD835SmaJ6Bxyzcyvwyh+3cV2K/Mw7AH9+6Rp5zopcXyY939x7KUfwrWQOQ3zY/na8iPWGwDUgODyID5VDgMf6PEfPLjL0yZxwUtibxDVkY4NSOWmtKRH6booj+T8lS7bCI672PEkorfPY8JKMaoQsga3AymgXfkudl9hdwoDhaEZPPBY5T47tZjiHsq0Xxpi4I+xG3oTVYua0pcm3VdRNnui4sw6EnI6YZ/LBjlpkzetPbqGegxknvG/5HkOojBBzS4uaXcKH2mxT8kC/8JE3otnBwIDAQAB} - public_key_id: ${PUBLIC_KEY_ID:PUB_KEY_ID_0117053349782025013000337100001480} + app_id: wx12cee9ea7c6a2069 + merchant_id: ${MERCHANT_ID:1374348102} + private_key: ${WX_PRIVATE_KEY:MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDQcL1GGv5kr4KVacUwUAZzz7Zh2wsn5rJZyTm8MiRlR3P/3kkiZqT4gHkyhLjfS80LJh4vm5mslY2N4ZeJR0KNmRX4Zl17AzIcxpfp1790Dsbc6YBJw5UCaalJRmf8Wg4Dy9VfcUpOTwfxNz2QsiL18mtrEk69oF/7V/E1rlI1zYRoi+zei12LftYnBATKIW3/yqKZpCmPHHjG2l5wmrUDlOfEZhKaFc4wTyXJOum6kGwBFv+QxsYH7qDaTfUFGqww1n0wX5ItTDqUN/ETNgANkRMp3TUyd65ch1eWUA26Hy693e+GZ6wdSzam7xl8m6nsiVM143NBrW1PNvEZ5mFhAgMBAAECggEAF5/vk/aTRs4tusmWM/eeA5pTTZwKE6euJ0cLaC02utPybdm/6EpCAHhvRC6O1aA9yTm0yiiUrl71AFPFXSXagToMp27SwZKHJ4PKzBJL/Nd/6qH8jF/Cj9dx/IAiYRPD6uI7eOnaRi3m9IwSSkgmdkHXsvcMPanjtxUsnaz4XGiOLN9JjrAM/vk4lrgzQaDqagxPkM1+mXuFYB6RJsd8IS2tOBwUIVGkadSLZcqtEJw29Bku/QtsJiBE/Xk7kCY+Le8Jrtw2QH0BthbfZuKQvGChulK6BBqaVaEZDohO82rn3Fovqcag2V0za1FoJa1sAHKkQMfTajQZiWHNFf/IwQKBgQD/VcPNfqPG7ilPxFOaEQoV4iACA6WxEWwiqixsouW2WZ4iXJZd4OczbCAqkd9QjJ3CZtZJMS8Zmyx9W1o26Tre/y9v4A0vYmb8ldSsxoCIbTh4Un4+tT9KeXhznfV+bOq7eqZNY8UJ8pEw99WdriOLS0EtoyChiN48vIVT08k8HQKBgQDQ+7WQ5okHjYrAs3Is5nCshRpfnfQDn6qV87ztWIG/6o54AZ1hRZjVGRH9NB2aK0jWiHbr7ELZufGXgt+UbbLq9wV/QYF+nZDvlZi0LcLaOvlpP7Z9fcAYVVxpSlTbRSUsSrqYwyjQw0NwOrhQIzJxsXUzp5MdMo23e9UYqZ3PFQKBgQDUcYd4cuXRnlbBB5iHl6XMj1gSVPaHXPeb3/sWaHK4RdhMvrxdX8L+Bfi9cqFbY6PfG7EvNLz7kSBzLI7jISraX3gYnVJbGoSVpBRPrNlEqZtSgVCI3ETMskSF7edUSUsEsgesXFaU8D3dgFc72qe4PeT9E70Sqc4+upw0IwJMAQKBgDQD8pU2TDUNDdQY1fpHARRvrLjP38RnIVZhbEzHEsRp5TwJatqjL/8aVlfneNa+n0qGfNML4ze+CFvlvzB6fWXuRff+nfSd001Otsth+HXI5/tCWHGzsvRbirzKO4S4GSCFGRyctrP/ZfGxK98GY6/Ys4s/0mYaBxv8PnX9AcJhAoGAF6AWpeB1+IlNj+M2FZAZigGBsIsS4PMTOp5oBHqjh4RpPJa8haESaNMDbAkLIlBwWsqzchQQOvVap8hv9ft8cyoQ/995xADQHJTSn5wkZzpDXQiNPwRoxmd852Kln0WQ88XmbbgZfeYMlDN3ovA3JC3NNBZRflAmVYAQrKsF+fM=} + merchant_serial_number: ${MERCHANT_SERIAL_NUMBER:50425CBE34C658C6E9A2F4F9DD0E85DC5F00DDD9} + api_v3_key: ${API_V3_KEY:Youlibao201508Youlibao2015082022} + public_key: ${WX_PUBLIC_KEY:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw7q/wZEL3ecfOGD9DfhEEoSS8TsLm+PLqHe5YbYfuRsk+Umdv7zfpncPcXa7xjXCiy9Y5bSFH0U6qnz0IChkl8hbYcwNQ6WWDFfSuYBsglPZcbDbDCk8cMRSmbusHKBfKTSJS5JBzaD3G2d7b9QkTOejOJNb4eYC7JkjTC/cPiWZztFtDP3tIismqvg6UHPw4AkHc+YX2yPF+e6sVlsPbn2xwzKZW+NU+JkQTi2uUeC1icSeF0uDVxvK3SZMQqkhw75h8zBhAZ+F9B30u4ExYBJtIMubaruSUERUFLb2JiQK4tECqX9lJa43nfXP3pHw6tDJicoA4yJ5AypkWI2+xwIDAQAB} + public_key_id: ${PUBLIC_KEY_ID:PUB_KEY_ID_0113743481022025060400112207001600} notify_domain: ${API_NOTIFY_DOMAIN:http://127.0.0.1:8080/api} # 支付宝支付