代理商户 钱包明细
This commit is contained in:
@@ -11,23 +11,32 @@ import com.sqx.modules.app.dao.UserMoneyDetailsDao;
|
|||||||
import com.sqx.modules.app.entity.UserMoney;
|
import com.sqx.modules.app.entity.UserMoney;
|
||||||
import com.sqx.modules.app.entity.UserMoneyDetails;
|
import com.sqx.modules.app.entity.UserMoneyDetails;
|
||||||
import com.sqx.modules.app.service.UserMoneyDetailsService;
|
import com.sqx.modules.app.service.UserMoneyDetailsService;
|
||||||
|
import com.sqx.modules.sys.entity.SysUserMoneyDetails;
|
||||||
|
import com.sqx.modules.sys.service.SysUserMoneyDetailsService;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class UserMoneyDetailsServiceImpl extends ServiceImpl<UserMoneyDetailsDao, UserMoneyDetails> implements UserMoneyDetailsService {
|
public class UserMoneyDetailsServiceImpl extends ServiceImpl<UserMoneyDetailsDao, UserMoneyDetails> implements UserMoneyDetailsService {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private SysUserMoneyDetailsService sysUserMoneyDetailsService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Result queryUserMoneyDetails(Integer page, Integer limit, Long sysUserId, Long userId, Integer classify,
|
public Result queryUserMoneyDetails(Integer page, Integer limit, Long sysUserId, Long userId, Integer classify,
|
||||||
Integer type, Integer moneyType, Integer viewType) {
|
Integer type, Integer moneyType, Integer viewType) {
|
||||||
PageHelper.startPage(page, limit);
|
PageHelper.startPage(page, limit);
|
||||||
QueryWrapper<UserMoneyDetails> queryWrapper = new QueryWrapper();
|
|
||||||
if (sysUserId != null) {
|
if (sysUserId != null) {
|
||||||
queryWrapper.eq("sys_user_id", sysUserId);
|
List<SysUserMoneyDetails> list = sysUserMoneyDetailsService.list(new LambdaQueryWrapper<SysUserMoneyDetails>()
|
||||||
|
.eq(SysUserMoneyDetails::getUserId, sysUserId).orderByDesc(SysUserMoneyDetails::getCreateTime));
|
||||||
|
return Result.success().put("data", PageUtils.page(new PageInfo<>(list), true));
|
||||||
}
|
}
|
||||||
|
QueryWrapper<UserMoneyDetails> queryWrapper = new QueryWrapper();
|
||||||
if (userId != null) {
|
if (userId != null) {
|
||||||
queryWrapper.eq("user_id", userId);
|
queryWrapper.eq("user_id", userId);
|
||||||
}
|
}
|
||||||
@@ -47,7 +56,7 @@ public class UserMoneyDetailsServiceImpl extends ServiceImpl<UserMoneyDetailsDao
|
|||||||
queryWrapper.in("classify", arrayList);
|
queryWrapper.in("classify", arrayList);
|
||||||
}
|
}
|
||||||
queryWrapper.orderByDesc("create_time");
|
queryWrapper.orderByDesc("create_time");
|
||||||
return Result.success().put("data", PageUtils.page(new PageInfo<>(baseMapper.selectList(queryWrapper)),true));
|
return Result.success().put("data", PageUtils.page(new PageInfo<>(baseMapper.selectList(queryWrapper)), true));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -246,7 +246,7 @@ public class TempOrdersTask {
|
|||||||
sysUserMoneyService.updateSysMoney(1, sysUser.getUserId(), Double.parseDouble(qdAward));
|
sysUserMoneyService.updateSysMoney(1, sysUser.getUserId(), Double.parseDouble(qdAward));
|
||||||
sysUserMoneyDetailsService.save(userMoneyDetails4);
|
sysUserMoneyDetailsService.save(userMoneyDetails4);
|
||||||
|
|
||||||
SysUserMoney sysUserMoney = sysUserMoneyService.selectSysUserMoneyByUserId(sysUser.getSysUserId());
|
SysUserMoney sysUserMoney = sysUserMoneyService.selectSysUserMoneyByUserId(sysUser.getUserId());
|
||||||
sysUserMoney.setInviteIncomeMoney(sysUserMoney.getInviteIncomeMoney() == null ? new BigDecimal(qdAward) : sysUserMoney.getInviteIncomeMoney().add(new BigDecimal(qdAward)));
|
sysUserMoney.setInviteIncomeMoney(sysUserMoney.getInviteIncomeMoney() == null ? new BigDecimal(qdAward) : sysUserMoney.getInviteIncomeMoney().add(new BigDecimal(qdAward)));
|
||||||
sysUserMoneyService.update(sysUserMoney, new LambdaQueryWrapper<SysUserMoney>()
|
sysUserMoneyService.update(sysUserMoney, new LambdaQueryWrapper<SysUserMoney>()
|
||||||
.eq(SysUserMoney::getUserId, sysUserMoney.getUserId())
|
.eq(SysUserMoney::getUserId, sysUserMoney.getUserId())
|
||||||
|
|||||||
@@ -17,16 +17,16 @@ import java.util.Map;
|
|||||||
public class SysUserMoneyServiceImpl extends ServiceImpl<SysUserMoneyDao, SysUserMoney> implements SysUserMoneyService {
|
public class SysUserMoneyServiceImpl extends ServiceImpl<SysUserMoneyDao, SysUserMoney> implements SysUserMoneyService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateSysMoney(int i, Long userId, double money){
|
public void updateSysMoney(int i, Long userId, double money) {
|
||||||
selectSysUserMoneyByUserId(userId);
|
selectSysUserMoneyByUserId(userId);
|
||||||
baseMapper.updateSysMoney(i,userId,money);
|
baseMapper.updateSysMoney(i, userId, money);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public SysUserMoney selectSysUserMoneyByUserId(Long userId){
|
public SysUserMoney selectSysUserMoneyByUserId(Long userId) {
|
||||||
SysUserMoney userMoney = baseMapper.selectOne(new QueryWrapper<SysUserMoney>().eq("user_id", userId));
|
SysUserMoney userMoney = baseMapper.selectOne(new QueryWrapper<SysUserMoney>().eq("user_id", userId));
|
||||||
if(userMoney==null){
|
if (userMoney == null) {
|
||||||
userMoney=new SysUserMoney();
|
userMoney = new SysUserMoney();
|
||||||
userMoney.setUserId(userId);
|
userMoney.setUserId(userId);
|
||||||
userMoney.setMoney(new BigDecimal("0.00"));
|
userMoney.setMoney(new BigDecimal("0.00"));
|
||||||
baseMapper.insert(userMoney);
|
baseMapper.insert(userMoney);
|
||||||
|
|||||||
Reference in New Issue
Block a user