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

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

@@ -449,6 +449,7 @@ public class CashController {
userMoneyDetails.setClassify(2);
userMoneyDetails.setMoney(new BigDecimal(v));
userMoneyDetails.setCreateTime(sdf.format(now));
userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails);
userMoneyService.updateSysMoney(1, userId, v);
} else {
@@ -461,6 +462,7 @@ public class CashController {
userMoneyDetails.setClassify(2);
userMoneyDetails.setMoney(new BigDecimal(v));
userMoneyDetails.setCreateTime(sdf.format(now));
userMoneyDetails.setMoneyType(1);
userMoneyDetailsService.save(userMoneyDetails);
inviteMoneyDao.updateInviteMoneyCashOut(1, v, userId);
if (userInfo.getOpenId() != null) {

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

@@ -158,6 +158,7 @@ public class AliPayController {
userMoneyDetails.setType(1);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails);
}
@@ -243,6 +244,7 @@ public class AliPayController {
userMoneyDetails.setType(1);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails);
}
}

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

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

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

@@ -128,6 +128,7 @@ public class IosPayController {
userMoneyDetails.setClassify(1);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails);
} else {
return Result.error("订单无效!");

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

@@ -139,7 +139,7 @@ public class WuyouController {
UserMoneyDetails userMoneyDetails = new UserMoneyDetails(
cashOut.getUserId(), null, null, "提现失败", 4, 1, 1,
new BigDecimal(cashOut.getMoney()), "提现失败存入余额" + cashOut.getMoney() + "元");
new BigDecimal(cashOut.getMoney()), "提现失败存入余额" + cashOut.getMoney() + "元", 1);
//存入余额 钱
userMoneyService.updateAmount(1, cashOut.getUserId(), Double.parseDouble(cashOut.getMoney()));
userMoneyDetailsService.save(userMoneyDetails);
@@ -241,6 +241,7 @@ public class WuyouController {
userMoneyDetails.setTitle("分享达标奖励");
userMoneyDetails.setState(2);
userMoneyDetails.setType(1);
userMoneyDetails.setMoneyType(1);
userMoneyDetailsService.save(userMoneyDetails);
//存入余额 钱
userMoneyService.updateAmount(1, sourceUser.getUserId(), Double.parseDouble(amount));

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

@@ -315,6 +315,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
userMoneyDetails.setMoney(new BigDecimal(moneySum));
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
userMoneyDetails.setCreateTime(sdf.format(new Date()));
userMoneyDetails.setMoneyType(1);
userMoneyDetailsService.save(userMoneyDetails);
CashOut cashOut = new CashOut();
cashOut.setState(0);
@@ -375,6 +376,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
userMoneyDetails.setMoney(new BigDecimal(moneySum));
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
userMoneyDetails.setCreateTime(sdf.format(new Date()));
userMoneyDetails.setMoneyType(1);
userMoneyDetailsService.save(userMoneyDetails);
CashOut cashOut = new CashOut();
cashOut.setState(0);
@@ -455,6 +457,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
userMoneyDetails.setClassify(4);
userMoneyDetails.setMoney(new BigDecimal(money));
userMoneyDetails.setCreateTime(DateUtil.now());
userMoneyDetails.setMoneyType(1);
UserMoney userMoney;
if (isSys) {
userMoney = userMoneyService.selectSysUserMoneyByUserId(userId);

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

@@ -446,6 +446,7 @@ public class DyServiceImpl implements DyService {
userMoneyDetails.setClassify(1);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails);
}
@@ -541,6 +542,7 @@ public class DyServiceImpl implements DyService {
userMoneyDetails.setTitle("抖音充值："+payClassify.getMoney()+",赠送："+payClassify.getGiveMoney());
userMoneyDetails.setMoney(BigDecimal.valueOf(payDetails.getMoney()));
}
userMoneyDetails.setMoneyType(2);
userMoneyDetails.setType(1);
userMoneyDetails.setClassify(1);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -612,4 +614,4 @@ public class DyServiceImpl implements DyService {
}
}

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

@@ -218,6 +218,7 @@ public class KsServiceImpl implements KsService {
userMoneyDetails.setClassify(1);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails);
}
@@ -349,4 +350,4 @@ public class KsServiceImpl implements KsService {
}
}

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

@@ -319,6 +319,7 @@ public class WxServiceImpl implements WxService {
userMoneyDetails.setType(1);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails);
}
@@ -397,6 +398,7 @@ public class WxServiceImpl implements WxService {
userMoneyDetails.setType(1);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
userMoneyDetails.setCreateTime(simpleDateFormat.format(new Date()));
userMoneyDetails.setMoneyType(2);
userMoneyDetailsService.save(userMoneyDetails);
}
@@ -467,4 +469,4 @@ public class WxServiceImpl implements WxService {
return false;
}
}
}
}