From f9cb0f3f384279b2cbe87c35dde3ba573a0197f3 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期四, 24 四月 2025 16:17:25 +0800
Subject: [PATCH] 煤矿缴费修改

---
 exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayServiceImpl.java |   36 ++++++++++++++++++++++++++++--------
 1 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayServiceImpl.java
index 30bf5de..bcf6e86 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayServiceImpl.java
@@ -18,6 +18,7 @@
 import com.gkhy.exam.pay.service.NonCoalPayCategoryService;
 import com.gkhy.exam.pay.service.NonCoalPayService;
 import com.gkhy.exam.pay.service.NonCoalPayStudentService;
+import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.bean.BeanUtils;
@@ -59,7 +60,7 @@
     }
 
     @Override
-    public NonCoalPayDetailH5RepDto selectNonCoalPayByStu(String phone, String idCard) {
+    public List<NonCoalPayDetailH5RepDto> selectNonCoalPayByStu(String phone, String idCard) {
         return nonCoalPayMapper.selectNonCoalPayByParam(phone, idCard);
     }
 
@@ -73,7 +74,9 @@
     @Override
     public List<NonCoalPayPageRepDto> selectNonCoalPayList(NonCoalPay nonCoalPay) {
         if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
-            nonCoalPay.setDistrictCode(SecurityUtils.getDeptDistrictCode());
+            if (!Constants.DIS_XINJIANG_CODE.equals(SecurityUtils.getDeptDistrictCode())) {
+                nonCoalPay.setDistrictCode(SecurityUtils.getDeptDistrictCode());
+            }
         }
         return nonCoalPayMapper.getNonCoalPayList(nonCoalPay);
     }
@@ -122,6 +125,15 @@
     @Override
     @Transactional
     public int insertNonCoalPay(NonCoalPayReqDto nonCoalPay) {
+        if (!nonCoalPay.getDistrictCode().startsWith(Constants.DIS_XINJIANG_CODE)) {
+            throw new RuntimeException("地州信息错误");
+        }
+        if (!SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+            if (Constants.DIS_XINJIANG_CODE.equals(nonCoalPay.getDistrictCode())) {
+                throw new RuntimeException("仅可选择下级地州");
+            }
+
+        }
         checkData(nonCoalPay);
         NonCoalPay nonCoalPay1 = new NonCoalPay();
         BeanUtils.copyProperties(nonCoalPay, nonCoalPay1);
@@ -155,7 +167,7 @@
                 .eq(NonCoalPay::getDistrictCode, nonCoalPay.getDistrictCode())
                 .eq(NonCoalPay::getBatchName, nonCoalPay.getBatchName())
                 .eq(NonCoalPay::getDelFlag, 0);
-        if (nonCoalPay.getId() == null) {
+        if (nonCoalPay.getId() != null) {
             lambdaQueryWrapper.ne(NonCoalPay::getId, nonCoalPay.getId());
         }
         Long l = baseMapper.selectCount(lambdaQueryWrapper);
@@ -173,10 +185,12 @@
     @Override
     @Transactional
     public int updateNonCoalPay(NonCoalPayReqDto nonCoalPay) {
+
         checkData(nonCoalPay);
         checkHavePay(nonCoalPay.getId());
         NonCoalPay nonCoalPay1 = new NonCoalPay();
         BeanUtils.copyProperties(nonCoalPay, nonCoalPay1);
+        nonCoalPay1.setDistrictCode(null);
         nonCoalPay1.setUpdateBy(SecurityUtils.getUsername());
         int i = nonCoalPayMapper.updateNonCoalPay(nonCoalPay1);
         if (i > 0) {
@@ -200,7 +214,7 @@
     @Override
     @Transactional
     public int updateNonCoalPayTypeStatus(int payPersonType, Long id) {
-        NonCoalPay byId = getById(id);
+        NonCoalPay byId = nonCoalPayMapper.selectNonCoalPayById(id);
         if (byId == null) {
             throw new ServiceException("该数据不存在");
         }
@@ -214,7 +228,7 @@
         int i = nonCoalPayMapper.updateNonCoalPay(nonCoalPay1);
         if (payPersonType == 2) {
             //更新未缴费的为团体
-            nonCoalPayStudentMapper.updateNonCoalPayStudentType(id, SecurityUtils.getUsername());
+            nonCoalPayStudentMapper.updateNonCoalPayStudentType(id, SecurityUtils.getUsername(),0);
         }
         return i;
     }
@@ -238,12 +252,18 @@
      */
     @Override
     public int deleteNonCoalPayById(Long id) {
-        NonCoalPay byId = getById(id);
-        if (byId == null) {
+        NonCoalPay nonCoalPay = nonCoalPayMapper.selectNonCoalPayById(id);
+        if (nonCoalPay == null) {
             throw new ServiceException("该数据不存在");
         }
         //验证是否有学员已缴费
-        checkHavePay(id);
+        NonCoalPayStudent nonCoalPayStudent = new NonCoalPayStudent();
+        nonCoalPayStudent.setNonCoalPayId(id);
+        nonCoalPayStudent.setPayStatus(1L);
+        List<NonCoalPayStudent> nonCoalPayStudents = nonCoalPayStudentService.selectNonCoalPayStudentList(nonCoalPayStudent);
+        if (nonCoalPayStudents.size()>0){
+            throw new ServiceException("该批次存在已缴费学员，请勿删除");
+        }
         return nonCoalPayMapper.deleteNonCoalPayById(id, SecurityUtils.getUsername());
     }
 

--
Gitblit v1.9.2