代理商提现记录
This commit is contained in:
@@ -115,25 +115,23 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PageUtils selectCashOutList(Integer page, Integer limit, CashOut cashOut,@Param("isApp") boolean isApp) {
|
public PageUtils selectCashOutList(Integer page, Integer limit, CashOut cashOut, @Param("isApp") boolean isApp) {
|
||||||
|
|
||||||
LambdaQueryWrapper<CashOut> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<CashOut> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
if (isApp) {
|
if (isApp) {
|
||||||
queryWrapper.eq(CashOut::getUserId, cashOut.getUserId())
|
queryWrapper.eq(CashOut::getUserId, cashOut.getUserId())
|
||||||
.eq(CashOut::getUserType, 1);
|
.eq(CashOut::getUserType, 1);
|
||||||
}else {
|
} else {
|
||||||
if (cashOut.getSysUserId() != null) {
|
if (cashOut.getSysUserId() == null) {
|
||||||
|
return PageUtils.page(new PageInfo<>());
|
||||||
|
}else {
|
||||||
queryWrapper.eq(CashOut::getUserId, cashOut.getSysUserId())
|
queryWrapper.eq(CashOut::getUserId, cashOut.getSysUserId())
|
||||||
.eq(CashOut::getUserType, 2);
|
.eq(CashOut::getUserType, 2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isApp && cashOut.getUserId() != null) {
|
|
||||||
queryWrapper.eq(CashOut::getUserId, cashOut.getUserId());
|
|
||||||
}
|
|
||||||
|
|
||||||
PageHelper.startPage(page, limit);
|
PageHelper.startPage(page, limit);
|
||||||
List<CashOut> cashOutList = list(queryWrapper.eq(CashOut::getUserType, 1).orderByDesc(CashOut::getCreateAt));
|
List<CashOut> cashOutList = list(queryWrapper.orderByDesc(CashOut::getCreateAt));
|
||||||
|
|
||||||
if (!isApp) {
|
if (!isApp) {
|
||||||
ArrayList<Long> userIdList = new ArrayList<>();
|
ArrayList<Long> userIdList = new ArrayList<>();
|
||||||
@@ -662,9 +660,9 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
|
|||||||
|
|
||||||
if (StrUtil.isNotBlank(cashOut.getStartTime()) && StrUtil.isNotBlank(cashOut.getEndTime())) {
|
if (StrUtil.isNotBlank(cashOut.getStartTime()) && StrUtil.isNotBlank(cashOut.getEndTime())) {
|
||||||
queryWrapper.between(CashOut::getCreateAt, cashOut.getStartTime(), cashOut.getEndTime());
|
queryWrapper.between(CashOut::getCreateAt, cashOut.getStartTime(), cashOut.getEndTime());
|
||||||
}else if (StrUtil.isNotBlank(cashOut.getStartTime())) {
|
} else if (StrUtil.isNotBlank(cashOut.getStartTime())) {
|
||||||
queryWrapper.ge(CashOut::getCreateAt, cashOut.getStartTime());
|
queryWrapper.ge(CashOut::getCreateAt, cashOut.getStartTime());
|
||||||
}else if (StrUtil.isNotBlank(cashOut.getEndTime())) {
|
} else if (StrUtil.isNotBlank(cashOut.getEndTime())) {
|
||||||
queryWrapper.le(CashOut::getCreateAt, cashOut.getEndTime());
|
queryWrapper.le(CashOut::getCreateAt, cashOut.getEndTime());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user