From dcf2c39ca10e6b7e91a7970cd784a5bf07a55207 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: Tue, 18 Feb 2025 16:41:52 +0800
Subject: [PATCH] merge
---
exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java | 163 ++++++++++++++++++++---------------------------------
1 files changed, 62 insertions(+), 101 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 bfd4605..86d86f7 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,7 +1,5 @@
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;
import com.alibaba.fastjson2.JSONObject;
@@ -15,14 +13,16 @@
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.*;
+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.ruoyi.common.constant.ResultConstants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.exception.BusinessException;
import com.ruoyi.common.utils.RandomUtil;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.SysDeptMapper;
import lombok.extern.slf4j.Slf4j;
import org.dom4j.Document;
@@ -37,17 +37,15 @@
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.ArrayList;
+import java.util.Base64;
+import java.util.Date;
+import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
-
-import static com.gkhy.exam.pay.utils.DemoUtils.generateBase64StringToFile;
@Service
@Slf4j
@@ -94,7 +92,7 @@
//学员数据
List<CoalPayStudent> coalPayStudents = coalPayStudentService.selectByCoalPayId(pay.getId());
List<CoalPayStudent> havePay = coalPayStudents.stream()
- .filter(stu -> stu.getPayStatus() != null && stu.getPayStatus()==1)
+ .filter(stu -> stu.getPayStatus() != null && stu.getPayStatus() == 1)
.collect(Collectors.toList());
coalPayRepDto.setTotalNum(coalPayStudents.size());
coalPayRepDto.setHavePayNum(havePay.size());
@@ -230,7 +228,7 @@
throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "已为团体缴费，不可更改");
}
int i = coalPayMapper.updateByPayId(coalPayTypeReq);
- if (i>0){
+ if (i > 0) {
CoalPayStudent coalPayStudent = new CoalPayStudent();
coalPayStudent.setCoalPayId(coalPayTypeReq.getCoalPayId());
coalPayStudent.setPayType(2);
@@ -252,20 +250,17 @@
CoalPay coalPay = coalPayMapper.selectById(coalPayId);
List<CoalCategory> coalCategories = coalCategoryMapper.selectByCoalPayId(coalPayId);
CoalTicket coalTicket = coalCategoryMapper.selectCoalTicket();
- if (CollectionUtils.isEmpty(coalPayStudent)){
- throw new BusinessException(this.getClass(),ResultConstants.BUSINESS_ERROR,"缴费学员不存在");
+ if (CollectionUtils.isEmpty(coalPayStudent)) {
+ throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "缴费学员不存在");
}
- if (coalPay==null){
- throw new BusinessException(this.getClass(),ResultConstants.BUSINESS_ERROR,"未找到相关缴费信息");
+ if (coalPay == null) {
+ throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "未找到相关缴费信息");
}
- if (student.getPayStatus()==1){
- throw new BusinessException(this.getClass(),ResultConstants.BUSINESS_ERROR,"请勿重新缴费");
- }
- if (student.getGovPayStatus() == 2){
- return student.getOrderId();
+ if (student.getPayStatus() == 1) {
+ throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "请勿重新缴费");
}
- PayReqData payReqData = fillData(coalPayStudent,coalPay,coalCategories,coalTicket,1,null);
+ PayReqData payReqData = fillData(coalPayStudent, coalPay, coalCategories, coalTicket, 1, null);
ResultVo resultVo = payUtils.sendApiPost(payReqData);
if (resultVo.getRespcode().equals("BUS0000")) {
@@ -275,9 +270,8 @@
// throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "签名验证错误");
// }
payStudent.setId(studentId);
- payStudent.setOrderId(resultVo.getRespdata().getOrderId());
- payStudent.setOrderNo(resultVo.getRespdata().getOrderNo());
- payStudent.setGovPayStatus(2);
+ payStudent.setOrderId(resultVo.getRespdata().getOrderNo());
+ payStudent.setGovPayStatus(1);
payStudent.setPayCode(resultVo.getRespdata().getBillNo());
coalPayStudentService.updateByCoalPayStudent(payStudent);
return resultVo.getRespdata().getOrderId();
@@ -299,35 +293,34 @@
public String teamPayMoney(CoalTeamPayReq coalTeamPayReq) {
RLock lock = redissonClient.getLock("SWSPKMAS_TEAM_PAY_" + coalTeamPayReq.getCoalPayId());
try {
- lock.lock(10,TimeUnit.SECONDS);
+ lock.lock(10, TimeUnit.SECONDS);
List<CoalPayStudent> coalPayStudents = coalPayStudentService.selectByCoalPayIdAndPayStatus(coalTeamPayReq.getCoalPayId(), 0);
CoalPay coalPay = coalPayMapper.selectById(coalTeamPayReq.getCoalPayId());
List<CoalCategory> coalCategories = coalCategoryMapper.selectByCoalPayId(coalTeamPayReq.getCoalPayId());
CoalTicket coalTicket = coalCategoryMapper.selectCoalTicket();
- if (CollectionUtils.isEmpty(coalPayStudents)){
- throw new BusinessException(this.getClass(),ResultConstants.BUSINESS_ERROR,"缴费学员不存在");
+ if (CollectionUtils.isEmpty(coalPayStudents)) {
+ throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "缴费学员不存在");
}
- if (coalPay==null){
- throw new BusinessException(this.getClass(),ResultConstants.BUSINESS_ERROR,"未找到相关缴费信息");
+ if (coalPay == null) {
+ throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "未找到相关缴费信息");
}
CoalPayStudent payStudent = new CoalPayStudent();
- PayReqData payReqData = fillData(coalPayStudents, coalPay, coalCategories, coalTicket,2,coalTeamPayReq);
+ PayReqData payReqData = fillData(coalPayStudents, coalPay, coalCategories, coalTicket, 2, coalTeamPayReq);
ResultVo resultVo = payUtils.sendApiPost(payReqData);
if (resultVo.getRespcode().equals("BUS0000")) {
payStudent.setCoalPayId(coalPay.getId());
- payStudent.setOrderId(resultVo.getRespdata().getOrderId());
- payStudent.setOrderNo(resultVo.getRespdata().getOrderNo());
- payStudent.setGovPayStatus(2);
+ payStudent.setOrderId(resultVo.getRespdata().getOrderNo());
+ payStudent.setGovPayStatus(1);
payStudent.setPayCode(resultVo.getRespdata().getBillNo());
coalPayStudentService.updateByCoalPayIdAndStatus(payStudent);
return resultVo.getRespdata().getOrderId();
} else {
throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "发起支付失败，请稍后重试");
}
- }catch (Exception e){
+ } catch (Exception e) {
throw new RuntimeException(e);
- }finally {
+ } finally {
if (lock.isLocked()) {
lock.unlock();
}
@@ -335,86 +328,56 @@
}
@Override
- public ResultVo topay() throws IOException, BillSignException {
+ public ResultVo topay() throws IOException {
PayReqData payReqData = new PayReqData();
PayReqData.Feedata feedatas = new PayReqData.Feedata();
//订单编号
- payReqData.setOrderNo("CO202502180328549421");
+ payReqData.setOrderNo("NC202502170905105061");
//订单总金额
- payReqData.setMoney(BigDecimal.valueOf(159));
+ payReqData.setMoney(BigDecimal.valueOf(112));
//子订单数目
- payReqData.setAmount(2);
+ payReqData.setAmount(1);
//缴费人姓名（单位填单位名称）阿克苏地区博安煤矿安全技术服务中心
- payReqData.setPayerName("闵强明");
+ payReqData.setPayerName("阿克苏地区博安煤矿安全技术服务中心");
//缴费人证件号（单位填同一信用代码）52652900789893140A
- payReqData.setCertNo("321023197209184616");
+ payReqData.setCertNo("52652900789893140A");
//缴款人类型（1个人 2单位）
- payReqData.setPayerType(1);
+ payReqData.setPayerType(2);
//开票单位社会信用代码12650000MB1A9612XD
- payReqData.setInvoiceSocialCode("65000023000000172848");
+ payReqData.setInvoiceSocialCode("11650000MB1957293J");
//开票人
- payReqData.setHandlingPerson("张三");
+ payReqData.setHandlingPerson("姜倩");
//复核人
- payReqData.setChecker("李四");
+ payReqData.setChecker("薄晓洁");
//单位编码547185129
payReqData.setEnterCode("547185129");
//订单描述（非必填）
- payReqData.setDesc("单位业务");
+ payReqData.setDesc("非煤安全作业理论考试-002002");
//订单明细
List<PayReqData.Feedata> feedatas1 = new ArrayList<>();
//数量
- feedatas.setAmount(1);
- //业务代码
- feedatas.setBusCode("DZ011573");
- //单价
- feedatas.setPrice(BigDecimal.valueOf(56));
+// feedatas.setAmount(1);
+// //业务代码
+// feedatas.setBusCode("DZ12401");
+// //单价
+// feedatas.setPrice(BigDecimal.valueOf(56));
PayReqData.Feedata feedata = new PayReqData.Feedata();
- feedata.setBusCode("DZ011574");
- feedata.setAmount(1);
- feedata.setPrice(BigDecimal.valueOf(103));
- feedatas1.add(feedatas);
+ feedata.setBusCode("DZ002002");
+ feedata.setAmount(2);
+ feedata.setPrice(BigDecimal.valueOf(112));
+// feedatas1.add(feedatas);
feedatas1.add(feedata);
payReqData.setFeeDatas(feedatas1);
- log.info("请求参数："+ JSONObject.toJSONString(payReqData));
+ log.info("请求参数：" + JSONObject.toJSONString(payReqData));
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[] decode = Base64.getDecoder().decode(fileData);
//byte字节文件转为xml字符串
String xmlString = new String(decode, StandardCharsets.UTF_8);
Document document = null;
@@ -423,27 +386,25 @@
} catch (DocumentException e) {
throw new RuntimeException(e);
}
- log.info("票据原文为:"+document.asXML());
- BillSign billSign = new BillSign();
- String s = billSign.readRefSignDto(document);
+ log.info("票据原文为:" + document.asXML());
Element rootElement = document.getRootElement();
- 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));
+ SignResult sign = payUtils.sign(decode);
+ VerifyResult verify = payUtils.verify(decode, sign.getSignData());
+ SignDto signDto = new SignDto(new Date(), verify.getSubjectdn(), verify.getSn(), verify.getIssure());
+ log.info("拼接对象为:" + JSONObject.toJSONString(signDto));
Sign sign1 = new Sign();
Document signature = sign1.getSignature(signDto);
// Element rootElement1 = signature.getRootElement();
- log.info("拼接结果为:"+signature.asXML());
+ 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());
+ 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) {
+ 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())));
@@ -465,11 +426,11 @@
}
payReqData.setFeeDatas(feedatas);
- if (1==payType){
+ if (1 == payType) {
payReqData.setPayerName(coalPayStudent.get(0).getName());
payReqData.setCertNo(coalPayStudent.get(0).getIdCard());
payReqData.setPayerType(1);
- }else if (2==payType){
+ } else if (2 == payType) {
payReqData.setPayerName(coalTeamPayReq.getPayCompanyName());
payReqData.setCertNo(coalTeamPayReq.getPayCompanyCard());
payReqData.setPayerType(2);
--
Gitblit v1.9.2