init
This commit is contained in:
@@ -46,7 +46,7 @@ public class AccountChangeLogServiceImpl extends ServiceImpl<AccountChangeLogMap
|
||||
public AccountChangeLog saveLogNoAdmin(Long userId, String usercode, AccountChangeCodeEnum change, Long price, Long traceId
|
||||
,Long tarUserId){
|
||||
AccountChangeLog changeLog = this.getAccountChangeLog(userId, usercode, change, price, traceId, 0);
|
||||
changeLog.setTarUserId(userId);
|
||||
changeLog.setTarUserId(tarUserId);
|
||||
this.save(changeLog);
|
||||
return changeLog;
|
||||
}
|
||||
@@ -55,7 +55,7 @@ public class AccountChangeLogServiceImpl extends ServiceImpl<AccountChangeLogMap
|
||||
public AccountChangeLog saveLogNoAdmin(Long userId, String usercode, AccountChangeCodeEnum change, Long price, Long traceId
|
||||
, Long tarUserId, Gift gift){
|
||||
AccountChangeLog changeLog = this.getAccountChangeLog(userId, usercode, change, price, traceId, 0);
|
||||
changeLog.setTarUserId(userId);
|
||||
changeLog.setTarUserId(tarUserId);
|
||||
if(gift != null){
|
||||
changeLog.setTarParam(gift.getId()+"");
|
||||
changeLog.setTarImg(gift.getImg());
|
||||
@@ -98,12 +98,27 @@ public class AccountChangeLogServiceImpl extends ServiceImpl<AccountChangeLogMap
|
||||
for (AccountChangeLog record : records) {
|
||||
User user = userMap.get(record.getTarUserId());
|
||||
if(user != null){
|
||||
String format = String.format("%s来自【%s】", record.getCateAdminName(), user.getNickname());
|
||||
record.setShowMessage(format);
|
||||
AccountChangeCodeEnum changeEnum = AccountChangeCodeEnum.getByCode(record.getChangeType());
|
||||
if(changeEnum != null){
|
||||
Boolean in = changeEnum.getIn();
|
||||
if(in == null){
|
||||
record.setShowMessage(record.getCateAdminName());
|
||||
}else{
|
||||
String format = String.format("%s%s%s",
|
||||
record.getCateAdminName(),
|
||||
in?"来自":"给",
|
||||
user.getNickname());
|
||||
record.setShowMessage(format);
|
||||
}
|
||||
}else{
|
||||
record.setShowMessage(record.getCateAdminName());
|
||||
}
|
||||
}else{
|
||||
record.setShowMessage(record.getCateAdminName());
|
||||
}
|
||||
if(AccountCateEnum.IM.getCode().equals(record.getCateId())
|
||||
|| AccountCateEnum.VIDEO.getCode().equals(record.getCateId())
|
||||
|| AccountCateEnum.GUARD.getCode().equals(record.getCateId())
|
||||
|| AccountCateEnum.SYSTEM.getCode().equals(record.getCateId())
|
||||
|| AccountCateEnum.UNION.getCode().equals(record.getCateId())){
|
||||
if(record.getTarUserId() != null){
|
||||
|
||||
@@ -118,7 +118,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
|
||||
// 记录接收方的流水
|
||||
if(targetUserId != null){
|
||||
AccountChangeCodeEnum change = ConsumeLogType.getTargetChange(consumeLogType);
|
||||
accountChangeLogService.saveLogNoAdmin(userId, consumeLog.getSourceUsercode(), change, consumeLog.getAnchorAmount(), consumeLog.getTraceId()
|
||||
accountChangeLogService.saveLogNoAdmin(consumeLog.getTargetUserId(), consumeLog.getTargetUsercode(), change, consumeLog.getAnchorAmount(), consumeLog.getTraceId()
|
||||
,consumeLog.getSourceUserId(),gift);
|
||||
}
|
||||
// 获取分销的比例和用户
|
||||
|
||||
@@ -156,7 +156,7 @@ public class ConsumeLogServiceImpl extends ServiceImpl<ConsumeLogMapper, Consume
|
||||
|| ConsumeLogType.VIDEO.getCode().equals(consumeLog.getType())){
|
||||
UnionUser unionUser = unionUserService.getByUserId(targetUserId);
|
||||
if(unionUser != null){
|
||||
User user = userService.getById(unionUser.getId());
|
||||
User user = userService.getById(unionUser.getUnionUserId());
|
||||
if(user != null && user.getIsUnion() == 1 && user.getStatus() == 0){
|
||||
Union union = unionService.getById(unionUser.getUnionId());
|
||||
if(union != null){
|
||||
@@ -172,7 +172,7 @@ public class ConsumeLogServiceImpl extends ServiceImpl<ConsumeLogMapper, Consume
|
||||
}else if(ConsumeLogType.VIDEO.getCode().equals(consumeLog.getType())){
|
||||
consumeLog.setUnionRate(unionUser.getVideoDivide());
|
||||
}
|
||||
consumeLog.setOneAmount(NumCaUtil.coin(consumeLog.getAnchorAmount(),consumeLog.getUnionRate()));
|
||||
consumeLog.setUnionAmount(NumCaUtil.coin(consumeLog.getAnchorAmount(),consumeLog.getUnionRate()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user