From 727c30f11ede5b3c82ead6e09e5e077c0e7519f1 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期三, 05 二月 2025 13:02:21 +0800
Subject: [PATCH] Merge branch 'dev-20250116' of https://sinanoaq.cn:8888/r/swspkmas into dev-20250116

---
 exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayServiceImpl.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 b8fb55f..b90d219 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
@@ -60,7 +60,7 @@
     }
 
     @Override
-    public NonCoalPayDetailH5RepDto selectNonCoalPayByStu(String phone, String idCard) {
+    public List<NonCoalPayDetailH5RepDto> selectNonCoalPayByStu(String phone, String idCard) {
         return nonCoalPayMapper.selectNonCoalPayByParam(phone, idCard);
     }
 
@@ -161,7 +161,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);
@@ -208,7 +208,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("该数据不存在");
         }
@@ -246,8 +246,8 @@
      */
     @Override
     public int deleteNonCoalPayById(Long id) {
-        NonCoalPay byId = getById(id);
-        if (byId == null) {
+        NonCoalPay nonCoalPay = nonCoalPayMapper.selectNonCoalPayById(id);
+        if (nonCoalPay == null) {
             throw new ServiceException("该数据不存在");
         }
         //验证是否有学员已缴费

--
Gitblit v1.9.2