LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 多数据源异常

Browse Source
This commit is contained in:
lijiarao
2021-09-13 17:21:43 +08:00
parent f546b17aac
commit bd8b7000ca
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+2 -2
View File
@@ -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<PayMeetingMapper, PayMeeting> implements IPayMeetingService {
@Resource
private ISysBaseAPI sysBaseApi;
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+3 -7
View File
@@ -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<PayMeetingSituationMapper, PayMeetingSituation> implements IPayMeetingSituationService {
@Resource
private IPayCompanyManagementService companyManagementService;
@@ -249,10 +248,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
//如果是标协会议判断会员类型
if (meetingType.equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))){
//根据企业名称和会员类型不为null判断是否为标协会员
LambdaQueryWrapper<MemberInfo> 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());
jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/IMemberInfoService.java
+1
View File
@@ -11,4 +11,5 @@ import com.jero.standards.memberinfo.entity.MemberInfo;
*/
public interface IMemberInfoService extends IService<MemberInfo> {
int check(String companyName);
}
jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/impl/MemberInfoServiceImpl.java
+8
View File
@@ -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<MemberInfoMapper, MemberInfo> implements IMemberInfoService {
@Override
public int check(String companyName) {
LambdaQueryWrapper<MemberInfo> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(MemberInfo::getCompanyName, companyName);
wrapper.isNotNull(MemberInfo::getMemberType);
return count(wrapper);
}
}