From 01abd59918bfc5412e23f685997bc4a4bfdbfc50 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: Mon, 17 Feb 2025 10:41:40 +0800
Subject: [PATCH] 煤矿缴费修改
---
exam-system/src/main/java/com/gkhy/exam/pay/service/CoalPayService.java | 2
exam-system/src/main/java/com/gkhy/exam/pay/utils/PayUtils.java | 36 ++++++------
exam-system/src/main/java/com/gkhy/exam/pay/utils/Sign.java | 18 +++--
exam-system/src/test/java/TextPay.java | 107 +++++++++++++++++++++--------------
4 files changed, 94 insertions(+), 69 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/service/CoalPayService.java b/exam-system/src/main/java/com/gkhy/exam/pay/service/CoalPayService.java
index 29ccd74..c49350e 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/service/CoalPayService.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/service/CoalPayService.java
@@ -32,5 +32,5 @@
String teamPayMoney(CoalTeamPayReq coalTeamPayReq);
- SignResult topay() throws IOException;
+ ResultVo topay() throws IOException;
}
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/utils/PayUtils.java b/exam-system/src/main/java/com/gkhy/exam/pay/utils/PayUtils.java
index 1fd4b76..2d5d976 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/utils/PayUtils.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/utils/PayUtils.java
@@ -2,6 +2,7 @@
import cn.com.jit.new_vstk.AdvanceSignClient;
import cn.com.jit.new_vstk.Bean.*;
+import cn.com.jit.new_vstk.SignClient;
import cn.com.jit.new_vstk.exception.NewCSSException;
import com.alibaba.fastjson2.JSONObject;
import com.gkhy.exam.pay.entity.PayReqData;
@@ -356,28 +357,28 @@
public ResultVo uploadXml(String orderId, byte[] plain) throws IOException {
Map<String, String> params = new HashMap<>();
- Sign sign = new Sign();
- SignResult sign1 = this.sign(plain);
- log.info("签名结果为:"+ Arrays.toString(sign1.getSignData()));
- VerifyResult verify = this.verify(plain, new String(sign1.getSignData()));
- SignDto signDto = new SignDto("SM3", "Base64", new Date(), verify.getReturnData(), verify.getSerialNumber(), verify.getIssure());
- Element signature = sign.getSignature(signDto);
+// Sign sign = new Sign();
+// SignResult sign1 = this.sign(plain);
+// log.info("签名结果为:"+ Arrays.toString(sign1.getSignData()));
+// VerifyResult verify = this.verify(plain, sign1.getSignData());
+// SignDto signDto = new SignDto("SM3", "Base64", new Date(), verify.getReturnData(), verify.getSerialNumber(), verify.getIssure());
+// Element signature = sign.getSignature(signDto);
JSONObject jsonObject = new JSONObject();
jsonObject.put("orderNo",orderId);
- jsonObject.put("fileData", Base64.getEncoder().encodeToString(convertElementToByteArray(signature)));
+ jsonObject.put("fileData", Base64.getEncoder().encodeToString(plain));
String reqdata = Base64.getEncoder().encodeToString(jsonObject.toJSONString().getBytes());
- String mac = appId+"||" +reqdata;
+ String mac = "ED76A5F1703540BE977D34780B371FEB"+"||" +reqdata;
mac = DigestUtils.md5Hex(mac.getBytes());
- params.put("appid",appId);
+ params.put("appid","ED76A5F1703540BE977D34780B371FEB");
params.put("reqdata",reqdata);
params.put("mac",mac);
- HttpPost httpPost = new HttpPost(uploadXmlUrl);
+ HttpPost httpPost = new HttpPost("http://finpt.xjcz.gov.cn/fs-service-test/fs-pay/uploadXml.do");
httpPost.setEntity(assemblyFormEntity(params,"utf-8"));
- HttpClient httpClient = getHttpClient(uploadXmlUrl);
+ HttpClient httpClient = getHttpClient("http://finpt.xjcz.gov.cn/fs-service-test/fs-pay/uploadXml.do");
HttpResultVo execute = httpClient.execute(httpPost, getResponseHandler());
String stringContent = execute.getStringContent();
ResultVo resultVo = JSONObject.parseObject(stringContent, ResultVo.class);
@@ -417,7 +418,7 @@
SignResult result = null;
String certId = "11650000MB1957293J";
try {
- AdvanceSignClient client = new AdvanceSignClient("D:\\work\\cssconfig.properties");
+ AdvanceSignClient client = new AdvanceSignClient("F:\\text\\cssconfig.properties");
result = client.sign(certId,strData);
log.info("***签名成功***");
byte[] signData = result.getSignData();
@@ -435,12 +436,12 @@
/**
* 验签名
*/
- public VerifyResult verify(byte[] strData,String signData){
+ public VerifyResult verify(byte[] strData,byte[] signData){
VerifyResult verify = null;
try {
- AdvanceSignClient client = new AdvanceSignClient("F:\\text\\cssconfig.properties");
+ SignClient client = new SignClient("F:\\text\\cssconfig.properties");
byte[] plain = strData;
- byte[] sign = signData.getBytes();
+ byte[] sign = signData;
verify = client.verify(sign, plain);
log.info("验签成功");
@@ -461,7 +462,7 @@
/**
* 制作数字信封
*/
- public EnvelopResult encryptEnvelop(String plain){
+ public EnvelopResult encryptEnvelop(byte[] plain){
EnvelopResult envelopResult = null;
try {
AdvanceSignClient client = new AdvanceSignClient("F:\\text\\cssconfig.properties");
@@ -469,9 +470,8 @@
CertIdParams certIdParams = new CertIdParams(certId);
//将封装好的加密证书参数对象放入 数组中
CertParams[] envelopCerts = new CertIdParams[]{certIdParams};
- byte[] bytes = plain.getBytes();
/* 制作信封 */
- envelopResult = client.encryptEnvelop(envelopCerts, bytes);
+ envelopResult = client.encryptEnvelop(envelopCerts, plain);
byte[] envelopData = envelopResult.getEnvelopData();
log.info("信封结果：["+envelopData+"]");
} catch (NewCSSException e) {
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/utils/Sign.java b/exam-system/src/main/java/com/gkhy/exam/pay/utils/Sign.java
index 2d35a92..7a2886b 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/utils/Sign.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/utils/Sign.java
@@ -13,21 +13,23 @@
this.signCommond = new SignCommond();
}
- public Element getSignature(SignDto signDto) {
+ public Document getSignature(SignDto signDto) {
+
// SignDto signDto = this.signCommond.signSm3Detach(plain);
Document document = DocumentHelper.createDocument();
- Element signature = document.addElement("Signature");
- signature.addElement("id", "InvoicingParty");
- Element signedInfo = signature.addElement("SignedInfo");
+ Element signature = document.addElement("EInvoiceSignature");
+ Element signature1 = signature.addElement("Signature");
+ signature1.addAttribute("id", "InvoicingParty");
+ Element signedInfo = signature1.addElement("SignedInfo");
signedInfo.addElement("Reference").addAttribute("URI", "/EInvoice/Headerl/EInvoice/EInvoiceData");
signedInfo.addElement("SignatureAlgorithm").setText(signDto.getSignatureAlgorithm());
signedInfo.addElement("SignatureFormat").setText(signDto.getSignatureFormat());
- signature.addElement("SignatureTime").setText(signDto.getSignatureTime());
- signature.addElement("SignatureValue").setText(signDto.getSignatureValue());
- Element keyInfo = signature.addElement("KeyInfo");
+ signature1.addElement("SignatureTime").setText(signDto.getSignatureTime());
+ signature1.addElement("SignatureValue").setText(signDto.getSignatureValue());
+ Element keyInfo = signature1.addElement("KeyInfo");
keyInfo.addElement("SerialNumber").setText(signDto.getSerialNumber());
keyInfo.addElement("X509IssuerName").setText(signDto.getIssuerDn());
- return signature;
+ return document;
}
diff --git a/exam-system/src/test/java/TextPay.java b/exam-system/src/test/java/TextPay.java
index 5d2608f..d2ff3a8 100644
--- a/exam-system/src/test/java/TextPay.java
+++ b/exam-system/src/test/java/TextPay.java
@@ -11,13 +11,14 @@
import com.google.gson.JsonObject;
import com.ruoyi.common.utils.RandomUtil;
import lombok.extern.log4j.Log4j2;
-import org.dom4j.Element;
+import org.dom4j.*;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ActiveProfiles;
import java.io.IOException;
import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
import java.util.*;
@SpringBootTest(classes = TextPay.class)
@@ -46,17 +47,17 @@
@Test
- public void paytext() throws IOException {
+ public void paytext() throws IOException, DocumentException {
PayReqData payReqData = new PayReqData();
PayReqData.Feedata feedatas = new PayReqData.Feedata();
- //订单编号
- payReqData.setOrderNo("CO202502140115634461");
+ //订单编号 RandomUtil.generateOrderNumber(1L, "NC") NC202502170849287181
+ payReqData.setOrderNo(RandomUtil.generateOrderNumber(1L, "NC"));
//订单总金额
- payReqData.setMoney(BigDecimal.valueOf(56));
+ payReqData.setMoney(BigDecimal.valueOf(112));
//子订单数目
payReqData.setAmount(1);
//缴费人姓名（单位填单位名称）阿克苏地区博安煤矿安全技术服务中心
@@ -66,29 +67,29 @@
//缴款人类型（1个人 2单位）
payReqData.setPayerType(2);
//开票单位社会信用代码12650000MB1A9612XD
- payReqData.setInvoiceSocialCode("11650000MB1957293J");
+ payReqData.setInvoiceSocialCode("11652300734487567J");
//开票人
- payReqData.setHandlingPerson("张三");
+ payReqData.setHandlingPerson("姜倩");
//复核人
- payReqData.setChecker("李四");
+ payReqData.setChecker("薄晓洁");
//单位编码547185129
payReqData.setEnterCode("547185129");
//订单描述（非必填）
- payReqData.setDesc("煤矿安全作业理论考试-002002");
+ payReqData.setDesc("非煤安全作业理论考试-002002");
//订单明细
List<PayReqData.Feedata> feedatas1 = new ArrayList<>();
//数量
-// feedatas.setAmount(1);
-// //业务代码
-// feedatas.setBusCode("DZ12401");
-// //单价
-// feedatas.setPrice(BigDecimal.valueOf(56));
- PayReqData.Feedata feedata = new PayReqData.Feedata();
- feedata.setBusCode("DZ002002");
- feedata.setAmount(1);
- feedata.setPrice(BigDecimal.valueOf(56));
-// feedatas1.add(feedatas);
- feedatas1.add(feedata);
+ feedatas.setAmount(2);
+ //业务代码
+ feedatas.setBusCode("DZ002002");
+ //单价
+ feedatas.setPrice(BigDecimal.valueOf(112));
+// PayReqData.Feedata feedata = new PayReqData.Feedata();
+// feedata.setBusCode("DZ012402");
+// feedata.setAmount(1);
+// feedata.setPrice(BigDecimal.valueOf(103));
+ feedatas1.add(feedatas);
+// feedatas1.add(feedata);
payReqData.setFeeDatas(feedatas1);
log.info("请求参数："+ JSONObject.toJSONString(payReqData));
@@ -96,36 +97,58 @@
PayUtils payUtils = new PayUtils();
ResultVo resultVo = payUtils.sendApiPost(payReqData);
String jsonString = JSONObject.toJSONString(resultVo);
- log.info("请求结果:"+jsonString);
+// log.info("请求结果:"+jsonString);
String fileData = resultVo.getRespdata().getFileData();
byte[] decode = Base64.getDecoder().decode(fileData);
- SignResult sign = payUtils.sign(decode);
- log.info("签名结果为:"+ Arrays.toString(sign.getSignData()));
- VerifyResult verify = payUtils.verify(decode, new String(sign.getSignData()));
- SignDto signDto = new SignDto("SM3", "Base64", new Date(), verify.getReturnData(), verify.getSerialNumber(), verify.getIssure());
- Sign sign1 = new Sign();
- Element signature = sign1.getSignature(signDto);
- EnvelopResult envelopResult = payUtils.encryptEnvelop(String.valueOf(signature));
- log.info("制作数字信封为:"+ Arrays.toString(envelopResult.getEnvelopData()));
+ String xmlString = new String(decode, StandardCharsets.UTF_8);
+ Document document = DocumentHelper.parseText(xmlString);
+ log.info("票据原文为:"+document.asXML());
+// Element rootElement = document.getRootElement();
+// Element eInvoiceData = rootElement.element("EInvoiceData");
+//// log.info("xml文件为:"+text);
+// SignResult sign = payUtils.sign(decode);
+//// log.info("签名结果为:"+ Arrays.toString(sign.getSignData()));
+// VerifyResult verify = payUtils.verify(decode, sign.getSignData());
+// SignDto signDto = new SignDto("SM3", "Base64", new Date(), verify.getReturnData(), verify.getSerialNumber(), verify.getIssure());
+// Sign sign1 = new Sign();
+// Document signature = sign1.getSignature(signDto);
+// eInvoiceData.add(signature);
+// EnvelopResult envelopResult = payUtils.encryptEnvelop(document.asXML().getBytes());
+// log.info("制作数字信封为:"+ Arrays.toString(envelopResult.getEnvelopData()));
}
-// @Test
-// public void sing(){
-// PayUtils payUtils = new PayUtils();
-// SignResult sign = payUtils.sign("aaaaaabbbbbb");
-// log.info(sign);
-// }
+ @Test
+ public void sing() throws IOException {
+ String fileData="<?xml version=\"1.0\" encoding=\"UTF-8\"?><EInvoice><Header><EInvoiceTag>CZ-EI-65</EInvoiceTag><EInvoiceID>8302000000-52101056</EInvoiceID><Version>1.0.0</Version></Header><EInvoiceData><Main><EInvoiceName>新疆维吾尔自治区政府非税收入票据_电子票</EInvoiceName><EInvoiceCode>65010125</EInvoiceCode><EInvoiceNumber>0000002038</EInvoiceNumber><RandomNumber>buac24</RandomNumber><EInvoiceSpecimenCode>652500010001</EInvoiceSpecimenCode><SupervisorAreaCode>650000</SupervisorAreaCode><TotalAmount>56.00</TotalAmount><IssueDate>2025-02-15</IssueDate><IssueTime>00:00:00</IssueTime><InvoicingParty><InvoicingPartyCode>11650000MB1957293J</InvoicingPartyCode><InvoicingPartyName>新疆维吾尔自治区应急管理厅</InvoicingPartyName></InvoicingParty><PayerParty><PayerPartyType>2</PayerPartyType><PayerPartyName>阿克苏地区博安煤矿安全技术服务中心</PayerPartyName></PayerParty><HandlingPerson>张三</HandlingPerson><Checker>李四</Checker><MainExt><PayCode>65000025000000017955</PayCode></MainExt><InvoicingPartySeal><SealId>006fba98-37ad-4499-8c2e-b2ed24d0d802</SealId><SealName>新疆维吾尔自治区应急管理厅机关（行政）</SealName><SealHash>1762185155</SealHash></InvoicingPartySeal><SupervisorPartySeal><SealId>cd7c38f4-ba68-4dd9-94ca-c5058faaf7ed</SealId><SealName>新疆维吾尔自治区财政厅</SealName><SealHash>-1186976973</SealHash></SupervisorPartySeal></Main><Details><Item><ItemCode>86211900001</ItemCode><ItemName>煤矿安全作业理论考试</ItemName><ItemAmount>56.00</ItemAmount></Item></Details></EInvoiceData><EInvoiceSignature><Signature id=\"InvoicingParty\"><SignedInfo><Reference URI=\"/EInvoice/Headerl/EInvoice/EInvoiceData\"/><SignatureAlgorithm>SM3</SignatureAlgorithm><SignatureFormat>DETACH</SignatureFormat></SignedInfo><SignatureTime>15 02 2025 15:15:15 GMT+08:00</SignatureTime><SignatureValue>CN=应急管理厅,T=11650000MB1957293J,OU=01,L=00,L=00,ST=65,O=01,O=MOF,C=CN</SignatureValue><KeyInfo><SerialNumber>63562B79EB75C36D</SerialNumber><X509IssuerName>CN=Private Certificate Authority Of MOF SM2,O=MOF,C=CN</X509IssuerName></KeyInfo></Signature></EInvoiceSignature></EInvoice>";
+
+
+ PayUtils payUtils = new PayUtils();
+ ResultVo resultVo = payUtils.uploadXml("CO202502140115634461", fileData.getBytes());
+ log.info("请求结果为:"+resultVo);
+ }
@Test
- public void text001() {
-// try {
-//// String s = PayUtils.affirmPost("10000001");
-// //JSONObject query = PayUtils.query("1000001");
-// } catch (IOException e) {
-// throw new RuntimeException(e);
-// }
+ public void text001() throws DocumentException {
+ String aa = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Signature><id xmlns=\"InvoicingParty\"/><SignedInfo><Reference URI=\"/EInvoice/Headerl/EInvoice/EInvoiceData\"/><SignatureAlgorithm>SM3</SignatureAlgorithm><SignatureFormat>DETACH</SignatureFormat></SignedInfo><SignatureTime>15 02 2025 13:16:17 GMT+08:00</SignatureTime><SignatureValue>CN=应急管理厅,T=11650000MB1957293J,OU=01,L=00,L=00,ST=65,O=01,O=MOF,C=CN</SignatureValue><KeyInfo><SerialNumber>63562B79EB75C36D</SerialNumber><X509IssuerName>CN=Private Certificate Authority Of MOF SM2,O=MOF,C=CN</X509IssuerName></KeyInfo></Signature>";
+ String bb = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><EInvoice><Header><EInvoiceTag>CZ-EI-65</EInvoiceTag><EInvoiceID>8302000000-52101056</EInvoiceID><Version>1.0.0</Version></Header><EInvoiceData><Main><EInvoiceName>新疆维吾尔自治区政府非税收入票据_电子票</EInvoiceName><EInvoiceCode>65010125</EInvoiceCode><EInvoiceNumber>0000002038</EInvoiceNumber><RandomNumber>buac24</RandomNumber><EInvoiceSpecimenCode>652500010001</EInvoiceSpecimenCode><SupervisorAreaCode>650000</SupervisorAreaCode><TotalAmount>56.00</TotalAmount><IssueDate>2025-02-15</IssueDate><IssueTime>00:00:00</IssueTime><InvoicingParty><InvoicingPartyCode>11650000MB1957293J</InvoicingPartyCode><InvoicingPartyName>新疆维吾尔自治区应急管理厅</InvoicingPartyName></InvoicingParty><PayerParty><PayerPartyType>2</PayerPartyType><PayerPartyName>阿克苏地区博安煤矿安全技术服务中心</PayerPartyName></PayerParty><HandlingPerson>张三</HandlingPerson><Checker>李四</Checker><MainExt><PayCode>65000025000000017955</PayCode></MainExt><InvoicingPartySeal><SealId>006fba98-37ad-4499-8c2e-b2ed24d0d802</SealId><SealName>新疆维吾尔自治区应急管理厅机关（行政）</SealName><SealHash>1762185155</SealHash></InvoicingPartySeal><SupervisorPartySeal><SealId>cd7c38f4-ba68-4dd9-94ca-c5058faaf7ed</SealId><SealName>新疆维吾尔自治区财政厅</SealName><SealHash>-1186976973</SealHash></SupervisorPartySeal></Main><Details><Item><ItemCode>86211900001</ItemCode><ItemName>煤矿安全作业理论考试</ItemName><ItemAmount>56.00</ItemAmount></Item></Details></EInvoiceData></EInvoice>";
+
+
+ Document documenta = DocumentHelper.parseText(aa);
+ Document documentb = DocumentHelper.parseText(bb);
+ log.info("原文为:"+documentb.asXML());
+ log.info("需要拼接为:"+documenta.asXML());
+ Element rootElement = documenta.getRootElement();
+// Element signature = rootElement.element("Signature");
+ Element rootElement1 = documentb.getRootElement();
+// Element eInvoice = rootElement1.element("EInvoice");
+ rootElement1.add(rootElement);
+ log.info("拼接后位:"+documentb.asXML());
+
+
+
+
}
--
Gitblit v1.9.2