Browse Source

修复提现流水

dos 3 weeks ago
parent
commit
376da5327b

+ 2 - 2
game-business/src/main/java/com/game/business/controller/AppUserController.java

@@ -272,8 +272,8 @@ public class AppUserController extends BaseController
             //流水 余额
             //流水 余额
             FinTranAddedInfo addedInfo = FinTranAddedInfo.createTranInfo(appUser.getUserid(), 0, 0, AppSceneType.Scene_None, "");
             FinTranAddedInfo addedInfo = FinTranAddedInfo.createTranInfo(appUser.getUserid(), 0, 0, AppSceneType.Scene_None, "");
             FinTranRecord tran = null;
             FinTranRecord tran = null;
-            tran = FinTranRecord.initFinTranRecordSomeParams(addedInfo, FinTranType3.CHARGE_IN_Back, FinTranType1.U_Income_Coin_Balance, appUser);
-            tran.setDiamondCoinChange(withdrawDto.getAmount());
+            tran = FinTranRecord.initFinTranRecordSomeParams(addedInfo, FinTranType3.CONSUM_GAME_ANCHOR_WITHDRAW, withdrawDto.getAmount()<0?FinTranType1.U_Income_Coin_Balance:FinTranType1.U_Outcome_Balance, appUser);
+            tran.setDiamondCoinChange(withdrawDto.getAmount()*-1);
             tran.setAfterDiamondCoin(appUser.getDiamondCoin());
             tran.setAfterDiamondCoin(appUser.getDiamondCoin());
             tran.setCurrencyType(TranCurrencyType.Balance.getType());
             tran.setCurrencyType(TranCurrencyType.Balance.getType());
             tran.setTranGroupId(IdUtil.getSnowflakeNextId());
             tran.setTranGroupId(IdUtil.getSnowflakeNextId());

+ 0 - 2
game-business/src/main/java/com/game/business/task/AppUserCountTask.java

@@ -616,8 +616,6 @@ public class AppUserCountTask {
         if(null != curTranList && curTranList.size() > 0){
         if(null != curTranList && curTranList.size() > 0){
             //筛选投注流水
             //筛选投注流水
             double bettingAmount = curTranList.stream().filter(e->
             double bettingAmount = curTranList.stream().filter(e->
-                    e.getTranType3().equals(FinTranType3.CONSUM_GAME_ANCHOR_ZHUANPAN.getType())
-                            &&
                             e.getCurrencyType().intValue() == 4
                             e.getCurrencyType().intValue() == 4
             ).mapToDouble(FinTranRecord::getDiamondCoinChange).sum() * -1;
             ).mapToDouble(FinTranRecord::getDiamondCoinChange).sum() * -1;
             if(bettingAmount >= money * 2){
             if(bettingAmount >= money * 2){