From 976fe8de4d45ccdd18cf988a36b9d71697d3bcc3 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: Fri, 21 Feb 2025 16:54:55 +0800
Subject: [PATCH] 修改
---
exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayStudentServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayStudentServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayStudentServiceImpl.java
index 333f15c..1a58a26 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayStudentServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayStudentServiceImpl.java
@@ -85,6 +85,10 @@
if (nonCoalStuRep.getGovPayStatus() == 2) {
return nonCoalStuRep.getOrderId();
}
+ //todo 验证缴款类型
+ if (!nonCoalStuRep.getPayType().toString().equals(payType)) {
+ throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "缴费类型不一致，请核对类型");
+ }
//财政缴款码未生成
// if (nonCoalStuRep.getPayStatus() == 0) {
// if ("1".equals(payType)) {
@@ -143,12 +147,12 @@
return orderId;
} else {
log.error("生成订单失败：" + resultVo.getRespmsg() + "，请稍后重试,错误编码：" + resultVo.getRespcode() + "参数如下：" + payReqData);
- throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "发起支付失败，请稍后重试");
+ throw new BusinessException(this.getClass(), ResultConstants.SYSTEM_ERROR, "发起支付失败，请稍后重试");
}
} catch (Exception e) {
log.error("发起支付调用接口失败:" + e);
- throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, e.getMessage());
+ throw new BusinessException(this.getClass(), ResultConstants.SYSTEM_ERROR, e.getMessage());
} finally {
redisLock.unlock(lockKey);
}
@@ -191,6 +195,7 @@
.eq(NonCoalPayStudent::getOrderNo, nonCoalStuRep.getOrderNo()).eq(NonCoalPayStudent::getDelFlag, 0)
.eq(NonCoalPayStudent::getPayStatus, 0));
// 回调确认支付
+ nonCoalStuRep.setPayStatus(1L);
payUtils.affirmPost(nonCoalStuRep.getOrderNo());
} else {
log.error("查询财政订单失败：" + result.getString("respmsg") + "，错误编码：" + result.getString("respcode"));
@@ -213,7 +218,7 @@
payReqData.setOrderNo(orderNo);
payReqData.setPayerType(Integer.valueOf(payType));
payReqData.setMoney(nonCoalPayOrder.getAmount().multiply(BigDecimal.valueOf(nonCoalStuList.size())));
- payReqData.setAmount(nonCoalStuList.size());
+ payReqData.setAmount(nonCoalPayCategoryList.size());
payReqData.setDesc(nonCoalPayOrder.getBatchName());
@@ -228,7 +233,7 @@
PayReqData.Feedata feedatas = new PayReqData.Feedata();
feedatas.setAmount(nonCoalStuList.size());
feedatas.setBusCode(nonCoalCateRep.getBusinessCode());
- feedatas.setPrice(nonCoalCateRep.getCategoryAmount());
+ feedatas.setPrice(nonCoalCateRep.getCategoryAmount().multiply(BigDecimal.valueOf(nonCoalStuList.size())));
feedatas1.add(feedatas);
}
payReqData.setFeeDatas(feedatas1);
@@ -242,8 +247,8 @@
payReqData.setPayerName(nonCoalPayOrder.getPayCompanyName());
payReqData.setCertNo(nonCoalPayOrder.getPayCompanyCard());
//todo 待确认
- payReqData.setInvoiceSocialCode(nonCoalPayOrder.getPayCompanyCard());
- payReqData.setEnterCode(nonCoalPayOrder.getPayCompanyCard());
+// payReqData.setInvoiceSocialCode(nonCoalPayOrder.getPayCompanyCard());
+// payReqData.setEnterCode(nonCoalPayOrder.getPayCompanyCard());
}
return payReqData;
--
Gitblit v1.9.2