diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java index 11d7e7e5..4c9054e7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.common.ProjectCommon; import com.jero.common.enums.PaymentStatusEnum; +import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.contract.common.PayIncomeContractCommon; import com.jero.meeting.entity.PayMeetingSituation; @@ -30,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; +import java.util.List; /** * 到账审核 @@ -60,10 +62,15 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); -// wrapper.eq(PayPaymentRecord::getProjectId,payPaymentRecord.getProjectId()); -// wrapper.eq(PayPaymentRecord::getPaymentStatus,PaymentStatusEnum.TO_BE_REVIEWED.getCode()); -// TbMemberProjectSubitem tbMember = tbMemberProjectSubitemMapper.selectOne(wrapper); + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayPaymentRecord::getProjectId,payPaymentRecord.getProjectId()); + wrapper.and(wrapperOr -> wrapperOr.eq(PayPaymentRecord::getPaymentStatus,PaymentStatusEnum.TO_BE_REVIEWED.getCode()) + .or().eq(PayPaymentRecord::getPaymentStatus,PaymentStatusEnum.REJECTED.getCode())); + List list = payPaymentRecordMapper.selectList(wrapper); + if(list !=null && list.size()>0){ + throw new JeroBootException("有待完成的阶段信息"); + } switch (String.valueOf(payPaymentRecord.getProjectType())){