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 | 5 +++++
exam-system/src/main/java/com/gkhy/exam/pay/dto/rep/NonCoalStuRep.java | 3 +++
exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml | 9 ++++++---
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/dto/rep/NonCoalStuRep.java b/exam-system/src/main/java/com/gkhy/exam/pay/dto/rep/NonCoalStuRep.java
index 1ac2278..0a02a95 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/dto/rep/NonCoalStuRep.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/dto/rep/NonCoalStuRep.java
@@ -54,4 +54,7 @@
@ApiModelProperty("财政缴款码")
private String payCode;
+
+ @ApiModelProperty("1个人2团体")
+ private Long payType;
}
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 bfc8eed..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)) {
@@ -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"));
diff --git a/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml b/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
index d32f665..f70b024 100644
--- a/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
+++ b/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
@@ -107,8 +107,9 @@
a.pay_type,
a.amount, a.year, a.quarter, a.pay_person_type, a.pay_company_name, a.pay_company_card, a.update_by,
a.update_time, a.create_by, a.create_time, (select count(id) from non_coal_pay_student where a.id =
- non_coal_pay_id) as total_num,
- (select count(id) from non_coal_pay_student where a.id = non_coal_pay_id and pay_status = 1) as have_pay_num
+ non_coal_pay_id and del_flag = 0) as total_num,
+ (select count(id) from non_coal_pay_student where a.id = non_coal_pay_id and pay_status = 1 and del_flag = 0) as
+ have_pay_num
from non_coal_pay a
left join sys_dept d on a.dept_id = d.dept_id
left join sys_district d2 on a.district_code = d2.code
@@ -240,6 +241,7 @@
<result property="orderNo" column="order_no"/>
<result property="govPayStatus" column="gov_pay_status"/>
<result property="payCode" column="pay_code"/>
+ <result property="payType" column="pay_type"/>
</resultMap>
@@ -269,7 +271,8 @@
t.order_id,
t.gov_pay_status,
t.order_no,
- t.pay_code
+ t.pay_code,
+ t.pay_type
from non_coal_pay a
inner join non_coal_pay_student t on t.non_coal_pay_id = a.id and t.del_flag = 0
<if test="isPay != null and isPay == 1 ">and t.pay_status = 0</if>
--
Gitblit v1.9.2