This commit is contained in:
dute7liang
2024-01-20 19:59:36 +08:00
parent 7956a89ef0
commit 3b6070428c
9 changed files with 116 additions and 6 deletions

View File

@@ -4,9 +4,12 @@ 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.dto.app.vo.account.AccountDetailsAppVo;
import com.ruoyi.cai.enums.account.AccountChangeCodeEnum;
import com.ruoyi.common.core.domain.PageQuery;
import java.util.List;
/**
* 账户明细Service接口
*
@@ -28,4 +31,6 @@ public interface AccountChangeLogService extends IService<AccountChangeLog> {
AccountChangeLog saveLogAdmin(Long userId, String usercode, AccountChangeCodeEnum change, Long price, Long traceId);
Page<AccountChangeLog> pageAdmin(PageQuery pageQuery, AccountChangeLog bo);
List<AccountDetailsAppVo> pageApp(PageQuery query, Integer cateId, Long userId);
}

View File

@@ -6,6 +6,7 @@ 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.dto.app.vo.account.AccountDetailsAppVo;
import com.ruoyi.cai.enums.account.AccountCateEnum;
import com.ruoyi.cai.enums.account.AccountChangeCodeEnum;
import com.ruoyi.cai.mapper.AccountChangeLogMapper;
@@ -15,6 +16,7 @@ import com.ruoyi.common.core.domain.PageQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -131,5 +133,62 @@ public class AccountChangeLogServiceImpl extends ServiceImpl<AccountChangeLogMap
return page;
}
@Override
public List<AccountDetailsAppVo> pageApp(PageQuery query, Integer cateId, Long userId) {
Page<AccountChangeLog> page = this.page(query.build(),
Wrappers.lambdaQuery(AccountChangeLog.class)
.eq(AccountChangeLog::getUserId,userId)
.eq(cateId != null, AccountChangeLog::getCateId,cateId)
.orderByDesc(AccountChangeLog::getCreateTime));
List<AccountDetailsAppVo> res = new ArrayList<>();
List<AccountChangeLog> records = page.getRecords();
if(records.isEmpty()){
return res;
}
Set<Long> userIds = records.stream().map(AccountChangeLog::getTarUserId).collect(Collectors.toSet());
List<User> users = userService.listByIds(userIds);
Map<Long, User> userMap = users.stream().collect(Collectors.toMap(User::getId, Function.identity()));
for (AccountChangeLog record : records) {
AccountDetailsAppVo vo = new AccountDetailsAppVo();
vo.setChangeValue(record.getChangeValue());
vo.setCreateTime(record.getCreateTime());
vo.setAccountType(record.getAccountType());
vo.setCateId(record.getCateId());
User user = userMap.get(record.getTarUserId());
if(user != null){
AccountChangeCodeEnum changeEnum = AccountChangeCodeEnum.getByCode(record.getChangeType());
if(changeEnum != null){
Boolean in = changeEnum.getIn();
if(in == null){
vo.setMessage(record.getCateAdminName());
}else{
String format = String.format("%s%s%s",
record.getCateAdminName(),
in?"来自":"",
user.getNickname());
vo.setMessage(format);
}
}else{
vo.setMessage(record.getCateAdminName());
}
}else{
vo.setMessage(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){
if(user != null){
vo.setImg(user.getAvatar());
}
}
}
res.add(vo);
}
return res;
}
}

View File

@@ -123,6 +123,7 @@ public class RechargeOrderServiceImpl extends ServiceImpl<RechargeOrderMapper,Re
resp.setSuccess(true);
resp.setConsumeLogId(consumeLog.getId());
resp.setUserId(user.getId());
resp.setTraceId(traceId);
return resp;
}