From 3a762add44449332d6d379e361698850f6066e16 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期一, 19 五月 2025 15:20:12 +0800
Subject: [PATCH] 修改
---
exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java | 180 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 136 insertions(+), 44 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 79e19c9..ef7bfca 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 com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.exam.pay.dto.rep.CoalPayRepDto;
import com.gkhy.exam.pay.dto.rep.CoalPayStudentRep;
@@ -10,18 +11,17 @@
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.BillSignException;
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;
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 org.dom4j.Element;
+import lombok.extern.slf4j.Slf4j;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.beans.BeanUtils;
@@ -39,6 +39,7 @@
import java.util.stream.Collectors;
@Service
+@Slf4j
public class CoalPayServiceImpl extends ServiceImpl<CoalPayMapper, CoalPay> implements CoalPayService {
@Resource
@@ -82,7 +83,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());
@@ -191,6 +192,8 @@
coalPayStudentRep.setIdCard(payStudent.getIdCard());
coalPayStudentRep.setPhone(payStudent.getPhone());
coalPayStudentRep.setSex(payStudent.getSex());
+ coalPayStudentRep.setPayType(payStudent.getPayType());
+ coalPayStudentRep.setPayCode(payStudent.getPayCode());
coalPayStudentRep.setPayStatus(payStudent.getPayStatus());
//查询对应批次以及批次包含工种类别
@@ -216,7 +219,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);
@@ -238,37 +241,39 @@
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.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);
+ PayReqData payReqData = fillData(coalPayStudent, coalPay, coalCategories, coalTicket, 1, null);
- ResultVo resultVo = payUtils.sendApiPost(payReqData);
+ ResultVo resultVo = payUtils.faqiV2(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, "签名验证错误");
- }
+// 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);
+ payStudent.setOrderNo(resultVo.getRespdata().getOrderNo());
+ payStudent.setOrderId(resultVo.getRespdata().getOrderId());
+ payStudent.setGovPayStatus(2);
payStudent.setPayCode(resultVo.getRespdata().getBillNo());
- coalPayStudentService.updateByCoalPayStudent(payStudent);
+ coalPayStudentService.updateByIdAndPayType(payStudent);
return resultVo.getRespdata().getOrderId();
} else {
throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, resultVo.getRespmsg());
}
} catch (BusinessException e) {
- throw new RuntimeException(e);
- } catch (IOException e) {
throw new RuntimeException(e);
} finally {
if (lock.isLocked()) {
@@ -281,45 +286,134 @@
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, "未找到相关缴费信息");
+ }
+ if (coalPayStudents.get(0).getGovPayStatus() == 2){
+ return coalPayStudents.get(0).getOrderId();
}
CoalPayStudent payStudent = new CoalPayStudent();
- PayReqData payReqData = fillData(coalPayStudents, coalPay, coalCategories, coalTicket,2,coalTeamPayReq);
- ResultVo resultVo = payUtils.sendApiPost(payReqData);
+ PayReqData payReqData = fillData(coalPayStudents, coalPay, coalCategories, coalTicket, 2, coalTeamPayReq);
+ ResultVo resultVo = payUtils.faqiV2(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();
} 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();
}
}
}
- private PayReqData fillData(List<CoalPayStudent> coalPayStudent, CoalPay coalPay, List<CoalCategory> coalCategories, CoalTicket coalTicket,Integer payType,CoalTeamPayReq coalTeamPayReq) {
+ @Override
+ public ResultVo topay() throws IOException, BillSignException {
+ PayReqData payReqData = new PayReqData();
+ PayReqData.Feedata feedatas = new PayReqData.Feedata();
+
+
+ //订单编号
+ payReqData.setOrderNo(RandomUtil.generateOrderNumber(1L, "NC"));
+ //订单总金额
+ payReqData.setMoney(BigDecimal.valueOf(56));
+ //子订单数目
+ payReqData.setAmount(1);
+ //缴费人姓名（单位填单位名称）阿克苏地区博安煤矿安全技术服务中心
+ payReqData.setPayerName("李州");
+ //缴费人证件号（单位填同一信用代码）52652900789893140A
+ payReqData.setCertNo("612324197909106056");
+ //缴款人类型（1个人 2单位）
+ payReqData.setPayerType(1);
+ //开票单位社会信用代码12650000MB1A9612XD
+ payReqData.setInvoiceSocialCode("11652100MB19019356");
+ //开票人
+ payReqData.setHandlingPerson("孙乾");
+ //复核人
+ payReqData.setChecker("哲霞");
+ //单位编码547185129
+ payReqData.setEnterCode("204704695");
+ //订单描述（非必填）
+ payReqData.setDesc("非煤安全作业考试费_理论-012381");
+ //订单明细
+ List<PayReqData.Feedata> feedatas1 = new ArrayList<>();
+ //数量
+ feedatas.setAmount(1);
+ //业务代码
+ feedatas.setBusCode("DZ012381");
+ //单价
+ 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);
+// feedatas1.add(feedata);
+ payReqData.setFeeDatas(feedatas1);
+ log.info("请求参数：" + JSONObject.toJSONString(payReqData));
+
+
+ PayUtils payUtils = new PayUtils();
+ ResultVo resultVo = payUtils.faqiV2(payReqData);
+ if (!resultVo.getRespcode().equals("BUS0000")) {
+ throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "签名验证错误");
+ } else {
+ //todo 业务处理
+ }
+ log.info("请求结果:" + JSONObject.toJSONString(resultVo));
+// String fileData = resultVo.getRespdata().getFileData();
+// //票据原文转为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());
+// BillSign billSign = new BillSign();
+// String s = billSign.readRefSignDto(document);
+// 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));
+// Sign sign1 = new 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());
+ return resultVo;
+ }
+
+ 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());
@@ -329,21 +423,19 @@
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);
- 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