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

1

zhanglei
God 9 months ago
parent
6cb2e3716f
commit
b7a8b11cd9
1 changed files with 18 additions and 16 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. 34
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

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

@ -283,26 +283,28 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
record.setUploadState("1"); record.setUploadState("1");
} }
//是否调整 //是否调整
if (new BigDecimal(record.getStayDetermineMoney()).compareTo(BigDecimal.ZERO) == 0) { if (0 == record.getAdjustmentState()){
BigDecimal decimal = new BigDecimal(StringUtils.isNotBlank(record.getUploadMoney()) ? record.getUploadMoney() : "0").add(new BigDecimal(StringUtils.isNotBlank(record.getSecondaryUploadMoney()) ? record.getSecondaryUploadMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getMoney()) ? record.getMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getStayDetermineMoney()) ? record.getStayDetermineMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getEstimateRebate()) ? record.getEstimateRebate() : "0")); if (new BigDecimal(record.getStayDetermineMoney()).compareTo(BigDecimal.ZERO) == 0) {
int i = decimal.compareTo(BigDecimal.ZERO); BigDecimal decimal = new BigDecimal(StringUtils.isNotBlank(record.getUploadMoney()) ? record.getUploadMoney() : "0").add(new BigDecimal(StringUtils.isNotBlank(record.getSecondaryUploadMoney()) ? record.getSecondaryUploadMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getMoney()) ? record.getMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getStayDetermineMoney()) ? record.getStayDetermineMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getEstimateRebate()) ? record.getEstimateRebate() : "0"));
if (i < 0) {//小于 int i = decimal.compareTo(BigDecimal.ZERO);
if (i < 0) {//小于
record.setIsAdjustment("否");
record.setAdjustmentMoney("0");
record.setAdjustOrNot(true);
} else if (i == 0) {//等于
record.setIsAdjustment("是");
record.setAdjustmentMoney("0");
record.setAdjustOrNot(false);
} else {//大于
record.setIsAdjustment("是");
record.setAdjustmentMoney(decimal.toString());
record.setAdjustOrNot(true);
}
} else {
record.setIsAdjustment("否"); record.setIsAdjustment("否");
record.setAdjustmentMoney("0"); record.setAdjustmentMoney("0");
record.setAdjustOrNot(true);
} else if (i == 0) {//等于
record.setIsAdjustment("是");
record.setAdjustmentMoney("0");
record.setAdjustOrNot(false); record.setAdjustOrNot(false);
} else {//大于
record.setIsAdjustment("是");
record.setAdjustmentMoney(decimal.toString());
record.setAdjustOrNot(true);
} }
} else {
record.setIsAdjustment("否");
record.setAdjustmentMoney("0");
record.setAdjustOrNot(false);
} }
} }
PagerVo<ScmVehRebateVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<ScmVehRebateVo> p = PagerUtil.pageToVo(pagging, null);

Write Preview
Loading…
Cancel
Save