dos 2 months ago
parent
commit
e3bcc8cc16

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

@@ -330,8 +330,11 @@ public class AppAgentController extends BaseController {
         }
         }
         List<AppUserAgent> list = appUserAgentService.selectSuperList(userId);
         List<AppUserAgent> list = appUserAgentService.selectSuperList(userId);
         appUserDetailVo.setSuperUserList(list);
         appUserDetailVo.setSuperUserList(list);
-        AppUserAgent appUserAgent = null!=list.stream().filter(e->e.getUserId().equals(userId)).collect(Collectors.toList())?
-                list.stream().filter(e->e.getUserId().equals(userId)).collect(Collectors.toList()).get(0):null;
+        AppUserAgent appUserAgent = null;
+        if(null != list && list.size() > 0){
+            List<AppUserAgent> curList = list.stream().filter(e->e.getUserId().equals(userId)).collect(Collectors.toList());
+            appUserAgent = null!=curList?curList.get(0):null;
+        }
         if(null != appUserAgent) {
         if(null != appUserAgent) {
             appUserDetailVo.setLiveRate(appUserAgent.getLiveRate());
             appUserDetailVo.setLiveRate(appUserAgent.getLiveRate());
             appUserDetailVo.setDividendGuaranteeRate(appUserAgent.getDividendGuaranteeRate());
             appUserDetailVo.setDividendGuaranteeRate(appUserAgent.getDividendGuaranteeRate());

+ 6 - 6
game-ui/src/views/index.vue

@@ -88,32 +88,32 @@
                 <tr>
                 <tr>
                   <th class="el-table__cell is-leaf"><div class="cell"></div></th>
                   <th class="el-table__cell is-leaf"><div class="cell"></div></th>
                   <th class="el-table__cell is-leaf"><div class="cell">线上充值总额</div></th>
                   <th class="el-table__cell is-leaf"><div class="cell">线上充值总额</div></th>
-                  <th class="el-table__cell is-leaf"><div class="cell">vip充值总额</div></th>
+                  <th class="el-table__cell is-leaf"><div class="cell">人工充值</div></th>
                   <th class="el-table__cell is-leaf"><div class="cell">充值总额</div></th>
                   <th class="el-table__cell is-leaf"><div class="cell">充值总额</div></th>
                 </tr>
                 </tr>
                 </thead>
                 </thead>
                 <tbody>
                 <tbody>
                 <tr>
                 <tr>
                   <td class="el-table__cell is-leaf" rowspan="2"><div class="cell">充值总额</div></td>
                   <td class="el-table__cell is-leaf" rowspan="2"><div class="cell">充值总额</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell">支付宝:{{getVal(getCharge('1'),0)}}</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">充值:{{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="2"><div class="cell">总额:{{getTotal()}}</div></td>
                 </tr>
                 </tr>
                 <tr>
                 <tr>
-                  <td class="el-table__cell is-leaf"><div class="cell" >微信:{{getVal(getCharge('1'),0)}}</div></td>
+                  <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>-->
 <!--                  <td class="el-table__cell is-leaf"><div class="cell" >微信</div></td>-->
                 </tr>
                 </tr>
                 <tr>
                 <tr>
                   <td class="el-table__cell is-leaf" rowspan="3"><div class="cell">提现总额</div></td>
                   <td class="el-table__cell is-leaf" rowspan="3"><div class="cell">提现总额</div></td>
-                  <td class="el-table__cell is-leaf" colspan="2"><div class="cell">支付宝:{{getCash("1")}}</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="3"><div class="cell">总额:{{getCash(null)}}</div></td>
                 </tr>
                 </tr>
                 <tr>
                 <tr>
-                  <td class="el-table__cell is-leaf" colspan="2"><div class="cell" >微信:{{getCash("2")}}</div></td>
+                  <td class="el-table__cell is-leaf" colspan="2"><div class="cell" >微信:{{getCash("8086")}}</div></td>
 <!--                  <td class="el-table__cell is-leaf"><div class="cell" >微信</div></td>-->
 <!--                  <td class="el-table__cell is-leaf"><div class="cell" >微信</div></td>-->
                 </tr>
                 </tr>
                 <tr>
                 <tr>
-                  <td class="el-table__cell is-leaf" colspan="2"><div class="cell" >银行卡:{{getCash("3")}}</div></td>
+                  <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>-->
 <!--                  <td class="el-table__cell is-leaf"><div class="cell" >银行卡</div></td>-->
                 </tr>
                 </tr>
                 </tbody>
                 </tbody>