From 62d725344d2f0758101122dfd3e3202d836292db Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期一, 17 二月 2025 10:41:53 +0800
Subject: [PATCH] 煤矿缴费修改

---
 exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java |   69 +++++++++++++++++++++-------------
 1 files changed, 42 insertions(+), 27 deletions(-)

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 d587e47..d4116a9 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
@@ -27,6 +27,9 @@
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
@@ -38,6 +41,7 @@
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -323,15 +327,15 @@
     }
 
     @Override
-    public SignResult topay() throws IOException {
+    public ResultVo topay() throws IOException {
         PayReqData payReqData = new PayReqData();
         PayReqData.Feedata feedatas = new PayReqData.Feedata();
 
 
         //订单编号
-        payReqData.setOrderNo(RandomUtil.generateOrderNumber(1L, "CO"));
+        payReqData.setOrderNo("NC202502170905105061");
         //订单总金额
-        payReqData.setMoney(BigDecimal.valueOf(56));
+        payReqData.setMoney(BigDecimal.valueOf(112));
         //子订单数目
         payReqData.setAmount(1);
         //缴费人姓名(单位填单位名称)阿克苏地区博安煤矿安全技术服务中心
@@ -343,13 +347,13 @@
         //开票单位社会信用代码12650000MB1A9612XD
         payReqData.setInvoiceSocialCode("11650000MB1957293J");
         //开票人
-        payReqData.setHandlingPerson("张三");
+        payReqData.setHandlingPerson("姜倩");
         //复核人
-        payReqData.setChecker("李四");
+        payReqData.setChecker("薄晓洁");
         //单位编码547185129
         payReqData.setEnterCode("547185129");
         //订单描述(非必填)
-        payReqData.setDesc("煤矿安全作业理论考试-002002");
+        payReqData.setDesc("非煤安全作业理论考试-002002");
         //订单明细
         List<PayReqData.Feedata> feedatas1 = new ArrayList<>();
         //数量
@@ -360,8 +364,8 @@
 //        feedatas.setPrice(BigDecimal.valueOf(56));
         PayReqData.Feedata feedata = new PayReqData.Feedata();
         feedata.setBusCode("DZ002002");
-        feedata.setAmount(1);
-        feedata.setPrice(BigDecimal.valueOf(56));
+        feedata.setAmount(2);
+        feedata.setPrice(BigDecimal.valueOf(112));
 //        feedatas1.add(feedatas);
         feedatas1.add(feedata);
         payReqData.setFeeDatas(feedatas1);
@@ -370,27 +374,40 @@
 
         PayUtils payUtils = new PayUtils();
         ResultVo resultVo = payUtils.sendApiPost(payReqData);
-        String jsonString = JSONObject.toJSONString(resultVo);
-        log.info("请求结果:"+jsonString);
         String fileData = resultVo.getRespdata().getFileData();
-        Base64.Decoder decoder = Base64.getDecoder();
-        byte[] decode = decoder.decode(fileData);
+        //票据原文转为byte字节文件
+        byte[] decode =  Base64.getDecoder().decode(fileData);
+        //byte字节文件转为xml字符串
+        String xmlString = new String(decode, StandardCharsets.UTF_8);
+        Document document = null;
+        try {
+            document = DocumentHelper.parseText(xmlString);
+        } catch (DocumentException e) {
+            throw new RuntimeException(e);
+        }
+        log.info("票据原文为:"+document.asXML());
+        Element rootElement = document.getRootElement();
         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());
+        VerifyResult verify = payUtils.verify(decode,sign.getSignData());
+        SignDto signDto = new SignDto("SM3", "DETACH", new Date(), verify.getSubjectdn(), verify.getSn(), verify.getIssure());
+        log.info("拼接对象为:"+JSONObject.toJSONString(signDto));
         Sign sign1 = new Sign();
-        Element signature = sign1.getSignature(signDto);
-        EnvelopResult envelopResult = payUtils.encryptEnvelop(String.valueOf(signature));
-        log.info("制作数字信封为:"+ Arrays.toString(envelopResult.getEnvelopData()));
-        return sign;
+        Document signature = sign1.getSignature(signDto);
+//        Element rootElement1 = signature.getRootElement();
+        log.info("拼接结果为:"+signature.asXML());
+        rootElement.add(signature.getRootElement());
+//        EnvelopResult envelopResult = payUtils.encryptEnvelop(document.asXML().getBytes());
+//        log.info("制作数字信封为:"+ Arrays.toString(envelopResult.getEnvelopData()));
+        log.info("签名后票据为:"+document.asXML());
+        ResultVo resultVo1 = payUtils.uploadXml(resultVo.getRespdata().getOrderNo(), document.asXML().getBytes());
+        return resultVo1;
     }
 
     private PayReqData fillData(List<CoalPayStudent>  coalPayStudent, CoalPay coalPay, List<CoalCategory> coalCategories, CoalTicket coalTicket,Integer payType,CoalTeamPayReq coalTeamPayReq) {
         PayReqData payReqData = new PayReqData();
         payReqData.setOrderNo(RandomUtil.generateOrderNumber(coalPay.getId(), "CO"));
         payReqData.setMoney(coalPay.getAmount().multiply(BigDecimal.valueOf(coalPayStudent.size())));
-        payReqData.setAmount(coalCategories.size()*coalPayStudent.size());
+        payReqData.setAmount(coalCategories.size());
         payReqData.setInvoiceSocialCode(coalTicket.getTicketCompanyCode());
         payReqData.setHandlingPerson(coalTicket.getDrawer());
         payReqData.setChecker(coalTicket.getCheck());
@@ -400,13 +417,11 @@
 
         List<PayReqData.Feedata> feedatas = new ArrayList<>();
         for (CoalCategory coalCategory : coalCategories) {
-            for (CoalPayStudent payStudent : coalPayStudent) {
-                PayReqData.Feedata feedata = new PayReqData.Feedata();
-                feedata.setAmount(1);
-                feedata.setPrice(coalCategory.getAmount());
-                feedata.setBusCode(coalCategory.getBusinessCode());
-                feedatas.add(feedata);
-            }
+            PayReqData.Feedata feedata = new PayReqData.Feedata();
+            feedata.setAmount(coalPayStudent.size());
+            feedata.setPrice(coalCategory.getAmount().multiply(BigDecimal.valueOf(coalPayStudent.size())));
+            feedata.setBusCode(coalCategory.getBusinessCode());
+            feedatas.add(feedata);
         }
         payReqData.setFeeDatas(feedatas);
 

--
Gitblit v1.9.2