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

fix 设计遗漏 项目来款方式选择打包合同后，金额应该设置为0

Browse Source
This commit is contained in:
lijiarao
2024-04-30 16:19:07 +08:00
parent ace8c3e334
commit 051f800a3a
4 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java
+6
View File
@@ -122,6 +122,9 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
LambdaUpdateWrapper<PayMemberProjectSubitem> update = new LambdaUpdateWrapper<>();
update.eq(PayMemberProjectSubitem::getId,payMemberProjectSubitem.getId());
update.set(PayMemberProjectSubitem::getPack,PayProjectCommon.PACKAGING1);
update.set(PayMemberProjectSubitem::getAmountReceivable,BigDecimal.ZERO);
update.set(PayMemberProjectSubitem::getTax,BigDecimal.ZERO);
update.set(PayMemberProjectSubitem::getNoTaxAmount,BigDecimal.ZERO);
update(update);
}
}
@@ -194,6 +197,9 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
// 关联了合同,判断合同是否打包，更新项目打包状态，添加打包
if(!Objects.isNull(payIncomeContractAdd) && Objects.equals(payIncomeContractAdd.getPack(),PayProjectCommon.PACKAGING1)){
payPackCompanyProjectService.setPack(payMemberProjectSubitem.getCompanyId(),payMemberProjectSubitem.getCompanyContactId(),payIncomeContractAdd.getPackYear(),payMemberProjectSubitem.getId(),PayProjectCommon.PROJECT_TYPE4,payIncomeContractAdd.getPack());
payMemberProjectSubitem.setAmountReceivable(BigDecimal.ZERO);
payMemberProjectSubitem.setTax(BigDecimal.ZERO);
payMemberProjectSubitem.setNoTaxAmount(BigDecimal.ZERO);
}
}
//无法更改状态
jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
+11
View File
@@ -46,6 +46,8 @@ import com.jero.payment.entity.PayPaymentRecord;
import com.jero.payment.service.IPayPaymentRecordService;
import com.jero.payment.service.impl.PayConfirmPaymentRecordService;
import com.jero.project.common.PayProjectCommon;
import com.jero.project.entity.PayCommonProject;
import com.jero.project.entity.PayWorkingGroupSubItem;
import com.jero.statistics.entity.MemberLineChartMap;
import com.jero.statistics.entity.MemberLineChartVO;
import com.jero.statistics.entity.MemberPieChartVO;
@@ -189,6 +191,9 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
LambdaUpdateWrapper<TbMemberProjectSubitem> update = new LambdaUpdateWrapper<>();
update.eq(TbMemberProjectSubitem::getId, tbMemberProjectSubitem.getId());
update.set(TbMemberProjectSubitem::getPack, PayProjectCommon.PACKAGING1);
update.set(TbMemberProjectSubitem::getAmountReceivable,BigDecimal.ZERO);
update.set(TbMemberProjectSubitem::getTax,BigDecimal.ZERO);
update.set(TbMemberProjectSubitem::getNoTaxAmount,BigDecimal.ZERO);
tbMemberProjectSubitemService.update(update);
}
}
@@ -366,6 +371,9 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
LambdaUpdateWrapper<TbMemberProjectSubitem> update = new LambdaUpdateWrapper<>();
update.eq(TbMemberProjectSubitem::getId, tbMemberProjectSubitem.getId());
update.set(TbMemberProjectSubitem::getPack, PayProjectCommon.PACKAGING1);
update.set(TbMemberProjectSubitem::getAmountReceivable,BigDecimal.ZERO);
update.set(TbMemberProjectSubitem::getTax,BigDecimal.ZERO);
update.set(TbMemberProjectSubitem::getNoTaxAmount,BigDecimal.ZERO);
tbMemberProjectSubitemService.update(update);
}
}
@@ -434,6 +442,9 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
if (!Objects.isNull(payIncomeContractAdd) && Objects.equals(payIncomeContractAdd.getPack(), PayProjectCommon.PACKAGING1)) {
String liaisonManId = tbMemberProjectSubitem.getLiaisonManId();
payPackCompanyProjectService.setPack(companyId, liaisonManId, payIncomeContractAdd.getPackYear(), subitemId, PayProjectCommon.PROJECT_TYPE5, payIncomeContractAdd.getPack());
tbMemberProjectSubitem.setAmountReceivable(BigDecimal.ZERO);
tbMemberProjectSubitem.setTax(BigDecimal.ZERO);
tbMemberProjectSubitem.setNoTaxAmount(BigDecimal.ZERO);
}
}
updateById(tbMemberProjectSubitem);
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
+7
View File
@@ -22,6 +22,7 @@ import com.jero.contract.entity.PayIncomeContractAssociated;
import com.jero.contract.service.IPayIncomeContractAssociatedService;
import com.jero.contract.service.IPayIncomeContractService;
import com.jero.mail.service.IPayMailBillService;
import com.jero.member.entity.PayMemberProjectSubitem;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import com.jero.pack.entity.PayPackCompanyProject;
@@ -131,6 +132,9 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
LambdaUpdateWrapper<PayCommonProject> update = new LambdaUpdateWrapper<>();
update.eq(PayCommonProject::getId,payCommonProject.getId());
update.set(PayCommonProject::getPack,PayProjectCommon.PACKAGING1);
update.set(PayCommonProject::getReceivableAmount,BigDecimal.ZERO);
update.set(PayCommonProject::getTax,BigDecimal.ZERO);
update.set(PayCommonProject::getNoTaxAmount,BigDecimal.ZERO);
payCommonProjectService.update(update);
}
}
@@ -224,6 +228,9 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
if(!Objects.isNull(payIncomeContractAdd) && Objects.equals(payIncomeContractAdd.getPack(),PayProjectCommon.PACKAGING1)){
payPackCompanyProjectService.setPack(payCommonProject.getChargeCompanyId(),payCommonProject.getContactsId(),payIncomeContractAdd.getPackYear(),payCommonProject.getId(),PayProjectCommon.PROJECT_TYPE1,payIncomeContractAdd.getPack());
payCommonProject.setPack(PayProjectCommon.PACKAGING1);
payCommonProject.setReceivableAmount(BigDecimal.ZERO);
payCommonProject.setTax(BigDecimal.ZERO);
payCommonProject.setNoTaxAmount(BigDecimal.ZERO);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+15
View File
@@ -33,6 +33,7 @@ import com.jero.contract.service.IPayIncomeContractService;
import com.jero.mail.service.IPayMailBillService;
import com.jero.meeting.entity.PayMeetingRemindRecord;
import com.jero.meeting.service.IPayMeetingRemindRecordService;
import com.jero.member.entity.TbMemberProjectSubitem;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.system.entity.SysUser;
@@ -272,6 +273,9 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
LambdaUpdateWrapper<PayWorkingGroupSubItem> update = new LambdaUpdateWrapper<>();
update.eq(PayWorkingGroupSubItem::getId, payWorkingGroupSubItem.getId());
update.set(PayWorkingGroupSubItem::getPack, PayProjectCommon.PACKAGING1);
update.set(PayWorkingGroupSubItem::getReceivableAmount,BigDecimal.ZERO);
update.set(PayWorkingGroupSubItem::getTax,BigDecimal.ZERO);
update.set(PayWorkingGroupSubItem::getNoTaxAmount,BigDecimal.ZERO);
payWorkingGroupSubItemService.update(update);
}
}
@@ -405,6 +409,10 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
if (!Objects.isNull(payIncomeContractAdd) && Objects.equals(payIncomeContractAdd.getPack(), PayProjectCommon.PACKAGING1)) {
String masterContactsId = payWorkingGroupSubItemContactsMapper.getMasterContactsId(workingGroupSubItemId);
payPackCompanyProjectService.setPack(payWorkingGroupSubItem.getChargeCompanyId(), masterContactsId, payIncomeContractAdd.getPackYear(), workingGroupSubItemId, PayProjectCommon.PROJECT_TYPE2, payIncomeContractAdd.getPack());
payWorkingGroupSubItem.setReceivableAmount(BigDecimal.ZERO);
payWorkingGroupSubItem.setTax(BigDecimal.ZERO);
payWorkingGroupSubItem.setNoTaxAmount(BigDecimal.ZERO);
}
}
LambdaQueryWrapper<PayWorkingGroupSubItemContacts> queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>();
@@ -578,6 +586,10 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
if (!Objects.isNull(payIncomeContractAdd) && Objects.equals(payIncomeContractAdd.getPack(), PayProjectCommon.PACKAGING1)) {
String masterContactsId = payWorkingGroupSubItemContactsMapper.getMasterContactsId(workingGroupSubItemId);
payPackCompanyProjectService.setPack(payWorkingGroupSubItem.getChargeCompanyId(), masterContactsId, payIncomeContractAdd.getPackYear(), workingGroupSubItemId, PayProjectCommon.PROJECT_TYPE2, payIncomeContractAdd.getPack());
payWorkingGroupSubItem.setReceivableAmount(BigDecimal.ZERO);
payWorkingGroupSubItem.setTax(BigDecimal.ZERO);
payWorkingGroupSubItem.setNoTaxAmount(BigDecimal.ZERO);
}
}
LambdaQueryWrapper<PayWorkingGroupSubItemContacts> queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>();
@@ -924,6 +936,9 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
LambdaUpdateWrapper<PayWorkingGroupSubItem> update = new LambdaUpdateWrapper<>();
update.eq(PayWorkingGroupSubItem::getId, workingGroupSubItemId);
update.set(PayWorkingGroupSubItem::getPack, PayProjectCommon.PACKAGING1);
update.set(PayWorkingGroupSubItem::getReceivableAmount,BigDecimal.ZERO);
update.set(PayWorkingGroupSubItem::getTax,BigDecimal.ZERO);
update.set(PayWorkingGroupSubItem::getNoTaxAmount,BigDecimal.ZERO);
payWorkingGroupSubItemService.update(update);
}
});