From 1f4de9490cae8eb0c81c18306a17e3fc7d547b22 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 25 Dec 2024 09:43:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BD=99=E9=A2=9D=E6=8F=8F=E8=BF=B0=20chas?=
 =?UTF-8?q?sify?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sqx/modules/app/service/impl/UserServiceImpl.java   | 2 +-
 .../discSpinning/service/impl/DiscSpinningServiceImpl.java  | 2 +-
 .../com/sqx/modules/pay/controller/app/WuyouController.java | 6 +++---
 .../taskCenter/service/impl/TaskCenterServiceImpl.java      | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

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 b32ae549..8a4eb39f 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
@@ -1491,7 +1491,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
             boolean ret = userMoneyDetailsService.save(userMoneyDetails);
             if (ret) {
                 ThreadUtil.execAsync(()->{
-                    discSpinningService.withdrawAsync(entity, money.doubleValue(), "[首绑支付宝]");
+                    discSpinningService.withdrawAsync(entity, money.doubleValue(), "[提现]");
                 },true);
             }
         } catch (Exception e) {
diff --git a/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java b/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java
index 98a96d08..a07709d9 100644
--- a/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java
+++ b/src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java
@@ -98,7 +98,7 @@ public class DiscSpinningServiceImpl extends ServiceImpl<DiscSpinningDao, DiscSp
     @Override
     @Transactional
     public void withdraw(UserEntity userInfo, Double money) {
-        withdraw(userInfo, money, "[现金大转盘]");
+        withdraw(userInfo, money, "[提现]");
     }
 
     @Override
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 64a277f2..0c0085dc 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
@@ -257,7 +257,7 @@ public class WuyouController {
                     String qdAward = commonRepository.findOne(915).getValue();
 
                     UserMoneyDetails userMoneyDetails4 = new UserMoneyDetails(
-                            null, sysUser.getUserId(), null, "[分享达标额外奖励]", 8, 1, 2,
+                            null, sysUser.getUserId(), null, "[分享达标额外奖励]", 6, 1, 2,
                             new BigDecimal(qdAward), "推广人员首次达标，额外奖励现金红包" + qdAward, 2);
 
                     userMoneyService.updateSysMoney(1, sysUser.getUserId(), Double.valueOf(qdAward));
@@ -281,7 +281,7 @@ public class WuyouController {
                 switch (completAward.getType()) {
                     case 1:
                         UserMoneyDetails userMoneyDetails1 = new UserMoneyDetails(
-                                sourceUser.getUserId(), null, null, "[分享达标额外奖励]", 8, 1, 2,
+                                sourceUser.getUserId(), null, null, "[分享达标额外奖励]", 6, 1, 2,
                                 completAward.getAwardNumber(), "邀请人员已有"+completAward.getInviteCount()+"人完成达标任务，额外奖励金币" + completAward.getAwardNumber(), 2);
 
                         userMoneyService.updateMoney(1, sourceUser.getUserId(), completAward.getAwardNumber().doubleValue());
@@ -289,7 +289,7 @@ public class WuyouController {
                         break;
                     case 2:
                         UserMoneyDetails userMoneyDetails2 = new UserMoneyDetails(
-                                sourceUser.getUserId(), null, null, "[分享达标额外奖励]", 8, 1, 2,
+                                sourceUser.getUserId(), null, null, "[分享达标额外奖励]", 6, 1, 2,
                                 completAward.getAwardNumber(), "邀请人员已有"+completAward.getInviteCount()+"人完成达标任务，额外奖励现金红包" + completAward.getAwardNumber(), 1);
 
                         userMoneyService.updateAmount(1, sourceUser.getUserId(), completAward.getAwardNumber().doubleValue());
diff --git a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java
index 086d6724..da13081d 100644
--- a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java
+++ b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java
@@ -217,7 +217,7 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
             switch (reward.getType()) {
                 case 1:
                     UserMoneyDetails userMoneyDetails1 = new UserMoneyDetails(
-                            userId, null, null, "[任务中心]", 8, 1, 2,
+                            userId, null, null, "[任务中心]", 7, 1, 2,
                             new BigDecimal(reward.getNumber()), taskCenter.getTitle() + "任务完成,金币奖励" + reward.getNumber(), 2);
 
                     userMoneyService.updateMoney(1, userId, reward.getNumber());
@@ -226,7 +226,7 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
                     break;
                 case 2:
                     UserMoneyDetails userMoneyDetails2 = new UserMoneyDetails(
-                            userId, null, null, "[任务中心]", 8, 1, 2,
+                            userId, null, null, "[任务中心]", 7, 1, 2,
                             new BigDecimal(reward.getNumber()), taskCenter.getTitle() + "任务完成,现金奖励" + reward.getNumber(), 1);
 
                     userMoneyService.updateAmount(1, userId, reward.getNumber());

From 1252d63bfd541a8faee99a245795502bfd858d22 Mon Sep 17 00:00:00 2001
From: GYJ <1157756119@qq.com>
Date: Wed, 25 Dec 2024 09:43:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=94=B6=E7=9B=8A?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/app/service/impl/UserMoneyDetailsServiceImpl.java | 2 --
 src/main/resources/mapper/app/UserMoneyDetailsDao.xml         | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java
index 46e153f0..344ec9de 100644
--- a/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java
+++ b/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java
@@ -42,8 +42,6 @@ public class UserMoneyDetailsServiceImpl extends ServiceImpl<UserMoneyDetailsDao
             ArrayList<Integer> arrayList = new ArrayList<>();
             arrayList.add(1);
             arrayList.add(6);
-            arrayList.add(7);
-            arrayList.add(8);
             queryWrapper.in("classify", arrayList);
         }
         queryWrapper.orderByDesc("create_time");
diff --git a/src/main/resources/mapper/app/UserMoneyDetailsDao.xml b/src/main/resources/mapper/app/UserMoneyDetailsDao.xml
index 7d9be6be..dbae0a99 100644
--- a/src/main/resources/mapper/app/UserMoneyDetailsDao.xml
+++ b/src/main/resources/mapper/app/UserMoneyDetailsDao.xml
@@ -7,11 +7,11 @@
     </select>
 
     <select id="queryUserInviteMoney" resultType="Double">
-        select sum(money)  from user_money_details where user_id=#{userId} and classify in (1,6,7,8) and type=1 and state=2 and money_type=1
+        select sum(money)  from user_money_details where user_id=#{userId} and classify in (1,6) and type=1 and state=2 and money_type=1
     </select>
 
     <select id="queryUserInviteGoldMoney" resultType="Double">
-        select sum(money)  from user_money_details where user_id=#{userId} and classify in (1,6,7,8) and type=1 and state=2 and money_type=2
+        select sum(money)  from user_money_details where user_id=#{userId} and classify in (1,6) and type=1 and state=2 and money_type=2
     </select>