修改金币分佣

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

@@ -141,17 +141,15 @@ public class AppGameBettingController extends BaseController{
             }else{
 
                 // 获取用户金额，判断投注金额是否大于余额
-                if(gameBetting.getBettingAmount() > (appUser.getCoin() + appUser.getCoinCash())){
+                if(gameBetting.getBettingAmount() > appUser.getCoin()){
                     return HttpRet.fail("金币不足，投注失败。");
                 }
 
+                appUser.setCoin(appUser.getCoin() - gameBetting.getBettingAmount());
+
                 // 判断不可提现金币是否满足扣款
-                if(gameBetting.getBettingAmount() > appUser.getCoin()){
-                    appUser.setCoinCash(appUser.getCoinCash() - (gameBetting.getBettingAmount() - appUser.getCoin()));
-                    appUser.setCoin(0.00);
-                }else{
-                    // 更新用户金币
-                    appUser.setCoin(appUser.getCoin() - gameBetting.getBettingAmount());
+                if(gameBetting.getBettingAmount() > (appUser.getCoin() - appUser.getCoinCash())){
+                    appUser.setCoinCash(gameBetting.getBettingAmount() - (appUser.getCoin() - appUser.getCoinCash()));
                 }
             }
 
@@ -176,7 +174,7 @@ public class AppGameBettingController extends BaseController{
 
             FinTranRecord finTranRecord = new FinTranRecord();
 
-            finTranRecord.setAfterCoin(appUser.getCoin() + appUser.getCoinCash());
+            finTranRecord.setAfterCoin(appUser.getCoin());
             finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
 
             if(gameBetting.getBettingType() == 0){

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

@@ -150,6 +150,7 @@ public class AppAgentGameBettingTask {
 
             // 更新用户金币
             }else{
+                appUser.setCoin(appUser.getCoin() + userCommission.doubleValue());
                 appUser.setCoinCash(appUser.getCoinCash() + userCommission.doubleValue());
             }
 
@@ -170,7 +171,7 @@ public class AppAgentGameBettingTask {
 
             FinTranRecord finTranRecord = new FinTranRecord();
             finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
-            finTranRecord.setAfterCoin(appUser.getCoin() + appUser.getCoinCash());
+            finTranRecord.setAfterCoin(appUser.getCoin());
 
             if(appGameBetting.getBettingType() == 0){
                 finTranRecord.setCurrencyType(4);
@@ -252,6 +253,7 @@ public class AppAgentGameBettingTask {
             appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() + gameRateAmount);
         // 更新用户金币
         }else{
+            appUser.setCoin(appUser.getCoin() + gameRateAmount);
             appUser.setCoinCash(appUser.getCoinCash() + gameRateAmount);
         }
         appUserService.updateAppUser(appUser);
@@ -273,7 +275,7 @@ public class AppAgentGameBettingTask {
         FinTranRecord finTranRecord = new FinTranRecord();
 
         finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
-        finTranRecord.setAfterCoin(appUser.getCoin() + appUser.getCoinCash());
+        finTranRecord.setAfterCoin(appUser.getCoin());
 
         if(appGameBetting.getBettingType() == 0){
             finTranRecord.setCurrencyType(4);

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

@@ -253,15 +253,19 @@ public class AppGameBettingTask {
                     continue;
                 }
 
+                double bettingAmount = appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple();
+
                 // 更新用户余额
                 if(appGameBetting.getBettingType() == 0){
-                    appUser.setDiamondCoin(appUser.getDiamondCoin() + (appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple()) );
-                    appUser.setDiamondCoinTotal(appUser.getDiamondCoinCashTotal() + (appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple()));
-                    appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() + (appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple()));
+                    appUser.setDiamondCoin(appUser.getDiamondCoin() + bettingAmount );
+                    appUser.setDiamondCoinTotal(appUser.getDiamondCoinCashTotal() + bettingAmount);
+                    appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() + bettingAmount);
                 // 更新用户金币
                 }else{
-                    appUser.setCoin(appUser.getCoin() + (appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple()));
-//                    appUser.setCoinCash(appUser.getCoinCash() + (appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple()));
+                    appUser.setCoin(appUser.getCoin() + bettingAmount);
+//                    if(appUser.getRole() == 1){
+//                        appUser.setCoinCash(appUser.getCoinCash() + bettingAmount);
+//                    }
                 }
 
                 appUserService.updateAppUser(appUser);
@@ -273,16 +277,16 @@ public class AppGameBettingTask {
 
                 FinTranRecord finTranRecord = new FinTranRecord();
 
-                finTranRecord.setAfterCoin(appUser.getCoin() + appUser.getCoinCash());
+                finTranRecord.setAfterCoin(appUser.getCoin());
                 finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
 
                 if(appGameBetting.getBettingType() == 0){
                     finTranRecord.setCurrencyType(4);
-                    finTranRecord.setDiamondCoinChange(appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple());
+                    finTranRecord.setDiamondCoinChange(bettingAmount);
                     finTranRecord.setCoinChange(0.00);
                 }else{
                     finTranRecord.setCurrencyType(2);
-                    finTranRecord.setCoinChange(appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple());
+                    finTranRecord.setCoinChange(bettingAmount);
                     finTranRecord.setDiamondCoinChange(0.00);
                 }
 

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

@@ -129,6 +129,7 @@ public class AppUserLiveDividedTask {
                 appUserService.updateAppUser(appUser);
                 // 更新用户金币
             }else{
+                appUser.setCoin(appUser.getCoin() + userCommission.doubleValue());
                 appUser.setCoinCash(appUser.getCoinCash() + userCommission.doubleValue());
                 appUserService.updateAppUser(appUser);
             }
@@ -147,19 +148,16 @@ public class AppUserLiveDividedTask {
 
             FinTranRecord finTranRecord = new FinTranRecord();
 
+            finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
+            finTranRecord.setAfterCoin(appUser.getCoin());
+
             if(item.getCurrencyType() == 4){
                 finTranRecord.setCurrencyType(4);
-                finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
                 finTranRecord.setDiamondCoinChange(userCommission.doubleValue());
-
-                finTranRecord.setAfterCoin(appUser.getCoin());
                 finTranRecord.setCoinChange(0.00);
             }else{
                 finTranRecord.setCurrencyType(2);
-                finTranRecord.setAfterCoin(appUser.getCoinCash());
                 finTranRecord.setCoinChange(userCommission.doubleValue());
-
-                finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
                 finTranRecord.setDiamondCoinChange(0.00);
             }
 
@@ -198,7 +196,6 @@ public class AppUserLiveDividedTask {
 
             finTranRecord.setCreateTime(new Date());
 
-            finTranRecord.setFromUid(0L);
             finTranRecord.setGoodsId(0L);
             finTranRecord.setGuildId(0L);
             finTranRecord.setManagerCoId(0L);