Merge remote-tracking branch 'origin/master'

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

@@ -18,6 +18,7 @@ import com.game.business.task.AppUserCountTask;
 import com.game.business.util.Md5Utils;
 import com.game.business.util.im.HttpClientUtils;
 import com.game.business.util.im.TencentCloudImUtil;
+import com.game.common.annotation.RepeatSubmit;
 import com.game.common.constant.AppSceneType;
 import com.game.common.constant.finance.*;
 import com.game.common.core.domain.HttpRet;
@@ -172,6 +173,7 @@ public class AppUserController extends BaseController
     @Log(title = "app用户", businessType = BusinessType.UPDATE)
     @PostMapping("/charge")
     @ApiOperation(value = "充值", notes = "充值")
+    @RepeatSubmit(message = "频繁操作")
     public R<String> charge(HttpServletResponse response,@RequestBody @Validated UserChargeDto userChargeDto)
     {
         AppUser appUser = appUserService.selectAppUserByUserid(userChargeDto.getUserId());
@@ -317,6 +319,7 @@ public class AppUserController extends BaseController
     @Log(title = "app用户", businessType = BusinessType.UPDATE)
     @PostMapping("/withdraw")
     @ApiOperation(value = "补足提现流水", notes = "补足提现流水")
+    @RepeatSubmit(message = "频繁操作")
     public R<String> withdraw(HttpServletResponse response,@RequestBody @Validated UserWithdrawDto withdrawDto)
     {
         AppUser appUser = appUserService.selectAppUserByUserid(withdrawDto.getUserId());

game-business/src/main/java/com/game/business/util/Common.java

@@ -51,8 +51,8 @@ public class Common {
     public static final String WS_GAME_FIVE_URL = "ws://175.178.245.120:8000/ws";
     public static final String WS_GAME_FIVE_REMARK_URL = "ws://119.29.4.157:8000/ws";
 
-    public static final String WS_GAME_SIX_URL = "ws://120.79.41.13:8000/ws";
-    public static final String WS_GAME_SIX_REMARK_URL = "ws://120.79.41.13:8000/ws";
+    public static final String WS_GAME_SIX_URL = "ws://111.230.69.178:8000/ws";
+    public static final String WS_GAME_SIX_REMARK_URL = "ws://111.230.115.182:8000/ws";
 
     public static final String WS_GAME_SEVEN_URL = "ws://120.79.41.13:8000/ws";
     public static final String WS_GAME_SEVEN_REMARK_URL = "ws://120.79.41.13:8000/ws";

game-ui/src/views/business/user/index.vue

@@ -421,7 +421,7 @@
         <el-form-item label="货币类型" prop="type">
           <el-select v-model="chargeForm.type" placeholder="请选择" clearable>
             <el-option
-              v-for="dict in dict.type.app_user_coin_type"
+              v-for="dict in dict.type.app_user_recharge_coin_type"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
@@ -866,7 +866,9 @@ import {allList} from "@/api/business/lottery";
 
 export default {
   name: "User",
-  dicts: ['is_anchor_auth', 'app_user_role', 'app_user_status', 'app_user_online_status','app_user_coin_type','app_charge_rate','app_goods_order_status','app_betting_is_live','app_game_betting_type','app_game_betting_winning','app_user_cash_account'],
+  dicts: ['is_anchor_auth', 'app_user_role', 'app_user_status',
+    'app_user_online_status','app_user_coin_type','app_charge_rate','app_goods_order_status','app_betting_is_live',
+    'app_game_betting_type','app_game_betting_winning','app_user_cash_account','app_user_recharge_coin_type'],
   data() {
     return {
       activeName:"first",

game-ui/src/views/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container home" style="align-content: center">
-    <el-row :gutter="20">
+  <div class="app-container home" style="align-content: center;">
+    <el-row :gutter="20" style="margin-left: 0.5rem">
       <el-col :span="3">
         <div class="grid-content bg-purple">
           <div class="k-title">用户剩余金币</div>
@@ -54,7 +54,7 @@
         </div>
       </el-col>
     </el-row>
-    <div style="    font-size: 14px;color: #606266">
+    <div style="    font-size: 14px;color: #606266;margin-left: 1rem">
       <el-radio v-model="dateRadio" label="1">昨日</el-radio>
       <el-radio v-model="dateRadio" label="2">今日</el-radio>
       <el-radio v-model="dateRadio" label="3">本周</el-radio>
@@ -94,19 +94,27 @@
                 </thead>
                 <tbody>
                 <tr>
-                  <td class="el-table__cell is-leaf" rowspan="2"><div class="cell">充值总额</div></td>
+                  <td class="el-table__cell is-leaf" rowspan="4"><div class="cell">充值总额</div></td>
                   <td class="el-table__cell is-leaf"><div class="cell">支付宝：{{getVal(getCharge('8085'),0)}}</div></td>
-                  <td class="el-table__cell is-leaf" rowspan="2"><div class="cell">充值：{{getVal(getCharge('4'),1)}}</div></td>
-                  <td class="el-table__cell is-leaf" rowspan="2"><div class="cell">总额：{{getTotal()}}</div></td>
+                  <td class="el-table__cell is-leaf" rowspan="4"><div class="cell">充值：{{getVal(getCharge('4'),1)}}</div></td>
+                  <td class="el-table__cell is-leaf" rowspan="4"><div class="cell">总额：{{getTotal()}}</div></td>
                 </tr>
                 <tr>
                   <td class="el-table__cell is-leaf"><div class="cell" >微信：{{getVal(getCharge('8086'),0)}}</div></td>
 <!--                  <td class="el-table__cell is-leaf"><div class="cell" >微信</div></td>-->
                 </tr>
                 <tr>
-                  <td class="el-table__cell is-leaf" rowspan="3"><div class="cell">提现总额</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" >OKPAY：{{getVal(getCharge('8084'),0)}}</div></td>
+<!--                  <td class="el-table__cell is-leaf"><div class="cell" >微信</div></td>-->
+                </tr>
+                <tr>
+                  <td class="el-table__cell is-leaf"><div class="cell" >cbpay：{{getVal(getCharge('8088'),0)}}</div></td>
+<!--                  <td class="el-table__cell is-leaf"><div class="cell" >微信</div></td>-->
+                </tr>
+                <tr>
+                  <td class="el-table__cell is-leaf" rowspan="5"><div class="cell">提现总额</div></td>
                   <td class="el-table__cell is-leaf" colspan="2"><div class="cell">支付宝：{{getCash("8085")}}</div></td>
-                  <td class="el-table__cell is-leaf" rowspan="3"><div class="cell">总额：{{getCash(null)}}</div></td>
+                  <td class="el-table__cell is-leaf" rowspan="5"><div class="cell">总额：{{getCash(null)}}</div></td>
                 </tr>
                 <tr>
                   <td class="el-table__cell is-leaf" colspan="2"><div class="cell" >微信：{{getCash("8086")}}</div></td>
@@ -114,6 +122,14 @@
                 </tr>
                 <tr>
                   <td class="el-table__cell is-leaf" colspan="2"><div class="cell" >银行卡：{{getCash("8087")}}</div></td>
+<!--                  <td class="el-table__cell is-leaf"><div class="cell" >银行卡</div></td>-->
+                </tr>
+                <tr>
+                  <td class="el-table__cell is-leaf" colspan="2"><div class="cell" >OKPAY：{{getCash("8084")}}</div></td>
+<!--                  <td class="el-table__cell is-leaf"><div class="cell" >银行卡</div></td>-->
+                </tr>
+                <tr>
+                  <td class="el-table__cell is-leaf" colspan="2"><div class="cell" >cbpay：{{getCash("8088")}}</div></td>
 <!--                  <td class="el-table__cell is-leaf"><div class="cell" >银行卡</div></td>-->
                 </tr>
                 </tbody>