zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zenghuapei:9326a3148949d52b95b3b66b830d7130266f68de
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product
..
compare: zenghuapei:5a5c69421ccd1f840215278516cb8c71184a2955
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product

2 Commits
9326a31489 ... 5a5c69421c

Author SHA1 Message Date
tangqian 5a5c69421c Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-01 11:27:17 +08:00
tangqian 06a0f96bf1 fix: 修改部门 2023-06-01 11:27:11 +08:00
1 changed files with 6 additions and 4 deletions
Show Stats Expand all files Collapse all files

10
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
View File

@ -132,14 +132,16 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
rechargeOrderMapper.findListPage(page, pageReqVO);
return new PageResult<>(page.getRecords(), page.getTotal());
}
@Override
public List<PromoterDrawExcelVO> findPromoterDrawExcel(PromoterDrawReqExcelVO excelVO) {
return rechargeOrderMapper.findPromoterDrawExcel(excelVO);
}
@Override
public PageResult<PromoterDrawVO> findPromoterDrawPage(PromoterDrawReqVO pageReqVO) {
Page<PromoterDrawVO> 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<RechargeOrderInfoDO> 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());