czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

流水区分金豆和钱

Browse Source
This commit is contained in:
GYJ
2024-12-11 16:10:24 +08:00
parent 2f73eb9032
commit 211f99c87b
25 changed files with 111 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/sqx/modules/app/controller/UserController.java
View File

@@ -310,6 +310,7 @@ public class UserController {
userMoneyDetails.setClassify(1);
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(sdf.format(new Date()));
userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails);
PayDetails payDetails=new PayDetails();
payDetails.setState(1);
@@ -337,6 +338,7 @@ public class UserController {
userMoneyDetails.setClassify(1);
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(sdf.format(new Date()));
userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails);
return Result.success();
}
@@ -355,6 +357,7 @@ public class UserController {
userMoneyDetails.setTitle("[减少金豆]平台减少金豆：" + money);
userMoneyDetails.setContent("[减少金豆]平台减少金豆：" + money);
}
userMoneyDetails.setMoneyType(2);
userMoneyDetails.setType(type);
userMoneyDetails.setClassify(1);
userMoneyDetails.setMoney(new BigDecimal(money));
@@ -411,4 +414,4 @@ public class UserController {
}
}

4
src/main/java/com/sqx/modules/app/controller/UserMoneyDetailsController.java
View File

@@ -21,8 +21,8 @@ public class UserMoneyDetailsController {
@ApiOperation("钱包明细")
@GetMapping("/queryUserMoneyDetails")
public Result queryUserMoneyDetails(Integer page, Integer limit,Long sysUserId, Long userId,Integer classify,Integer type) {
return userMoneyDetailsService.queryUserMoneyDetails(page, limit, sysUserId, userId,classify,type);
public Result queryUserMoneyDetails(Integer page, Integer limit,Long sysUserId, Long userId,Integer classify,Integer type, Integer moneyType) {
return userMoneyDetailsService.queryUserMoneyDetails(page, limit, sysUserId, userId,classify,type, moneyType);
}
@GetMapping("/selectUserMoney")

4
src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyDetailsController.java
View File

@@ -25,8 +25,8 @@ public class AppUserMoneyDetailsController {
@Login
@ApiOperation("钱包明细")
@GetMapping("/queryUserMoneyDetails")
public Result queryUserMoneyDetails(Integer page, Integer limit, @RequestAttribute Long userId,Integer classify,Integer type) {
return userMoneyDetailsService.queryUserMoneyDetails(page, limit,null, userId,classify,type);
public Result queryUserMoneyDetails(Integer page, Integer limit, @RequestAttribute Long userId,Integer classify,Integer type, Integer moneyType) {
return userMoneyDetailsService.queryUserMoneyDetails(page, limit,null, userId,classify,type, moneyType);
}
@Login

21
src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java
View File

@@ -75,6 +75,10 @@ public class UserMoneyDetails implements Serializable {
*/
@ApiModelProperty("内容")
private String content;
@ApiModelProperty("金额类型： 1 红包，2金豆")
private Integer moneyType;
/**
* 创建时间
*/
@@ -86,18 +90,18 @@ public class UserMoneyDetails implements Serializable {
}
/**
*
* @param userId 用户Id tb_user的id
* @param sysUserId 系统用户Id tb_sys_user的id
* @param byUserId 对应用户Id
* @param title 标题
* @param classify 1注册 2首次购买 3购买 4提现 5现金大转盘 6 分享 7 分享达标
* @param type 类别（1充值2支出）
* @param state 状态 1待支付 2已到账 3取消
* @param money 金额
* @param content 内容描述
* @param title 标题
* @param classify 1注册 2首次购买 3购买 4提现 5现金大转盘 6 分享 7 分享达标
* @param type 类别（1充值2支出）
* @param state 状态 1待支付 2已到账 3取消
* @param money 金额
* @param content 内容描述
*/
public UserMoneyDetails(Long userId, Long sysUserId, Long byUserId, String title, Integer classify, Integer type, Integer state, BigDecimal money, String content) {
public UserMoneyDetails(Long userId, Long sysUserId, Long byUserId, String title, Integer classify, Integer type,
Integer state, BigDecimal money, String content, Integer moneyType) {
this.userId = userId;
this.sysUserId = sysUserId;
this.byUserId = byUserId;
@@ -108,5 +112,6 @@ public class UserMoneyDetails implements Serializable {
this.money = money;
this.content = content;
this.createTime = DateUtil.now();
this.moneyType = moneyType;
}
}

2
src/main/java/com/sqx/modules/app/service/UserMoneyDetailsService.java
View File

@@ -5,6 +5,6 @@ import com.sqx.common.utils.Result;
import com.sqx.modules.app.entity.UserMoneyDetails;
public interface UserMoneyDetailsService extends IService<UserMoneyDetails> {
Result queryUserMoneyDetails(Integer page, Integer limit,Long sysUserId,Long userId,Integer classify,Integer type);
Result queryUserMoneyDetails(Integer page, Integer limit,Long sysUserId,Long userId,Integer classify,Integer type, Integer moneyType);
Double monthIncome(String date,Long userId);
}

15
src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java
View File

@@ -14,27 +14,30 @@ import org.springframework.stereotype.Service;
public class UserMoneyDetailsServiceImpl extends ServiceImpl<UserMoneyDetailsDao, UserMoneyDetails> implements UserMoneyDetailsService {
@Override
public Result queryUserMoneyDetails(Integer page, Integer limit,Long sysUserId,Long userId,Integer classify,Integer type) {
public Result queryUserMoneyDetails(Integer page, Integer limit, Long sysUserId, Long userId, Integer classify, Integer type, Integer moneyType) {
IPage<UserMoneyDetails> page1 = new Page(page, limit);
QueryWrapper<UserMoneyDetails> queryWrapper = new QueryWrapper();
if(sysUserId!=null){
if (sysUserId != null) {
queryWrapper.eq("sys_user_id", sysUserId);
}
if(userId!=null){
if (userId != null) {
queryWrapper.eq("user_id", userId);
}
if(classify!=null){
if (classify != null) {
queryWrapper.eq("classify", classify);
}
if(type!=null){
if (type != null) {
queryWrapper.eq("type", type);
}
if (moneyType != null) {
queryWrapper.eq("money_type", moneyType);
}
queryWrapper.orderByDesc("create_time");
return Result.success().put("data", baseMapper.selectPage(page1, queryWrapper));
}
@Override
public Double monthIncome(String date, Long userId) {
return baseMapper.monthIncome(date,userId);
return baseMapper.monthIncome(date, userId);
}
}

3
src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
View File

@@ -160,6 +160,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
userMoneyDetails.setClassify(1);
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(sdf.format(new Date()));
userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails);
messageInfo.setContent("2");
@@ -188,6 +189,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
userMoneyDetails.setClassify(1);
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(sdf.format(new Date()));
userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails);
//发送短信
@@ -232,6 +234,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
userMoneyDetails.setClassify(1);
userMoneyDetails.setMoney(money);
userMoneyDetails.setCreateTime(DateUtils.format(new Date()));
userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails);
}
return Result.success();