diff --git a/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java b/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java index c4192c2a6..bf8388111 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java +++ b/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java @@ -816,11 +816,16 @@ public class BillingStatementApplicationService { BigDecimal allAmount = BigDecimal.ZERO; BigDecimal allFreeFee = BigDecimal.ZERO; String settlementCurrency = "CNY"; + Long organizationId = null; + Long topOrganizationId = null; + String organizationName = null; for (BillingStatement billingStatement : billingStatements) { settlementCurrency = billingStatement.getSettlementCurrency(); String firstSubjectCode = billingStatement.getFirstSubjectCode(); String firstSubjectName = billingStatement.getFirstSubjectName(); - Long organizationId = billingStatement.getOrganizationId(); + organizationId = billingStatement.getOrganizationId(); + topOrganizationId = billingStatement.getTopOrganizationId(); + organizationName = billingStatement.getOrganizationName(); Map taxRateMap = billingStatementMapper.getTaxRate(organizationId, firstSubjectCode, firstSubjectName); if (taxRateMap == null) continue; BigDecimal taxRateBigDecimal = (BigDecimal) taxRateMap.get("taxRate"); @@ -858,6 +863,9 @@ public class BillingStatementApplicationService { billingStatementDTO1.setTaxFreeFee(allFreeFee); billingStatementDTO1.setSettlementCurrency(settlementCurrency); billingStatementDTO1.setBillingStatementList(billingStatementADDVOS); + billingStatementDTO1.setOrganizationId(organizationId); + billingStatementDTO1.setTopOrganizationId(topOrganizationId); + billingStatementDTO1.setOrganizationName(organizationName); generateBillsJob(billingStatementDTO1); } } @@ -874,11 +882,16 @@ public class BillingStatementApplicationService { BigDecimal allAmount = BigDecimal.ZERO; BigDecimal allFreeFee = BigDecimal.ZERO; String settlementCurrency = "CNY"; + Long organizationId = null; + Long topOrganizationId = null; + String organizationName = null; for (BillingStatement billingStatement : billingStatementList) { settlementCurrency = billingStatement.getSettlementCurrency(); String firstSubjectCode = billingStatement.getFirstSubjectCode(); String firstSubjectName = billingStatement.getFirstSubjectName(); - Long organizationId = billingStatement.getOrganizationId(); + organizationId = billingStatement.getOrganizationId(); + topOrganizationId = billingStatement.getTopOrganizationId(); + organizationName = billingStatement.getOrganizationName(); Map taxRateMap = billingStatementMapper.getTaxRate(organizationId, firstSubjectCode, firstSubjectName); if (taxRateMap == null) continue; BigDecimal taxRateBigDecimal = (BigDecimal) taxRateMap.get("taxRate"); @@ -916,6 +929,9 @@ public class BillingStatementApplicationService { billingStatementDTO1.setTaxFreeFee(allFreeFee); billingStatementDTO1.setSettlementCurrency(settlementCurrency); billingStatementDTO1.setBillingStatementList(billingStatementADDVOS); + billingStatementDTO1.setOrganizationId(organizationId); + billingStatementDTO1.setTopOrganizationId(topOrganizationId); + billingStatementDTO1.setOrganizationName(organizationName); generateBillsJob(billingStatementDTO1); } } @@ -947,11 +963,16 @@ public class BillingStatementApplicationService { BigDecimal allAmount = BigDecimal.ZERO; BigDecimal allFreeFee = BigDecimal.ZERO; String settlementCurrency = "CNY"; + Long organizationId = null; + Long topOrganizationId = null; + String organizationName = null; for (BillingStatement billingStatement : billingStatementList) { settlementCurrency = billingStatement.getSettlementCurrency(); String firstSubjectCode = billingStatement.getFirstSubjectCode(); String firstSubjectName = billingStatement.getFirstSubjectName(); - Long organizationId = billingStatement.getOrganizationId(); + organizationId = billingStatement.getOrganizationId(); + topOrganizationId = billingStatement.getTopOrganizationId(); + organizationName = billingStatement.getOrganizationName(); Map taxRateMap = billingStatementMapper.getTaxRate(organizationId, firstSubjectCode, firstSubjectName); if (taxRateMap == null) continue; BigDecimal taxRateBigDecimal = (BigDecimal) taxRateMap.get("taxRate"); @@ -989,6 +1010,9 @@ public class BillingStatementApplicationService { billingStatementDTO1.setTaxFreeFee(allFreeFee); billingStatementDTO1.setSettlementCurrency(settlementCurrency); billingStatementDTO1.setBillingStatementList(billingStatementADDVOS); + billingStatementDTO1.setOrganizationId(organizationId); + billingStatementDTO1.setTopOrganizationId(topOrganizationId); + billingStatementDTO1.setOrganizationName(organizationName); generateBillsJob(billingStatementDTO1); } } @@ -1028,11 +1052,16 @@ public class BillingStatementApplicationService { BigDecimal allAmount = BigDecimal.ZERO; BigDecimal allFreeFee = BigDecimal.ZERO; String settlementCurrency = "CNY"; + Long organizationId = null; + Long topOrganizationId = null; + String organizationName = null; for (BillingStatement billingStatement : billingContractStatementList) { settlementCurrency = billingStatement.getSettlementCurrency(); String firstSubjectCode = billingStatement.getFirstSubjectCode(); String firstSubjectName = billingStatement.getFirstSubjectName(); - Long organizationId = billingStatement.getOrganizationId(); + organizationId = billingStatement.getOrganizationId(); + topOrganizationId = billingStatement.getTopOrganizationId(); + organizationName = billingStatement.getOrganizationName(); Map taxRateMap = billingStatementMapper.getTaxRate(organizationId, firstSubjectCode, firstSubjectName); if (taxRateMap == null) continue; BigDecimal taxRateBigDecimal = (BigDecimal) taxRateMap.get("taxRate"); @@ -1069,6 +1098,9 @@ public class BillingStatementApplicationService { billingStatementDTO1.setTaxFreeFee(allFreeFee); billingStatementDTO1.setSettlementCurrency(settlementCurrency); billingStatementDTO1.setBillingStatementList(billingStatementADDVOS); + billingStatementDTO1.setOrganizationId(organizationId); + billingStatementDTO1.setTopOrganizationId(topOrganizationId); + billingStatementDTO1.setOrganizationName(organizationName); generateBillsJob(billingStatementDTO1); } } @@ -1085,11 +1117,16 @@ public class BillingStatementApplicationService { BigDecimal allAmount = BigDecimal.ZERO; BigDecimal allFreeFee = BigDecimal.ZERO; String settlementCurrency = "CNY"; + Long organizationId = null; + Long topOrganizationId = null; + String organizationName = null; for (BillingStatement billingStatement : billingStatementList) { settlementCurrency = billingStatement.getSettlementCurrency(); String firstSubjectCode = billingStatement.getFirstSubjectCode(); String firstSubjectName = billingStatement.getFirstSubjectName(); - Long organizationId = billingStatement.getOrganizationId(); + organizationId = billingStatement.getOrganizationId(); + topOrganizationId = billingStatement.getTopOrganizationId(); + organizationName = billingStatement.getOrganizationName(); Map taxRateMap = billingStatementMapper.getTaxRate(organizationId, firstSubjectCode, firstSubjectName); if (taxRateMap == null) continue; BigDecimal taxRateBigDecimal = (BigDecimal) taxRateMap.get("taxRate"); @@ -1127,6 +1164,9 @@ public class BillingStatementApplicationService { billingStatementDTO1.setTaxFreeFee(allFreeFee); billingStatementDTO1.setSettlementCurrency(settlementCurrency); billingStatementDTO1.setBillingStatementList(billingStatementADDVOS); + billingStatementDTO1.setOrganizationId(organizationId); + billingStatementDTO1.setTopOrganizationId(topOrganizationId); + billingStatementDTO1.setOrganizationName(organizationName); generateBillsJob(billingStatementDTO1); } } @@ -1158,11 +1198,16 @@ public class BillingStatementApplicationService { BigDecimal allAmount = BigDecimal.ZERO; BigDecimal allFreeFee = BigDecimal.ZERO; String settlementCurrency = "CNY"; + Long organizationId = null; + Long topOrganizationId = null; + String organizationName = null; for (BillingStatement billingStatement : billingStatementList) { settlementCurrency = billingStatement.getSettlementCurrency(); String firstSubjectCode = billingStatement.getFirstSubjectCode(); String firstSubjectName = billingStatement.getFirstSubjectName(); - Long organizationId = billingStatement.getOrganizationId(); + organizationId = billingStatement.getOrganizationId(); + topOrganizationId = billingStatement.getTopOrganizationId(); + organizationName = billingStatement.getOrganizationName(); Map taxRateMap = billingStatementMapper.getTaxRate(organizationId, firstSubjectCode, firstSubjectName); if (taxRateMap == null) continue; BigDecimal taxRateBigDecimal = (BigDecimal) taxRateMap.get("taxRate"); @@ -1200,6 +1245,9 @@ public class BillingStatementApplicationService { billingStatementDTO1.setTaxFreeFee(allFreeFee); billingStatementDTO1.setSettlementCurrency(settlementCurrency); billingStatementDTO1.setBillingStatementList(billingStatementADDVOS); + billingStatementDTO1.setOrganizationId(organizationId); + billingStatementDTO1.setTopOrganizationId(topOrganizationId); + billingStatementDTO1.setOrganizationName(organizationName); generateBillsJob(billingStatementDTO1); } } @@ -1233,11 +1281,16 @@ public class BillingStatementApplicationService { BigDecimal allAmount = BigDecimal.ZERO; BigDecimal allFreeFee = BigDecimal.ZERO; String settlementCurrency = "CNY"; + Long organizationId = null; + Long topOrganizationId = null; + String organizationName = null; for (BillingStatement billingStatement : billingStatements) { settlementCurrency = billingStatement.getSettlementCurrency(); String firstSubjectCode = billingStatement.getFirstSubjectCode(); String firstSubjectName = billingStatement.getFirstSubjectName(); - Long organizationId = billingStatement.getOrganizationId(); + organizationId = billingStatement.getOrganizationId(); + topOrganizationId = billingStatement.getTopOrganizationId(); + organizationName = billingStatement.getOrganizationName(); Map taxRateMap = billingStatementMapper.getTaxRate(organizationId, firstSubjectCode, firstSubjectName); if (taxRateMap == null) continue; BigDecimal taxRateBigDecimal = (BigDecimal) taxRateMap.get("taxRate"); @@ -1276,6 +1329,9 @@ public class BillingStatementApplicationService { billingStatementDTO1.setTaxFreeFee(allFreeFee); billingStatementDTO1.setSettlementCurrency(settlementCurrency); billingStatementDTO1.setBillingStatementList(billingStatementADDVOS); + billingStatementDTO1.setOrganizationId(organizationId); + billingStatementDTO1.setTopOrganizationId(topOrganizationId); + billingStatementDTO1.setOrganizationName(organizationName); generateBillsJob(billingStatementDTO1); } } @@ -1292,11 +1348,16 @@ public class BillingStatementApplicationService { BigDecimal allAmount = BigDecimal.ZERO; BigDecimal allFreeFee = BigDecimal.ZERO; String settlementCurrency = "CNY"; + Long organizationId = null; + Long topOrganizationId = null; + String organizationName = null; for (BillingStatement billingStatement : billingStatementList) { settlementCurrency = billingStatement.getSettlementCurrency(); String firstSubjectCode = billingStatement.getFirstSubjectCode(); String firstSubjectName = billingStatement.getFirstSubjectName(); - Long organizationId = billingStatement.getOrganizationId(); + organizationId = billingStatement.getOrganizationId(); + topOrganizationId = billingStatement.getTopOrganizationId(); + organizationName = billingStatement.getOrganizationName(); Map taxRateMap = billingStatementMapper.getTaxRate(organizationId, firstSubjectCode, firstSubjectName); if (taxRateMap == null) continue; BigDecimal taxRateBigDecimal = (BigDecimal) taxRateMap.get("taxRate"); @@ -1334,6 +1395,9 @@ public class BillingStatementApplicationService { billingStatementDTO1.setTaxFreeFee(allFreeFee); billingStatementDTO1.setSettlementCurrency(settlementCurrency); billingStatementDTO1.setBillingStatementList(billingStatementADDVOS); + billingStatementDTO1.setOrganizationId(organizationId); + billingStatementDTO1.setTopOrganizationId(topOrganizationId); + billingStatementDTO1.setOrganizationName(organizationName); generateBillsJob(billingStatementDTO1); } } @@ -1365,11 +1429,16 @@ public class BillingStatementApplicationService { BigDecimal allAmount = BigDecimal.ZERO; BigDecimal allFreeFee = BigDecimal.ZERO; String settlementCurrency = "CNY"; + Long organizationId = null; + Long topOrganizationId = null; + String organizationName = null; for (BillingStatement billingStatement : billingStatementList) { settlementCurrency = billingStatement.getSettlementCurrency(); String firstSubjectCode = billingStatement.getFirstSubjectCode(); String firstSubjectName = billingStatement.getFirstSubjectName(); - Long organizationId = billingStatement.getOrganizationId(); + organizationId = billingStatement.getOrganizationId(); + topOrganizationId = billingStatement.getTopOrganizationId(); + organizationName = billingStatement.getOrganizationName(); Map taxRateMap = billingStatementMapper.getTaxRate(organizationId, firstSubjectCode, firstSubjectName); if (taxRateMap == null) continue; BigDecimal taxRateBigDecimal = (BigDecimal) taxRateMap.get("taxRate"); @@ -1407,6 +1476,9 @@ public class BillingStatementApplicationService { billingStatementDTO1.setTaxFreeFee(allFreeFee); billingStatementDTO1.setSettlementCurrency(settlementCurrency); billingStatementDTO1.setBillingStatementList(billingStatementADDVOS); + billingStatementDTO1.setOrganizationId(organizationId); + billingStatementDTO1.setTopOrganizationId(topOrganizationId); + billingStatementDTO1.setOrganizationName(organizationName); generateBillsJob(billingStatementDTO1); } } @@ -1446,11 +1518,16 @@ public class BillingStatementApplicationService { BigDecimal allAmount = BigDecimal.ZERO; BigDecimal allFreeFee = BigDecimal.ZERO; String settlementCurrency = "CNY"; + Long organizationId = null; + Long topOrganizationId = null; + String organizationName = null; for (BillingStatement billingStatement : billingContractStatementList) { settlementCurrency = billingStatement.getSettlementCurrency(); String firstSubjectCode = billingStatement.getFirstSubjectCode(); String firstSubjectName = billingStatement.getFirstSubjectName(); - Long organizationId = billingStatement.getOrganizationId(); + organizationId = billingStatement.getOrganizationId(); + topOrganizationId = billingStatement.getTopOrganizationId(); + organizationName = billingStatement.getOrganizationName(); Map taxRateMap = billingStatementMapper.getTaxRate(organizationId, firstSubjectCode, firstSubjectName); if (taxRateMap == null) continue; BigDecimal taxRateBigDecimal = (BigDecimal) taxRateMap.get("taxRate"); @@ -1487,6 +1564,9 @@ public class BillingStatementApplicationService { billingStatementDTO1.setTaxFreeFee(allFreeFee); billingStatementDTO1.setSettlementCurrency(settlementCurrency); billingStatementDTO1.setBillingStatementList(billingStatementADDVOS); + billingStatementDTO1.setOrganizationId(organizationId); + billingStatementDTO1.setTopOrganizationId(topOrganizationId); + billingStatementDTO1.setOrganizationName(organizationName); generateBillsJob(billingStatementDTO1); } } @@ -1503,11 +1583,16 @@ public class BillingStatementApplicationService { BigDecimal allAmount = BigDecimal.ZERO; BigDecimal allFreeFee = BigDecimal.ZERO; String settlementCurrency = "CNY"; + Long organizationId = null; + Long topOrganizationId = null; + String organizationName = null; for (BillingStatement billingStatement : billingStatementList) { settlementCurrency = billingStatement.getSettlementCurrency(); String firstSubjectCode = billingStatement.getFirstSubjectCode(); String firstSubjectName = billingStatement.getFirstSubjectName(); - Long organizationId = billingStatement.getOrganizationId(); + organizationId = billingStatement.getOrganizationId(); + topOrganizationId = billingStatement.getTopOrganizationId(); + organizationName = billingStatement.getOrganizationName(); Map taxRateMap = billingStatementMapper.getTaxRate(organizationId, firstSubjectCode, firstSubjectName); if (taxRateMap == null) continue; BigDecimal taxRateBigDecimal = (BigDecimal) taxRateMap.get("taxRate"); @@ -1545,6 +1630,9 @@ public class BillingStatementApplicationService { billingStatementDTO1.setTaxFreeFee(allFreeFee); billingStatementDTO1.setSettlementCurrency(settlementCurrency); billingStatementDTO1.setBillingStatementList(billingStatementADDVOS); + billingStatementDTO1.setOrganizationId(organizationId); + billingStatementDTO1.setTopOrganizationId(topOrganizationId); + billingStatementDTO1.setOrganizationName(organizationName); generateBillsJob(billingStatementDTO1); } } @@ -1576,11 +1664,16 @@ public class BillingStatementApplicationService { BigDecimal allAmount = BigDecimal.ZERO; BigDecimal allFreeFee = BigDecimal.ZERO; String settlementCurrency = "CNY"; + Long organizationId = null; + Long topOrganizationId = null; + String organizationName = null; for (BillingStatement billingStatement : billingStatementList) { settlementCurrency = billingStatement.getSettlementCurrency(); String firstSubjectCode = billingStatement.getFirstSubjectCode(); String firstSubjectName = billingStatement.getFirstSubjectName(); - Long organizationId = billingStatement.getOrganizationId(); + organizationId = billingStatement.getOrganizationId(); + topOrganizationId = billingStatement.getTopOrganizationId(); + organizationName = billingStatement.getOrganizationName(); Map taxRateMap = billingStatementMapper.getTaxRate(organizationId, firstSubjectCode, firstSubjectName); if (taxRateMap == null) continue; BigDecimal taxRateBigDecimal = (BigDecimal) taxRateMap.get("taxRate"); @@ -1618,6 +1711,9 @@ public class BillingStatementApplicationService { billingStatementDTO1.setTaxFreeFee(allFreeFee); billingStatementDTO1.setSettlementCurrency(settlementCurrency); billingStatementDTO1.setBillingStatementList(billingStatementADDVOS); + billingStatementDTO1.setOrganizationId(organizationId); + billingStatementDTO1.setTopOrganizationId(topOrganizationId); + billingStatementDTO1.setOrganizationName(organizationName); generateBillsJob(billingStatementDTO1); } }