BY-Team
/
ad-platform
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去掉最低充值限制

Browse Source
master
wjt 1 year ago
parent a9b8decb78
commit a132525cb8
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File

2
ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/ChannelManageServiceImpl.java
Unescape Escape View File

@ -61,7 +61,7 @@ public class ChannelManageServiceImpl implements ChannelManageService {
for (ChannelCustom channelCustom : content) { for (ChannelCustom channelCustom : content) {
Long parentId = channelCustom.getId(); Long parentId = channelCustom.getId();
if (userMap.containsKey(parentId)) { if (userMap.containsKey(parentId)) {
List<ChannelCustom> list = userMap.get(parentId); List<ChannelCustom> list = userMap.get(parentId).stream().sorted(Comparator.comparing(ChannelCustom::getCreateTime).reversed()).collect(Collectors.toList());
if (CollUtil.isNotEmpty(list)) { if (CollUtil.isNotEmpty(list)) {
List<ChannelCustom> normalNums = list.stream().filter(c -> c.getStatus() == DefaultNumberConstants.ONE_NUMBER).collect(Collectors.toList()); List<ChannelCustom> normalNums = list.stream().filter(c -> c.getStatus() == DefaultNumberConstants.ONE_NUMBER).collect(Collectors.toList());
List<ChannelCustom> waitNums = list.stream().filter(c -> c.getStatus() == DefaultNumberConstants.TWO_NUMBER).collect(Collectors.toList()); List<ChannelCustom> waitNums = list.stream().filter(c -> c.getStatus() == DefaultNumberConstants.TWO_NUMBER).collect(Collectors.toList());

44
ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java
Unescape Escape View File

@ -85,15 +85,15 @@ public class CustomManageServiceImpl implements CustomManageService {
ChannelCustom parent = getChannelCustomByUserId(); ChannelCustom parent = getChannelCustomByUserId();
//设置分配 //设置分配
if (channelCustom.getTotalNum() != null && channelCustom.getTotalNum() > 0) { if (channelCustom.getTotalNum() != null && channelCustom.getTotalNum() > 0) {
if (channelCustom.getType() == DefaultNumberConstants.ONE_NUMBER) { // if (channelCustom.getType() == DefaultNumberConstants.ONE_NUMBER) {
if (channelCustom.getTotalNum() < DefaultNumberConstants.TEN_THOUSAND) { // if (channelCustom.getTotalNum() < DefaultNumberConstants.TEN_THOUSAND) {
return CommonResponse.createByErrorMessage("渠道商账号最低分配1万"); // return CommonResponse.createByErrorMessage("渠道商账号最低分配1万");
} // }
} else { // } else {
if (channelCustom.getTotalNum() < DefaultNumberConstants.ONE_THOUSAND) { // if (channelCustom.getTotalNum() < DefaultNumberConstants.ONE_THOUSAND) {
return CommonResponse.createByErrorMessage("直客账号最低分配1000"); // return CommonResponse.createByErrorMessage("直客账号最低分配1000");
} // }
} // }
if (parent.getSurplusNum() == null || parent.getSurplusNum() < channelCustom.getTotalNum()) { if (parent.getSurplusNum() == null || parent.getSurplusNum() < channelCustom.getTotalNum()) {
return CommonResponse.createByErrorMessage("可分配的余量不足"); return CommonResponse.createByErrorMessage("可分配的余量不足");
} }
@ -102,9 +102,6 @@ public class CustomManageServiceImpl implements CustomManageService {
parent.setSurplusNum(parent.getSurplusNum() - channelCustom.getTotalNum()); parent.setSurplusNum(parent.getSurplusNum() - channelCustom.getTotalNum());
parent.setCreateTime(DateUtil.date()); parent.setCreateTime(DateUtil.date());
channelCustomRepository.save(parent); channelCustomRepository.save(parent);
//分配记录
ChannelResourceAssign channelResourceAssign = new ChannelResourceAssign().addChannelResourceAssign(parent.getId(), channelCustom.getTotalNum(), channelCustom.getId(), channelCustom.getChannelName());
channelResourceAssignRepository.save(channelResourceAssign);
} }
//激活码 //激活码
@ -135,6 +132,11 @@ public class CustomManageServiceImpl implements CustomManageService {
} }
channelCustom.setCreateTime(DateUtil.date()); channelCustom.setCreateTime(DateUtil.date());
channelCustomRepository.save(channelCustom); channelCustomRepository.save(channelCustom);
if (channelCustom.getSurplusNum() != null && channelCustom.getSurplusNum() > 0) {
//分配记录
ChannelResourceAssign channelResourceAssign = new ChannelResourceAssign().addChannelResourceAssign(parent.getId(), channelCustom.getTotalNum(), channelCustom.getId(), channelCustom.getChannelName());
channelResourceAssignRepository.save(channelResourceAssign);
}
return CommonResponse.createBySuccess(); return CommonResponse.createBySuccess();
} }
@ -144,15 +146,15 @@ public class CustomManageServiceImpl implements CustomManageService {
ChannelCustom channelCustom = channelCustomRepository.findById(customId).orElse(new ChannelCustom()); ChannelCustom channelCustom = channelCustomRepository.findById(customId).orElse(new ChannelCustom());
ChannelCustom parent = channelCustomRepository.findById(channelCustom.getParentId()).orElse(new ChannelCustom()); ChannelCustom parent = channelCustomRepository.findById(channelCustom.getParentId()).orElse(new ChannelCustom());
int parentSurplusNum = parent.getSurplusNum(); int parentSurplusNum = parent.getSurplusNum();
if (channelCustom.getType() == DefaultNumberConstants.ONE_NUMBER) { // if (channelCustom.getType() == DefaultNumberConstants.ONE_NUMBER) {
if (assignNum < DefaultNumberConstants.TEN_THOUSAND) { // if (assignNum < DefaultNumberConstants.TEN_THOUSAND) {
return CommonResponse.createByErrorMessage("渠道商账号最低分配1万"); // return CommonResponse.createByErrorMessage("渠道商账号最低分配1万");
} // }
} else { // } else {
if (assignNum < DefaultNumberConstants.ONE_THOUSAND) { // if (assignNum < DefaultNumberConstants.ONE_THOUSAND) {
return CommonResponse.createByErrorMessage("直客账号最低分配1000"); // return CommonResponse.createByErrorMessage("直客账号最低分配1000");
} // }
} // }
if (parentSurplusNum < assignNum) { if (parentSurplusNum < assignNum) {
return CommonResponse.createByErrorMessage("可分配的余量不足"); return CommonResponse.createByErrorMessage("可分配的余量不足");
} }

Write Preview
Loading…
Cancel
Save