|
|
|
@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
|
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
|
|
import cn.hutool.core.text.StrPool;
|
|
|
|
|
import cn.hutool.core.util.IdUtil;
|
|
|
|
|
import cn.hutool.core.util.NumberUtil;
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
|
import cn.hutool.core.util.RandomUtil;
|
|
|
|
|
import com.baiye.constant.DefaultNumberConstants;
|
|
|
|
@ -118,14 +119,15 @@ public class CustomManageServiceImpl implements CustomManageService {
|
|
|
|
|
}
|
|
|
|
|
channelCustom.setSurplusNum(channelCustom.getTotalNum());
|
|
|
|
|
//减掉渠道商余量
|
|
|
|
|
parent.setSurplusNum(parent.getSurplusNum() - channelCustom.getTotalNum());
|
|
|
|
|
parent.setSurplusNum(NumberUtil.sub(parent.getSurplusNum(),channelCustom.getTotalNum()).intValue());
|
|
|
|
|
}
|
|
|
|
|
if (channelCustom.getTotalPhoneBill() != null && channelCustom.getTotalPhoneBill() > 0) {
|
|
|
|
|
if (parent.getSurplusPhoneBill() == null || parent.getSurplusPhoneBill() < channelCustom.getTotalPhoneBill()) {
|
|
|
|
|
return CommonResponse.createByErrorMessage("可分配的话费不足");
|
|
|
|
|
}
|
|
|
|
|
channelCustom.setSurplusPhoneBill(channelCustom.getTotalPhoneBill());
|
|
|
|
|
parent.setSurplusPhoneBill(parent.getSurplusPhoneBill() - channelCustom.getSurplusPhoneBill());
|
|
|
|
|
parent.setSurplusPhoneBill(NumberUtil.sub(parent.getSurplusPhoneBill(),channelCustom.getSurplusPhoneBill()).intValue());
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
channelCustom.setPurchaseTime(DateUtil.date());
|
|
|
|
|
channelCustomRepository.save(parent);
|
|
|
|
@ -271,24 +273,24 @@ public class CustomManageServiceImpl implements CustomManageService {
|
|
|
|
|
ChannelCustom parent = channelCustomRepository.findById(channelCustom.getParentId()).orElse(new ChannelCustom());
|
|
|
|
|
//添加分配记录
|
|
|
|
|
ChannelResourceAssign channelResourceAssign = new ChannelResourceAssign().addChannelResourceAssign(parent.getId(), customId, channelCustom.getChannelName());
|
|
|
|
|
int parentSurplusNum = parent.getSurplusNum();
|
|
|
|
|
int parentSurplusBill = parent.getSurplusPhoneBill();
|
|
|
|
|
Integer parentSurplusNum = parent.getSurplusNum();
|
|
|
|
|
Integer parentSurplusBill = parent.getSurplusPhoneBill();
|
|
|
|
|
if (assignNum != null) {
|
|
|
|
|
if (parentSurplusNum < assignNum) {
|
|
|
|
|
return CommonResponse.createByErrorMessage("可分配的余量不足");
|
|
|
|
|
}
|
|
|
|
|
parent.setSurplusNum(parentSurplusNum - assignNum);
|
|
|
|
|
channelCustom.setTotalNum(channelCustom.getTotalNum() + assignNum);
|
|
|
|
|
channelCustom.setSurplusNum(channelCustom.getSurplusNum() + assignNum);
|
|
|
|
|
parent.setSurplusNum(NumberUtil.sub(parentSurplusNum,assignNum).intValue());
|
|
|
|
|
channelCustom.setTotalNum(NumberUtil.add(channelCustom.getTotalNum(),assignNum).intValue());
|
|
|
|
|
channelCustom.setSurplusNum(NumberUtil.add(channelCustom.getSurplusNum(),assignNum).intValue());
|
|
|
|
|
channelResourceAssign.setAssignNum(assignNum);
|
|
|
|
|
}
|
|
|
|
|
if (assignBill != null) {
|
|
|
|
|
if (parentSurplusBill < assignBill) {
|
|
|
|
|
return CommonResponse.createByErrorMessage("可分配的话费不足");
|
|
|
|
|
}
|
|
|
|
|
parent.setSurplusPhoneBill(parentSurplusBill - assignBill);
|
|
|
|
|
channelCustom.setTotalPhoneBill(channelCustom.getTotalPhoneBill() + assignBill);
|
|
|
|
|
channelCustom.setSurplusPhoneBill(channelCustom.getSurplusPhoneBill() + assignBill);
|
|
|
|
|
parent.setSurplusPhoneBill(NumberUtil.sub(parentSurplusBill,assignBill).intValue());
|
|
|
|
|
channelCustom.setTotalPhoneBill(NumberUtil.sub(channelCustom.getTotalPhoneBill(),assignBill).intValue());
|
|
|
|
|
channelCustom.setSurplusPhoneBill(NumberUtil.sub(channelCustom.getSurplusPhoneBill(),assignBill).intValue());
|
|
|
|
|
channelResourceAssign.setAssignBill(assignBill);
|
|
|
|
|
}
|
|
|
|
|
channelCustom.setPurchaseTime(DateUtil.date());
|
|
|
|
|