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-12 16:24:03 +08:00
parent 6d96ea7dbd
commit a6bcb3da8f
17 changed files with 79 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -307,7 +307,8 @@ public class UserController {
userMoneyDetails.setTitle("[增加金币]平台增加金币：" + money);
userMoneyDetails.setContent("[增加金币]平台增加金币：" + money);
userMoneyDetails.setType(1);
userMoneyDetails.setClassify(1);
// ✅
userMoneyDetails.setClassify(8);
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(sdf.format(new Date()));
userMoneyDetails.setMoneyType(2);
@@ -317,7 +318,6 @@ public class UserController {
payDetails.setCreateTime(sdf.format(new Date()));
payDetails.setUserId(userId);
payDetails.setMoney(money);
payDetails.setClassify(9);
payDetails.setType(1);
payDetails.setPayTime(sdf.format(new Date()));
payDetailsDao.insert(payDetails);
@@ -335,7 +335,8 @@ public class UserController {
userMoneyDetails.setTitle("[减少金币]平台减少金币：" + money);
userMoneyDetails.setContent("平台减少金币：" + money);
userMoneyDetails.setType(1);
userMoneyDetails.setClassify(1);
// ✅
userMoneyDetails.setClassify(8);
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(sdf.format(new Date()));
userMoneyDetails.setMoneyType(2);
@@ -359,7 +360,8 @@ public class UserController {
}
userMoneyDetails.setMoneyType(2);
userMoneyDetails.setType(type);
userMoneyDetails.setClassify(1);
// ✅
userMoneyDetails.setClassify(8);
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(sdf.format(new Date()));
userMoneyDetailsService.save(userMoneyDetails);

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

@@ -50,10 +50,29 @@ public class UserMoneyDetails implements Serializable {
*/
@ApiModelProperty("标题")
private String title;
/**
* 1注册 2首次购买 3购买 4提现
/***
* 1 注册 （上级）
* 2 充值
* 3 购买
* 4 提现
* 5 现金大转盘
* 6 分享达标
* 7 任务领取
* 8 平台操作
* 9 订单退款
* 10 渠道推广
*/
@ApiModelProperty("1充值钱包明细 2提现钱包明细")
@ApiModelProperty(" * 1 注册 （上级）\n" +
" * 2 充值\n" +
" * 3 购买\n" +
" * 4 提现\n" +
" * 5 现金大转盘\n" +
" * 6 分享达标\n" +
" * 7 任务领取\n" +
" * 8 平台操作\n" +
" * 9 订单退款\n" +
" * 10 渠道推广")
private Integer classify;
/**
* 类别（1充值2支出）

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

@@ -157,6 +157,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
userMoneyDetails.setTitle("[增加金币]赠送金币：" + money);
userMoneyDetails.setContent("[增加金币]赠送金币：" + money);
userMoneyDetails.setType(1);
// ✅
userMoneyDetails.setClassify(1);
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(sdf.format(new Date()));
@@ -186,6 +187,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
userMoneyDetails.setTitle("[增加金币]赠送金币：" + money);
userMoneyDetails.setContent("[增加金币]赠送金币：" + money);
userMoneyDetails.setType(1);
// ✅
userMoneyDetails.setClassify(1);
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(sdf.format(new Date()));
@@ -231,6 +233,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
userMoneyDetails.setTitle("[新用户红包]");
userMoneyDetails.setContent("增加金币：" + money);
userMoneyDetails.setType(1);
// ✅
userMoneyDetails.setClassify(1);
userMoneyDetails.setMoney(money);
userMoneyDetails.setCreateTime(DateUtils.format(new Date()));

3
src/main/java/com/sqx/modules/integral/service/Impl/UserIntegralDetailsServiceImpl.java
View File

@@ -126,7 +126,8 @@ public class UserIntegralDetailsServiceImpl extends ServiceImpl<UserIntegralDeta
userMoneyDetails.setTitle("[积分]积分兑换");
userMoneyDetails.setContent("增加金币:"+money);
userMoneyDetails.setType(1);
userMoneyDetails.setClassify(1);
// ✅
userMoneyDetails.setClassify(2);
userMoneyDetails.setMoney(BigDecimal.valueOf(v));
userMoneyDetails.setCreateTime(sdf.format(new Date()));
userMoneyDetails.setMoneyType(2);

6
src/main/java/com/sqx/modules/invite/controller/InviteController.java
View File

@@ -156,7 +156,8 @@ public class InviteController {
userMoneyDetails.setTitle("平台修改收益");
userMoneyDetails.setContent("平台增加收益：" + money);
userMoneyDetails.setType(1);
userMoneyDetails.setClassify(2);
// ✅
userMoneyDetails.setClassify(8);
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(sdf.format(new Date()));
userMoneyDetails.setMoneyType(2);
@@ -174,7 +175,8 @@ public class InviteController {
userMoneyDetails.setTitle("平台修改收益");
userMoneyDetails.setContent("平台减少收益：" + money);
userMoneyDetails.setType(2);
userMoneyDetails.setClassify(2);
// ✅
userMoneyDetails.setClassify(8);
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(sdf.format(new Date()));
userMoneyDetails.setMoneyType(2);

2
src/main/java/com/sqx/modules/invite/controller/app/AppInviteController.java
View File

@@ -172,7 +172,7 @@ public class AppInviteController {
@Login
@PostMapping("/inviteMoneyConvertUserMoney")
@ApiOperation("收益充值京豆")
@ApiOperation("收益充值金币")
public Result inviteMoneyConvertUserMoney(@LoginUser UserEntity userEntity, Long payClassifyId) {
return inviteMoneyService.inviteMoneyConvertUserMoney(userEntity, payClassifyId);
}

6
src/main/java/com/sqx/modules/invite/service/impl/InviteMoneyServiceImpl.java
View File

@@ -85,7 +85,8 @@ public class InviteMoneyServiceImpl extends ServiceImpl<InviteMoneyDao, InviteMo
userMoneyDetails.setTitle("收益转余额");
userMoneyDetails.setContent("减少收益:"+price+",增加余额:"+add);
userMoneyDetails.setType(2);
userMoneyDetails.setClassify(2);
// ✅
userMoneyDetails.setClassify(3);
userMoneyDetails.setMoney(price);
userMoneyDetails.setCreateTime(DateUtils.format(new Date()));
userMoneyDetails.setMoneyType(1);
@@ -96,7 +97,8 @@ public class InviteMoneyServiceImpl extends ServiceImpl<InviteMoneyDao, InviteMo
userMoneyDetails.setTitle("收益转余额");
userMoneyDetails.setContent("减少收益:"+price+",增加余额:"+add);
userMoneyDetails.setType(1);
userMoneyDetails.setClassify(1);
// ✅
userMoneyDetails.setClassify(2);
userMoneyDetails.setMoney(add);
userMoneyDetails.setCreateTime(DateUtils.format(new Date()));
userMoneyDetails.setMoneyType(1);

9
src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java
View File

@@ -161,7 +161,8 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> implements
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
userMoneyDetails.setUserId(userEntity.getUserId());
userMoneyDetails.setType(1);
userMoneyDetails.setClassify(6);
// ✅
userMoneyDetails.setClassify(1);
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(format);
userMoneyDetails.setTitle("[分享奖励金币]");
@@ -246,7 +247,8 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> implements
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
userMoneyDetails.setUserId(userEntity.getUserId());
userMoneyDetails.setType(1);
userMoneyDetails.setClassify(2);
// ✅
userMoneyDetails.setClassify(1);
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(format);
userMoneyDetails.setTitle("[邀请好友]好友名称：" + userEntity1.getUserName());
@@ -285,7 +287,8 @@ public class InviteServiceImpl extends ServiceImpl<InviteDao, Invite> implements
userMoneyDetails.setType(1);
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(format);
userMoneyDetails.setClassify(2);
// ✅
userMoneyDetails.setClassify(1);
userMoneyDetails.setTitle("[邀请好友]好友名称：" + userEntity1.getUserName());
userMoneyDetails.setContent("获取佣金:" + money);
userMoneyDetails.setMoneyType(1);

6
src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java
View File

@@ -352,7 +352,8 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
userMoneyDetails.setContent("金币支付订单");
userMoneyDetails.setTitle("下单成功，订单号：" + orders.getOrdersNo());
userMoneyDetails.setType(2);
userMoneyDetails.setClassify(1);
// ✅
userMoneyDetails.setClassify(3);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
userMoneyDetails.setMoneyType(2);
@@ -430,7 +431,8 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
userMoneyDetails.setContent("订单:" + bean.getOrdersNo());
userMoneyDetails.setTitle("订单退款：" + bean.getPayMoney());
userMoneyDetails.setType(1);
userMoneyDetails.setClassify(1);
// ✅
userMoneyDetails.setClassify(9);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
userMoneyDetails.setMoneyType(1);

6
src/main/java/com/sqx/modules/pay/controller/CashController.java
View File

@@ -446,7 +446,8 @@ public class CashController {
userMoneyDetails.setTitle("[退款提醒]提现失败:" + one.getMoney() + ",退还手续费:" + one.getRate() + ",总退还:" + v);
userMoneyDetails.setContent(content);
userMoneyDetails.setType(1);
userMoneyDetails.setClassify(2);
// ✅
userMoneyDetails.setClassify(4);
userMoneyDetails.setMoney(new BigDecimal(v));
userMoneyDetails.setCreateTime(sdf.format(now));
userMoneyDetails.setMoneyType(2);
@@ -459,7 +460,8 @@ public class CashController {
userMoneyDetails.setTitle("[退款提醒]提现失败:" + one.getMoney() + ",退还手续费:" + one.getRate() + ",总退还:" + v);
userMoneyDetails.setContent(content);
userMoneyDetails.setType(1);
userMoneyDetails.setClassify(2);
// ✅
userMoneyDetails.setClassify(4);
userMoneyDetails.setMoney(new BigDecimal(v));
userMoneyDetails.setCreateTime(sdf.format(now));
userMoneyDetails.setMoneyType(1);

6
src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java
View File

@@ -150,7 +150,8 @@ public class AliPayController {
BigDecimal add = payClassify.getMoney().add(payClassify.getGiveMoney());
userMoneyService.updateMoney(1,payDetails.getUserId(),add.doubleValue());
UserMoneyDetails userMoneyDetails=new UserMoneyDetails();
userMoneyDetails.setClassify(1);
// ✅
userMoneyDetails.setClassify(2);
userMoneyDetails.setMoney(add);
userMoneyDetails.setUserId(payDetails.getUserId());
userMoneyDetails.setContent("支付宝充值金币");
@@ -236,7 +237,8 @@ public class AliPayController {
BigDecimal add = payClassify.getMoney().add(payClassify.getGiveMoney());
userMoneyService.updateMoney(1,payDetails.getUserId(),add.doubleValue());
UserMoneyDetails userMoneyDetails=new UserMoneyDetails();
userMoneyDetails.setClassify(1);
// ✅
userMoneyDetails.setClassify(2);
userMoneyDetails.setMoney(add);
userMoneyDetails.setUserId(payDetails.getUserId());
userMoneyDetails.setContent("支付宝充值金币");

3
src/main/java/com/sqx/modules/pay/controller/app/IosPayController.java
View File

@@ -125,7 +125,8 @@ public class IosPayController {
userMoneyDetails.setContent("苹果充值金币");
userMoneyDetails.setTitle("苹果充值："+payClassify.getMoney());
userMoneyDetails.setType(1);
userMoneyDetails.setClassify(1);
// ✅
userMoneyDetails.setClassify(2);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
userMoneyDetails.setMoneyType(2);

2
src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java
View File

@@ -256,7 +256,7 @@ public class WuyouController {
if (sumOrderNum > Integer.parseInt(commonRepository.findOne(913).getValue())) {
String amount = commonRepository.findOne(912).getValue();
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
userMoneyDetails.setClassify(7);
userMoneyDetails.setClassify(6);
userMoneyDetails.setMoney(new BigDecimal(amount));
userMoneyDetails.setUserId(sourceUser.getUserId());
userMoneyDetails.setByUserId(user.getUserId());

7
src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java
View File

@@ -311,7 +311,8 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
userMoneyDetails.setTitle("提现：" + money);
userMoneyDetails.setContent("支付宝提现：" + money + "，手续费：" + mul + ",总计：" + moneySum);
userMoneyDetails.setType(2);
userMoneyDetails.setClassify(2);
// ✅
userMoneyDetails.setClassify(4);
userMoneyDetails.setMoney(new BigDecimal(moneySum));
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
userMoneyDetails.setCreateTime(sdf.format(new Date()));
@@ -372,7 +373,8 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
userMoneyDetails.setTitle("提现：" + money);
userMoneyDetails.setContent("提现：" + money + "，手续费：" + mul + ",总计：" + moneySum);
userMoneyDetails.setType(2);
userMoneyDetails.setClassify(2);
// ✅
userMoneyDetails.setClassify(4);
userMoneyDetails.setMoney(new BigDecimal(moneySum));
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
userMoneyDetails.setCreateTime(sdf.format(new Date()));
@@ -454,6 +456,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
userMoneyDetails.setContent("提现：" + money + "元");
userMoneyDetails.setType(2);
userMoneyDetails.setState(1);
// ✅
userMoneyDetails.setClassify(4);
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(DateUtil.now());

6
src/main/java/com/sqx/modules/pay/service/impl/DyServiceImpl.java
View File

@@ -443,7 +443,8 @@ public class DyServiceImpl implements DyService {
userMoneyDetails.setContent("抖音充值金币");
userMoneyDetails.setTitle("抖音充值："+payClassify.getMoney()+",赠送："+payClassify.getGiveMoney());
userMoneyDetails.setType(1);
userMoneyDetails.setClassify(1);
// ✅
userMoneyDetails.setClassify(2);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
userMoneyDetails.setMoneyType(2);
@@ -544,7 +545,8 @@ public class DyServiceImpl implements DyService {
}
userMoneyDetails.setMoneyType(2);
userMoneyDetails.setType(1);
userMoneyDetails.setClassify(1);
// ✅
userMoneyDetails.setClassify(2);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
userMoneyDetailsService.save(userMoneyDetails);

4
src/main/java/com/sqx/modules/pay/service/impl/KsServiceImpl.java
View File

@@ -83,6 +83,7 @@ public class KsServiceImpl implements KsService {
payDetails.setOrderId(bean.getOrdersNo());
payDetails.setUserId(bean.getUserId());
payDetails.setMoney(bean.getPayMoney().doubleValue());
// ✅
payDetails.setClassify(8);
payDetails.setType(1);
payDetailsDao.insert(payDetails);
@@ -215,7 +216,8 @@ public class KsServiceImpl implements KsService {
userMoneyDetails.setContent("快手充值金币");
userMoneyDetails.setTitle("快手充值："+payDetails.getMoney());
userMoneyDetails.setType(1);
userMoneyDetails.setClassify(1);
// ✅
userMoneyDetails.setClassify(2);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
userMoneyDetails.setMoneyType(2);

6
src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java
View File

@@ -311,7 +311,8 @@ public class WxServiceImpl implements WxService {
BigDecimal add = payClassify.getMoney().add(payClassify.getGiveMoney());
userMoneyService.updateMoney(1,payDetails.getUserId(),add.doubleValue());
UserMoneyDetails userMoneyDetails=new UserMoneyDetails();
userMoneyDetails.setClassify(1);
// ✅
userMoneyDetails.setClassify(2);
userMoneyDetails.setMoney(add);
userMoneyDetails.setUserId(payDetails.getUserId());
userMoneyDetails.setContent("微信充值金币");
@@ -390,7 +391,8 @@ public class WxServiceImpl implements WxService {
BigDecimal add = payClassify.getMoney().add(payClassify.getGiveMoney());
userMoneyService.updateMoney(1,payDetails.getUserId(),add.doubleValue());
UserMoneyDetails userMoneyDetails=new UserMoneyDetails();
userMoneyDetails.setClassify(1);
// ✅
userMoneyDetails.setClassify(2);
userMoneyDetails.setMoney(add);
userMoneyDetails.setUserId(payDetails.getUserId());
userMoneyDetails.setContent("微信充值金币");