修改金豆为金币
This commit is contained in:
@@ -297,15 +297,15 @@ public class UserController {
|
||||
|
||||
|
||||
@PostMapping("addCannotMoney/{userId}/{money}")
|
||||
@ApiOperation("添加金豆")
|
||||
@ApiOperation("添加金币")
|
||||
public Result addCannotMoney(@PathVariable("userId") Long userId, @PathVariable("money") Double money) {
|
||||
userMoneyService.updateMoney(1, userId, money);
|
||||
//inviteMoneyDao.updateInviteMoneySum(money,userId);
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||
userMoneyDetails.setUserId(userId);
|
||||
userMoneyDetails.setTitle("[增加金豆]平台增加金豆:" + money);
|
||||
userMoneyDetails.setContent("[增加金豆]平台增加金豆:" + money);
|
||||
userMoneyDetails.setTitle("[增加金币]平台增加金币:" + money);
|
||||
userMoneyDetails.setContent("[增加金币]平台增加金币:" + money);
|
||||
userMoneyDetails.setType(1);
|
||||
userMoneyDetails.setClassify(1);
|
||||
userMoneyDetails.setMoney(new BigDecimal(money));
|
||||
@@ -325,15 +325,15 @@ public class UserController {
|
||||
}
|
||||
|
||||
@PostMapping("subCannotMoney/{userId}/{money}")
|
||||
@ApiOperation("减少金豆")
|
||||
@ApiOperation("减少金币")
|
||||
public Result subCannotMoney(@PathVariable("userId") Long userId, @PathVariable("money") Double money) {
|
||||
userMoneyService.updateMoney(2, userId, money);
|
||||
//inviteMoneyDao.updateInviteMoneySumSub(money,userId);
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||
userMoneyDetails.setUserId(userId);
|
||||
userMoneyDetails.setTitle("[减少金豆]平台减少金豆:" + money);
|
||||
userMoneyDetails.setContent("平台减少金豆:" + money);
|
||||
userMoneyDetails.setTitle("[减少金币]平台减少金币:" + money);
|
||||
userMoneyDetails.setContent("平台减少金币:" + money);
|
||||
userMoneyDetails.setType(1);
|
||||
userMoneyDetails.setClassify(1);
|
||||
userMoneyDetails.setMoney(new BigDecimal(money));
|
||||
@@ -344,18 +344,18 @@ public class UserController {
|
||||
}
|
||||
|
||||
@PostMapping("/updateSysUserMoney")
|
||||
@ApiOperation("修改金豆")
|
||||
@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);
|
||||
userMoneyDetails.setTitle("[增加金币]平台增加金币:" + money);
|
||||
userMoneyDetails.setContent("[增加金币]平台增加金币:" + money);
|
||||
}else{
|
||||
userMoneyDetails.setTitle("[减少金豆]平台减少金豆:" + money);
|
||||
userMoneyDetails.setContent("[减少金豆]平台减少金豆:" + money);
|
||||
userMoneyDetails.setTitle("[减少金币]平台减少金币:" + money);
|
||||
userMoneyDetails.setContent("[减少金币]平台减少金币:" + money);
|
||||
}
|
||||
userMoneyDetails.setMoneyType(2);
|
||||
userMoneyDetails.setType(type);
|
||||
|
||||
@@ -11,7 +11,7 @@ public class UserDetails {
|
||||
*/
|
||||
private int monthlyOrderNum;
|
||||
/**
|
||||
* 本月充值金豆
|
||||
* 本月充值金币
|
||||
*/
|
||||
private BigDecimal monthlyRechargeMoney;
|
||||
/**
|
||||
@@ -19,7 +19,7 @@ public class UserDetails {
|
||||
*/
|
||||
private int monthWithdrawalNum;
|
||||
/**
|
||||
* 本月提现金豆
|
||||
* 本月提现金币
|
||||
*/
|
||||
private BigDecimal monthlyWithdrawalMoney;
|
||||
|
||||
|
||||
@@ -27,13 +27,13 @@ public class UserMoney implements Serializable {
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 钱包金豆
|
||||
* 钱包金币
|
||||
*/
|
||||
@ApiModelProperty("钱包金豆")
|
||||
@ApiModelProperty("钱包金币")
|
||||
private BigDecimal money;
|
||||
|
||||
/**
|
||||
* 钱包金豆
|
||||
* 钱包金币
|
||||
*/
|
||||
@ApiModelProperty("钱包余额 钱")
|
||||
private BigDecimal amount;
|
||||
|
||||
@@ -66,9 +66,9 @@ public class UserMoneyDetails implements Serializable {
|
||||
@ApiModelProperty("状态 1待支付 2已到账 3取消")
|
||||
private Integer state;
|
||||
/**
|
||||
* 金豆
|
||||
* 金币
|
||||
*/
|
||||
@ApiModelProperty("金豆")
|
||||
@ApiModelProperty("金币")
|
||||
private BigDecimal money;
|
||||
/**
|
||||
* 内容
|
||||
@@ -76,7 +76,7 @@ public class UserMoneyDetails implements Serializable {
|
||||
@ApiModelProperty("内容")
|
||||
private String content;
|
||||
|
||||
@ApiModelProperty("金额类型: 1 红包,2金豆")
|
||||
@ApiModelProperty("金额类型: 1 红包,2金币")
|
||||
private Integer moneyType;
|
||||
|
||||
/**
|
||||
|
||||
@@ -19,7 +19,7 @@ public class CourseOrderResponse implements Serializable {
|
||||
*/
|
||||
private int coursenum;
|
||||
/**
|
||||
* 售卖金豆
|
||||
* 售卖金币
|
||||
*/
|
||||
private Double coursemoney;
|
||||
}
|
||||
|
||||
@@ -154,8 +154,8 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||
userMoneyDetails.setUserId(userEntity.getUserId());
|
||||
userMoneyDetails.setTitle("[增加金豆]赠送金豆:" + money);
|
||||
userMoneyDetails.setContent("[增加金豆]赠送金豆:" + money);
|
||||
userMoneyDetails.setTitle("[增加金币]赠送金币:" + money);
|
||||
userMoneyDetails.setContent("[增加金币]赠送金币:" + money);
|
||||
userMoneyDetails.setType(1);
|
||||
userMoneyDetails.setClassify(1);
|
||||
userMoneyDetails.setMoney(new BigDecimal(money));
|
||||
@@ -183,8 +183,8 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||
userMoneyDetails.setUserId(userEntity.getUserId());
|
||||
userMoneyDetails.setTitle("[增加金豆]赠送金豆:" + money);
|
||||
userMoneyDetails.setContent("[增加金豆]赠送金豆:" + money);
|
||||
userMoneyDetails.setTitle("[增加金币]赠送金币:" + money);
|
||||
userMoneyDetails.setContent("[增加金币]赠送金币:" + money);
|
||||
userMoneyDetails.setType(1);
|
||||
userMoneyDetails.setClassify(1);
|
||||
userMoneyDetails.setMoney(new BigDecimal(money));
|
||||
@@ -229,7 +229,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
|
||||
UserMoneyDetails userMoneyDetails=new UserMoneyDetails();
|
||||
userMoneyDetails.setUserId(userId);
|
||||
userMoneyDetails.setTitle("[新用户红包]");
|
||||
userMoneyDetails.setContent("增加金豆:" + money);
|
||||
userMoneyDetails.setContent("增加金币:" + money);
|
||||
userMoneyDetails.setType(1);
|
||||
userMoneyDetails.setClassify(1);
|
||||
userMoneyDetails.setMoney(money);
|
||||
|
||||
Reference in New Issue
Block a user