From cff3c43f216c6f01f675e4821832e15f2a77c57c Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期三, 05 二月 2025 13:00:04 +0800
Subject: [PATCH] 煤矿缴费修改
---
exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java | 10 ++++
exam-system/src/main/java/com/gkhy/exam/pay/dto/rep/CoalPayRepDto.java | 2
exam-system/src/main/java/com/gkhy/exam/pay/utils/PayUtils.java | 66 +++++++++++++++++++++++++++++++++
exam-system/src/main/resources/mapper/pay/CoalPayStudentMapper.xml | 2 -
exam-system/src/main/java/com/gkhy/exam/pay/controller/PayFeesController.java | 2 +
ruoyi-admin/src/main/resources/application-pro.yml | 3 +
ruoyi-admin/src/main/resources/application-dev.yml | 1
7 files changed, 81 insertions(+), 5 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/controller/PayFeesController.java b/exam-system/src/main/java/com/gkhy/exam/pay/controller/PayFeesController.java
index ac51b25..8f970d5 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/controller/PayFeesController.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/controller/PayFeesController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson2.JSONObject;
import com.gkhy.exam.pay.utils.PayUtils;
+import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.controller.BaseController;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.PostMapping;
@@ -20,6 +21,7 @@
@PostMapping("/inform")
+ @Anonymous
public Map<String,String> inform(@RequestBody JSONObject jsonObject){
PayUtils payUtils = new PayUtils();
Map<String, String> receive = null;
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/dto/rep/CoalPayRepDto.java b/exam-system/src/main/java/com/gkhy/exam/pay/dto/rep/CoalPayRepDto.java
index 25efa99..5e884c6 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/dto/rep/CoalPayRepDto.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/dto/rep/CoalPayRepDto.java
@@ -71,7 +71,7 @@
*/
private Integer totalNum;
/**
- * 未交费数量
+ * 已交费数量
*/
private Integer havePayNum;
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java
index 2c86c26..79e19c9 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java
@@ -12,6 +12,7 @@
import com.gkhy.exam.pay.service.CoalPayStudentService;
import com.gkhy.exam.pay.utils.PayUtils;
import com.gkhy.exam.pay.utils.ResultVo;
+import com.gkhy.exam.pay.utils.Sign;
import com.ruoyi.common.constant.ResultConstants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept;
@@ -20,6 +21,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.SysDeptMapper;
+import org.dom4j.Element;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.beans.BeanUtils;
@@ -80,7 +82,7 @@
//学员数据
List<CoalPayStudent> coalPayStudents = coalPayStudentService.selectByCoalPayId(pay.getId());
List<CoalPayStudent> havePay = coalPayStudents.stream()
- .filter(stu -> stu.getPayStatus() != null && stu.getPayStatus().equals(1))
+ .filter(stu -> stu.getPayStatus() != null && stu.getPayStatus()==1)
.collect(Collectors.toList());
coalPayRepDto.setTotalNum(coalPayStudents.size());
coalPayRepDto.setHavePayNum(havePay.size());
@@ -184,6 +186,7 @@
for (CoalPayStudent payStudent : coalPayStudents) {
//封装学生基础信息
CoalPayStudentRep coalPayStudentRep = new CoalPayStudentRep();
+ coalPayStudentRep.setId(payStudent.getId());
coalPayStudentRep.setName(payStudent.getName());
coalPayStudentRep.setIdCard(payStudent.getIdCard());
coalPayStudentRep.setPhone(payStudent.getPhone());
@@ -249,6 +252,11 @@
ResultVo resultVo = payUtils.sendApiPost(payReqData);
if (resultVo.getRespcode().equals("BUS0000")) {
+ //进行票据签名并校验
+ ResultVo resultVo1 = payUtils.uploadXml(resultVo.getRespdata().getOrderNo(), resultVo.getRespdata().getFileData());
+ if (!resultVo1.getRespcode().equals("BUS0000")){
+ throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "签名验证错误");
+ }
payStudent.setId(studentId);
payStudent.setOrderId(resultVo.getRespdata().getOrderNo());
payStudent.setGovPayStatus(1);
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 8c94e73..a9038c0 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
@@ -29,6 +29,9 @@
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils;
+import org.dom4j.Element;
+import org.dom4j.io.OutputFormat;
+import org.dom4j.io.XMLWriter;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
@@ -36,8 +39,11 @@
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.X509Certificate;
@@ -67,6 +73,9 @@
@Value("${finance.queryUrl}")
private String queryUrl;
+ @Value("${finance.uploadXmlUrl}")
+ private String uploadXmlUrl;
+
/**
* 请求开票，发起支付
* @param payReqData
@@ -92,6 +101,7 @@
HttpResultVo execute = httpClient.execute(httpPost, getResponseHandler());
String stringContent = execute.getStringContent();
ResultVo resultVo = JSONObject.parseObject(stringContent, ResultVo.class);
+ log.info("请求结果为:"+resultVo);
return resultVo;
}
@@ -337,4 +347,60 @@
return ResponseEntity.ok(result);
}
+
+ //上传财政电子票据签名文件
+ public ResultVo uploadXml(String orderId, String plain) throws IOException {
+ Map<String, String> params = new HashMap<>();
+
+ Sign sign = new Sign();
+ Element signature = sign.getSignature(plain);
+
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("orderNo",orderId);
+ jsonObject.put("fileData", Base64.getEncoder().encodeToString(convertElementToByteArray(signature)));
+
+ String reqdata = Base64.getEncoder().encodeToString(jsonObject.toJSONString().getBytes());
+ String mac = appId+"||" +reqdata;
+ mac = DigestUtils.md5Hex(mac.getBytes());
+
+ params.put("appid",appId);
+ params.put("reqdata",reqdata);
+ params.put("mac",mac);
+
+ HttpPost httpPost = new HttpPost(uploadXmlUrl);
+ httpPost.setEntity(assemblyFormEntity(params,"utf-8"));
+ HttpClient httpClient = getHttpClient(uploadXmlUrl);
+ HttpResultVo execute = httpClient.execute(httpPost, getResponseHandler());
+ String stringContent = execute.getStringContent();
+ ResultVo resultVo = JSONObject.parseObject(stringContent, ResultVo.class);
+ log.info("请求结果转为:"+resultVo);
+ return resultVo;
+ }
+
+ //获取XML文件字节码
+ public static byte[] convertElementToByteArray(Element element) {
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+
+ try {
+ // 设置输出格式
+ OutputFormat format = OutputFormat.createPrettyPrint();
+ format.setEncoding("UTF-8"); // 设置编码为UTF-8
+
+ // 创建 XMLWriter
+ XMLWriter writer = new XMLWriter(new OutputStreamWriter(byteArrayOutputStream, StandardCharsets.UTF_8), format);
+
+ // 写入 Element 对象
+ writer.write(element.getDocument());
+ writer.close(); // 关闭 writer，确保所有数据都被写入
+
+ } catch (IOException e) {
+ e.printStackTrace(); // 打印异常信息
+ // 处理异常，比如返回一个空的字节数组或重新抛出异常
+ return new byte[0];
+ }
+
+ // 返回字节数组
+ return byteArrayOutputStream.toByteArray();
+ }
+
}
diff --git a/exam-system/src/main/resources/mapper/pay/CoalPayStudentMapper.xml b/exam-system/src/main/resources/mapper/pay/CoalPayStudentMapper.xml
index 7078ba9..fddcd40 100644
--- a/exam-system/src/main/resources/mapper/pay/CoalPayStudentMapper.xml
+++ b/exam-system/src/main/resources/mapper/pay/CoalPayStudentMapper.xml
@@ -70,8 +70,6 @@
<if test="govPayStatus!=null">gov_pay_status=#{govPayStatus},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
- <if test="createBy != null">create_by = #{createBy},</if>
- <if test="createTime != null">create_time = #{createTime},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
</trim>
where id = #{id}
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 3c1d886..bc90bed 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -138,3 +138,4 @@
payNotifyUrl: http://finpt.xjcz.gov.cn/fs-service-test/fs-pay/notifyConfirm.do
payQueryUrl: http://finpt.xjcz.gov.cn/fs-service/fs-pay/query.do
queryUrl: http://finpt.xjcz.gov.cn/fs-service-test/fs-pay/queryFile.do
+ uploadXmlUrl: http://finpt.xjcz.gov.cn/fs-service-test/fs-pay/uploadXml.do
diff --git a/ruoyi-admin/src/main/resources/application-pro.yml b/ruoyi-admin/src/main/resources/application-pro.yml
index c48b982..01d99f1 100644
--- a/ruoyi-admin/src/main/resources/application-pro.yml
+++ b/ruoyi-admin/src/main/resources/application-pro.yml
@@ -136,4 +136,5 @@
orderUrl: http://finpt.xjcz.gov.cn/fs-service/fs-pay/invoice.do
payNotifyUrl: http://finpt.xjcz.gov.cn/fs-service/fs-pay/notifyConfirm.do
payQueryUrl: http://finpt.xjcz.gov.cn/fs-service-test/fs-pay/query.do
- queryUrl: http://finpt.xjcz.gov.cn/fs-service/fs-pay/queryFile.do
\ No newline at end of file
+ queryUrl: http://finpt.xjcz.gov.cn/fs-service/fs-pay/queryFile.do
+ uploadXmlUrl: http://finpt.xjcz.gov.cn/fs-service/fs-pay/uploadXml.do
\ No newline at end of file
--
Gitblit v1.9.2