From 06bc26e0f7639ba93b402acf8252c1c20a85b8c6 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期四, 23 一月 2025 16:14:58 +0800
Subject: [PATCH] 特种作业非煤缴费版本优化
---
exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java | 126 +++++++++++++++++++++++++++++++++--------
1 files changed, 101 insertions(+), 25 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 1f1cd8b..4271919 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
@@ -7,35 +7,35 @@
import com.gkhy.exam.pay.dto.req.CoalPayReq;
import com.gkhy.exam.pay.dto.req.CoalPayStudentReq;
import com.gkhy.exam.pay.dto.req.CoalPayTypeReq;
-import com.gkhy.exam.pay.entity.CoalCategory;
-import com.gkhy.exam.pay.entity.CoalPay;
-import com.gkhy.exam.pay.entity.CoalPayCategory;
-import com.gkhy.exam.pay.entity.CoalPayStudent;
+import com.gkhy.exam.pay.entity.*;
import com.gkhy.exam.pay.mapper.CoalCategoryMapper;
import com.gkhy.exam.pay.mapper.CoalPayCategoryMapper;
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.PayUtils;
+import com.gkhy.exam.pay.utils.ResultVo;
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.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
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 javafx.print.Collation;
-import org.aspectj.weaver.loadtime.Aj;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
+import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Date;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@Service
@@ -53,9 +53,16 @@
@Autowired
private CoalPayStudentService coalPayStudentService;
+ @Autowired
+ private RedissonClient redissonClient;
+
+ @Autowired
+ private PayUtils payUtils;
+
/**
* 缴费管理列表
+ *
* @param coalPay
* @return
*/
@@ -65,7 +72,7 @@
List<CoalPay> coalPays = coalPayMapper.selectCoalPayList(coalPay);
for (CoalPay pay : coalPays) {
CoalPayRepDto coalPayRepDto = new CoalPayRepDto();
- BeanUtils.copyProperties(pay,coalPayRepDto);
+ BeanUtils.copyProperties(pay, coalPayRepDto);
//部门数据
SysDept sysDept = sysDeptMapper.selectDeptById(pay.getDeptId());
coalPayRepDto.setDeptName(sysDept.getDeptName());
@@ -91,7 +98,7 @@
//基本数据
CoalPay coalPay = coalPayMapper.selectById(id);
- BeanUtils.copyProperties(coalPay,coalPayRepDto);
+ BeanUtils.copyProperties(coalPay, coalPayRepDto);
//考点名称
SysDept sysDept = sysDeptMapper.selectDeptById(coalPay.getDeptId());
coalPayRepDto.setDeptName(sysDept.getDeptName());
@@ -113,12 +120,12 @@
@Override
public int insertCoalPay(CoalPayDto coalPayDto) {
CoalPay coalPay = new CoalPay();
- BeanUtils.copyProperties(coalPayDto,coalPay);
+ BeanUtils.copyProperties(coalPayDto, coalPay);
coalPay.setCreateBy(SecurityUtils.getUsername());
coalPay.setCreateTime(new Date());
int insert = coalPayMapper.insertBath(coalPay);
- if (CollectionUtils.isEmpty(coalPayDto.getCoalPayCategoryies())){
- throw new BusinessException(this.getClass(),ResultConstants.BUSINESS_ERROR,"工种类别不能为空");
+ if (CollectionUtils.isEmpty(coalPayDto.getCoalPayCategoryies())) {
+ throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "工种类别不能为空");
}
List<CoalPayCategory> coalPayCategories = coalPayDto.getCoalPayCategoryies();
for (CoalPayCategory coalPayCategory : coalPayCategories) {
@@ -130,18 +137,19 @@
/**
* 修改缴费信息
+ *
* @param coalPayDto
* @return
*/
@Override
public int updateCoalPay(CoalPayDto coalPayDto) {
CoalPay coalPay = new CoalPay();
- BeanUtils.copyProperties(coalPayDto,coalPay);
+ BeanUtils.copyProperties(coalPayDto, coalPay);
coalPay.setUpdateBy(SecurityUtils.getUsername());
coalPay.setUpdateTime(new Date());
int i = coalPayMapper.updateCoalPayById(coalPay);
int update = coalPayCategoryMapper.deleteByCoalPayId(coalPayDto.getId());
- if (update>0){
+ if (update > 0) {
List<CoalPayCategory> coalPayCategories = coalPayDto.getCoalPayCategoryies();
for (CoalPayCategory coalPayCategory : coalPayCategories) {
coalPayCategory.setCoalPayId(coalPay.getId());
@@ -154,13 +162,13 @@
@Override
public AjaxResult deleteCoalPayByIds(Long[] ids) {
for (Long id : ids) {
- List<CoalPayStudent> coalPayStudents = coalPayStudentService.selectByCoalPayIdAndPayStatus(id,1);
- if (!CollectionUtils.isEmpty(coalPayStudents)){
- throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR,"已有学员完成缴费，请勿删除");
+ List<CoalPayStudent> coalPayStudents = coalPayStudentService.selectByCoalPayIdAndPayStatus(id, 1);
+ if (!CollectionUtils.isEmpty(coalPayStudents)) {
+ throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "已有学员完成缴费，请勿删除");
}
}
int i = coalPayMapper.updateByIds(ids);
- if (i>0){
+ if (i > 0) {
return AjaxResult.success();
}
return AjaxResult.error();
@@ -168,9 +176,12 @@
//个人查询缴费
@Override
- public List<CoalPayStudentRep> selectCoalPay(CoalPayStudentReq coalPayStudent) {
+ public List<CoalPayStudentRep> selectCoalPay(String idcard, String phone) {
+ CoalPayStudentReq coalPayStudentReq = new CoalPayStudentReq();
+ coalPayStudentReq.setIdCard(idcard);
+ coalPayStudentReq.setPhone(phone);
//查询个人需要缴费
- List<CoalPayStudent> coalPayStudents = coalPayStudentService.selectbyIdcard(coalPayStudent);
+ List<CoalPayStudent> coalPayStudents = coalPayStudentService.selectbyIdcard(coalPayStudentReq);
List<CoalPayStudentRep> coalPayStudentReps = new ArrayList<>();
for (CoalPayStudent payStudent : coalPayStudents) {
//封装学生基础信息
@@ -184,7 +195,7 @@
//查询对应批次以及批次包含工种类别
CoalPay coalPay = coalPayMapper.selectById(payStudent.getCoalPayId());
CoalPayRepDto coalPayRepDto = new CoalPayRepDto();
- BeanUtils.copyProperties(coalPay,coalPayRepDto);
+ BeanUtils.copyProperties(coalPay, coalPayRepDto);
//考点名称
SysDept sysDept = sysDeptMapper.selectDeptById(coalPay.getDeptId());
coalPayRepDto.setDeptName(sysDept.getDeptName());
@@ -200,9 +211,74 @@
@Override
public int updateCoalPayType(CoalPayTypeReq coalPayTypeReq) {
CoalPay byId = coalPayMapper.selectById(coalPayTypeReq.getCoalPayId());
- if (coalPayTypeReq.getPayPersonType() != null && byId.getPayPersonType() == 2){
- throw new BusinessException(this.getClass(),ResultConstants.BUSINESS_ERROR,"已为团体缴费，不可更改");
+ if (coalPayTypeReq.getPayPersonType() != null && byId.getPayPersonType() == 2) {
+ throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "已为团体缴费，不可更改");
}
return coalPayMapper.updateByPayId(coalPayTypeReq);
}
+
+ @Override
+ public String personPayMoney(Long coalPayId, Long studentId) {
+ CoalPayStudent coalPayStudent = coalPayStudentService.selectbyId(studentId);
+ CoalPay coalPay = coalPayMapper.selectById(coalPayId);
+ List<CoalCategory> coalCategories = coalCategoryMapper.selectByCoalPayId(coalPayId);
+ CoalTicket coalTicket = coalCategoryMapper.selectCoalTicket();
+
+ PayReqData payReqData = new PayReqData();
+ payReqData.setOrderNo(RandomUtil.generateOrderNumber(coalPayId, "CO"));
+ payReqData.setMoney(coalPay.getAmount());
+ payReqData.setAmount(1);
+ payReqData.setPayerName(coalPayStudent.getName());
+ payReqData.setCertNo(coalPayStudent.getIdCard());
+ payReqData.setPayerType(1);
+ payReqData.setInvoiceSocialCode(coalTicket.getTicketCompanyCode());
+ payReqData.setHandlingPerson(coalTicket.getDrawer());
+ payReqData.setChecker(coalTicket.getCheck());
+ payReqData.setEnterCode(coalTicket.getCompanyCode());
+ payReqData.setDesc(coalPay.getBatchName());
+
+ PayReqData.Feedata feedata = new PayReqData.Feedata();
+ List<PayReqData.Feedata> feedatas = new ArrayList<>();
+ for (CoalCategory coalCategory : coalCategories) {
+ feedata.setAmount(1);
+ feedata.setPrice(coalCategory.getAmount());
+ feedata.setBusCode(coalCategory.getBusinessCode());
+ feedatas.add(feedata);
+ }
+ payReqData.setFeeDatas(feedatas);
+
+ CoalPayStudent payStudent = new CoalPayStudent();
+
+ RLock lock = redissonClient.getLock("SWSPKMAS_PAY_PERSON_" + coalPayId);
+ try {
+ lock.lock(10, TimeUnit.SECONDS);
+ if (coalPayStudent.getGovPayStatus() != 0) {
+ throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "请勿重复发起支付");
+ }
+ if (StringUtils.isEmpty(coalPayStudent.getPayCode())) {
+
+ }
+
+
+ ResultVo resultVo = payUtils.sendApiPost(payReqData);
+ if (resultVo.getRespcode().equals("BUS0000")) {
+ payStudent.setId(studentId);
+ payStudent.setOrderId(resultVo.getRespdata().getOrderNo());
+ payStudent.setGovPayStatus(1);
+ payStudent.setPayCode(resultVo.getRespdata().getBillNo());
+ coalPayStudentService.updateByCoalPayStudent(payStudent);
+ return resultVo.getRespdata().getBillNo();
+ } else {
+ throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "发起支付失败，请稍后重试");
+ }
+ } catch (BusinessException e) {
+ throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "请稍后重试");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ } finally {
+ if (lock.isLocked()) {
+ lock.unlock();
+ }
+ }
+ }
}
--
Gitblit v1.9.2