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

收入合同关联会议项目

Browse Source
This commit is contained in:
梁琦涛
2021-09-18 15:07:43 +08:00
parent c6559d4215
commit 7153725796
1 changed files with 22 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/contract/service/impl/PayIncomeContractServiceImpl.java
+22 -9
View File
@@ -20,7 +20,8 @@ import com.jero.contract.service.IPayIncomeContractInstallmentService;
import com.jero.contract.service.IPayIncomeContractService;
import com.jero.contract.vo.PayIncomeContractInput;
import com.jero.contract.vo.ProjectOutput;
import com.jero.meeting.service.IPayMeetingService;
import com.jero.meeting.entity.PayMeetingSituation;
import com.jero.meeting.service.IPayMeetingSituationService;
import com.jero.member.entity.PayMemberProject;
import com.jero.member.entity.PayMemberProjectSubitem;
import com.jero.member.entity.TbMemberProjectSubitem;
@@ -31,7 +32,6 @@ import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import com.jero.pack.entity.PayPackCompanyProject;
import com.jero.pack.service.IPayPackCompanyProjectService;
import com.jero.pack.service.IPayPackCompanyService;
import com.jero.project.entity.PayCommonProject;
import com.jero.project.entity.PayWorkingGroup;
import com.jero.project.entity.PayWorkingGroupSubItem;
@@ -89,11 +89,9 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
@Autowired
private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
@Autowired
private IPayPackCompanyService payPackCompanyService;
@Autowired
private IPayPackCompanyProjectService payPackCompanyProjectService;
@Resource
private IPayMeetingService payMeetingService;
private IPayMeetingSituationService payMeetingSituationService;
@Resource
private IPayMemberProjectService memberProjectService;
@Resource
@@ -374,14 +372,23 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
p.setProjectId(listPayWorkingGroupSubItem.get(0).getId());
break;
case PayIncomeContractCommon.PROJECT_TYPE3:
// 会议项目
// 打包合同不可选择会议项目
if(Objects.equals(payIncomeContract.getPack(),PayIncomeContractCommon.PACK1)){
throw new JeroBootException("打包合同不可关联会议项目！");
}
PayMeetingSituation payMeetingSituation = payMeetingSituationService.getById(p.getProjectId());
if(Objects.isNull(payMeetingSituation)){
throw new JeroBootException("会员项目不存在！");
}
// 验证企业是否正确
if(!Objects.equals(payMeetingSituation.getCompanyId(),payIncomeContract.getSignedCompanyId())){
throw new JeroBootException("企业不匹配！");
}
// 验证项目是否已被关联
getIncomeContractAssociated(p.getContractId(),payMeetingSituation.getId());
// 更新项目id
// p.setProjectId(listPayWorkingGroupSubItem.get(0).getId());
// todo 会议项目
p.setProjectId(payMeetingSituation.getId());
break;
case PayIncomeContractCommon.PROJECT_TYPE4:
// 会员项目
@@ -554,7 +561,13 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
}
break;
case PayIncomeContractCommon.PROJECT_TYPE3:
// todo 会议项目
// 会议项目
PayMeetingSituation payMeetingSituation = payMeetingSituationService.getById(payIncomeContractAssociated.getProjectId());
if(Objects.isNull(payMeetingSituation)){
throw new JeroBootException("会员项目不存在！");
}
// 更新项目id
payIncomeContractAssociated.setProjectId(payMeetingSituation.getId());
break;
case PayIncomeContractCommon.PROJECT_TYPE4:
// 会员项目