fix bug 41425 标协会议,报名时,没有根据会员的身份自动算出会议费用

This commit is contained in:
lijiarao
2021-10-26 10:48:02 +08:00
parent 258e2e0a8f
commit 1b20d86078
3 changed files with 19 additions and 4 deletions
@@ -315,5 +315,9 @@ public class InternalMeetingSituationController extends JeroController<PayMeetin
return Result.OK("合并开票成功!");
}
@ApiOperation(value = "校验是否为会员单位")
@GetMapping(value = "/checkMember")
public Result<Boolean> checkMember(String companyName) {
return Result.OK(payMeetingSituationService.checkMember(companyName));
}
}
@@ -28,7 +28,9 @@ public interface IPayMeetingSituationService extends IService<PayMeetingSituatio
*/
void editById(PayMeetingSituationVO payMeetingSituationVO);
/**
Boolean checkMember(String companyName);
/**
* 通过id删除
*/
void deleteById(String id);
@@ -922,9 +922,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
//如果是标协会议判断会员类型
if (meetingType.equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
//根据企业名称和会员类型不为null判断是否为标协会员
int count = memberInfoService.check(payMeetingSituation1.getCompanyName());
//如果是标协会员就存入会议费用(标协会员)
if (count > 0) {
if (checkMember(payMeetingSituation1.getCompanyName())) {
payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCostsVip());
} else {
payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCosts());
@@ -989,6 +988,16 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
return payMeetingSituation1;
}
/**
* 判断是否是会员单位
* @param companyName 公司名称
* @return boolean
*/
@Override
public Boolean checkMember(String companyName){
return memberInfoService.check(companyName) > 0;
}
private void canHuiContact(PayMeetingSituation payMeetingSituation, String companyId, PayContactsManagement contactsManagement) {
if (contactsManagement == null) {
throw new JeroBootException("联系人不存在");