系统用户钱包 拆分
This commit is contained in:
@@ -360,24 +360,24 @@ public class UserController {
|
||||
@PostMapping("/updateSysUserMoney")
|
||||
@ApiOperation("修改金币")
|
||||
public Result updateSysUserMoney(Long userId, Double money, Integer type) {
|
||||
userMoneyService.updateSysMoney(type, userId, money);
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||
userMoneyDetails.setSysUserId(userId);
|
||||
if (type == 1) {
|
||||
userMoneyDetails.setTitle("[增加金币]平台增加金币:" + money);
|
||||
userMoneyDetails.setContent("[增加金币]平台增加金币:" + money);
|
||||
} else {
|
||||
userMoneyDetails.setTitle("[减少金币]平台减少金币:" + money);
|
||||
userMoneyDetails.setContent("[减少金币]平台减少金币:" + money);
|
||||
}
|
||||
userMoneyDetails.setMoneyType(2);
|
||||
userMoneyDetails.setType(type);
|
||||
// ✅
|
||||
userMoneyDetails.setClassify(8);
|
||||
userMoneyDetails.setMoney(new BigDecimal(money));
|
||||
userMoneyDetails.setCreateTime(sdf.format(new Date()));
|
||||
userMoneyDetailsService.save(userMoneyDetails);
|
||||
// userMoneyService.updateSysMoney(type, userId, money);
|
||||
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
// UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||
// userMoneyDetails.setSysUserId(userId);
|
||||
// if (type == 1) {
|
||||
// userMoneyDetails.setTitle("[增加金币]平台增加金币:" + money);
|
||||
// userMoneyDetails.setContent("[增加金币]平台增加金币:" + money);
|
||||
// } else {
|
||||
// userMoneyDetails.setTitle("[减少金币]平台减少金币:" + money);
|
||||
// userMoneyDetails.setContent("[减少金币]平台减少金币:" + money);
|
||||
// }
|
||||
// userMoneyDetails.setMoneyType(2);
|
||||
// userMoneyDetails.setType(type);
|
||||
// // ✅
|
||||
// userMoneyDetails.setClassify(8);
|
||||
// userMoneyDetails.setMoney(new BigDecimal(money));
|
||||
// userMoneyDetails.setCreateTime(sdf.format(new Date()));
|
||||
// userMoneyDetailsService.save(userMoneyDetails);
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ package com.sqx.modules.app.controller;
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.app.service.UserMoneyDetailsService;
|
||||
import com.sqx.modules.app.service.UserMoneyService;
|
||||
import com.sqx.modules.sys.service.SysUserMoneyService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.AllArgsConstructor;
|
||||
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
public class UserMoneyDetailsController {
|
||||
private UserMoneyDetailsService userMoneyDetailsService;
|
||||
private UserMoneyService userMoneyService;
|
||||
private SysUserMoneyService sysUserMoneyService;
|
||||
|
||||
|
||||
@ApiOperation("钱包明细")
|
||||
@@ -34,7 +36,7 @@ public class UserMoneyDetailsController {
|
||||
@GetMapping("/selectSysUserMoney")
|
||||
@ApiOperation("代理钱包")
|
||||
public Result selectSysUserMoney(Long userId){
|
||||
return Result.success().put("data",userMoneyService.selectSysUserMoneyByUserId(userId));
|
||||
return Result.success().put("data",sysUserMoneyService.selectSysUserMoneyByUserId(userId));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -14,10 +14,6 @@ public interface UserMoneyDao extends BaseMapper<UserMoney> {
|
||||
|
||||
void updateMayAmount(@Param("type") Integer type, @Param("userId")Long userId, @Param("amount") Double amount);
|
||||
|
||||
void updateSysMoney(@Param("type") Integer type, @Param("sysUserId")Long sysUserId, @Param("money") Double money);
|
||||
|
||||
void updateSysAmount(@Param("type") Integer type, @Param("sysUserId")Long sysUserId, @Param("amount") Double amount);
|
||||
|
||||
@Select("select sum(money) from user_money_details where user_id=#{userId} and classify in (6,1) and (content like '%额外奖励金币%' or content like '获取金币')")
|
||||
BigDecimal sumMoney(Long userId);
|
||||
|
||||
|
||||
@@ -7,13 +7,7 @@ public interface UserMoneyService extends IService<UserMoney> {
|
||||
|
||||
UserMoney selectUserMoneyByUserId(Long userId);
|
||||
|
||||
UserMoney selectSysUserMoneyByUserId(Long userId);
|
||||
|
||||
void updateMoney(int i, Long userId, double money);
|
||||
|
||||
void updateAmount(int i, Long userId, double amount);
|
||||
|
||||
void updateSysMoney(int i, Long userId, double money);
|
||||
|
||||
void updateSysAmount(int i, Long userId, double amount);
|
||||
}
|
||||
|
||||
@@ -24,18 +24,6 @@ public class UserMoneyServiceImpl extends ServiceImpl<UserMoneyDao, UserMoney> i
|
||||
baseMapper.updateMayAmount(i,userId,amount);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateSysMoney(int i, Long userId, double money){
|
||||
selectSysUserMoneyByUserId(userId);
|
||||
baseMapper.updateSysMoney(i,userId,money);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateSysAmount(int i, Long userId, double amount){
|
||||
selectSysUserMoneyByUserId(userId);
|
||||
baseMapper.updateSysAmount(i,userId,amount);
|
||||
}
|
||||
|
||||
@Override
|
||||
public UserMoney selectUserMoneyByUserId(Long userId){
|
||||
UserMoney userMoney = baseMapper.selectOne(new QueryWrapper<UserMoney>().eq("user_id", userId));
|
||||
@@ -48,19 +36,4 @@ public class UserMoneyServiceImpl extends ServiceImpl<UserMoneyDao, UserMoney> i
|
||||
}
|
||||
return userMoney;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UserMoney selectSysUserMoneyByUserId(Long userId){
|
||||
UserMoney userMoney = baseMapper.selectOne(new QueryWrapper<UserMoney>().eq("sys_user_id", userId));
|
||||
if(userMoney==null){
|
||||
userMoney=new UserMoney();
|
||||
userMoney.setSysUserId(userId);
|
||||
userMoney.setMoney(new BigDecimal("0.00"));
|
||||
userMoney.setAmount(new BigDecimal("0.00"));
|
||||
baseMapper.insert(userMoney);
|
||||
}
|
||||
return userMoney;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user