修改分佣

game-business/src/main/java/com/game/business/task/AppAgentGameBettingTask.java

@@ -55,11 +55,9 @@ public class AppAgentGameBettingTask {
         }
 
         AppUserAgent userAgent = userAgents.get(0);
-        if(userAgent.getPid() == null || userAgent.getPid() == 0){
-            return;
-        }
 
         List<AppGameCommission> gameRateList = new ArrayList<>();
+
         getGameRate(appGameBetting.getGameId(), userAgent.getPid(), userAgent.getUserId(), gameRateList);
         if(gameRateList.isEmpty()){
             return;
@@ -82,8 +80,8 @@ public class AppAgentGameBettingTask {
         }
 
         AppGameCommission gameCommission = gameCommissions.get(0);
-        if(gameCommission.getGameRate() == null || gameCommission.getGameRate() <= 0){
-            return;
+        if(gameCommission.getGameRate() == null){
+            gameCommission.setGameRate(0L);
         }
 
         gameRateList.add(gameCommission);
@@ -97,9 +95,6 @@ public class AppAgentGameBettingTask {
         }
 
         AppUserAgent userAgent = userAgents.get(0);
-        if(userAgent.getPid() == null || userAgent.getPid() == 0){
-            return;
-        }
 
         getGameRate(gameId, userAgent.getPid(), userAgent.getUserId(), gameRateList);
 
@@ -128,16 +123,21 @@ public class AppAgentGameBettingTask {
 
         for (int i = 0; i < gameRateList.size(); i++) {
 
-            // 给上级分佣金
+            // 分佣
             AppGameCommission appGameCommission = gameRateList.get(i);
-            AppUser appUser = appUserService.selectAppUserByUserid(appGameCommission.getPid());
+            AppUser appUser = appUserService.selectAppUserByUserid(appGameCommission.getUserId());
             if(appUser == null){
                 continue;
             }
 
-            // 计算上级佣金
-            BigDecimal pidGameRate = new BigDecimal(((appGameCommission.getGameRate() - indexCommission) / 100.00) + "");
-            BigDecimal userCommission = bettingAmount.multiply(pidGameRate).setScale(2, RoundingMode.DOWN);
+            BigDecimal userGgameRate = new BigDecimal("0");
+            BigDecimal userCommission = new BigDecimal("0");
+
+            if(appGameCommission.getGameRate() > 0){
+                // 计算佣金
+                userGgameRate = new BigDecimal(((appGameCommission.getGameRate() - indexCommission) / 100.00) + "");
+                userCommission = bettingAmount.multiply(userGgameRate).setScale(2, RoundingMode.DOWN);
+            }
 
             // 上一次费率
             indexCommission = appGameCommission.getGameRate();
@@ -163,7 +163,7 @@ public class AppAgentGameBettingTask {
             appUserGameRecordCount.setPid(appUser.getPid());
             appUserGameRecordCount.setCreateTime(new Date());
             appUserGameRecordCount.setType(0);
-            appUserGameRecordCount.setGameRate(pidGameRate.doubleValue());
+            appUserGameRecordCount.setGameRate(userGgameRate.doubleValue());
             appUserGameRecordCount.setCommission(userCommission.doubleValue());
 
             appUserGameRecordCountService.save(appUserGameRecordCount);

game-business/src/main/java/com/game/business/task/AppUserLiveDividedTask.java

@@ -78,10 +78,9 @@ public class AppUserLiveDividedTask {
         }
 
         AppUserAgent userAgent = userAgents.get(0);
-        if(userAgent.getPid() == null || userAgent.getPid() == 0){
-            return;
+        if(userAgent.getLiveRate() == null){
+            userAgent.setLiveRate(0.00);
         }
-
         liveRateList.add(userAgent);
 
         getLiveRate(userAgent.getPid(), liveRateList);
@@ -104,20 +103,20 @@ public class AppUserLiveDividedTask {
 
         for (int i = 0; i < liveRateList.size(); i++) {
 
-            // 给上级分佣金
+            // 计算佣金
             AppUserAgent appUserAgent = liveRateList.get(i);
 
-            AppUser appUser = appUserService.selectAppUserByUserid(appUserAgent.getPid());
+            AppUser appUser = appUserService.selectAppUserByUserid(appUserAgent.getUserId());
             if(appUser == null){
                 continue;
             }
 
             // 计算上级佣金
-            BigDecimal pidLiveRate = new BigDecimal("0.00");
-            if(appUserAgent.getLiveRate() != null){
-                pidLiveRate = new BigDecimal(((appUserAgent.getLiveRate() - indexCommission) / 100.00) + "");
+            BigDecimal userLiveRate = new BigDecimal("0.00");
+            if(appUserAgent.getLiveRate() > 0){
+                userLiveRate = new BigDecimal(((appUserAgent.getLiveRate() - indexCommission) / 100.00) + "");
             }
-            BigDecimal userCommission = item.getMoney().multiply(pidLiveRate).setScale(2, RoundingMode.DOWN);
+            BigDecimal userCommission = item.getMoney().multiply(userLiveRate).setScale(2, RoundingMode.DOWN);
 
             // 上一次费率
             indexCommission = appUserAgent.getLiveRate();
@@ -138,7 +137,7 @@ public class AppUserLiveDividedTask {
 
             // 插入分佣记录
             AppUserLiveDividedRecord appUserLiveDividedRecord = new AppUserLiveDividedRecord();
-            appUserLiveDividedRecord.setRate(pidLiveRate);
+            appUserLiveDividedRecord.setRate(userLiveRate);
             appUserLiveDividedRecord.setUserId(appUser.getUserid());
             appUserLiveDividedRecord.setUserLiveDividedId(item.getId());
             appUserLiveDividedRecord.setMoney(userCommission);