优化

game-business/src/main/java/com/game/business/controller/AppUserCountDividendController.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -80,7 +81,7 @@ public class AppUserCountDividendController extends BaseController
     public HttpRetPageArr<AppUserCountDividend> list(AppUserDividendListDto dto)
     {
         startPage();
-        List<AppUserCountDividend> list = appUserCountDividendService.selectUserDividendList(SecurityUtils.getUserId(),null,null);
+        List<AppUserCountDividend> list = appUserCountDividendService.selectUserDividendList(SecurityUtils.getUserId(),null,null,null);
         return HttpRetPageArr.success("查询成功", getDataTable(list));
     }
 
@@ -103,4 +104,9 @@ public class AppUserCountDividendController extends BaseController
         return appUserCountDividendService.send(userId,dateNo,curUserId);
     }
 
+    @PostConstruct
+    private void test(){
+        appUserCountDividendService.send("10302","2024-09-30",10013L);
+    }
+
 }

game-business/src/main/java/com/game/business/mapper/AppUserCountDividendMapper.java

@@ -64,5 +64,5 @@ public interface AppUserCountDividendMapper extends BaseMapper<AppUserCountDivid
      * 查询用户团队分红列表
      *
      * */
-    public List<AppUserCountDividend> selectUserDividendList(@Param("pid") Long pid,@Param("userId") Long userId,@Param("dateNum")String dateNum);
+    public List<AppUserCountDividend> selectUserDividendList(@Param("pid") Long pid,@Param("userId") Long userId,@Param("dateNum")String dateNum,@Param("status")Integer status);
 }

game-business/src/main/java/com/game/business/service/IAppUserCountDividendService.java

@@ -63,7 +63,7 @@ public interface IAppUserCountDividendService extends IService<AppUserCountDivid
     /**
      * 查询团队分红
      * */
-    public List<AppUserCountDividend> selectUserDividendList(Long pid,Long userId,String dateNum);
+    public List<AppUserCountDividend> selectUserDividendList(Long pid,Long userId,String dateNum,Integer status);
 
     /**
      * 发放分红

game-business/src/main/java/com/game/business/service/impl/AppUserCountDividendServiceImpl.java

@@ -1,6 +1,7 @@
 package com.game.business.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.thread.ThreadUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -144,8 +145,8 @@ public class AppUserCountDividendServiceImpl extends ServiceImpl<AppUserCountDiv
     }
 
     @Override
-    public List<AppUserCountDividend> selectUserDividendList(Long pid,Long userId,String dateNum) {
-        List<AppUserCountDividend> dividendList = appUserCountDividendMapper.selectUserDividendList(pid,userId,dateNum);
+    public List<AppUserCountDividend> selectUserDividendList(Long pid,Long userId,String dateNum,Integer status) {
+        List<AppUserCountDividend> dividendList = appUserCountDividendMapper.selectUserDividendList(pid,userId,dateNum,status);
         if(null != dividendList && dividendList.size()>0){
             List<Long> ids = dividendList.stream().map(AppUserCountDividend::getUserId).collect(Collectors.toList());
             List<AppUser> userList = appUserService.selectListByIds(ids);
@@ -164,14 +165,14 @@ public class AppUserCountDividendServiceImpl extends ServiceImpl<AppUserCountDiv
 
     @Override
     public HttpRet<Boolean> send(String userId, String dateNo,Long sendUserId) {
-        List<AppUserCountDividend> dividendList = this.selectUserDividendList(sendUserId, StringUtils.isBlank(userId)?null:Long.parseLong(userId),dateNo);
+        List<AppUserCountDividend> dividendList = this.selectUserDividendList(sendUserId, StringUtils.isBlank(userId)?null:Long.parseLong(userId),dateNo,0);
         if(null == dividendList || dividendList.size() < 1){
             return HttpRet.fail("发放失败，不存在或已发放");
         }
-        dividendList = dividendList.stream().filter(e->e.getStatus().intValue() == 0).collect(Collectors.toList());
+        /*dividendList = dividendList.stream().filter(e->e.getStatus().intValue() == 0).collect(Collectors.toList());
         if(dividendList.size() < 1){
             return HttpRet.fail("发放失败，不存在或已发放");
-        }
+        }*/
         /*AppUser curUser = appUserService.selectAppUserByUserid(curUserId);
         if(curUser.getDiamondCoin() < dividendList.stream().mapToDouble(e->e.getDiamondCoin()).sum()){
             return HttpRet.fail("发放失败，余额不足");
@@ -194,7 +195,6 @@ public class AppUserCountDividendServiceImpl extends ServiceImpl<AppUserCountDiv
                     continue;
                 }
                 try {
-                    List<FinTranRecord> tranRecordList = new ArrayList<>();
                     AppUser appUser = userMap.get(String.valueOf(countDividend.getUserId()));
                     AppUser curUser = appUserService.selectAppUserByUserid(sendUserId);
                     if(!sendUserId.equals(appUser.getPid())){
@@ -308,7 +308,9 @@ public class AppUserCountDividendServiceImpl extends ServiceImpl<AppUserCountDiv
             userIds = userIds.stream().distinct().collect(Collectors.toList());
             for(Long uid : userIds) {
                 //更新用户可提现余额
-                appUserCountTask.updateWithdrawAble(uid);
+                ThreadUtil.execute(()->{
+                    appUserCountTask.updateWithdrawAble(uid);
+                });
             }
         }
         return HttpRet.success("发放成功",true);

game-business/src/main/resources/mapper/business/AppUserCountDividendMapper.xml

@@ -107,5 +107,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="dateNum != null and dateNum != ''">
             and a.date_no = #{dateNum}
         </if>
+        <if test="status != null">
+            and a.status = #{status}
+        </if>
+        order by a.date_no desc
     </select>
 </mapper>