余额修改

game-business/src/main/java/com/game/business/domain/FinTranRecord.java

@@ -68,9 +68,9 @@ private static final long serialVersionUID=1L;
     @TableField(value = "coin_change")
     private Double coinChange;
 
-    /** 变动后的余额 */
-    @ApiModelProperty(value = "变动后的余额")
-    @Excel(name = "变动后的余额")
+    /** 变动余额 */
+    @ApiModelProperty(value = "变动余额")
+    @Excel(name = "变动余额")
     @TableField(value = "diamond_coin_change")
     private Double diamondCoinChange;
 

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

@@ -169,20 +169,16 @@ public class AppAgentGameBettingTask {
             appUserGameRecordCountService.save(appUserGameRecordCount);
 
             FinTranRecord finTranRecord = new FinTranRecord();
+            finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
+            finTranRecord.setAfterCoin(appUser.getCoin() + appUser.getCoinCash());
 
             if(appGameBetting.getBettingType() == 0){
                 finTranRecord.setCurrencyType(4);
-                finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
                 finTranRecord.setDiamondCoinChange(userCommission.doubleValue());
-
-                finTranRecord.setAfterCoin(appUser.getCoin() + appUser.getCoinCash());
                 finTranRecord.setCoinChange(0.00);
             }else{
                 finTranRecord.setCurrencyType(2);
-                finTranRecord.setAfterCoin(appUser.getCoin() + appUser.getCoinCash());
                 finTranRecord.setCoinChange(userCommission.doubleValue());
-
-                finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
                 finTranRecord.setDiamondCoinChange(0.00);
             }
 
@@ -275,19 +271,16 @@ public class AppAgentGameBettingTask {
 
         FinTranRecord finTranRecord = new FinTranRecord();
 
+        finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
+        finTranRecord.setAfterCoin(appUser.getCoin() + appUser.getCoinCash());
+
         if(appGameBetting.getBettingType() == 0){
             finTranRecord.setCurrencyType(4);
-            finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
             finTranRecord.setDiamondCoinChange(gameRateAmount);
-
-            finTranRecord.setAfterCoin(appUser.getCoin() + appUser.getCoinCash());
             finTranRecord.setCoinChange(0.00);
         }else{
             finTranRecord.setCurrencyType(2);
-            finTranRecord.setAfterCoin(appUser.getCoin() + appUser.getCoinCash());
             finTranRecord.setCoinChange(gameRateAmount);
-
-            finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
             finTranRecord.setDiamondCoinChange(0.00);
         }
 
@@ -306,7 +299,12 @@ public class AppAgentGameBettingTask {
         finTranRecord.setSceneType(0L);
 
         finTranRecord.setTranGroupId(appGameBetting.getId());
-        finTranRecord.setTranType1(FinTranType1.U_Income_Coin.getType());
+        if(appGameBetting.getBettingType() == 0){
+            finTranRecord.setTranType1(FinTranType1.U_Income_Coin_Balance.getType());
+        }else{
+            finTranRecord.setTranType1(FinTranType1.U_Income_Coin.getType());
+        }
+
         finTranRecord.setTranType2(FinTranType2.REWARD_Income.getType());
         finTranRecord.setTranType3(FinTranType3.RECOMMEND_ADD_AMOUNT.getType());
 

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

@@ -258,7 +258,8 @@ public class AppGameBettingTask {
                     appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() + (appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple()));
                 // 更新用户金币
                 }else{
-                    appUser.setCoinCash(appUser.getCoinCash() + (appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple()));
+                    appUser.setCoin(appUser.getCoin() + (appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple()));
+//                    appUser.setCoinCash(appUser.getCoinCash() + (appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple()));
                 }
 
                 appUserService.updateAppUser(appUser);
@@ -298,7 +299,12 @@ public class AppGameBettingTask {
 
                 finTranRecord.setTranGroupId(appGameBetting.getId());
 
-                finTranRecord.setTranType1(FinTranType1.U_Income_Coin_Balance.getType());
+                if(appGameBetting.getBettingType() == 0){
+                    finTranRecord.setTranType1(FinTranType1.U_Income_Coin_Balance.getType());
+                }else{
+                    finTranRecord.setTranType1(FinTranType1.U_Income_Coin.getType());
+                }
+
                 finTranRecord.setTranType2(FinTranType2.GAME_REWARD.getType());
                 finTranRecord.setTranType3(FinTranType3.CHARGE_WIN_GAME.getType());