From bd8b7000caf0ec1167773a973fb84a81f5fbee1e Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 13 Sep 2021 17:21:43 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=A4=9A=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/service/impl/PayMeetingServiceImpl.java | 4 ++-- .../service/impl/PayMeetingSituationServiceImpl.java | 10 +++------- .../memberinfo/service/IMemberInfoService.java | 1 + .../memberinfo/service/impl/MemberInfoServiceImpl.java | 8 ++++++++ 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 23c9398e..d799c5c5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -38,7 +38,7 @@ import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.annotation.Resource; -import javax.transaction.Transactional; +import org.springframework.transaction.annotation.Transactional; /** * @Description: 会议管理 @@ -47,7 +47,7 @@ import javax.transaction.Transactional; * @Version: V1.0 */ @Service -@Transactional(rollbackOn = Exception.class) +@Transactional(rollbackFor = Exception.class) public class PayMeetingServiceImpl extends ServiceImpl implements IPayMeetingService { @Resource private ISysBaseAPI sysBaseApi; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index b5777bdb..96f0eec2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -34,10 +34,9 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import org.springframework.transaction.annotation.Transactional; /** * @Description: 会议报名信息 @@ -46,7 +45,7 @@ import javax.annotation.Resource; * @Version: V1.0 */ @Service -@Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class) +@Transactional(rollbackFor = Exception.class) public class PayMeetingSituationServiceImpl extends ServiceImpl implements IPayMeetingSituationService { @Resource private IPayCompanyManagementService companyManagementService; @@ -249,10 +248,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(MemberInfo::getCompanyName, payMeetingSituation.getCompanyName()); - wrapper.isNotNull(MemberInfo::getMemberType); - int count = memberInfoService.count(wrapper); + int count = memberInfoService.check(payMeetingSituation.getCompanyName()); //如果是标协会员就存入会议费用（标协会员） if (count>0){ payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCostsVip()); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/IMemberInfoService.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/IMemberInfoService.java index 7ff1676a..949df9ad 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/IMemberInfoService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/IMemberInfoService.java @@ -11,4 +11,5 @@ import com.jero.standards.memberinfo.entity.MemberInfo; */ public interface IMemberInfoService extends IService { + int check(String companyName); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/impl/MemberInfoServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/impl/MemberInfoServiceImpl.java index e027b156..f6c5c5be 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/impl/MemberInfoServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/impl/MemberInfoServiceImpl.java @@ -1,6 +1,7 @@ package com.jero.standards.memberinfo.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.standards.memberinfo.entity.MemberInfo; import com.jero.standards.memberinfo.mapper.MemberInfoMapper; @@ -20,4 +21,11 @@ import org.springframework.transaction.annotation.Transactional; @DS(value = "multi-datasource1") public class MemberInfoServiceImpl extends ServiceImpl implements IMemberInfoService { + @Override + public int check(String companyName) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(MemberInfo::getCompanyName, companyName); + wrapper.isNotNull(MemberInfo::getMemberType); + return count(wrapper); + } }