123
This commit is contained in:
@@ -167,7 +167,8 @@ public class ConsumeLogServiceImpl extends ServiceImpl<ConsumeLogMapper, Consume
|
|||||||
if(userInvite != null){
|
if(userInvite != null){
|
||||||
User oneUser = userService.getById(userInvite.getInviteId());
|
User oneUser = userService.getById(userInvite.getInviteId());
|
||||||
if(oneUser != null && oneUser.getStatus() == 0){
|
if(oneUser != null && oneUser.getStatus() == 0){
|
||||||
UserInfo userInfo = userInfoService.getByUserId(userInvite.getUserId());
|
UserInfo userInfo = userInfoService.getByUserId(userInvite.getInviteId());
|
||||||
|
if(userInfo != null){
|
||||||
if(ConsumeLogType.GUARD.getCode().equals(consumeLog.getType())){
|
if(ConsumeLogType.GUARD.getCode().equals(consumeLog.getType())){
|
||||||
consumeLog.setOneRate(userInfo.getGuardIncomeRate());
|
consumeLog.setOneRate(userInfo.getGuardIncomeRate());
|
||||||
}else if(ConsumeLogType.GIFT.getCode().equals(consumeLog.getType())){
|
}else if(ConsumeLogType.GIFT.getCode().equals(consumeLog.getType())){
|
||||||
@@ -183,6 +184,7 @@ public class ConsumeLogServiceImpl extends ServiceImpl<ConsumeLogMapper, Consume
|
|||||||
consumeLog.setOneAmount(CaiNumUtil.coin(consumeLog.getAnchorAmount(),consumeLog.getOneRate()));
|
consumeLog.setOneAmount(CaiNumUtil.coin(consumeLog.getAnchorAmount(),consumeLog.getOneRate()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// 工会分销 只有通话和礼物才有
|
// 工会分销 只有通话和礼物才有
|
||||||
if(ConsumeLogType.GIFT.getCode().equals(consumeLog.getType())
|
if(ConsumeLogType.GIFT.getCode().equals(consumeLog.getType())
|
||||||
|| ConsumeLogType.VIDEO.getCode().equals(consumeLog.getType())){
|
|| ConsumeLogType.VIDEO.getCode().equals(consumeLog.getType())){
|
||||||
|
|||||||
Reference in New Issue
Block a user