From c15dda7ca82a479caa54cbbe169f1cf80c3be156 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: Thu, 20 Feb 2025 13:22:12 +0800
Subject: [PATCH] 修改
---
exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayStudentServiceImpl.java | 101 ++++++++++++++++++++++++++++++++------------------
1 files changed, 65 insertions(+), 36 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 c6df39a..333f15c 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
@@ -1,9 +1,9 @@
package com.gkhy.exam.pay.service.impl;
+import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gkhy.exam.institutionalaccess.enums.StudentSex;
import com.gkhy.exam.pay.dto.rep.NonCoalCateRep;
import com.gkhy.exam.pay.dto.rep.NonCoalPayOrder;
import com.gkhy.exam.pay.dto.rep.NonCoalStuRep;
@@ -15,8 +15,10 @@
import com.gkhy.exam.pay.mapper.NonCoalPayMapper;
import com.gkhy.exam.pay.mapper.NonCoalPayStudentMapper;
import com.gkhy.exam.pay.service.NonCoalPayStudentService;
+import com.gkhy.exam.pay.utils.CaiZhengConstans;
import com.gkhy.exam.pay.utils.PayUtils;
import com.gkhy.exam.pay.utils.ResultVo;
+import com.gkhy.exam.pay.utils.SexUtils;
import com.ruoyi.common.constant.ResultConstants;
import com.ruoyi.common.exception.BusinessException;
import com.ruoyi.common.exception.ServiceException;
@@ -53,19 +55,17 @@
@Autowired
private RedisLock redisLock;
- private static final String NON_COAL_PAY_STUDENT_LOCK = "NON_COAL_PAY_STUDENT_LOCK_";
-
@Override
public String sendOrder(Long dataId, String payType) {
- String lockKey = NON_COAL_PAY_STUDENT_LOCK + dataId + "_PAY_TYPE_" + payType;
+ String lockKey = CaiZhengConstans.NON_COAL_PAY_STUDENT_LOCK + dataId + CaiZhengConstans.UN_COAL_ORDER_KEY_1 + payType;
- Boolean b = redisLock.tryLock(lockKey, 10, 20, TimeUnit.SECONDS);
+ Boolean b = redisLock.tryLock(lockKey, 30, 40, TimeUnit.SECONDS);
if (b) {
- String orderNo = RandomUtil.generateOrderNumber(dataId, "NC");
- List<NonCoalPayOrder> nonCoalPayOrders = nonCoalPayMapper.selectNonCoalPayOrderByParam(dataId, Long.valueOf(payType));
+ String orderNo = RandomUtil.generateOrderNumber(dataId, CaiZhengConstans.UN_COAL_ORDER_PERFIX);
+ List<NonCoalPayOrder> nonCoalPayOrders = nonCoalPayMapper.selectNonCoalPayOrderByParam(dataId, Long.valueOf(payType), 1L);
if (StringUtils.isEmpty(nonCoalPayOrders)) {
throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "未找到相关缴费信息");
}
@@ -86,24 +86,24 @@
return nonCoalStuRep.getOrderId();
}
//财政缴款码未生成
- if (nonCoalStuRep.getPayStatus() == 0) {
- if ("1".equals(payType)) {
- baseMapper.update(null, Wrappers.<NonCoalPayStudent>lambdaUpdate()
- .set(NonCoalPayStudent::getOrderNo, orderNo)
- .set(NonCoalPayStudent::getGovPayStatus, 1)
- .eq(NonCoalPayStudent::getId, dataId).eq(NonCoalPayStudent::getDelFlag, 0)
- .eq(NonCoalPayStudent::getPayType, payType).eq(NonCoalPayStudent::getPayStatus, 0));
- } else {
- //团体缴费
- baseMapper.update(null, Wrappers.<NonCoalPayStudent>lambdaUpdate()
- .set(NonCoalPayStudent::getOrderNo, orderNo)
- .set(NonCoalPayStudent::getGovPayStatus, 1)
- .eq(NonCoalPayStudent::getNonCoalPayId, dataId).eq(NonCoalPayStudent::getDelFlag, 0)
- .eq(NonCoalPayStudent::getPayType, payType).eq(NonCoalPayStudent::getPayStatus, 0));
- }
- } else {
- orderNo = nonCoalStuRep.getOrderNo();
- }
+// if (nonCoalStuRep.getPayStatus() == 0) {
+// if ("1".equals(payType)) {
+// baseMapper.update(null, Wrappers.<NonCoalPayStudent>lambdaUpdate()
+// .set(NonCoalPayStudent::getOrderNo, orderNo)
+// .set(NonCoalPayStudent::getGovPayStatus, 1)
+// .eq(NonCoalPayStudent::getId, dataId).eq(NonCoalPayStudent::getDelFlag, 0)
+// .eq(NonCoalPayStudent::getPayType, payType).eq(NonCoalPayStudent::getPayStatus, 0));
+// } else {
+// //团体缴费
+// baseMapper.update(null, Wrappers.<NonCoalPayStudent>lambdaUpdate()
+// .set(NonCoalPayStudent::getOrderNo, orderNo)
+// .set(NonCoalPayStudent::getGovPayStatus, 1)
+// .eq(NonCoalPayStudent::getNonCoalPayId, dataId).eq(NonCoalPayStudent::getDelFlag, 0)
+// .eq(NonCoalPayStudent::getPayType, payType).eq(NonCoalPayStudent::getPayStatus, 0));
+// }
+// } else {
+// orderNo = nonCoalStuRep.getOrderNo();
+// }
List<NonCoalCateRep> nonCoalPayCategoryList = nonCoalPayOrder.getNonCoalPayCategoryList();
if (StringUtils.isEmpty(nonCoalPayCategoryList)) {
@@ -114,9 +114,9 @@
PayReqData payReqData = dealData(nonCoalPayOrder, orderNo, payType);
try {
- ResultVo resultVo = payUtils.sendApiPost(payReqData);
+ ResultVo resultVo = payUtils.faqiV2(payReqData);
log.info("调用接口返回结果：" + resultVo);
- if (resultVo.getRespcode().equals("BUS0000")) {
+ if (resultVo.getRespcode().equals(CaiZhengConstans.CAI_ZHENG_SUCCESS)) {
String orderId = resultVo.getRespdata().getOrderId();
String billNo = resultVo.getRespdata().getBillNo();
if (StringUtils.isNotEmpty(orderId)) {
@@ -124,16 +124,18 @@
if ("1".equals(payType)) {
baseMapper.update(null, Wrappers.<NonCoalPayStudent>lambdaUpdate()
.set(NonCoalPayStudent::getOrderId, orderId)
-// .set(NonCoalPayStudent::getOrderNo, orderNo)
+ .set(NonCoalPayStudent::getOrderNo, orderNo)
.set(NonCoalPayStudent::getPayCode, billNo)
+ .set(NonCoalPayStudent::getGovPayStatus, 2)
.eq(NonCoalPayStudent::getId, dataId).eq(NonCoalPayStudent::getDelFlag, 0)
.eq(NonCoalPayStudent::getPayType, payType).eq(NonCoalPayStudent::getPayStatus, 0));
} else {
//团体缴费
baseMapper.update(null, Wrappers.<NonCoalPayStudent>lambdaUpdate()
.set(NonCoalPayStudent::getOrderId, orderId)
-// .set(NonCoalPayStudent::getOrderNo, orderNo)
+ .set(NonCoalPayStudent::getOrderNo, orderNo)
.set(NonCoalPayStudent::getPayCode, billNo)
+ .set(NonCoalPayStudent::getGovPayStatus, 2)
.eq(NonCoalPayStudent::getNonCoalPayId, dataId).eq(NonCoalPayStudent::getDelFlag, 0)
.eq(NonCoalPayStudent::getPayType, payType).eq(NonCoalPayStudent::getPayStatus, 0));
}
@@ -158,7 +160,7 @@
@Override
public NonCoalStuRep queryOrder(Long dataId, String payType) {
- List<NonCoalPayOrder> nonCoalPayOrders = nonCoalPayMapper.selectNonCoalPayOrderByParam(dataId, Long.valueOf(payType));
+ List<NonCoalPayOrder> nonCoalPayOrders = nonCoalPayMapper.selectNonCoalPayOrderByParam(dataId, Long.valueOf(payType), 2L);
if (StringUtils.isEmpty(nonCoalPayOrders)) {
throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "未找到相关缴费信息");
}
@@ -171,8 +173,34 @@
}
NonCoalStuRep nonCoalStuRep = nonCoalStuList.get(0);
- if (nonCoalStuRep.getPayStatus() == 1) {
- throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "已缴费请勿重复缴费");
+// if (nonCoalStuRep.getPayStatus() == 1) {
+// throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "已缴费请勿重复缴费");
+// }
+
+ if (nonCoalStuRep.getGovPayStatus() == 2 && nonCoalStuRep.getPayStatus() == 0) {
+ try {
+ JSONObject result = payUtils.query(nonCoalStuRep.getOrderNo());
+ log.info("查询财政订单返回结果：" + result);
+ String respcode = result.getString("respcode");
+ if (CaiZhengConstans.CAI_ZHENG_SUCCESS.equals(respcode)) {
+ JSONObject respdata = result.getJSONObject("respdata");
+ if (respdata != null && "1".equals(respdata.getString("status"))) {
+ nonCoalPayStudentMapper.update(null, Wrappers.<NonCoalPayStudent>lambdaUpdate()
+ .set(NonCoalPayStudent::getPayStatus, 1)
+ .set(NonCoalPayStudent::getPayTime, respdata.getDate("payTime"))
+ .eq(NonCoalPayStudent::getOrderNo, nonCoalStuRep.getOrderNo()).eq(NonCoalPayStudent::getDelFlag, 0)
+ .eq(NonCoalPayStudent::getPayStatus, 0));
+ // 回调确认支付
+ payUtils.affirmPost(nonCoalStuRep.getOrderNo());
+ } else {
+ log.error("查询财政订单失败：" + result.getString("respmsg") + "，错误编码：" + result.getString("respcode"));
+ }
+
+ }
+ } catch (Exception e) {
+ log.error("查询财政订单失败：" + e.getMessage());
+
+ }
}
return nonCoalStuRep;
@@ -383,7 +411,7 @@
StringBuilder failureMsg = new StringBuilder();
for (NonCoalPayStuImport stu : nonCoalPayStudents) {
try {
- if (StringUtils.isEmpty(stu.getIdCard()) || StringUtils.isEmpty(stu.getName()) || StringUtils.isEmpty(stu.getPhone()) || stu.getSex() == null) {
+ if (StringUtils.isEmpty(stu.getIdCard()) || StringUtils.isEmpty(stu.getName()) || StringUtils.isEmpty(stu.getPhone())) {
failureMsg.append("<br/>" + failureNum + "、导入数据为空： " + stu.getIdCard() + " 数据错误");
} else if (idCardToNameMap.get(stu.getIdCard().trim()) != null) {
failureMsg.append("<br/>" + failureNum + "、身份证号： " + stu.getIdCard() + " 数据已存在");
@@ -396,9 +424,10 @@
stu1.setName(stu.getName());
stu1.setIdCard(stu.getIdCard());
stu1.setPhone(stu.getPhone());
-
-// stu1.setOrderNo(RandomUtil.generateOrderNumber());
- stu1.setSex(StudentSex.BOY.getStatus().equals(stu.getSex().trim()) ? 0L : 1L);
+ if (StringUtils.isNotEmpty(stu.getTrain())) {
+ stu1.setTrain(stu.getTrain());
+ }
+ stu1.setSex(SexUtils.sexType(stu.getIdCard()));
nonCoalPayStudentMapper.insertNonCoalPayStudent(stu1);
successNum++;
successMsg.append("<br/>" + successNum + "、身份证号 " + stu.getIdCard() + " 导入成功");
--
Gitblit v1.9.2