From 7333eaf163013f853250b87ccb72e0c64da23dc1 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 6 Jan 2025 18:39:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=90=86=E5=95=86=E6=88=B7=20?=
 =?UTF-8?q?=E9=92=B1=E5=8C=85=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserMoneyDetailsServiceImpl.java | 15 ++++++++++++---
 .../com/sqx/modules/job/task/TempOrdersTask.java  |  2 +-
 .../sys/service/impl/SysUserMoneyServiceImpl.java | 10 +++++-----
 3 files changed, 18 insertions(+), 9 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 4d1fbe42..50f112fc 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
@@ -11,23 +11,32 @@ import com.sqx.modules.app.dao.UserMoneyDetailsDao;
 import com.sqx.modules.app.entity.UserMoney;
 import com.sqx.modules.app.entity.UserMoneyDetails;
 import com.sqx.modules.app.service.UserMoneyDetailsService;
+import com.sqx.modules.sys.entity.SysUserMoneyDetails;
+import com.sqx.modules.sys.service.SysUserMoneyDetailsService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Service
 public class UserMoneyDetailsServiceImpl extends ServiceImpl<UserMoneyDetailsDao, UserMoneyDetails> implements UserMoneyDetailsService {
 
+    @Autowired
+    private SysUserMoneyDetailsService sysUserMoneyDetailsService;
+
     @Override
     public Result queryUserMoneyDetails(Integer page, Integer limit, Long sysUserId, Long userId, Integer classify,
                                         Integer type, Integer moneyType, Integer viewType) {
         PageHelper.startPage(page, limit);
-        QueryWrapper<UserMoneyDetails> queryWrapper = new QueryWrapper();
         if (sysUserId != null) {
-            queryWrapper.eq("sys_user_id", sysUserId);
+            List<SysUserMoneyDetails> list = sysUserMoneyDetailsService.list(new LambdaQueryWrapper<SysUserMoneyDetails>()
+                    .eq(SysUserMoneyDetails::getUserId, sysUserId).orderByDesc(SysUserMoneyDetails::getCreateTime));
+            return Result.success().put("data", PageUtils.page(new PageInfo<>(list), true));
         }
+        QueryWrapper<UserMoneyDetails> queryWrapper = new QueryWrapper();
         if (userId != null) {
             queryWrapper.eq("user_id", userId);
         }
@@ -47,7 +56,7 @@ public class UserMoneyDetailsServiceImpl extends ServiceImpl<UserMoneyDetailsDao
             queryWrapper.in("classify", arrayList);
         }
         queryWrapper.orderByDesc("create_time");
-        return Result.success().put("data", PageUtils.page(new PageInfo<>(baseMapper.selectList(queryWrapper)),true));
+        return Result.success().put("data", PageUtils.page(new PageInfo<>(baseMapper.selectList(queryWrapper)), true));
     }
 
     @Override
diff --git a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java
index aa5e81b1..c0687e0b 100644
--- a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java
+++ b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java
@@ -246,7 +246,7 @@ public class TempOrdersTask {
                     sysUserMoneyService.updateSysMoney(1, sysUser.getUserId(), Double.parseDouble(qdAward));
                     sysUserMoneyDetailsService.save(userMoneyDetails4);
 
-                    SysUserMoney sysUserMoney = sysUserMoneyService.selectSysUserMoneyByUserId(sysUser.getSysUserId());
+                    SysUserMoney sysUserMoney = sysUserMoneyService.selectSysUserMoneyByUserId(sysUser.getUserId());
                     sysUserMoney.setInviteIncomeMoney(sysUserMoney.getInviteIncomeMoney() == null ? new BigDecimal(qdAward) : sysUserMoney.getInviteIncomeMoney().add(new BigDecimal(qdAward)));
                     sysUserMoneyService.update(sysUserMoney, new LambdaQueryWrapper<SysUserMoney>()
                             .eq(SysUserMoney::getUserId, sysUserMoney.getUserId())
diff --git a/src/main/java/com/sqx/modules/sys/service/impl/SysUserMoneyServiceImpl.java b/src/main/java/com/sqx/modules/sys/service/impl/SysUserMoneyServiceImpl.java
index 1bbf10a0..484e72e4 100644
--- a/src/main/java/com/sqx/modules/sys/service/impl/SysUserMoneyServiceImpl.java
+++ b/src/main/java/com/sqx/modules/sys/service/impl/SysUserMoneyServiceImpl.java
@@ -17,16 +17,16 @@ import java.util.Map;
 public class SysUserMoneyServiceImpl extends ServiceImpl<SysUserMoneyDao, SysUserMoney> implements SysUserMoneyService {
 
     @Override
-    public void updateSysMoney(int i, Long userId, double money){
+    public void updateSysMoney(int i, Long userId, double money) {
         selectSysUserMoneyByUserId(userId);
-        baseMapper.updateSysMoney(i,userId,money);
+        baseMapper.updateSysMoney(i, userId, money);
     }
 
     @Override
-    public SysUserMoney selectSysUserMoneyByUserId(Long userId){
+    public SysUserMoney selectSysUserMoneyByUserId(Long userId) {
         SysUserMoney userMoney = baseMapper.selectOne(new QueryWrapper<SysUserMoney>().eq("user_id", userId));
-        if(userMoney==null){
-            userMoney=new SysUserMoney();
+        if (userMoney == null) {
+            userMoney = new SysUserMoney();
             userMoney.setUserId(userId);
             userMoney.setMoney(new BigDecimal("0.00"));
             baseMapper.insert(userMoney);