From a6bcb3da8fad6f478e0ebf83d51d86cc51e4c27f Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Thu, 12 Dec 2024 16:24:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=94=B6=E7=9B=8A?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AF=B9=E7=85=A7=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/UserController.java | 10 +++++--- .../modules/app/entity/UserMoneyDetails.java | 25 ++++++++++++++++--- .../app/service/impl/UserServiceImpl.java | 3 +++ .../Impl/UserIntegralDetailsServiceImpl.java | 3 ++- .../invite/controller/InviteController.java | 6 +++-- .../controller/app/AppInviteController.java | 2 +- .../service/impl/InviteMoneyServiceImpl.java | 6 +++-- .../service/impl/InviteServiceImpl.java | 9 ++++--- .../service/impl/OrdersServiceImpl.java | 6 +++-- .../pay/controller/CashController.java | 6 +++-- .../pay/controller/app/AliPayController.java | 6 +++-- .../pay/controller/app/IosPayController.java | 3 ++- .../pay/controller/app/WuyouController.java | 2 +- .../pay/service/impl/CashOutServiceImpl.java | 7 ++++-- .../pay/service/impl/DyServiceImpl.java | 6 +++-- .../pay/service/impl/KsServiceImpl.java | 4 ++- .../pay/service/impl/WxServiceImpl.java | 6 +++-- 17 files changed, 79 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/controller/UserController.java b/src/main/java/com/sqx/modules/app/controller/UserController.java index 69a8a103..4edb069b 100644 --- a/src/main/java/com/sqx/modules/app/controller/UserController.java +++ b/src/main/java/com/sqx/modules/app/controller/UserController.java @@ -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); diff --git a/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java b/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java index 88e0cfcb..e61f7bd1 100644 --- a/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java +++ b/src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java @@ -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支出） diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java index a257cbec..63f7a8ce 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java @@ -157,6 +157,7 @@ public class UserServiceImpl extends ServiceImpl 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 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 implements userMoneyDetails.setTitle("[新用户红包]"); userMoneyDetails.setContent("增加金币：" + money); userMoneyDetails.setType(1); + // ✅ userMoneyDetails.setClassify(1); userMoneyDetails.setMoney(money); userMoneyDetails.setCreateTime(DateUtils.format(new Date())); diff --git a/src/main/java/com/sqx/modules/integral/service/Impl/UserIntegralDetailsServiceImpl.java b/src/main/java/com/sqx/modules/integral/service/Impl/UserIntegralDetailsServiceImpl.java index 41174f35..d0cd06b3 100644 --- a/src/main/java/com/sqx/modules/integral/service/Impl/UserIntegralDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/integral/service/Impl/UserIntegralDetailsServiceImpl.java @@ -126,7 +126,8 @@ public class UserIntegralDetailsServiceImpl extends ServiceImpl 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 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 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); diff --git a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java index 3d3a7745..6fff9b6b 100644 --- a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java @@ -352,7 +352,8 @@ public class OrdersServiceImpl extends ServiceImpl 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 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); diff --git a/src/main/java/com/sqx/modules/pay/controller/CashController.java b/src/main/java/com/sqx/modules/pay/controller/CashController.java index 6f9733bc..69a9bf96 100644 --- a/src/main/java/com/sqx/modules/pay/controller/CashController.java +++ b/src/main/java/com/sqx/modules/pay/controller/CashController.java @@ -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); diff --git a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java index 2d672164..ec5f508d 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java @@ -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("支付宝充值金币"); diff --git a/src/main/java/com/sqx/modules/pay/controller/app/IosPayController.java b/src/main/java/com/sqx/modules/pay/controller/app/IosPayController.java index 45b35ffc..2a5b4352 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/IosPayController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/IosPayController.java @@ -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); diff --git a/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java b/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java index 9e5b71fe..69542e8e 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java @@ -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()); diff --git a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java index cb438837..545475e9 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java @@ -311,7 +311,8 @@ public class CashOutServiceImpl extends ServiceImpl 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 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 impleme userMoneyDetails.setContent("提现：" + money + "元"); userMoneyDetails.setType(2); userMoneyDetails.setState(1); + // ✅ userMoneyDetails.setClassify(4); userMoneyDetails.setMoney(new BigDecimal(money)); userMoneyDetails.setCreateTime(DateUtil.now()); diff --git a/src/main/java/com/sqx/modules/pay/service/impl/DyServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/DyServiceImpl.java index d18f7df5..ad2576af 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/DyServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/DyServiceImpl.java @@ -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); diff --git a/src/main/java/com/sqx/modules/pay/service/impl/KsServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/KsServiceImpl.java index 42b55df7..6e7437e2 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/KsServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/KsServiceImpl.java @@ -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); diff --git a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java index f16d6ff8..df2331e0 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java @@ -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("微信充值金币");