diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java index 7b8914900..274b699d6 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java @@ -132,14 +132,16 @@ public class RechargeOrderServiceImpl implements RechargeOrderService { rechargeOrderMapper.findListPage(page, pageReqVO); return new PageResult<>(page.getRecords(), page.getTotal()); } + @Override public List findPromoterDrawExcel(PromoterDrawReqExcelVO excelVO) { return rechargeOrderMapper.findPromoterDrawExcel(excelVO); } + @Override public PageResult findPromoterDrawPage(PromoterDrawReqVO pageReqVO) { Page page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); - if (Objects.nonNull(pageReqVO.getSort())&& StringUtils.equals("2",pageReqVO.getSort())) { + if (Objects.nonNull(pageReqVO.getSort()) && StringUtils.equals("2", pageReqVO.getSort())) { pageReqVO.setSort(null); } rechargeOrderMapper.findPromoterDrawPage(page, pageReqVO); @@ -241,11 +243,11 @@ public class RechargeOrderServiceImpl implements RechargeOrderService { List infoDOS1 = collect.get(orderDO.getOrderId()); for (RechargeOrderInfoDO infoDO : infoDOS1) { if (infoDO.getPrice().compareTo(new BigDecimal("240")) == 0) { - grade.append("套餐1,"); + grade.append("套餐" + infoDO.getPrice() + ","); } else if (infoDO.getPrice().compareTo(new BigDecimal("400")) == 0) { - grade.append("套餐2,"); + grade.append("套餐" + infoDO.getPrice() + ","); } else if (infoDO.getPrice().compareTo(new BigDecimal("640")) == 0) { - grade.append("套餐3"); + grade.append("套餐" + infoDO.getPrice() + ","); } } orderDO.setGrade(grade.toString());