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

update 处理历史数据接口

Browse Source
This commit is contained in:
lijiarao
2024-07-17 10:25:28 +08:00
parent 2bba254cef
commit a006657b68
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
+26 -7
View File
@@ -37,8 +37,10 @@ import com.jero.pack.vo.PayPackCompanyProjectInput;
import com.jero.pack.vo.PayProjectExcel;
import com.jero.project.common.PayProjectCommon;
import com.jero.project.entity.PayCommonProject;
import com.jero.project.entity.PayWorkingGroup;
import com.jero.project.entity.PayWorkingGroupSubItem;
import com.jero.project.mapper.PayCommonProjectMapper;
import com.jero.project.mapper.PayWorkingGroupMapper;
import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -83,6 +85,8 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
@Resource
private PayWorkingGroupSubItemMapper payWorkingGroupSubItemMapper;
@Resource
private PayWorkingGroupMapper payWorkingGroupMapper;
@Resource
private PayMeetingSituationMapper payMeetingSituationMapper;
@Resource
private PayMemberProjectSubitemMapper payMemberProjectSubitemMapper;
@@ -443,6 +447,12 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
if (!new BigDecimal("0.00").equals(old1.getReceivableAmount())){
continue;
}
String workingGroupId = old1.getWorkingGroupId();
PayWorkingGroup payWorkingGroup = payWorkingGroupMapper.selectById(workingGroupId);
BigDecimal yearChargeA = payWorkingGroup.getYearChargeA();
if (yearChargeA == null || new BigDecimal("0.00").equals(yearChargeA)){
continue;
}
PayWorkingGroupSubItem payWorking = null;
List<JSONObject> jsonObjects1 = sysBaseAPI.getLogByRequestParam(projectId);
if (jsonObjects1.isEmpty()){
@@ -463,14 +473,23 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
}
}
if (payWorking == null) {
continue;
PayWorkingGroupSubItem project2 = new PayWorkingGroupSubItem();
project2.setId(projectId);
project2.setReceivableAmount(yearChargeA);
BigDecimal noTaxAmount = yearChargeA.divide(StaticConfig.TAX_RATE_CALCULATE, 2, RoundingMode.HALF_UP);
project2.setNoTaxAmount(noTaxAmount);
project2.setTax(yearChargeA.subtract(noTaxAmount));
payWorkingGroupSubItemMapper.updateById(project2);
}else {
PayWorkingGroupSubItem project2 = new PayWorkingGroupSubItem();
project2.setId(projectId);
project2.setReceivableAmount(payWorking.getReceivableAmount());
project2.setNoTaxAmount(payWorking.getNoTaxAmount());
project2.setTax(payWorking.getTax());
payWorkingGroupSubItemMapper.updateById(project2);
}
PayWorkingGroupSubItem project2 = new PayWorkingGroupSubItem();
project2.setId(projectId);
project2.setReceivableAmount(payWorking.getReceivableAmount());
project2.setNoTaxAmount(payWorking.getNoTaxAmount());
project2.setTax(payWorking.getTax());
payWorkingGroupSubItemMapper.updateById(project2);
break;
//会员项目
case PayIncomeContractCommon.PROJECT_TYPE4: