diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysCommisionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysCommisionController.java index c78e13754..fec73a841 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysCommisionController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysCommisionController.java @@ -58,8 +58,40 @@ public class SysCommisionController extends BaseController { @Log(title = "业务提成比例", businessType = BusinessType.EXPORT) @GetMapping("/export") public AjaxResult export(SysCommision sysCommision) { - List list = sysCommisionService.selectSysCommisionList(sysCommision); +// List list = sysCommisionService.selectSysCommisionList(sysCommision); ExcelUtil util = new ExcelUtil(SysCommision.class); + List list = sysCommisionService.selectSysCommisionDetail(sysCommision); + for (SysCommision detail : list) { + detail.setRate(0F); + SysCommision tmpQueryCom = new SysCommision(); + tmpQueryCom.setUserId(detail.getUserId()); + tmpQueryCom.setPostId(detail.getPostId()); + List tmpComList = sysCommisionService.selectSysCommisionList(tmpQueryCom); + + float dAmount = detail.getAmount().floatValue(); + for (int i = 0; i < tmpComList.size(); i++) { + SysCommision com = tmpComList.get(i); + float cAmount = com.getAmount().floatValue(); + if (dAmount <= cAmount && i == 0) { + // 第一条规则 + detail.setRate(com.getRate()); + break; + } else if (i == tmpComList.size() - 1 && dAmount > cAmount) { + // 最后一条规则 + detail.setRate(com.getRate()); + break; + } else if (cAmount < dAmount && dAmount <= tmpComList.get(i + 1).getAmount().floatValue()) { + // 中间规则 + detail.setRate(tmpComList.get(i + 1).getRate()); + break; + } + } + + float amount = detail.getAmount().floatValue(); + amount = amount * detail.getRate() / 100F; + detail.setCommision(new BigDecimal(amount)); + } + return util.exportExcel(list, "commision"); } diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysCommision.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysCommision.java index 0f953b95e..71f54c664 100644 --- a/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysCommision.java +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysCommision.java @@ -43,7 +43,7 @@ public class SysCommision extends BaseEntity { /** * 金额 */ - @Excel(name = "金额") + @Excel(name = "金额", scale = 2) private BigDecimal amount; /**