From 3bf782ceb9411b81e5c03cadb73751f429e4051a Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期二, 18 二月 2025 16:28:33 +0800
Subject: [PATCH] 煤矿缴费修改

---
 exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java |  104 ++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 72 insertions(+), 32 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 d4116a9..bfd4605 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
@@ -1,5 +1,6 @@
 package com.gkhy.exam.pay.service.impl;
 
+import cn.com.jit.mof.bean.MOFVerifyResult;
 import cn.com.jit.new_vstk.Bean.EnvelopResult;
 import cn.com.jit.new_vstk.Bean.SignResult;
 import cn.com.jit.new_vstk.Bean.VerifyResult;
@@ -14,10 +15,7 @@
 import com.gkhy.exam.pay.mapper.CoalPayMapper;
 import com.gkhy.exam.pay.service.CoalPayService;
 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.gkhy.exam.pay.utils.SignDto;
+import com.gkhy.exam.pay.utils.*;
 import com.ruoyi.common.constant.ResultConstants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
@@ -39,12 +37,17 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
 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;
+
+import static com.gkhy.exam.pay.utils.DemoUtils.generateBase64StringToFile;
 
 @Service
 @Slf4j
@@ -258,6 +261,9 @@
             if (student.getPayStatus()==1){
                 throw new BusinessException(this.getClass(),ResultConstants.BUSINESS_ERROR,"请勿重新缴费");
             }
+            if (student.getGovPayStatus() == 2){
+                return student.getOrderId();
+            }
 
             PayReqData payReqData = fillData(coalPayStudent,coalPay,coalCategories,coalTicket,1,null);
 
@@ -269,8 +275,9 @@
 //                  throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "签名验证错误");
 //              }
                 payStudent.setId(studentId);
-                payStudent.setOrderId(resultVo.getRespdata().getOrderNo());
-                payStudent.setGovPayStatus(1);
+                payStudent.setOrderId(resultVo.getRespdata().getOrderId());
+                payStudent.setOrderNo(resultVo.getRespdata().getOrderNo());
+                payStudent.setGovPayStatus(2);
                 payStudent.setPayCode(resultVo.getRespdata().getBillNo());
                 coalPayStudentService.updateByCoalPayStudent(payStudent);
                 return resultVo.getRespdata().getOrderId();
@@ -309,8 +316,9 @@
             ResultVo resultVo = payUtils.sendApiPost(payReqData);
             if (resultVo.getRespcode().equals("BUS0000")) {
                 payStudent.setCoalPayId(coalPay.getId());
-                payStudent.setOrderId(resultVo.getRespdata().getOrderNo());
-                payStudent.setGovPayStatus(1);
+                payStudent.setOrderId(resultVo.getRespdata().getOrderId());
+                payStudent.setOrderNo(resultVo.getRespdata().getOrderNo());
+                payStudent.setGovPayStatus(2);
                 payStudent.setPayCode(resultVo.getRespdata().getBillNo());
                 coalPayStudentService.updateByCoalPayIdAndStatus(payStudent);
                 return resultVo.getRespdata().getOrderId();
@@ -327,46 +335,46 @@
     }
 
     @Override
-    public ResultVo topay() throws IOException {
+    public ResultVo topay() throws IOException, BillSignException {
         PayReqData payReqData = new PayReqData();
         PayReqData.Feedata feedatas = new PayReqData.Feedata();
 
 
         //订单编号
-        payReqData.setOrderNo("NC202502170905105061");
+        payReqData.setOrderNo("CO202502180328549421");
         //订单总金额
-        payReqData.setMoney(BigDecimal.valueOf(112));
+        payReqData.setMoney(BigDecimal.valueOf(159));
         //子订单数目
-        payReqData.setAmount(1);
+        payReqData.setAmount(2);
         //缴费人姓名(单位填单位名称)阿克苏地区博安煤矿安全技术服务中心
-        payReqData.setPayerName("阿克苏地区博安煤矿安全技术服务中心");
+        payReqData.setPayerName("闵强明");
         //缴费人证件号(单位填同一信用代码)52652900789893140A
-        payReqData.setCertNo("52652900789893140A");
+        payReqData.setCertNo("321023197209184616");
         //缴款人类型(1个人  2单位)
-        payReqData.setPayerType(2);
+        payReqData.setPayerType(1);
         //开票单位社会信用代码12650000MB1A9612XD
-        payReqData.setInvoiceSocialCode("11650000MB1957293J");
+        payReqData.setInvoiceSocialCode("65000023000000172848");
         //开票人
-        payReqData.setHandlingPerson("姜倩");
+        payReqData.setHandlingPerson("张三");
         //复核人
-        payReqData.setChecker("薄晓洁");
+        payReqData.setChecker("李四");
         //单位编码547185129
         payReqData.setEnterCode("547185129");
         //订单描述(非必填)
-        payReqData.setDesc("非煤安全作业理论考试-002002");
+        payReqData.setDesc("单位业务");
         //订单明细
         List<PayReqData.Feedata> feedatas1 = new ArrayList<>();
         //数量
-//        feedatas.setAmount(1);
-//        //业务代码
-//        feedatas.setBusCode("DZ12401");
-//        //单价
-//        feedatas.setPrice(BigDecimal.valueOf(56));
+        feedatas.setAmount(1);
+        //业务代码
+        feedatas.setBusCode("DZ011573");
+        //单价
+        feedatas.setPrice(BigDecimal.valueOf(56));
         PayReqData.Feedata feedata = new PayReqData.Feedata();
-        feedata.setBusCode("DZ002002");
-        feedata.setAmount(2);
-        feedata.setPrice(BigDecimal.valueOf(112));
-//        feedatas1.add(feedatas);
+        feedata.setBusCode("DZ011574");
+        feedata.setAmount(1);
+        feedata.setPrice(BigDecimal.valueOf(103));
+        feedatas1.add(feedatas);
         feedatas1.add(feedata);
         payReqData.setFeeDatas(feedatas1);
         log.info("请求参数:"+ JSONObject.toJSONString(payReqData));
@@ -374,7 +382,37 @@
 
         PayUtils payUtils = new PayUtils();
         ResultVo resultVo = payUtils.sendApiPost(payReqData);
+
         String fileData = resultVo.getRespdata().getFileData();
+//        String orderNo = resultVo.getRespdata().getOrderNo();
+//        String xmlFilePath = "F:\\text/" + orderNo + ".xml";
+//        generateBase64StringToFile(fileData, xmlFilePath);
+//        String trr2 = "";
+//        try {
+//            File file2 = new File(xmlFilePath);
+//            FileReader reader1 = new FileReader(file2);
+//            BufferedReader bReader = new BufferedReader(reader1);
+//            StringBuilder sb = new StringBuilder();
+//            String s = "";
+//            while ((s = bReader.readLine()) != null) {
+//                sb.append(s);
+//            }
+//            bReader.close();
+//            trr2 = sb.toString();
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        log.info("拼接原文为trr2:"+trr2);
+//
+//        BillSign billSign = new BillSign();
+//        String signData="";
+//        try {
+//            signData = billSign.signBill(trr2);
+//        } catch (BillSignException e) {
+//            throw new RuntimeException(e);
+//        } catch (Exception e) {
+//            throw new RuntimeException(e);
+//        }
         //票据原文转为byte字节文件
         byte[] decode =  Base64.getDecoder().decode(fileData);
         //byte字节文件转为xml字符串
@@ -386,10 +424,12 @@
             throw new RuntimeException(e);
         }
         log.info("票据原文为:"+document.asXML());
+        BillSign billSign = new BillSign();
+        String s = billSign.readRefSignDto(document);
         Element rootElement = document.getRootElement();
-        SignResult sign = payUtils.sign(decode);
-        VerifyResult verify = payUtils.verify(decode,sign.getSignData());
-        SignDto signDto = new SignDto("SM3", "DETACH", new Date(), verify.getSubjectdn(), verify.getSn(), verify.getIssure());
+        SignResult sign = payUtils.sign(s);
+        MOFVerifyResult verify = payUtils.verify(sign.getSignData(),s);
+        SignDto signDto = new SignDto(verify.getSignTime(), new String(Base64.getEncoder().encode(sign.getSignData())), verify.getIssure(),verify.getSn());
         log.info("拼接对象为:"+JSONObject.toJSONString(signDto));
         Sign sign1 = new Sign();
         Document signature = sign1.getSignature(signDto);
@@ -399,7 +439,7 @@
 //        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());
+        ResultVo resultVo1 = payUtils.uploadXml(resultVo.getRespdata().getOrderNo(), document.asXML());
         return resultVo1;
     }
 

--
Gitblit v1.9.2