update user amount

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

@@ -142,115 +142,112 @@ public class AppGameBettingController extends BaseController{
         if(count > 0){
             return HttpRet.fail("游戏已开奖，无法下单。");
         }
-        AppUser appUser = null;
-        synchronized (this){
 
-            appUser = appUserService.selectAppUserByUserid(gameBetting.getUserId());
+        AppUser appUser = appUserService.selectAppUserByUserid(gameBetting.getUserId());
 
-            if(appUser == null){
-                return HttpRet.fail("用户不存在。");
-            }
+        if(appUser == null){
+            return HttpRet.fail("用户不存在。");
+        }
 
-            if(gameBetting.getBettingType() == 0){
+        if(gameBetting.getBettingType() == 0){
 
-                // 获取用户金额，判断投注金额是否大于余额
-                if(gameBetting.getBettingAmount() > appUser.getDiamondCoin()){
-                    return HttpRet.fail("余额不足，投注失败。");
-                }
+            // 获取用户金额，判断投注金额是否大于余额
+            if(gameBetting.getBettingAmount() > appUser.getDiamondCoin()){
+                return HttpRet.fail("余额不足，投注失败。");
+            }
 
-                // 更新用户余额
-                appUser.setDiamondCoin(appUser.getDiamondCoin() - gameBetting.getBettingAmount());
-                appUser.setDiamondCoinTotal(appUser.getDiamondCoinTotal() - gameBetting.getBettingAmount());
-                appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() - gameBetting.getBettingAmount());
-            }else{
+            // 更新用户余额
+            //appUser.setDiamondCoin(appUser.getDiamondCoin() - gameBetting.getBettingAmount());
+            //appUser.setDiamondCoinTotal(appUser.getDiamondCoinTotal() - gameBetting.getBettingAmount());
+            //appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() - gameBetting.getBettingAmount());
+        }else{
 
-                // 获取用户金额，判断投注金额是否大于余额
-                if(gameBetting.getBettingAmount() > appUser.getCoin()){
-                    return HttpRet.fail("金币不足，投注失败。");
-                }
+            // 获取用户金额，判断投注金额是否大于余额
+            if(gameBetting.getBettingAmount() > appUser.getCoin()){
+                return HttpRet.fail("金币不足，投注失败。");
+            }
 
-                appUser.setCoin(appUser.getCoin() - gameBetting.getBettingAmount());
+            //appUser.setCoin(appUser.getCoin() - gameBetting.getBettingAmount());
 
-                // 判断不可提现金币是否满足扣款
-                if(gameBetting.getBettingAmount() > (appUser.getCoin() - appUser.getCoinCash())){
-                    appUser.setCoinCash(gameBetting.getBettingAmount() - (appUser.getCoin() - appUser.getCoinCash()));
-                }
-            }
+            // 判断不可提现金币是否满足扣款
+            //if(gameBetting.getBettingAmount() > (appUser.getCoin() - appUser.getCoinCash())){
+            //    appUser.setCoinCash(gameBetting.getBettingAmount() - (appUser.getCoin() - appUser.getCoinCash()));
+            //}
+        }
 
-            appUserService.updateAppUser(appUser);
+        //appUserService.updateAppUser(appUser);
 
-            redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
+        //redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
 
-            gameBetting.setGameDate(appGame.getGameDate());
-            gameBetting.setIsLive(0);
-            if(gameBetting.getLiveRoomId() != null && gameBetting.getLiveUserId() != null){
-                gameBetting.setIsLive(1);
-            }
+        gameBetting.setGameDate(appGame.getGameDate());
+        gameBetting.setIsLive(0);
+        if(gameBetting.getLiveRoomId() != null && gameBetting.getLiveUserId() != null){
+            gameBetting.setIsLive(1);
+        }
 
-            gameBetting.setCreateTime(new Date());
-            // 插入投注记录
-            appGameBettingService.save(gameBetting);
+        gameBetting.setCreateTime(new Date());
+        // 插入投注记录
+        appGameBettingService.save(gameBetting);
 
-            // 分佣
-            if(gameBetting.getBettingType() == 0){
-                appAgentGameBettingTask.agentGameBettingTask(gameBetting);
-            }
+        // 分佣
+        if(gameBetting.getBettingType() == 0){
+            appAgentGameBettingTask.agentGameBettingTask(gameBetting);
+        }
 
-            FinTranRecord finTranRecord = new FinTranRecord();
+        FinTranRecord finTranRecord = new FinTranRecord();
 
-            finTranRecord.setAfterCoin(appUser.getCoin());
-            finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
+        //finTranRecord.setAfterCoin(appUser.getCoin());
+        //finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
 
-            if(gameBetting.getBettingType() == 0){
-                finTranRecord.setCurrencyType(4);
-                finTranRecord.setDiamondCoinChange(gameBetting.getBettingAmount());
-                finTranRecord.setCoinChange(0.00);
-            }else{
-                finTranRecord.setCurrencyType(2);
-                finTranRecord.setCoinChange(gameBetting.getBettingAmount());
-                finTranRecord.setDiamondCoinChange(0.00);
-            }
+        if(gameBetting.getBettingType() == 0){
+            finTranRecord.setCurrencyType(4);
+            finTranRecord.setDiamondCoinChange(gameBetting.getBettingAmount());
+            finTranRecord.setCoinChange(0.00);
+        }else{
+            finTranRecord.setCurrencyType(2);
+            finTranRecord.setCoinChange(gameBetting.getBettingAmount());
+            finTranRecord.setDiamondCoinChange(0.00);
+        }
 
-            finTranRecord.setAfterMoney(0.00);
-            finTranRecord.setMoneyChange(0.00);
+        finTranRecord.setAfterMoney(0.00);
+        finTranRecord.setMoneyChange(0.00);
 
-            finTranRecord.setAfterTicket(0.00);
-            finTranRecord.setTicketChange(0.00);
+        finTranRecord.setAfterTicket(0.00);
+        finTranRecord.setTicketChange(0.00);
 
-            finTranRecord.setToUid(appUser.getUserid());
-            finTranRecord.setUid(appUser.getUserid());
+        finTranRecord.setToUid(appUser.getUserid());
+        finTranRecord.setUid(appUser.getUserid());
 
-            finTranRecord.setSceneId1(0L);
-            finTranRecord.setSceneId2(null);
-            finTranRecord.setSceneType(0L);
+        finTranRecord.setSceneId1(0L);
+        finTranRecord.setSceneId2(null);
+        finTranRecord.setSceneType(0L);
 
-            finTranRecord.setTranGroupId(gameBetting.getId());
-            finTranRecord.setTranType1(FinTranType1.U_Outcome_Balance.getType());
-            finTranRecord.setTranType2(FinTranType2.CONSUM_GAME.getType());
-            finTranRecord.setTranType3(FinTranType3.CONSUM_GAME_ANCHOR_ZHUANPAN.getType());
+        finTranRecord.setTranGroupId(gameBetting.getId());
+        finTranRecord.setTranType1(FinTranType1.U_Outcome_Balance.getType());
+        finTranRecord.setTranType2(FinTranType2.CONSUM_GAME.getType());
+        finTranRecord.setTranType3(FinTranType3.CONSUM_GAME_ANCHOR_ZHUANPAN.getType());
 
-            finTranRecord.setRemarks("游戏下注");
+        finTranRecord.setRemarks("游戏下注");
 
-            finTranRecord.setConsumptionCoin(gameBetting.getBettingAmount());
-            finTranRecord.setConsumptionMoney(0.00);
-            finTranRecord.setCommissionRelatedUid(0L);
-            finTranRecord.setAgentId(appUser.getAgentId());
+        finTranRecord.setConsumptionCoin(gameBetting.getBettingAmount());
+        finTranRecord.setConsumptionMoney(0.00);
+        finTranRecord.setCommissionRelatedUid(0L);
+        finTranRecord.setAgentId(appUser.getAgentId());
 
-            finTranRecord.setCreateTime(new Date());
+        finTranRecord.setCreateTime(new Date());
 
-            finTranRecord.setFromUid(appUser.getUserid());
-            finTranRecord.setGoodsId(0L);
-            finTranRecord.setGuildId(0L);
-            finTranRecord.setManagerCoId(0L);
-            finTranRecord.setManagerId(0L);
+        finTranRecord.setFromUid(appUser.getUserid());
+        finTranRecord.setGoodsId(0L);
+        finTranRecord.setGuildId(0L);
+        finTranRecord.setManagerCoId(0L);
+        finTranRecord.setManagerId(0L);
 
-            finTranRecord.setPerc(0.00);
-            finTranRecord.setProId(0L);
-            finTranRecord.setProCount(0L);
+        finTranRecord.setPerc(0.00);
+        finTranRecord.setProId(0L);
+        finTranRecord.setProCount(0L);
 
-            finTranRecord.setOrderId(gameBetting.getId());
-            finTranRecordService.insertFinTranRecord(finTranRecord);
-        }
+        finTranRecord.setOrderId(gameBetting.getId());
+        finTranRecordService.insertFinTranRecord(finTranRecord);
 
         return HttpRet.success("下注成功", appUser.getDiamondCoin());
     }

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

@@ -159,20 +159,20 @@ public class AppAgentGameBettingTask {
             indexCommission = appGameCommission.getGameRate();
 
             // 更新用户余额
-            if(appGameBetting.getBettingType() == 0){
-                appUser.setDiamondCoin(appUser.getDiamondCoin() + userCommission.doubleValue());
-                appUser.setDiamondCoinTotal(appUser.getDiamondCoinTotal() + userCommission.doubleValue());
-                appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() + userCommission.doubleValue());
+            //if(appGameBetting.getBettingType() == 0){
+            //    appUser.setDiamondCoin(appUser.getDiamondCoin() + userCommission.doubleValue());
+            //    appUser.setDiamondCoinTotal(appUser.getDiamondCoinTotal() + userCommission.doubleValue());
+            //    appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() + userCommission.doubleValue());
 
             // 更新用户金币
-            }else{
-                appUser.setCoin(appUser.getCoin() + userCommission.doubleValue());
-                appUser.setCoinCash(appUser.getCoinCash() + userCommission.doubleValue());
-            }
+            //}else{
+            //    appUser.setCoin(appUser.getCoin() + userCommission.doubleValue());
+            //    appUser.setCoinCash(appUser.getCoinCash() + userCommission.doubleValue());
+            //}
 
-            appUserService.updateAppUser(appUser);
+            //appUserService.updateAppUser(appUser);
 
-            redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
+            //redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
 
             AppUserGameRecordCount appUserGameRecordCount = new AppUserGameRecordCount();
             appUserGameRecordCount.setGameId(appGameBetting.getGameId());
@@ -188,8 +188,8 @@ public class AppAgentGameBettingTask {
             recordCountList.add(appUserGameRecordCount);
 
             FinTranRecord finTranRecord = new FinTranRecord();
-            finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
-            finTranRecord.setAfterCoin(appUser.getCoin());
+            //finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
+            //finTranRecord.setAfterCoin(appUser.getCoin());
 
             if(appGameBetting.getBettingType() == 0){
                 finTranRecord.setCurrencyType(4);
@@ -265,19 +265,18 @@ public class AppAgentGameBettingTask {
         double gameRateAmount = appGameBetting.getBettingAmount() * 0.003;
 
         // 更新用户余额
-        if(appGameBetting.getBettingType() == 0){
-            appUser.setDiamondCoin(appUser.getDiamondCoin() + gameRateAmount);
-            appUser.setDiamondCoinTotal(appUser.getDiamondCoinTotal() + gameRateAmount);
-            appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() + gameRateAmount);
+        //if(appGameBetting.getBettingType() == 0){
+        //    appUser.setDiamondCoin(appUser.getDiamondCoin() + gameRateAmount);
+        //    appUser.setDiamondCoinTotal(appUser.getDiamondCoinTotal() + gameRateAmount);
+        //    appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() + gameRateAmount);
         // 更新用户金币
-        }else{
-            appUser.setCoin(appUser.getCoin() + gameRateAmount);
-            appUser.setCoinCash(appUser.getCoinCash() + gameRateAmount);
-        }
-        appUserService.updateAppUser(appUser);
-
+        //}else{
+        //    appUser.setCoin(appUser.getCoin() + gameRateAmount);
+        //    appUser.setCoinCash(appUser.getCoinCash() + gameRateAmount);
+        //}
+        //appUserService.updateAppUser(appUser);
 
-        redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
+        //redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
 
         AppUserGameRecordCount appUserGameRecordCount = new AppUserGameRecordCount();
         appUserGameRecordCount.setGameId(appGameBetting.getGameId());
@@ -294,8 +293,8 @@ public class AppAgentGameBettingTask {
 
         FinTranRecord finTranRecord = new FinTranRecord();
 
-        finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
-        finTranRecord.setAfterCoin(appUser.getCoin());
+        //finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
+        //finTranRecord.setAfterCoin(appUser.getCoin());
 
         if(appGameBetting.getBettingType() == 0){
             finTranRecord.setCurrencyType(4);

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

@@ -355,29 +355,29 @@ public class AppGameBettingTask {
             }
 
             // 更新用户余额
-            if(appGameBetting.getBettingType() == 0){
-                appUser.setDiamondCoin(appUser.getDiamondCoin() + bettingAmount );
-                appUser.setDiamondCoinTotal(appUser.getDiamondCoinCashTotal() + bettingAmount);
-                appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() + bettingAmount);
-                // 更新用户金币
-            }else{
-                appUser.setCoin(appUser.getCoin() + bettingAmount);
-//                    if(appUser.getRole() == 1){
-//                        appUser.setCoinCash(appUser.getCoinCash() + bettingAmount);
-//                    }
-            }
-
-            appUserService.updateAppUser(appUser);
-
-            redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
+            //if(appGameBetting.getBettingType() == 0){
+            //    appUser.setDiamondCoin(appUser.getDiamondCoin() + bettingAmount );
+            //    appUser.setDiamondCoinTotal(appUser.getDiamondCoinCashTotal() + bettingAmount);
+            //    appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() + bettingAmount);
+            // 更新用户金币
+            //}else{
+            //    appUser.setCoin(appUser.getCoin() + bettingAmount);
+            //        if(appUser.getRole() == 1){
+            //            appUser.setCoinCash(appUser.getCoinCash() + bettingAmount);
+            //        }
+            //}
+
+            //appUserService.updateAppUser(appUser);
+
+            //redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
 
             appGameBetting.setIsWinning(1);
             appGameBettingService.updateById(appGameBetting);
 
             FinTranRecord finTranRecord = new FinTranRecord();
 
-            finTranRecord.setAfterCoin(appUser.getCoin());
-            finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
+            //finTranRecord.setAfterCoin(appUser.getCoin());
+            //finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
 
             if(appGameBetting.getBettingType() == 0){
                 finTranRecord.setCurrencyType(4);

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

@@ -120,29 +120,29 @@ public class AppGameLotteryTask {
                 }
 
                 // 更新用户余额
-                if(appGameBetting.getBettingType() == 0){
-                    appUser.setDiamondCoin(appUser.getDiamondCoin() + bettingAmount );
-                    appUser.setDiamondCoinTotal(appUser.getDiamondCoinCashTotal() + bettingAmount);
-                    appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() + bettingAmount);
-                    // 更新用户金币
-                }else{
-                    appUser.setCoin(appUser.getCoin() + bettingAmount);
-//                    if(appUser.getRole() == 1){
-//                        appUser.setCoinCash(appUser.getCoinCash() + bettingAmount);
-//                    }
-                }
-
-                appUserService.updateAppUser(appUser);
-
-                redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
+                //if(appGameBetting.getBettingType() == 0){
+                //    appUser.setDiamondCoin(appUser.getDiamondCoin() + bettingAmount );
+                //    appUser.setDiamondCoinTotal(appUser.getDiamondCoinCashTotal() + bettingAmount);
+                //    appUser.setDiamondCoinCash(appUser.getDiamondCoinCash() + bettingAmount);
+                // 更新用户金币
+                //}else{
+                //    appUser.setCoin(appUser.getCoin() + bettingAmount);
+                //    if(appUser.getRole() == 1){
+                //        appUser.setCoinCash(appUser.getCoinCash() + bettingAmount);
+                //    }
+                //}
+
+                //appUserService.updateAppUser(appUser);
+
+                //redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
 
                 appGameBetting.setIsWinning(1);
                 appGameBettingService.updateById(appGameBetting);
 
                 FinTranRecord finTranRecord = new FinTranRecord();
 
-                finTranRecord.setAfterCoin(appUser.getCoin());
-                finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
+                //finTranRecord.setAfterCoin(appUser.getCoin());
+                //finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
 
                 if(appGameBetting.getBettingType() == 0){
                     finTranRecord.setCurrencyType(4);

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

@@ -122,19 +122,19 @@ public class AppUserLiveDividedTask {
             indexCommission = appUserAgent.getLiveRate();
 
             // 更新用户余额
-            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);
+            //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);
-            }
+            //}else{
+            //    appUser.setCoin(appUser.getCoin() + userCommission.doubleValue());
+            //    appUser.setCoinCash(appUser.getCoinCash() + userCommission.doubleValue());
+            //    appUserService.updateAppUser(appUser);
+            //}
 
-            redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
+            //redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
 
             // 插入分佣记录
             AppUserLiveDividedRecord appUserLiveDividedRecord = new AppUserLiveDividedRecord();
@@ -148,8 +148,8 @@ public class AppUserLiveDividedTask {
 
             FinTranRecord finTranRecord = new FinTranRecord();
 
-            finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
-            finTranRecord.setAfterCoin(appUser.getCoin());
+            //finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
+            //finTranRecord.setAfterCoin(appUser.getCoin());
 
             if(item.getCurrencyType() == 4){
                 finTranRecord.setCurrencyType(4);