会员修改临时企业，联系人
This commit is contained in:
梁琦涛
+110
-16
@@ -85,7 +85,8 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
|
||||
if (count>0){
|
||||
throw new JeroBootException("会员单位已经存在");
|
||||
}
|
||||
validMemberProjectSubitem(payMemberProjectSubitem);
|
||||
// validMemberProjectSubitem(payMemberProjectSubitem);
|
||||
validMemberProjectSubitemAdd(payMemberProjectSubitem);
|
||||
//实收金额
|
||||
payMemberProjectSubitem.setPaidAmount(new BigDecimal("0.00"));
|
||||
//到账
|
||||
@@ -167,20 +168,20 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
|
||||
payMemberProjectSubitem.setMail(payMemberProjectSubitem1.getMail());
|
||||
|
||||
//如果原始企业id和现在企业id不同，就删除临时表数据
|
||||
String companyId = payMemberProjectSubitem.getCompanyTemporaryId();
|
||||
if (!payMemberProjectSubitem1.getCompanyTemporaryId().equals(companyId)) {
|
||||
companyManagementTemporaryService.removeById(companyId);
|
||||
}
|
||||
//如果原始企业联系人id和现在企业联系人id不同，就删除临时表数据
|
||||
String companyContactId = payMemberProjectSubitem.getCompanyContactTemporaryId();
|
||||
if (!payMemberProjectSubitem1.getCompanyContactTemporaryId().equals(companyContactId)) {
|
||||
contactsManagementTemporaryService.removeById(companyContactId);
|
||||
}
|
||||
//如果原始邮寄联系人id和现在邮寄联系人id不同，就删除临时表数据
|
||||
String postContactId = payMemberProjectSubitem.getPostContactTemporaryId();
|
||||
if (!payMemberProjectSubitem1.getPostContactTemporaryId().equals(postContactId)) {
|
||||
contactsManagementTemporaryService.removeById(postContactId);
|
||||
}
|
||||
// String companyId = payMemberProjectSubitem.getCompanyTemporaryId();
|
||||
// if (!payMemberProjectSubitem1.getCompanyTemporaryId().equals(companyId)) {
|
||||
// companyManagementTemporaryService.removeById(companyId);
|
||||
// }
|
||||
// //如果原始企业联系人id和现在企业联系人id不同，就删除临时表数据
|
||||
// String companyContactId = payMemberProjectSubitem.getCompanyContactTemporaryId();
|
||||
// if (!payMemberProjectSubitem1.getCompanyContactTemporaryId().equals(companyContactId)) {
|
||||
// contactsManagementTemporaryService.removeById(companyContactId);
|
||||
// }
|
||||
// //如果原始邮寄联系人id和现在邮寄联系人id不同，就删除临时表数据
|
||||
// String postContactId = payMemberProjectSubitem.getPostContactTemporaryId();
|
||||
// if (!payMemberProjectSubitem1.getPostContactTemporaryId().equals(postContactId)) {
|
||||
// contactsManagementTemporaryService.removeById(postContactId);
|
||||
// }
|
||||
// 变更应收金额，重新校验状态
|
||||
ProjectStatusVO projectStatusVO = projectDetailService.getStatus(payMemberProjectSubitem.getId(),payMemberProjectSubitem.getAmountReceivable(),payMemberProjectSubitem.getNeedInvoice());
|
||||
if(!Objects.isNull(projectStatusVO)){
|
||||
@@ -194,10 +195,103 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
|
||||
payMemberProjectSubitem.setMail(projectStatusVO.getMail());
|
||||
}
|
||||
}
|
||||
validMemberProjectSubitem(payMemberProjectSubitem);
|
||||
validMemberProjectSubitemEdit(payMemberProjectSubitem,payMemberProjectSubitem1);
|
||||
saveOrUpdate(payMemberProjectSubitem);
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验会员项目成员
|
||||
* @param payMemberProjectSubitem 会员项目成员
|
||||
*/
|
||||
public void validMemberProjectSubitemAdd(PayMemberProjectSubitem payMemberProjectSubitem) {
|
||||
// 企业
|
||||
PayCompanyManagementTemporary chargeCompanyName = companyManagementTemporaryService.insertCompanyManagementTemporary(payMemberProjectSubitem.getCompanyId());
|
||||
if(Objects.isNull(chargeCompanyName)){
|
||||
throw new JeroBootException("企业名称为空！");
|
||||
}
|
||||
payMemberProjectSubitem.setCompanyTemporaryId(chargeCompanyName.getId());
|
||||
payMemberProjectSubitem.setCompanyName(chargeCompanyName.getCompanyName());
|
||||
|
||||
// 联系人
|
||||
PayContactsManagementTemporary contactsName = contactsManagementTemporaryService.insertContactsManagementTemporary(payMemberProjectSubitem.getCompanyContactId());
|
||||
if(Objects.isNull(contactsName)){
|
||||
throw new JeroBootException("联系人名称为空！");
|
||||
}
|
||||
payMemberProjectSubitem.setCompanyContactTemporaryId(contactsName.getId());
|
||||
payMemberProjectSubitem.setCompanyContactName(contactsName.getName());
|
||||
|
||||
// 联系人
|
||||
PayContactsManagementTemporary postContactsName = contactsManagementTemporaryService.insertContactsManagementTemporary(payMemberProjectSubitem.getPostContactId());
|
||||
if(Objects.isNull(postContactsName)){
|
||||
throw new JeroBootException("邮寄联系人为空！");
|
||||
}
|
||||
payMemberProjectSubitem.setPostContactTemporaryId(postContactsName.getId());
|
||||
payMemberProjectSubitem.setPostContactName(postContactsName.getName());
|
||||
|
||||
//校验来款方式
|
||||
Integer paymentMethod = payMemberProjectSubitem.getPaymentMethod();
|
||||
//合同
|
||||
if (paymentMethod.equals(2)){
|
||||
ValidUtil.validate(payMemberProjectSubitem, Contract.class);
|
||||
}
|
||||
//收费通知
|
||||
if (paymentMethod.equals(3)){
|
||||
ValidUtil.validate(payMemberProjectSubitem, ChargeNotice.class);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验会员项目成员
|
||||
* @param payMemberProjectSubitem 会员项目成员
|
||||
*/
|
||||
public void validMemberProjectSubitemEdit(PayMemberProjectSubitem payMemberProjectSubitem,PayMemberProjectSubitem payMemberProjectSubitemOld) {
|
||||
// 企业id != 企业模板id 变更
|
||||
if(!Objects.equals(payMemberProjectSubitem.getCompanyId(),payMemberProjectSubitemOld.getCompanyId())){
|
||||
// 企业
|
||||
PayCompanyManagementTemporary chargeCompanyName = companyManagementTemporaryService.insertCompanyManagementTemporary(payMemberProjectSubitem.getCompanyId());
|
||||
if(Objects.isNull(chargeCompanyName)){
|
||||
throw new JeroBootException("企业名称为空！");
|
||||
}
|
||||
payMemberProjectSubitem.setCompanyTemporaryId(chargeCompanyName.getId());
|
||||
payMemberProjectSubitem.setCompanyName(chargeCompanyName.getCompanyName());
|
||||
companyManagementTemporaryService.removeById(payMemberProjectSubitemOld.getCompanyTemporaryId());
|
||||
}
|
||||
|
||||
// 联系人id != 联系人模板id 变更
|
||||
if(!Objects.equals(payMemberProjectSubitem.getCompanyContactId(),payMemberProjectSubitemOld.getCompanyContactId())){
|
||||
// 联系人
|
||||
PayContactsManagementTemporary contactsName = contactsManagementTemporaryService.insertContactsManagementTemporary(payMemberProjectSubitem.getCompanyContactId());
|
||||
if(Objects.isNull(contactsName)){
|
||||
throw new JeroBootException("联系人名称为空！");
|
||||
}
|
||||
payMemberProjectSubitem.setCompanyContactTemporaryId(contactsName.getId());
|
||||
payMemberProjectSubitem.setCompanyContactName(contactsName.getName());
|
||||
contactsManagementTemporaryService.removeById(payMemberProjectSubitemOld.getCompanyContactTemporaryId());
|
||||
}
|
||||
// 邮寄联系人id != 邮寄联系人模板id 变更
|
||||
if(!Objects.equals(payMemberProjectSubitem.getPostContactId(),payMemberProjectSubitemOld.getPostContactId())){
|
||||
// 联系人
|
||||
PayContactsManagementTemporary contactsName = contactsManagementTemporaryService.insertContactsManagementTemporary(payMemberProjectSubitem.getPostContactId());
|
||||
if(Objects.isNull(contactsName)){
|
||||
throw new JeroBootException("邮寄联系人为空！");
|
||||
}
|
||||
payMemberProjectSubitem.setPostContactTemporaryId(contactsName.getId());
|
||||
payMemberProjectSubitem.setPostContactName(contactsName.getName());
|
||||
contactsManagementTemporaryService.removeById(payMemberProjectSubitemOld.getPostContactTemporaryId());
|
||||
}
|
||||
|
||||
//校验来款方式
|
||||
Integer paymentMethod = payMemberProjectSubitem.getPaymentMethod();
|
||||
//合同
|
||||
if (paymentMethod.equals(2)){
|
||||
ValidUtil.validate(payMemberProjectSubitem, Contract.class);
|
||||
}
|
||||
//收费通知
|
||||
if (paymentMethod.equals(3)){
|
||||
ValidUtil.validate(payMemberProjectSubitem, ChargeNotice.class);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验会员项目成员
|
||||
* @param payMemberProjectSubitem 会员项目成员
|
||||
|
||||
Reference in New Issue
Block a user