修改可提现余额与金币

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

@@ -137,15 +137,22 @@ public class AppGameBettingController extends BaseController{
                 // 更新用户余额
                 appUser.setDiamondCoin(appUser.getDiamondCoin() - gameBetting.getBettingAmount());
                 appUser.setDiamondCoinTotal(appUser.getDiamondCoinTotal() - gameBetting.getBettingAmount());
+                appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() - gameBetting.getBettingAmount());
             }else{
 
                 // 获取用户金额，判断投注金额是否大于余额
-                if(gameBetting.getBettingAmount() > appUser.getCoin()){
+                if(gameBetting.getBettingAmount() > (appUser.getCoin() + appUser.getCoinCash())){
                     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());
+                }
             }
 
             appUserService.updateAppUser(appUser);
@@ -169,7 +176,7 @@ public class AppGameBettingController extends BaseController{
 
             FinTranRecord finTranRecord = new FinTranRecord();
 
-            finTranRecord.setAfterCoin(appUser.getCoin());
+            finTranRecord.setAfterCoin(appUser.getCoin() + appUser.getCoinCash());
             finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
 
             if(gameBetting.getBettingType() == 0){

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

@@ -146,13 +146,15 @@ public class AppAgentGameBettingTask {
             if(appGameBetting.getBettingType() == 0){
                 appUser.setDiamondCoin(appUser.getDiamondCoin() + userCommission.doubleValue());
                 appUser.setDiamondCoinTotal(appUser.getDiamondCoinTotal() + userCommission.doubleValue());
-                appUserService.updateAppUser(appUser);
+                appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() + userCommission.doubleValue());
+
             // 更新用户金币
             }else{
-                appUser.setCoin(appUser.getCoin() + userCommission.doubleValue());
-                appUserService.updateAppUser(appUser);
+                appUser.setCoinCash(appUser.getCoinCash() + userCommission.doubleValue());
             }
 
+            appUserService.updateAppUser(appUser);
+
             redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
 
             AppUserGameRecordCount appUserGameRecordCount = new AppUserGameRecordCount();
@@ -173,11 +175,11 @@ public class AppAgentGameBettingTask {
                 finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
                 finTranRecord.setDiamondCoinChange(userCommission.doubleValue());
 
-                finTranRecord.setAfterCoin(appUser.getCoin());
+                finTranRecord.setAfterCoin(appUser.getCoin() + appUser.getCoinCash());
                 finTranRecord.setCoinChange(0.00);
             }else{
                 finTranRecord.setCurrencyType(2);
-                finTranRecord.setAfterCoin(appUser.getCoin());
+                finTranRecord.setAfterCoin(appUser.getCoin() + appUser.getCoinCash());
                 finTranRecord.setCoinChange(userCommission.doubleValue());
 
                 finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
@@ -250,12 +252,13 @@ public class AppAgentGameBettingTask {
         if(appGameBetting.getBettingType() == 0){
             appUser.setDiamondCoin(appUser.getDiamondCoin() + gameRateAmount);
             appUser.setDiamondCoinTotal(appUser.getDiamondCoinTotal() + gameRateAmount);
-            appUserService.updateAppUser(appUser);
-            // 更新用户金币
+            appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() + gameRateAmount);
+        // 更新用户金币
         }else{
-            appUser.setCoin(appUser.getCoin() + gameRateAmount);
-            appUserService.updateAppUser(appUser);
+            appUser.setCoinCash(appUser.getCoinCash() + gameRateAmount);
         }
+        appUserService.updateAppUser(appUser);
+
 
         redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
 
@@ -277,11 +280,11 @@ public class AppAgentGameBettingTask {
             finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
             finTranRecord.setDiamondCoinChange(gameRateAmount);
 
-            finTranRecord.setAfterCoin(appUser.getCoin());
+            finTranRecord.setAfterCoin(appUser.getCoin() + appUser.getCoinCash());
             finTranRecord.setCoinChange(0.00);
         }else{
             finTranRecord.setCurrencyType(2);
-            finTranRecord.setAfterCoin(appUser.getCoin());
+            finTranRecord.setAfterCoin(appUser.getCoin() + appUser.getCoinCash());
             finTranRecord.setCoinChange(gameRateAmount);
 
             finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());

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

@@ -255,9 +255,10 @@ public class AppGameBettingTask {
                 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()));
                 // 更新用户金币
                 }else{
-                    appUser.setCoin(appUser.getCoin() + (appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple()));
+                    appUser.setCoinCash(appUser.getCoinCash() + (appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple()));
                 }
 
                 appUserService.updateAppUser(appUser);
@@ -269,7 +270,7 @@ public class AppGameBettingTask {
 
                 FinTranRecord finTranRecord = new FinTranRecord();
 
-                finTranRecord.setAfterCoin(appUser.getCoin());
+                finTranRecord.setAfterCoin(appUser.getCoin() + appUser.getCoinCash());
                 finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
 
                 if(appGameBetting.getBettingType() == 0){

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

@@ -126,10 +126,11 @@ public class AppUserLiveDividedTask {
             if(item.getCurrencyType() == 4){
                 appUser.setDiamondCoin(appUser.getDiamondCoin() + userCommission.doubleValue());
                 appUser.setDiamondCoinTotal(appUser.getDiamondCoinTotal() + userCommission.doubleValue());
+                appUser.setDiamondCoinCash(appUser.getDiamondCoinTotal() + userCommission.doubleValue());
                 appUserService.updateAppUser(appUser);
                 // 更新用户金币
             }else{
-                appUser.setCoin(appUser.getCoin() + userCommission.doubleValue());
+                appUser.setCoinCash(appUser.getCoinCash() + userCommission.doubleValue());
                 appUserService.updateAppUser(appUser);
             }
 
@@ -156,7 +157,7 @@ public class AppUserLiveDividedTask {
                 finTranRecord.setCoinChange(0.00);
             }else{
                 finTranRecord.setCurrencyType(2);
-                finTranRecord.setAfterCoin(appUser.getCoin());
+                finTranRecord.setAfterCoin(appUser.getCoinCash());
                 finTranRecord.setCoinChange(userCommission.doubleValue());
 
                 finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());