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

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("微信充值金币");