dos 1 maand geleden
bovenliggende
commit
2cf53e70d1
19 gewijzigde bestanden met toevoegingen van 202 en 48 verwijderingen
  1. 10 0
      game-business/src/main/java/com/game/business/controller/AppAgentController.java
  2. 5 1
      game-business/src/main/java/com/game/business/controller/AppUserController.java
  3. 5 2
      game-business/src/main/java/com/game/business/controller/AppUsersCashrecordController.java
  4. 4 0
      game-business/src/main/java/com/game/business/domain/AppUsersCashrecord.java
  5. 4 0
      game-business/src/main/java/com/game/business/mapper/AppGameBettingMapper.java
  6. 5 0
      game-business/src/main/java/com/game/business/mapper/AppUsersCashrecordMapper.java
  7. 4 0
      game-business/src/main/java/com/game/business/mapper/AppUsersChargeMapper.java
  8. 2 0
      game-business/src/main/java/com/game/business/service/IAppGameBettingService.java
  9. 2 0
      game-business/src/main/java/com/game/business/service/IAppUsersCashrecordService.java
  10. 2 0
      game-business/src/main/java/com/game/business/service/IAppUsersChargeService.java
  11. 5 0
      game-business/src/main/java/com/game/business/service/impl/AppGameBettingServiceImpl.java
  12. 6 0
      game-business/src/main/java/com/game/business/service/impl/AppUsersCashrecordServiceImpl.java
  13. 6 0
      game-business/src/main/java/com/game/business/service/impl/AppUsersChargeServiceImpl.java
  14. 8 0
      game-business/src/main/java/com/game/business/vo/AppUserDetailVo.java
  15. 1 0
      game-business/src/main/resources/mapper/business/AppUsersCashrecordMapper.xml
  16. 1 1
      game-business/src/main/resources/mapper/business/FinTranRecordMapper.xml
  17. 35 6
      game-ui/src/views/business/cashrecord/index.vue
  18. 68 36
      game-ui/src/views/business/user/index.vue
  19. 29 2
      game-ui/src/views/index.vue

+ 10 - 0
game-business/src/main/java/com/game/business/controller/AppAgentController.java

@@ -386,6 +386,11 @@ public class AppAgentController extends BaseController {
                 DateUtil.format(beginDate,"yyyy-MM-dd").concat(" 00:00:00"),
                 DateUtil.format(endDate,"yyyy-MM-dd").concat(" 23:59:59"),
                 null,null,null,null);
+        //用户总投注流水
+        appUserDetailVo.setTotalBetting(appGameBettingService.sumBettingAmount(userId,0));
+        //用户金币总投注流水
+        appUserDetailVo.setTotalCoinBetting(appGameBettingService.sumBettingAmount(userId,1));
+
         //当日游戏投注
         appUserDetailVo.setTodayBetting(gameBettingList.stream().filter(e->{
            return DateUtil.format(e.getCreateTime(),"yyyy-MM-dd").equals(DateUtil.format(nowDate,"yyyy-MM-dd")) &&
@@ -441,6 +446,8 @@ public class AppAgentController extends BaseController {
         List<AppUsersCharge> appUsersChargeList = appUsersChargeService.getChargeList(userId,
                 DateUtil.format(beginDate,"yyyy-MM-dd").concat(" 00:00:00"),
                 DateUtil.format(endDate,"yyyy-MM-dd").concat(" 23:59:59"));
+        //总充值
+        appUserDetailVo.setTotalCharge(appUsersChargeService.sumCharge(userId));
         //当日充值
         appUserDetailVo.setTodayCharge(appUsersChargeList.stream().filter(e->{
            return DateUtil.format(e.getAddtime(),"yyyy-MM-dd").equals(DateUtil.format(nowDate,"yyyy-MM-dd"));
@@ -449,6 +456,9 @@ public class AppAgentController extends BaseController {
         //本周充值
         appUserDetailVo.setWeekCharge(appUsersChargeList.stream().mapToDouble(e->{return e.getCoin().doubleValue();}).sum());
 
+        //总提现
+        appUserDetailVo.setTotalWithdraw(appUsersCashrecordService.sumWithdraw(userId));
+
         //提现
         List<AppUsersCashrecord> appUsersCashrecords = appUsersCashrecordService.getUserCashList(userId,
                 DateUtil.format(beginDate,"yyyy-MM-dd").concat(" 00:00:00"),

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

@@ -9,6 +9,7 @@ import cn.hutool.core.util.RandomUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.game.business.domain.*;
 import com.game.business.dto.RestPwdDto;
 import com.game.business.dto.UserChargeDto;
@@ -24,6 +25,7 @@ import com.game.common.constant.finance.*;
 import com.game.common.core.domain.HttpRet;
 import com.game.common.core.domain.R;
 import com.game.common.core.redis.RedisCache;
+import com.game.common.exception.ServiceException;
 import com.game.common.utils.SecurityUtils;
 import com.game.system.service.ISysConfigService;
 import lombok.extern.log4j.Log4j2;
@@ -31,6 +33,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -201,6 +204,7 @@ public class AppUserController extends BaseController
     @PostMapping("/charge")
     @ApiOperation(value = "充值", notes = "充值")
     @RepeatSubmit(message = "频繁操作")
+    @DSTransactional
     public R<String> charge(HttpServletResponse response,@RequestBody @Validated UserChargeDto userChargeDto)
     {
         AppUser appUser = appUserService.selectAppUserByUserid(userChargeDto.getUserId());
@@ -334,7 +338,7 @@ public class AppUserController extends BaseController
 
         } catch (Exception e) {
             log.info("{}充值失败:{}",userChargeDto.getUserId(),e);
-            return  R.fail("充值失败");
+            throw new ServiceException("充值失败");
         }
         return R.ok("充值成功");
     }

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

@@ -151,7 +151,8 @@ public class AppUsersCashrecordController extends BaseController
         update.setId(cashrecord.getId());
         update.setStatus(appUsersCashrecord.getStatus());
         update.setReason(appUsersCashrecord.getReason());
-        if(1 == appUsersCashrecord.getStatus().intValue() && null != appUsersCashrecord.getCashChannelId() && appUsersCashrecord.getCashChannelId() > 0){
+        if(1 == appUsersCashrecord.getStatus().intValue() && null != appUsersCashrecord.getCashChannelId() && appUsersCashrecord.getCashChannelId() > 0
+         && appUsersCashrecord.getCallOther() == 0){
             //审核通过
             AppChargeChannel appChargeChannel = appChargeChannelService.selectAppChargeChannelById(appUsersCashrecord.getCashChannelId());
             if(null != appChargeChannel && StringUtils.isNotBlank(appChargeChannel.getChannelKey())){
@@ -200,12 +201,14 @@ public class AppUsersCashrecordController extends BaseController
             tran.setTranGroupId(IdUtil.getSnowflakeNextId());
             tran.setRemarks("提现审核失败:回退金额");
             appUserService.updateUserAmount(tran);
-            appUserCountTask.updateWithdrawAble(appUser.getUserid());
         }
         int rest = appUsersCashrecordService.updateAppUsersCashrecord(update);
+        //更新用户可提现余额
+        appUserCountTask.updateWithdrawAble(appUser.getUserid());
         if(rest < 1){
             return R.fail("审核失败");
         }
+
         return R.ok("审核成功");
     }
 

+ 4 - 0
game-business/src/main/java/com/game/business/domain/AppUsersCashrecord.java

@@ -228,4 +228,8 @@ private static final long serialVersionUID=1L;
     @TableField(exist = false)
     private String endTime;
 
+    //是否调用第三方 0:调用  1:不调用
+    @TableField(exist = false)
+    private int callOther = 0;
+
 }

+ 4 - 0
game-business/src/main/java/com/game/business/mapper/AppGameBettingMapper.java

@@ -8,6 +8,7 @@ import com.game.business.vo.AppGameBettingDetailsCountVO;
 import com.game.business.vo.AppUserGameBettingCountVO;
 import com.game.business.vo.AppUserGameBettingDetailsCountVO;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -73,4 +74,7 @@ public interface AppGameBettingMapper extends BaseMapper<AppGameBetting> {
      */
     public int deleteAppGameBettingByIds(Long[] ids);
 
+    @Select("select ifNull(sum(betting_amount),0) from app_game_betting where user_id = #{userId} and betting_type = #{bettingType}")
+    public Double sumBettingAmount(@Param("userId") Long userId, @Param("bettingType") Integer bettingType);
+
 }

+ 5 - 0
game-business/src/main/java/com/game/business/mapper/AppUsersCashrecordMapper.java

@@ -3,6 +3,8 @@ package com.game.business.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.game.business.domain.AppUsersCashrecord;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * 提现记录Mapper接口
@@ -58,4 +60,7 @@ public interface AppUsersCashrecordMapper extends BaseMapper<AppUsersCashrecord>
      * @return 结果
      */
     public int deleteAppUsersCashrecordByIds(Long[] ids);
+
+    @Select("select IFNULL(sum(money),0) from app_users_cashrecord where status = 1 and uid = #{userId}")
+    public Double sumWithdraw(@Param("userId") Long userId);
 }

+ 4 - 0
game-business/src/main/java/com/game/business/mapper/AppUsersChargeMapper.java

@@ -3,6 +3,7 @@ package com.game.business.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.game.business.domain.AppUsersCharge;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Service;
 
@@ -65,4 +66,7 @@ public interface AppUsersChargeMapper extends BaseMapper<AppUsersCharge> {
 
     @Select("select next_val from sys_sequence where sequence_name = 'app_users_charge'")
     public Long getMaxId();
+
+    @Select("select IFNULL(sum(coin),0) from app_users_charge where uid = #{userId} and status = 1")
+    public Double sumCharge(@Param("userId") Long userId);
 }

+ 2 - 0
game-business/src/main/java/com/game/business/service/IAppGameBettingService.java

@@ -100,4 +100,6 @@ public interface IAppGameBettingService extends IService<AppGameBetting> {
      * @return 结果
      */
     public int deleteAppGameBettingById(Long id);
+
+    public Double sumBettingAmount(Long userId,Integer bettingType);
 }

+ 2 - 0
game-business/src/main/java/com/game/business/service/IAppUsersCashrecordService.java

@@ -64,4 +64,6 @@ public interface IAppUsersCashrecordService extends IService<AppUsersCashrecord>
      *
      * */
     public List<AppUsersCashrecord> getUserCashList(Long userId,String beginTime,String endTime);
+
+    public Double sumWithdraw(Long userId);
 }

+ 2 - 0
game-business/src/main/java/com/game/business/service/IAppUsersChargeService.java

@@ -72,4 +72,6 @@ public interface IAppUsersChargeService extends IService<AppUsersCharge> {
     public double isChargeToday(Long userId,int coinType);
 
     AppUsersCharge selectByOrderNo(String orderNo);
+
+    Double sumCharge(Long userId);
 }

+ 5 - 0
game-business/src/main/java/com/game/business/service/impl/AppGameBettingServiceImpl.java

@@ -248,5 +248,10 @@ public class AppGameBettingServiceImpl extends ServiceImpl<AppGameBettingMapper,
         return appGameBettingMapper.deleteAppGameBettingById(id);
     }
 
+    @Override
+    public Double sumBettingAmount(Long userId,Integer bettingType) {
+        return appGameBettingMapper.sumBettingAmount(userId,bettingType);
+    }
+
 
 }

+ 6 - 0
game-business/src/main/java/com/game/business/service/impl/AppUsersCashrecordServiceImpl.java

@@ -106,4 +106,10 @@ public class AppUsersCashrecordServiceImpl extends ServiceImpl<AppUsersCashrecor
         queryWrapper.between(AppUsersCashrecord::getAddtime,beginTime,endTime);
         return appUsersCashrecordMapper.selectList(queryWrapper);
     }
+
+    @Override
+    @DataSource(DataSourceType.SLAVE)
+    public Double sumWithdraw(Long userId) {
+        return appUsersCashrecordMapper.sumWithdraw(userId);
+    }
 }

+ 6 - 0
game-business/src/main/java/com/game/business/service/impl/AppUsersChargeServiceImpl.java

@@ -146,4 +146,10 @@ public class AppUsersChargeServiceImpl extends ServiceImpl<AppUsersChargeMapper,
         queryWrapper.eq(AppUsersCharge::getOrderno,orderNo);
         return appUsersChargeMapper.selectOne(queryWrapper);
     }
+
+    @Override
+    @DataSource(DataSourceType.SLAVE)
+    public Double sumCharge(Long userId) {
+        return appUsersChargeMapper.sumCharge(userId);
+    }
 }

+ 8 - 0
game-business/src/main/java/com/game/business/vo/AppUserDetailVo.java

@@ -29,6 +29,12 @@ public class AppUserDetailVo implements Serializable {
     private Double todayCoinWin;
     private Double todayCoinLose;
 
+    //游戏总投注
+    private Double totalBetting;
+
+    //游戏金币总投注
+    private Double totalCoinBetting;
+
     //游戏余额当日
     private Double todayBetting;
     private Double todayWin;
@@ -51,9 +57,11 @@ public class AppUserDetailVo implements Serializable {
     //充值
     private Double todayCharge;
     private Double weekCharge;
+    private Double totalCharge;
 
     //提现
     private Double todayWithdraw;
     private Double weekWithdraw;
+    private Double totalWithdraw;
 
 }

+ 1 - 0
game-business/src/main/resources/mapper/business/AppUsersCashrecordMapper.xml

@@ -80,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="beginTime != null  and beginTime != ''"> and addtime &gt; CONCAT(#{beginTime},' 00:00:00')</if>
             <if test="endTime != null  and endTime != ''"> and addtime &lt; CONCAT(#{endTime},' 23:59:59')</if>
         </where>
+        order by addtime desc
     </select>
     
     <select id="selectAppUsersCashrecordById" parameterType="Long" resultMap="AppUsersCashrecordResult">

+ 1 - 1
game-business/src/main/resources/mapper/business/FinTranRecordMapper.xml

@@ -277,7 +277,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and uid = #{userId}
         </if>
         <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
-            and (date_format(uptime, '%Y-%m-%d') &gt;= #{beginTime} and date_format(uptime, '%Y-%m-%d') &lt;= #{endTime})
+            and (date_format(addtime, '%Y-%m-%d') &gt;= #{beginTime} and date_format(addtime, '%Y-%m-%d') &lt;= #{endTime})
         </if>
         group by type
     </select>

+ 35 - 6
game-ui/src/views/business/cashrecord/index.vue

@@ -42,6 +42,7 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" size="mini" @click="reshData">{{reshBtn}}</el-button> <span style="font-size: 12px;color: red;">开启后10秒刷新一次</span>
       </el-form-item>
     </el-form>
 
@@ -129,10 +130,18 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            @click="handleUpdate(scope.row,0)"
             v-hasPermi="['business:cashrecord:edit']"
             v-if="scope.row.status == 0"
           >审核</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row,1)"
+            v-hasPermi="['business:cashrecord:edit']"
+            v-if="scope.row.status == 0"
+          >人工审核</el-button>
           <el-button
             size="mini"
             type="text"
@@ -174,7 +183,7 @@
           <el-input disabled v-model="form.service" placeholder="请输入服务费" />
         </el-form-item>
         <el-form-item label="转出备注" prop="cashOutRemark">
-          <el-input disabled v-model="form.cashOutRemark" type="textarea" placeholder="请输入内容" />
+          <el-input disabled v-model="form.cashOutRemark" type="textarea" placeholder="" />
         </el-form-item>
         <el-form-item label="账号类型" prop="type">
           <el-select disabled v-model="form.type" placeholder="请选择账号类型">
@@ -182,7 +191,7 @@
               v-for="dict in dict.type.app_user_cash_account"
               :key="dict.value"
               :label="dict.label"
-              :value="parseInt(dict.value)"
+              :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -238,6 +247,8 @@ export default {
       // 是否显示弹出层
       open: false,
       daterange:[],
+      reshBtn:"开启自动刷新",
+      reshTimer:null,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -260,6 +271,19 @@ export default {
     this.getList();
   },
   methods: {
+    reshData(){
+      let that = this;
+      if(!that.reshTimer){
+        that.reshTimer = setInterval(function (){
+          that.getList();
+        },10000)
+        that.reshBtn = "关闭自动刷新";
+      }else{
+        clearInterval(that.reshTimer);
+        that.reshTimer = null;
+        that.reshBtn = "开启自动刷新";
+      }
+    },
     dateChage(val){
       if(undefined != val && null != val && val.length > 1){
         this.queryParams.beginTime = val[0];
@@ -315,7 +339,8 @@ export default {
         uid: null,
         unitType: null,
         uptime: null,
-        votes: null
+        votes: null,
+        callOther:0
       };
       this.resetForm("form");
     },
@@ -345,13 +370,17 @@ export default {
       this.title = "添加提现记录";
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleUpdate(row,calOther) {
+      if(!calOther){
+        calOther = 0;
+      }
       this.reset();
       const id = row.id || this.ids
       getCashrecord(id).then(response => {
         this.form = response.data;
+        this.form["callOther"] = calOther;
         this.open = true;
-        this.title = "审核";
+        this.title = calOther==0?"审核":"人工审核";
       });
     },
     /** 提交按钮 */

+ 68 - 36
game-ui/src/views/business/user/index.vue

@@ -541,60 +541,91 @@
           <span style="margin-left: 1rem;">
             余额:{{userInfo.diamondCoin}}
           </span>
-        </el-form-item>
-        <el-form-item label="今日">
-          <span>
-            充值余额:{{userInfo.infoDetail.todayCharge}}
-          </span>
-          <span style="margin-left: 1rem;">
-            提现余额:{{userInfo.infoDetail.todayWithdraw}}
-          </span>
-          <span style="margin-left: 1rem;">
-            下注余额:{{userInfo.infoDetail.todayBetting}}
-          </span>
-          <span style="margin-left: 1rem;">
-            余额赢:{{userInfo.infoDetail.todayWin}}
-          </span>
           <span style="margin-left: 1rem;">
-            余额输:{{userInfo.infoDetail.todayLose}}
+            总充值:{{userInfo.infoDetail.totalCharge}}
           </span>
           <span style="margin-left: 1rem;">
-            下注金币:{{userInfo.infoDetail.todayCoinBetting}}
+            总提现:{{userInfo.infoDetail.totalWithdraw}}
           </span>
           <span style="margin-left: 1rem;">
-            金币赢:{{userInfo.infoDetail.todayCoinWin}}
+            总投注(余额):{{userInfo.infoDetail.totalBetting}}
           </span>
           <span style="margin-left: 1rem;">
-            金币输:{{userInfo.infoDetail.todayCoinLose}}
+            总投注(金币):{{userInfo.infoDetail.totalCoinBetting}}
           </span>
         </el-form-item>
-        <el-form-item label="本周期">
+        <el-tabs v-model="activeName2" @tab-click="handleClick" style="width: 100%">
+          <el-tab-pane label="今日" name="first">
+            <el-form-item >
+            <span>
+              充值:{{userInfo.infoDetail.todayCharge}}
+            </span>
+                <span style="margin-left: 1rem;">
+              提现:{{userInfo.infoDetail.todayWithdraw}}
+            </span>
+              </el-form-item>
+              <el-form-item >
+            <span>
+              游戏下注(余额):{{userInfo.infoDetail.todayBetting}}
+            </span>
+                <span style="margin-left: 1rem;">
+              下注赢(余额):{{userInfo.infoDetail.todayWin}}
+            </span>
+                <span style="margin-left: 1rem;">
+              下注输 (余额):{{userInfo.infoDetail.todayLose}}
+            </span>
+              </el-form-item>
+              <el-form-item>
+            <span>
+              游戏下注(金币):{{userInfo.infoDetail.todayCoinBetting}}
+            </span>
+                <span style="margin-left: 1rem;">
+              下注赢(金币):{{userInfo.infoDetail.todayCoinWin}}
+            </span>
+                <span style="margin-left: 1rem;">
+              下注输(金币):{{userInfo.infoDetail.todayCoinLose}}
+            </span>
+            </el-form-item>
+          </el-tab-pane>
+          <el-tab-pane label="本周期" name="second">
+            <el-form-item>
           <span>
-            充值余额:{{userInfo.infoDetail.weekCharge}}
+            充值:{{userInfo.infoDetail.weekCharge}}
           </span>
-          <span style="margin-left: 1rem;">
-            提现余额:{{userInfo.infoDetail.weekWithdraw}}
+              <span style="margin-left: 1rem;">
+            提现:{{userInfo.infoDetail.weekWithdraw}}
           </span>
-          <span style="margin-left: 1rem;">
-            下注余额:{{userInfo.infoDetail.weekBetting}}
+            </el-form-item>
+            <el-form-item>
+          <span>
+            游戏下注(余额):{{userInfo.infoDetail.weekBetting}}
           </span>
-          <span style="margin-left: 1rem;">
-            余额赢:{{userInfo.infoDetail.weekWin}}
+              <span style="margin-left: 1rem;">
+            下注赢(余额):{{userInfo.infoDetail.weekWin}}
           </span>
-          <span style="margin-left: 1rem;">
-            余额输:{{userInfo.infoDetail.weekLose}}
+              <span style="margin-left: 1rem;">
+            下注输(余额):{{userInfo.infoDetail.weekLose}}
           </span>
-          <span style="margin-left: 1rem;">
-            下注金币:{{userInfo.infoDetail.weekCoinBetting}}
+            </el-form-item>
+            <el-form-item>
+          <span>
+            游戏下注(金币):{{userInfo.infoDetail.weekCoinBetting}}
           </span>
-          <span style="margin-left: 1rem;">
-            金币赢:{{userInfo.infoDetail.weekCoinWin}}
+              <span style="margin-left: 1rem;">
+            下注赢(金币):{{userInfo.infoDetail.weekCoinWin}}
           </span>
-          <span style="margin-left: 1rem;">
-            金币输:{{userInfo.infoDetail.weekCoinLose}}
+              <span style="margin-left: 1rem;">
+            下注输(金币):{{userInfo.infoDetail.weekCoinLose}}
           </span>
+            </el-form-item>
+          </el-tab-pane>
+        </el-tabs>
+<!--        <el-form-item label="今日">
         </el-form-item>
 
+        <el-form-item label="本周期">
+        </el-form-item>-->
+
         <el-form-item label="">
           <el-tabs v-model="activeName" @tab-click="handleClick" style="width: 100%">
             <el-tab-pane label="上级推荐人列表" name="first">
@@ -895,6 +926,7 @@ export default {
   data() {
     return {
       activeName:"first",
+      activeName2:"first",
       // 遮罩层
       loading: true,
       ipLoading: true,
@@ -1638,7 +1670,7 @@ export default {
             spinner: 'el-icon-loading',
             background: 'rgba(0, 0, 0, 0.7)'
           });
-          setTimeout(function (){loading.close();},1000);
+          // setTimeout(function (){loading.close();},1000);
           userCharge(this.chargeForm).then(response => {
             this.$modal.msgSuccess("修改成功");
             this.chargeopen = false;
@@ -1658,7 +1690,7 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       });
-      setTimeout(function (){loading.close();},1000);
+      // setTimeout(function (){loading.close();},1000);
       openLive(this.liveLive).then(response => {
         that.liveOpen = false;
         setTimeout(function (){

+ 29 - 2
game-ui/src/views/index.vue

@@ -309,9 +309,15 @@ export default {
     },
     getTotal(){
       //支付宝
-      let ali = this.getCharge("1");
+      let ali = this.getCharge("8085");
       //微信
-      let wexin = this.getCharge("2");
+      let wexin = this.getCharge("8086");
+      //OKPAY
+      let okpay = this.getCharge("8084");
+      //cbpay
+      let cbpay = this.getCharge("8088");
+      //bank
+      let bank = this.getCharge("8087");
       //线下
       let down = this.getCharge("4");
       let total = 0;
@@ -337,6 +343,27 @@ export default {
         totalService += wexin["platformServiceDiamondCoinUpSum"];
       }
 
+      if (okpay["diamondCoinUpSum"] != undefined) {
+        total += okpay["diamondCoinUpSum"];
+      }
+      if(okpay["platformServiceDiamondCoinUpSum"] != undefined){
+        totalService += okpay["platformServiceDiamondCoinUpSum"];
+      }
+
+      if (cbpay["diamondCoinUpSum"] != undefined) {
+        total += cbpay["diamondCoinUpSum"];
+      }
+      if(cbpay["platformServiceDiamondCoinUpSum"] != undefined){
+        totalService += cbpay["platformServiceDiamondCoinUpSum"];
+      }
+
+      if (bank["diamondCoinUpSum"] != undefined) {
+        total += bank["diamondCoinUpSum"];
+      }
+      if(bank["platformServiceDiamondCoinUpSum"] != undefined){
+        totalService += bank["platformServiceDiamondCoinUpSum"];
+      }
+
       return total + " (包含手续费:"+totalService+")"
 
     },