enhance api

src/api/agnetManagement.js

@@ -53,3 +53,30 @@ export function fetchAllMemberList(query) {
   })
 }
 
+export function fetchGroupDetail(data, query) {
+  return request({
+    url: `/agents/${data.GambleMember.id}/groupDetail`,
+    method: 'get',
+    params: {
+      startAt: query.startAt,
+      endAt: query.endAt
+      // name: query.name
+    //   chipsSort: query.chipsSort,
+    //   updatedSort: query.updatedSort
+    }
+  })
+}
+
+export function fetchGroupAll(data, query) {
+  return request({
+    url: `/agents/${data.GambleMember.id}/all`,
+    method: 'get',
+    params: {
+      startAt: query.startAt,
+      endAt: query.endAt
+      // name: query.name
+    //   chipsSort: query.chipsSort,
+    //   updatedSort: query.updatedSort
+    }
+  })
+}

src/router/index.js

@@ -167,7 +167,7 @@ export const constantRouterMap = [
         meta: {
           title: '代理商管理',
           icon: 'table',
-          noCache: true
+          noCache: false
           // role: ['dd']
         },
         children: [

src/utils/request.js

@@ -6,7 +6,7 @@ import { getToken } from '@/utils/auth'
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api的base_url
-  timeout: 20000 // 请求超时时间
+  timeout: 600000 // 请求超时时间
 })
 
 // request拦截器

src/views/agnetManagement/gambleMemberManagement/index.vue

@@ -17,10 +17,10 @@
           </div>
       </div>
       <el-table :data="allCombine" v-loading.body="listLoading" element-loading-text="Loading" border fit highlight-current-row>
-          <el-table-column label="代理商名稱" align="center">
-            <template slot-scope="scope">
+          <el-table-column label="代理商名稱" prop="data.secondLayer.GambleMember.name).slice(19)" align="center">
+            <!-- <template slot-scope="scope">
               <span>{{scope.row.name}}</span>
-            </template>
+            </template> -->
           </el-table-column>
           <el-table-column label="總上分額" align="center">
             <template slot-scope="scope">
@@ -106,7 +106,7 @@
 <script>
 
 import { mapActions, mapGetters } from 'vuex'
-import { fetchMemberList } from '@/api/agnetManagement'
+import { fetchMemberList, fetchGroupDetail } from '@/api/agnetManagement'
 import waves from '@/directive/waves' // 水波纹指令
 import moment from 'moment-timezone'
 import config from '../../../../config' 
@@ -152,6 +152,7 @@ export default {
         }]
       },
       date: null,
+      sum: [],      
       dialogFormVisible: false
 
     }
@@ -176,103 +177,110 @@ export default {
       this.listLoading = true
       this.allCombine = []
       this.combine = []
-       let combine = []
-      await fetchMemberList(this.data.secondLayer, this.listQuery).then(response => {
-       console.log('response', response.data.rows)
-        response.data.rows.map(member => {
-          let row = {
-            id: member.id,
-            name: member.name,
-            chips: member.chips,
-            totalUp: 0,
-            totalDown: 0,
-            totalReward: 0,
-            totalPunishment: 0,
-            effectiveTotal: 0,
-            bookieEarned: 0,
-            memberEarned: 0,
-            bookieWagerFee: 0,
-            bookieWagerFeeRatio: 0,
-            bookieServiceFees: 0,
-            bookieServiceFeesRatio: 0,
-            memberServiceFees: 0,
-            memberServiceFeesRatio: 0,
-            totalServiceFees: 0,
-            memberCheckOut: 0,
-            feeRatio: new Decimal(this.data.secondLayer.feeRatio/100),
-          }
-          let bookie = _.groupBy(member['GambleGame-Bucket-MemberRecords'], 'isBookie')
-          if (bookie.false) {
-            row.memberEarned = _.sumBy(bookie.false, item => {
-              return Math.abs(item.earned)
-            });
-            // console.log('membeEarned', row.memberEarned)
-            row.memberServiceFees = _.sumBy(bookie.false, 'serviceFees');
-            row.memberServiceFeesRatio = row.feeRatio.times(row.memberServiceFees).valueOf()
+      //  let combine = []
+       await fetchGroupDetail(this.data.secondLayer, this.listQuery).then(response => {
+
+         console.log('combine', response.data)
+         
+         this.combine = response.data
+         
+       });
+      // await fetchMemberList(this.data.secondLayer, this.listQuery).then(response => {
+      //  console.log('response', response.data.rows)
+      //   response.data.rows.map(member => {
+      //     let row = {
+      //       id: member.id,
+      //       name: member.name,
+      //       chips: member.chips,
+      //       totalUp: 0,
+      //       totalDown: 0,
+      //       totalReward: 0,
+      //       totalPunishment: 0,
+      //       effectiveTotal: 0,
+      //       bookieEarned: 0,
+      //       memberEarned: 0,
+      //       bookieWagerFee: 0,
+      //       bookieWagerFeeRatio: 0,
+      //       bookieServiceFees: 0,
+      //       bookieServiceFeesRatio: 0,
+      //       memberServiceFees: 0,
+      //       memberServiceFeesRatio: 0,
+      //       totalServiceFees: 0,
+      //       memberCheckOut: 0,
+      //       feeRatio: new Decimal(this.data.secondLayer.feeRatio/100),
+      //     }
+      //     let bookie = _.groupBy(member['GambleGame-Bucket-MemberRecords'], 'isBookie')
+      //     if (bookie.false) {
+      //       row.memberEarned = _.sumBy(bookie.false, item => {
+      //         return Math.abs(item.earned)
+      //       });
+      //       // console.log('membeEarned', row.memberEarned)
+      //       row.memberServiceFees = _.sumBy(bookie.false, 'serviceFees');
+      //       row.memberServiceFeesRatio = row.feeRatio.times(row.memberServiceFees).valueOf()
             
-          }
-          if (bookie.true) {
-            row.bookieWagerFee = _.sumBy(bookie.true, (item) => {
-              return item.wagerServiceFees
-            });
-            row.bookieWagerFeeRatio = row.feeRatio.times(row.bookieWagerFee).valueOf()
-            // console.log('eeee', bookie.true)
-            row.bookieEarned = _.sumBy(bookie.true, item => {
-              return Math.abs(item.earned)
-            });
-            // console.log('bookieEarned' , row.bookieEarned)
-            row.bookieServiceFees = _.sumBy(bookie.true, (item) => { return item.serviceFees});
-            row.bookieServiceFeesRatio = row.feeRatio.times(row.bookieServiceFees).valueOf()
-          }
+      //     }
+      //     if (bookie.true) {
+      //       row.bookieWagerFee = _.sumBy(bookie.true, (item) => {
+      //         return item.wagerServiceFees
+      //       });
+      //       row.bookieWagerFeeRatio = row.feeRatio.times(row.bookieWagerFee).valueOf()
+      //       // console.log('eeee', bookie.true)
+      //       row.bookieEarned = _.sumBy(bookie.true, item => {
+      //         return Math.abs(item.earned)
+      //       });
+      //       // console.log('bookieEarned' , row.bookieEarned)
+      //       row.bookieServiceFees = _.sumBy(bookie.true, (item) => { return item.serviceFees});
+      //       row.bookieServiceFeesRatio = row.feeRatio.times(row.bookieServiceFees).valueOf()
+      //     }
 
-          row.effectiveTotal = _.sumBy(member['GambleGame-Bucket-RoundRecords'], item => {
-              return item.used_quota
-            }) + row.memberEarned
+      //     row.effectiveTotal = _.sumBy(member['GambleGame-Bucket-RoundRecords'], item => {
+      //         return item.used_quota
+      //       }) + row.memberEarned
 
-          row.totalServiceFees = Number(new Decimal(row.bookieServiceFees).plus(row.memberServiceFees).plus(row.bookieWagerFee).times(row.feeRatio).valueOf())
-          let chipsLog = _.groupBy(member.GambleMemberChipsLogs, 'type')
-          console.log('type', chipsLog)
-          if (chipsLog['0'] || chipsLog['2']) {
-            row.totalUp = _.sumBy(chipsLog['0'], (item) => { 
-              return item.chips > 0 ? item.chips : 0
-            })
-            row.totalDown = _.sumBy(chipsLog['0'], (item) => { 
-              return item.chips < 0 ? item.chips : 0
-            }) + _.sumBy(chipsLog['2'], (item) => { 
-              return item.chips < 0 ? item.chips : 0
-            })
+      //     row.totalServiceFees = Number(new Decimal(row.bookieServiceFees).plus(row.memberServiceFees).plus(row.bookieWagerFee).times(row.feeRatio).valueOf())
+      //     let chipsLog = _.groupBy(member.GambleMemberChipsLogs, 'type')
+      //     console.log('type', chipsLog)
+      //     if (chipsLog['0'] || chipsLog['2']) {
+      //       row.totalUp = _.sumBy(chipsLog['0'], (item) => { 
+      //         return item.chips > 0 ? item.chips : 0
+      //       })
+      //       row.totalDown = _.sumBy(chipsLog['0'], (item) => { 
+      //         return item.chips < 0 ? item.chips : 0
+      //       }) + _.sumBy(chipsLog['2'], (item) => { 
+      //         return item.chips < 0 ? item.chips : 0
+      //       })
 
-          }
-          row.memberCheckOut = (row.totalUp + row.totalDown - row.chips)*(-1)
-          // TODO CHECK 是否需要
-          let punishment =  _.sumBy(member['GambleGame-Bucket-PunishmentRecords'], item => {
-              return (item.chips)*(-1)
-          })
-          if(chipsLog['1']) {
-            row.totalReward = _.sumBy(chipsLog['1'], (item) => { 
-              return item.chips > 0 ? item.chips : 0
-            })
-            row.totalPunishment = _.sumBy(chipsLog['1'], (item) => { 
-              return item.chips < 0 ? item.chips : 0
-            });
-          }
-          row.totalPunishment += punishment
-          // console.log('www',row)
+      //     }
+      //     row.memberCheckOut = (row.totalUp + row.totalDown - row.chips)*(-1)
+      //     // TODO CHECK 是否需要
+      //     let punishment =  _.sumBy(member['GambleGame-Bucket-PunishmentRecords'], item => {
+      //         return (item.chips)*(-1)
+      //     })
+      //     if(chipsLog['1']) {
+      //       row.totalReward = _.sumBy(chipsLog['1'], (item) => { 
+      //         return item.chips > 0 ? item.chips : 0
+      //       })
+      //       row.totalPunishment = _.sumBy(chipsLog['1'], (item) => { 
+      //         return item.chips < 0 ? item.chips : 0
+      //       });
+      //     }
+      //     row.totalPunishment += punishment
+      //     // console.log('www',row)
 
-          combine.push(row)
-        })
-        // console.log('cimbine' , this.combine)
-        this.allCombine.push({
-          name: (this.data.secondLayer.GambleMember.name).slice(19),
-          allUp: _.sumBy(combine, 'totalUp'),
-          allDown: _.sumBy(combine, 'totalDown'),
-          allChips: _.sumBy(combine, 'chips'),
-          allEarned: _.sumBy(combine, (item) => {return item.bookieEarned + item.memberEarned}),
-          allServiceFees: _.sumBy(combine, (item) => {return item.totalServiceFees }).toFixed(2),
-        })
-        this.combine = combine
+      //     combine.push(row)
+      //   })
+      //   // console.log('cimbine' , this.combine)
+      //   this.allCombine.push({
+      //     name: (this.data.secondLayer.GambleMember.name).slice(19),
+      //     allUp: _.sumBy(combine, 'totalUp'),
+      //     allDown: _.sumBy(combine, 'totalDown'),
+      //     allChips: _.sumBy(combine, 'chips'),
+      //     allEarned: _.sumBy(combine, (item) => {return item.bookieEarned + item.memberEarned}),
+      //     allServiceFees: _.sumBy(combine, (item) => {return item.totalServiceFees }).toFixed(2),
+      //   })
+      //   this.combine = combine
         this.listLoading = false
-      })
+      // })
       
     },
     handlePersonDetail(row) {
@@ -329,7 +337,7 @@ export default {
     },
     getSummaries(param) {
         const { columns, data } = param;
-        const sums = [];
+        let sums = [];
         columns.forEach((column, index) => {
           if (index === 0) {
             sums[index] = '合計';
@@ -350,7 +358,14 @@ export default {
             sums[index] = 'N/A';
           }
         });
-
+        // this.allCombine.push({
+        //   name: (this.data.secondLayer.GambleMember.name).slice(19),
+        //   allUp: sums[2],
+        //   allDown: sums[3],
+        //   allChips: sums[1],
+        //   allEarned: sums[6],
+        //   allServiceFees: sums[13],
+        // });
         return sums;
       }
   },

src/views/agnetManagement/index.vue

@@ -66,7 +66,7 @@
 <script>
 
 import { mapGetters, mapActions } from 'vuex'
-import { fetchList, createAgent, fetchMemberList } from '@/api/agnetManagement'
+import { fetchList, createAgent, fetchMemberList,fetchGroupAll } from '@/api/agnetManagement'
 import waves from '@/directive/waves' // 水波纹指令
 import moment from 'moment-timezone'
 import _ from 'lodash'
@@ -123,73 +123,85 @@ export default {
 
         response.data.rows.map(agent => {
           let combine = []
-          this.list = []          
-          fetchMemberList(agent, this.listQuery).then(response => {
-            response.data.rows.map(member => {
-              let row = {
-                id: member.id,
-                name: member.name,
-                chips: member.chips,
-                totalUp: 0,
-                totalDown: 0,
-                totalReward: 0,
-                totalPunishment: 0,
-                bookieEarned: 0,
-                memberEarned: 0,
-                bookieWagerFee: 0,
-                bookieServiceFees: 0,
-                memberServiceFees: 0,
-                totalServiceFees: 0,
-                memberCheckOut: 0,
-              }
-            
-              let bookie = _.groupBy(member['GambleGame-Bucket-MemberRecords'], 'isBookie')
-              if (bookie.false) {
-                row.memberEarned = _.sumBy(bookie.false, item => {
-                  return Math.abs(item.earned)
-                });
-                row.memberServiceFees = _.sumBy(bookie.false, 'serviceFees')*agent.feeRatio/100;
-              }
-              if (bookie.true) {
-                row.bookieWagerFee = _.sumBy(bookie.true, (item) => {
-                  return item.wagerServiceFees
-                }) * agent.feeRatio/100;
-                row.bookieEarned = _.sumBy(bookie.true, item => {
-                  return Math.abs(item.earned)
-                });
-                row.bookieServiceFees = _.sumBy(bookie.true, (item) => { return item.serviceFees })*agent.feeRatio/100;
-              }
-              row.totalServiceFees =  Number(new Decimal(row.bookieServiceFees).plus(row.memberServiceFees).plus(row.bookieWagerFee).valueOf())
-              let chipsLog = _.groupBy(member.GambleMemberChipsLogs, 'type')
-              if (chipsLog['0']) {
-                row.totalUp = _.sumBy(chipsLog['0'], (item) => { 
-                  return item.chips > 0 ? item.chips : 0
-                })
-                row.totalDown = _.sumBy(chipsLog['0'], (item) => { 
-                  return item.chips < 0 ? item.chips : 0
-                })
-              }
-              row.memberCheckOut = row.totalUp + row.totalDown - row.chips
-              if(chipsLog['1']) {
-                row.totalReward = _.sumBy(chipsLog['1'], (item) => { 
-                  return item.chips > 0 ? item.chips : 0
-                })
-                row.totalPunishment = _.sumBy(chipsLog['1'], (item) => { 
-                  return item.chips < 0 ? item.chips : 0
-                })
-              }
-              combine.push(row)
+          this.list = []   
+          this.visible.firstLayer === true ?  fetchGroupAll(agent, this.listQuery).then(response => {
+            console.log('response' , response.data.all)
+            this.list.push({
+              // id: agent.GambleMember.id,
+              GambleMember: {
+                id: agent.GambleMember.id,
+                name: agent.GambleMember.name
+              },
+              feeRatio: response.data.feeRatio,
+              all: response.data.all
             })
-            let allUp = _.sumBy(combine, 'totalUp')
-            let allDown = _.sumBy(combine, 'totalDown')
-            let allChips = _.sumBy(combine, 'chips')
-            let allEarned = _.sumBy(combine, (item) => {return item.bookieEarned + item.memberEarned})
-            let allServiceFees = _.sumBy(combine, (item) => {return item.totalServiceFees}).toFixed(2)
-            agent.all = (allUp+allDown-allChips-allServiceFees)*(-1)
-            this.list.push(agent)
+          }) : false
+          // fetchMemberList(agent, this.listQuery).then(response => {
+          //   response.data.rows.map(member => {
+          //     let row = {
+          //       id: member.id,
+          //       name: member.name,
+          //       chips: member.chips,
+          //       totalUp: 0,
+          //       totalDown: 0,
+          //       totalReward: 0,
+          //       totalPunishment: 0,
+          //       bookieEarned: 0,
+          //       memberEarned: 0,
+          //       bookieWagerFee: 0,
+          //       bookieServiceFees: 0,
+          //       memberServiceFees: 0,
+          //       totalServiceFees: 0,
+          //       memberCheckOut: 0,
+          //     }
             
-            this.listLoading = false
-          })
+          //     let bookie = _.groupBy(member['GambleGame-Bucket-MemberRecords'], 'isBookie')
+          //     if (bookie.false) {
+          //       row.memberEarned = _.sumBy(bookie.false, item => {
+          //         return Math.abs(item.earned)
+          //       });
+          //       row.memberServiceFees = _.sumBy(bookie.false, 'serviceFees')*agent.feeRatio/100;
+          //     }
+          //     if (bookie.true) {
+          //       row.bookieWagerFee = _.sumBy(bookie.true, (item) => {
+          //         return item.wagerServiceFees
+          //       }) * agent.feeRatio/100;
+          //       row.bookieEarned = _.sumBy(bookie.true, item => {
+          //         return Math.abs(item.earned)
+          //       });
+          //       row.bookieServiceFees = _.sumBy(bookie.true, (item) => { return item.serviceFees })*agent.feeRatio/100;
+          //     }
+          //     row.totalServiceFees =  Number(new Decimal(row.bookieServiceFees).plus(row.memberServiceFees).plus(row.bookieWagerFee).valueOf())
+          //     let chipsLog = _.groupBy(member.GambleMemberChipsLogs, 'type')
+          //     if (chipsLog['0']) {
+          //       row.totalUp = _.sumBy(chipsLog['0'], (item) => { 
+          //         return item.chips > 0 ? item.chips : 0
+          //       })
+          //       row.totalDown = _.sumBy(chipsLog['0'], (item) => { 
+          //         return item.chips < 0 ? item.chips : 0
+          //       })
+          //     }
+          //     row.memberCheckOut = row.totalUp + row.totalDown - row.chips
+          //     if(chipsLog['1']) {
+          //       row.totalReward = _.sumBy(chipsLog['1'], (item) => { 
+          //         return item.chips > 0 ? item.chips : 0
+          //       })
+          //       row.totalPunishment = _.sumBy(chipsLog['1'], (item) => { 
+          //         return item.chips < 0 ? item.chips : 0
+          //       })
+          //     }
+          //     combine.push(row)
+          //   })
+          //   let allUp = _.sumBy(combine, 'totalUp')
+          //   let allDown = _.sumBy(combine, 'totalDown')
+          //   let allChips = _.sumBy(combine, 'chips')
+          //   let allEarned = _.sumBy(combine, (item) => {return item.bookieEarned + item.memberEarned})
+          //   let allServiceFees = _.sumBy(combine, (item) => {return item.totalServiceFees}).toFixed(2)
+          //   agent.all = (allUp+allDown-allChips-allServiceFees)*(-1)
+          //   this.list.push(agent)
+            
+          //   this.listLoading = false
+          // })
         })
         this.total = response.data.count
         this.listLoading = false