yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更改

master
ligaode 3 months ago
parent
5c54d9f3b7
commit
0073ad5721
2 changed files with 84 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 80
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
  2. 80
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

80
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
View File

@ -1299,29 +1299,31 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
break; break;
} }
} }
int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO); if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
//上传返利金额 int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO);
BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getOnceItureCost())).subtract(new BigDecimal(excelInfo.getOnceTreatCost())).subtract(new BigDecimal(excelInfo.getOnceSuppCost())); //上传返利金额
//预提返利-其中预提费用 BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getOnceItureCost())).subtract(new BigDecimal(excelInfo.getOnceTreatCost())).subtract(new BigDecimal(excelInfo.getOnceSuppCost()));
BigDecimal ytfy = new BigDecimal(excelInfo.getEstimateRebate()).subtract(new BigDecimal(excelInfo.getExpectCost())); //预提返利-其中预提费用
//调整金额 BigDecimal ytfy = new BigDecimal(excelInfo.getEstimateRebate()).subtract(new BigDecimal(excelInfo.getExpectCost()));
BigDecimal tzje = new BigDecimal(excelInfo.getUploadMoney()).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getOnceItureCost())).subtract(new BigDecimal(excelInfo.getOnceTreatCost())).subtract(new BigDecimal(excelInfo.getOnceSuppCost())).subtract(new BigDecimal(excelInfo.getEstimateRebate())).add(new BigDecimal(excelInfo.getExpectCost())); //调整金额
if (i > 0) { BigDecimal tzje = new BigDecimal(excelInfo.getUploadMoney()).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getOnceItureCost())).subtract(new BigDecimal(excelInfo.getOnceTreatCost())).subtract(new BigDecimal(excelInfo.getOnceSuppCost())).subtract(new BigDecimal(excelInfo.getEstimateRebate())).add(new BigDecimal(excelInfo.getExpectCost()));
excelInfo.setIsAdjustment("否"); if (i > 0) {
excelInfo.setAdjustmentMoney("0");
} else if (i == 0) {
if (scflje.compareTo(ytfy) > 0) {
excelInfo.setIsAdjustment("是");
excelInfo.setAdjustmentMoney(tzje.toString());
} else if (scflje.compareTo(ytfy) == 0) {
excelInfo.setIsAdjustment("是");
excelInfo.setAdjustmentMoney(tzje.toString());
} else if (scflje.compareTo(ytfy) < 0) {
excelInfo.setIsAdjustment("否"); excelInfo.setIsAdjustment("否");
excelInfo.setAdjustmentMoney("0"); excelInfo.setAdjustmentMoney("0");
} else if (i == 0) {
if (scflje.compareTo(ytfy) > 0) {
excelInfo.setIsAdjustment("是");
excelInfo.setAdjustmentMoney(tzje.toString());
} else if (scflje.compareTo(ytfy) == 0) {
excelInfo.setIsAdjustment("是");
excelInfo.setAdjustmentMoney(tzje.toString());
} else if (scflje.compareTo(ytfy) < 0) {
excelInfo.setIsAdjustment("否");
excelInfo.setAdjustmentMoney("0");
}
} }
excelInfo.setDiffAmount(scflje.subtract(ytfy).toString());
} }
excelInfo.setDiffAmount(scflje.subtract(ytfy).toString());
} }
} }
StringBuffer sbcheck1 = new StringBuffer(); StringBuffer sbcheck1 = new StringBuffer();
@ -1826,29 +1828,31 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
break; break;
} }
} }
int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO); if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) {
//上传返利金额 int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO);
BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).add(new BigDecimal(excelInfo.getSecondaryUploadMoney())).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getMoney())).subtract(new BigDecimal(excelInfo.getSecondItureCost())).subtract(new BigDecimal(excelInfo.getSecondTreatCost())).subtract(new BigDecimal(excelInfo.getSecondSuppCost())); //上传返利金额
//预提返利-其中预提费用 BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).add(new BigDecimal(excelInfo.getSecondaryUploadMoney())).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getMoney())).subtract(new BigDecimal(excelInfo.getSecondItureCost())).subtract(new BigDecimal(excelInfo.getSecondTreatCost())).subtract(new BigDecimal(excelInfo.getSecondSuppCost()));
BigDecimal ytfy = new BigDecimal(excelInfo.getEstimateRebate()).subtract(new BigDecimal(excelInfo.getExpectCost())); //预提返利-其中预提费用
//调整金额 BigDecimal ytfy = new BigDecimal(excelInfo.getEstimateRebate()).subtract(new BigDecimal(excelInfo.getExpectCost()));
BigDecimal tzje = new BigDecimal(excelInfo.getUploadMoney()).add(new BigDecimal(excelInfo.getSecondaryUploadMoney())).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getMoney())).subtract(new BigDecimal(excelInfo.getSecondItureCost())).subtract(new BigDecimal(excelInfo.getSecondTreatCost())).subtract(new BigDecimal(excelInfo.getSecondSuppCost())).subtract(new BigDecimal(excelInfo.getEstimateRebate())).add(new BigDecimal(excelInfo.getExpectCost())); //调整金额
if (i > 0) { BigDecimal tzje = new BigDecimal(excelInfo.getUploadMoney()).add(new BigDecimal(excelInfo.getSecondaryUploadMoney())).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getMoney())).subtract(new BigDecimal(excelInfo.getSecondItureCost())).subtract(new BigDecimal(excelInfo.getSecondTreatCost())).subtract(new BigDecimal(excelInfo.getSecondSuppCost())).subtract(new BigDecimal(excelInfo.getEstimateRebate())).add(new BigDecimal(excelInfo.getExpectCost()));
excelInfo.setIsAdjustment("否"); if (i > 0) {
excelInfo.setAdjustmentMoney("0");
} else if (i == 0) {
if (scflje.compareTo(ytfy) > 0) {
excelInfo.setIsAdjustment("是");
excelInfo.setAdjustmentMoney(tzje.toString());
} else if (scflje.compareTo(ytfy) == 0) {
excelInfo.setIsAdjustment("是");
excelInfo.setAdjustmentMoney(tzje.toString());
} else if (scflje.compareTo(ytfy) < 0) {
excelInfo.setIsAdjustment("否"); excelInfo.setIsAdjustment("否");
excelInfo.setAdjustmentMoney("0"); excelInfo.setAdjustmentMoney("0");
} else if (i == 0) {
if (scflje.compareTo(ytfy) > 0) {
excelInfo.setIsAdjustment("是");
excelInfo.setAdjustmentMoney(tzje.toString());
} else if (scflje.compareTo(ytfy) == 0) {
excelInfo.setIsAdjustment("是");
excelInfo.setAdjustmentMoney(tzje.toString());
} else if (scflje.compareTo(ytfy) < 0) {
excelInfo.setIsAdjustment("否");
excelInfo.setAdjustmentMoney("0");
}
} }
excelInfo.setDiffAmount(scflje.subtract(ytfy).toString());
} }
excelInfo.setDiffAmount(scflje.subtract(ytfy).toString());
} }
} }
StringBuffer sbcheck1 = new StringBuffer(); StringBuffer sbcheck1 = new StringBuffer();

80
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
View File

@ -1606,29 +1606,31 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
break; break;
} }
} }
int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO); if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getUploadMoney())){
//上传返利金额 int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO);
BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getOnceTreatCost())).subtract(new BigDecimal(excelInfo.getOnceSuppCost())); //上传返利金额
//预提返利-其中预提费用 BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getOnceTreatCost())).subtract(new BigDecimal(excelInfo.getOnceSuppCost()));
BigDecimal ytfy = new BigDecimal(excelInfo.getEstimateRebate()).subtract(new BigDecimal(excelInfo.getWithholdCost())); //预提返利-其中预提费用
//调整金额 BigDecimal ytfy = new BigDecimal(excelInfo.getEstimateRebate()).subtract(new BigDecimal(excelInfo.getWithholdCost()));
BigDecimal tzje = new BigDecimal(excelInfo.getUploadMoney()).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getOnceTreatCost())).subtract(new BigDecimal(excelInfo.getOnceSuppCost())).subtract(new BigDecimal(excelInfo.getEstimateRebate())).add(new BigDecimal(excelInfo.getWithholdCost())); //调整金额
if (i > 0) { BigDecimal tzje = new BigDecimal(excelInfo.getUploadMoney()).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getOnceTreatCost())).subtract(new BigDecimal(excelInfo.getOnceSuppCost())).subtract(new BigDecimal(excelInfo.getEstimateRebate())).add(new BigDecimal(excelInfo.getWithholdCost()));
excelInfo.setIsAdjustment("否"); if (i > 0) {
excelInfo.setAdjustmentMoney("0");
} else if (i == 0) {
if (scflje.compareTo(ytfy) > 0) {
excelInfo.setIsAdjustment("是");
excelInfo.setAdjustmentMoney(tzje.toString());
} else if (scflje.compareTo(ytfy) == 0) {
excelInfo.setIsAdjustment("是");
excelInfo.setAdjustmentMoney(tzje.toString());
} else if (scflje.compareTo(ytfy) < 0) {
excelInfo.setIsAdjustment("否"); excelInfo.setIsAdjustment("否");
excelInfo.setAdjustmentMoney("0"); excelInfo.setAdjustmentMoney("0");
} else if (i == 0) {
if (scflje.compareTo(ytfy) > 0) {
excelInfo.setIsAdjustment("是");
excelInfo.setAdjustmentMoney(tzje.toString());
} else if (scflje.compareTo(ytfy) == 0) {
excelInfo.setIsAdjustment("是");
excelInfo.setAdjustmentMoney(tzje.toString());
} else if (scflje.compareTo(ytfy) < 0) {
excelInfo.setIsAdjustment("否");
excelInfo.setAdjustmentMoney("0");
}
} }
excelInfo.setDiffAmount(scflje.subtract(ytfy).toString());
} }
excelInfo.setDiffAmount(scflje.subtract(ytfy).toString());
} }
} }
StringBuffer sbcheck1 = new StringBuffer(); StringBuffer sbcheck1 = new StringBuffer();
@ -2097,29 +2099,31 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
break; break;
} }
} }
int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO); if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())){
//上传返利金额 int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO);
BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).add(new BigDecimal(excelInfo.getSecondaryUploadMoney())).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getQzMoney())).subtract(new BigDecimal(excelInfo.getSecondTreatCost())).subtract(new BigDecimal(excelInfo.getSecondSuppCost())); //上传返利金额
//预提返利-其中预提费用 BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).add(new BigDecimal(excelInfo.getSecondaryUploadMoney())).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getQzMoney())).subtract(new BigDecimal(excelInfo.getSecondTreatCost())).subtract(new BigDecimal(excelInfo.getSecondSuppCost()));
BigDecimal ytfy = new BigDecimal(excelInfo.getEstimateRebate()).subtract(new BigDecimal(excelInfo.getWithholdCost())); //预提返利-其中预提费用
//调整金额 BigDecimal ytfy = new BigDecimal(excelInfo.getEstimateRebate()).subtract(new BigDecimal(excelInfo.getWithholdCost()));
BigDecimal tzje = new BigDecimal(excelInfo.getUploadMoney()).add(new BigDecimal(excelInfo.getSecondaryUploadMoney())).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getQzMoney())).subtract(new BigDecimal(excelInfo.getSecondTreatCost())).subtract(new BigDecimal(excelInfo.getSecondSuppCost())).subtract(new BigDecimal(excelInfo.getEstimateRebate())).add(new BigDecimal(excelInfo.getWithholdCost())); //调整金额
if (i > 0) { BigDecimal tzje = new BigDecimal(excelInfo.getUploadMoney()).add(new BigDecimal(excelInfo.getSecondaryUploadMoney())).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getQzMoney())).subtract(new BigDecimal(excelInfo.getSecondTreatCost())).subtract(new BigDecimal(excelInfo.getSecondSuppCost())).subtract(new BigDecimal(excelInfo.getEstimateRebate())).add(new BigDecimal(excelInfo.getWithholdCost()));
excelInfo.setIsAdjustment("否"); if (i > 0) {
excelInfo.setAdjustmentMoney("0");
} else if (i == 0) {
if (scflje.compareTo(ytfy) > 0) {
excelInfo.setIsAdjustment("是");
excelInfo.setAdjustmentMoney(tzje.toString());
} else if (scflje.compareTo(ytfy) == 0) {
excelInfo.setIsAdjustment("是");
excelInfo.setAdjustmentMoney(tzje.toString());
} else if (scflje.compareTo(ytfy) < 0) {
excelInfo.setIsAdjustment("否"); excelInfo.setIsAdjustment("否");
excelInfo.setAdjustmentMoney("0"); excelInfo.setAdjustmentMoney("0");
} else if (i == 0) {
if (scflje.compareTo(ytfy) > 0) {
excelInfo.setIsAdjustment("是");
excelInfo.setAdjustmentMoney(tzje.toString());
} else if (scflje.compareTo(ytfy) == 0) {
excelInfo.setIsAdjustment("是");
excelInfo.setAdjustmentMoney(tzje.toString());
} else if (scflje.compareTo(ytfy) < 0) {
excelInfo.setIsAdjustment("否");
excelInfo.setAdjustmentMoney("0");
}
} }
excelInfo.setDiffAmount(scflje.subtract(ytfy).toString());
} }
excelInfo.setDiffAmount(scflje.subtract(ytfy).toString());
} }
} }
StringBuffer sbcheck1 = new StringBuffer(); StringBuffer sbcheck1 = new StringBuffer();

Write Preview
Loading…
Cancel
Save