Merge remote-tracking branch 'origin/master'

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

@@ -160,7 +160,9 @@ public class AppGameBettingController extends BaseController{
             appGameBettingService.save(gameBetting);
 
             // 分佣
-            appAgentGameBettingTask.agentGameBettingTask(gameBetting);
+            if(gameBetting.getBettingType() == 0){
+                appAgentGameBettingTask.agentGameBettingTask(gameBetting);
+            }
 
             FinTranRecord finTranRecord = new FinTranRecord();
 

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

@@ -5,6 +5,10 @@ import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.game.business.domain.*;
 import com.game.business.service.*;
+import com.game.common.constant.finance.FinTranType1;
+import com.game.common.constant.finance.FinTranType2;
+import com.game.common.constant.finance.FinTranType3;
+import com.game.common.core.domain.HttpRet;
 import com.game.common.core.redis.RedisCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
@@ -248,8 +252,14 @@ public class AppGameBettingTask {
                 }
 
                 // 更新用户余额
-                appUser.setDiamondCoin(appUser.getDiamondCoin() + (appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple()) );
-                appUser.setDiamondCoinTotal(appUser.getDiamondCoinCashTotal() + (appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple()));
+                if(appGameBetting.getBettingType() == 0){
+                    appUser.setDiamondCoin(appUser.getDiamondCoin() + (appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple()) );
+                    appUser.setDiamondCoinTotal(appUser.getDiamondCoinCashTotal() + (appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple()));
+                // 更新用户金币
+                }else{
+                    appUser.setCoin(appUser.getCoin() + (appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple()));
+                }
+
                 appUserService.updateAppUser(appUser);
 
                 redisCache.deleteObject("U:UserInfo:" + appUser.getUserid());
@@ -260,14 +270,21 @@ public class AppGameBettingTask {
                 FinTranRecord finTranRecord = new FinTranRecord();
 
                 finTranRecord.setAfterCoin(appUser.getCoin());
-                finTranRecord.setCoinChange(0.00);
+                finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
+
+                if(appGameBetting.getBettingType() == 0){
+                    finTranRecord.setCurrencyType(4L);
+                    finTranRecord.setDiamondCoinChange(appGameBetting.getBettingAmount());
+                    finTranRecord.setCoinChange(0.00);
+                }else{
+                    finTranRecord.setCurrencyType(2L);
+                    finTranRecord.setCoinChange(appGameBetting.getBettingAmount());
+                    finTranRecord.setDiamondCoinChange(0.00);
+                }
 
                 finTranRecord.setAfterMoney(0.00);
                 finTranRecord.setMoneyChange(0.00);
 
-                finTranRecord.setAfterDiamondCoin(appUser.getDiamondCoin());
-                finTranRecord.setDiamondCoinChange(appGameBetting.getBettingAmount());
-
                 finTranRecord.setAfterTicket(0.00);
                 finTranRecord.setTicketChange(0.00);
 
@@ -279,9 +296,10 @@ public class AppGameBettingTask {
                 finTranRecord.setSceneType(0L);
 
                 finTranRecord.setTranGroupId(appGameBetting.getId());
-                finTranRecord.setTranType1(17L);
-                finTranRecord.setTranType2(200L);
-                finTranRecord.setTranType3(20001L);
+
+                finTranRecord.setTranType1(FinTranType1.U_Income_Coin_Balance.getType());
+                finTranRecord.setTranType2(FinTranType2.GAME_REWARD.getType());
+                finTranRecord.setTranType3(FinTranType3.CHARGE_WIN_GAME.getType());
 
                 finTranRecord.setRemarks("游戏中奖");
 
@@ -292,8 +310,6 @@ public class AppGameBettingTask {
 
                 finTranRecord.setCreateTime(new Date());
 
-                finTranRecord.setCurrencyType(4L);
-
                 finTranRecord.setFromUid(0L);
                 finTranRecord.setGoodsId(0L);
                 finTranRecord.setGuildId(0L);