Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1，修改用户管理展示岗位信息

Browse Source 
2，修复提成比例数据格式为浮点型
3，修复修改提成比例时业务员展示
4，金额数字逢三位加逗号
This commit is contained in:
huangdeliang
2020-10-06 20:16:58 +08:00
parent 0e3b59b12f
commit 92fc73e923
11 changed files with 839 additions and 783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysCommisionController.java
View File

@ -123,8 +123,8 @@ public class SysCommisionController extends BaseController {
boolean comHit = false;
for (int i = 0; i < tmpComList.size(); i++) {
SysCommision com = tmpComList.get(i);
long dAmount = detail.getAmount().longValue();
long cAmount = com.getAmount().longValue();
float dAmount = detail.getAmount().floatValue();
float cAmount = com.getAmount().floatValue();
if (dAmount < cAmount && i == 0) {
comHit = false;
break;
@ -132,17 +132,17 @@ public class SysCommisionController extends BaseController {
comHit = true;
detail.setRate(com.getRate());
break;
} else if (dAmount >= cAmount && dAmount < tmpComList.get(i + 1).getAmount().longValue()) {
} else if (dAmount >= cAmount && dAmount < tmpComList.get(i + 1).getAmount().floatValue()) {
comHit = true;
detail.setRate(com.getRate());
}
}
if (!comHit) {
detail.setRate(0L);
detail.setRate(0F);
detail.setCommision(BigDecimal.ZERO);
} else {
long amount = detail.getAmount().longValue();
amount = amount * detail.getRate() / 100;
float amount = detail.getAmount().floatValue();
amount = amount * detail.getRate() / 100F;
detail.setCommision(new BigDecimal(amount));
}
}