init
This commit is contained in:
@@ -1,9 +1,11 @@
|
||||
package com.ruoyi.cai.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.ruoyi.cai.domain.AccountChangeLog;
|
||||
import com.ruoyi.cai.domain.Gift;
|
||||
import com.ruoyi.cai.enums.account.AccountChangeCodeEnum;
|
||||
import com.ruoyi.common.core.domain.PageQuery;
|
||||
|
||||
/**
|
||||
* 账户明细Service接口
|
||||
@@ -24,4 +26,6 @@ public interface AccountChangeLogService extends IService<AccountChangeLog> {
|
||||
, Long tarUserId, Gift gift);
|
||||
|
||||
AccountChangeLog saveLogAdmin(Long userId, String usercode, AccountChangeCodeEnum change, Long price, Long traceId);
|
||||
|
||||
Page<AccountChangeLog> pageAdmin(PageQuery pageQuery, AccountChangeLog bo);
|
||||
}
|
||||
|
||||
@@ -1,13 +1,26 @@
|
||||
package com.ruoyi.cai.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.ruoyi.cai.domain.AccountChangeLog;
|
||||
import com.ruoyi.cai.domain.Gift;
|
||||
import com.ruoyi.cai.domain.User;
|
||||
import com.ruoyi.cai.enums.account.AccountCateEnum;
|
||||
import com.ruoyi.cai.enums.account.AccountChangeCodeEnum;
|
||||
import com.ruoyi.cai.mapper.AccountChangeLogMapper;
|
||||
import com.ruoyi.cai.service.AccountChangeLogService;
|
||||
import com.ruoyi.cai.service.UserService;
|
||||
import com.ruoyi.common.core.domain.PageQuery;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 账户明细Service业务层处理
|
||||
*
|
||||
@@ -69,5 +82,39 @@ public class AccountChangeLogServiceImpl extends ServiceImpl<AccountChangeLogMap
|
||||
return changeLog;
|
||||
}
|
||||
|
||||
@Autowired
|
||||
private UserService userService;
|
||||
|
||||
@Override
|
||||
public Page<AccountChangeLog> pageAdmin(PageQuery pageQuery, AccountChangeLog bo) {
|
||||
Page<AccountChangeLog> page = this.page(pageQuery.build(), Wrappers.lambdaQuery(bo).orderByDesc(AccountChangeLog::getCreateTime));
|
||||
List<AccountChangeLog> records = page.getRecords();
|
||||
Set<Long> userIds = records.stream().map(AccountChangeLog::getTarUserId).collect(Collectors.toSet());
|
||||
if(records.isEmpty()){
|
||||
return page;
|
||||
}
|
||||
List<User> users = userService.listByIds(userIds);
|
||||
Map<Long, User> userMap = users.stream().collect(Collectors.toMap(User::getId, Function.identity()));
|
||||
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);
|
||||
}else{
|
||||
record.setShowMessage(record.getCateAdminName());
|
||||
}
|
||||
if(AccountCateEnum.IM.getCode().equals(record.getCateId())
|
||||
|| AccountCateEnum.SYSTEM.getCode().equals(record.getCateId())
|
||||
|| AccountCateEnum.UNION.getCode().equals(record.getCateId())){
|
||||
if(record.getTarUserId() != null){
|
||||
if(user != null){
|
||||
record.setTarImg(user.getAvatar());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return page;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -112,13 +112,13 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
|
||||
}
|
||||
if(incomeCoin != 0){
|
||||
AccountChangeCodeEnum change = ConsumeLogType.getSourceChange(consumeLogType, AccountTypeEnum.INCOME_COIN);
|
||||
accountChangeLogService.saveLogNoAdmin(userId, consumeLog.getSourceUsercode(), change, coin, consumeLog.getTraceId()
|
||||
accountChangeLogService.saveLogNoAdmin(userId, consumeLog.getSourceUsercode(), change, incomeCoin, consumeLog.getTraceId()
|
||||
,consumeLog.getTargetUserId(),gift);
|
||||
}
|
||||
// 记录接收方的流水
|
||||
if(targetUserId != null){
|
||||
AccountChangeCodeEnum change = ConsumeLogType.getTargetChange(consumeLogType);
|
||||
accountChangeLogService.saveLogNoAdmin(userId, consumeLog.getSourceUsercode(), change, coin, consumeLog.getTraceId()
|
||||
accountChangeLogService.saveLogNoAdmin(userId, consumeLog.getSourceUsercode(), change, consumeLog.getAnchorAmount(), consumeLog.getTraceId()
|
||||
,consumeLog.getSourceUserId(),gift);
|
||||
}
|
||||
// 获取分销的比例和用户
|
||||
|
||||
Reference in New Issue
Block a user