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

添加运营助理岗位

Browse Source
This commit is contained in:
huangdeliang
2020-10-08 21:02:25 +08:00
parent c17f078f7b
commit 5522e23de2
6 changed files with 266 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,35 +116,31 @@ public class SysCommisionController extends BaseController {
startPage();
List<SysCommision> list = sysCommisionService.selectSysCommisionDetail(sysCommision);
for (SysCommision detail : list) {
detail.setRate(0F);
SysCommision tmpQueryCom = new SysCommision();
tmpQueryCom.setUserId(detail.getUserId());
List<SysCommision> tmpComList = sysCommisionService.selectSysCommisionList(tmpQueryCom);
boolean comHit = false;
for (int i = 0; i < tmpComList.size(); i++) {
SysCommision com = tmpComList.get(i);
float dAmount = detail.getAmount().floatValue();
float cAmount = com.getAmount().floatValue();
detail.setRate(com.getRate());
if (dAmount < cAmount && i == 0) {
comHit = false;
// 第一条规则
break;
} else if (i == tmpComList.size() - 1 && dAmount > cAmount) {
comHit = true;
detail.setRate(com.getRate());
// 最后一条规则
break;
} else if (dAmount >= cAmount && dAmount < tmpComList.get(i + 1).getAmount().floatValue()) {
comHit = true;
detail.setRate(com.getRate());
// 中间规则
break;
}
}
if (!comHit) {
detail.setRate(0F);
detail.setCommision(BigDecimal.ZERO);
} else {
float amount = detail.getAmount().floatValue();
amount = amount * detail.getRate() / 100F;
detail.setCommision(new BigDecimal(amount));
}
float amount = detail.getAmount().floatValue();
amount = amount * detail.getRate() / 100F;
detail.setCommision(new BigDecimal(amount));
}
return getDataTable(list);
}

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java
View File

@ -69,6 +69,8 @@ public class SysOrderController extends BaseController {
order.setPlanner(user.getNickName());
} else if (user.getUserId().equals(order.getPlannerAssisId())) {
order.setPlannerAssis(user.getNickName());
} else if (user.getUserId().equals(order.getOperatorAssisId())) {
order.setOperatorAssis(user.getNickName());
}
}
}
@ -102,6 +104,8 @@ public class SysOrderController extends BaseController {
order.setPlanner(user.getNickName());
} else if (user.getUserId().equals(order.getPlannerAssisId())) {
order.setPlannerAssis(user.getNickName());
} else if (user.getUserId().equals(order.getOperatorAssisId())) {
order.setOperatorAssis(user.getNickName());
}
}
}