add this week

src/api/agnetManagement.js

@@ -39,3 +39,17 @@ export function fetchMemberList(data, query) {
   })
 }
 
+export function fetchAllMemberList(query) {
+  return request({
+    url: `/agents/gambleMembers/detail`,
+    method: 'get',
+    params: {
+      startAt: query.startAt,
+      endAt: query.endAt
+      // name: query.name
+    //   chipsSort: query.chipsSort,
+    //   updatedSort: query.updatedSort
+    }
+  })
+}
+

src/views/agnetManagement/index.vue

@@ -26,7 +26,7 @@
         </el-table-column>
           <el-table-column label="上繳工作室金額" align="center">
             <template slot-scope="scope">
-              <span :style="moneyColor(0)">{{0}}</span>
+              <span :style="moneyColor(scope.row.all)">{{scope.row.all}}</span>
             </template>
         </el-table-column>
         <el-table-column align="center" label="操作" width="450">
@@ -66,8 +66,11 @@
 <script>
 
 import { mapGetters, mapActions } from 'vuex'
-import { fetchList, createAgent } from '@/api/agnetManagement'
+import { fetchList, createAgent, fetchMemberList } from '@/api/agnetManagement'
 import waves from '@/directive/waves' // 水波纹指令
+import moment from 'moment-timezone'
+import _ from 'lodash'
+import { Decimal } from 'decimal.js';
 
 export default {
   directives: {
@@ -75,12 +78,14 @@ export default {
   },
   data() {
     return {
-      list: null,
+      list: [],
       total: null,
       listLoading: true,
       listQuery: {
         page: 1,
         limit: 20,
+        startAt: moment().subtract(1, 'weeks').day(7).hour(16).minute(0).second(0),
+        endAt: moment().day(7).hour(11).minute(59).second(59)
       },
       dialogCreateFormVisible: false,
       dialogStatus: '',
@@ -113,8 +118,70 @@ export default {
     getList() {
       this.listLoading = true
       fetchList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        console.log(this.list)
+
+        response.data.rows.map(agent => {
+          let combine = []
+          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,
+                bookieServiceFees: 0,
+                memberServiceFees: 0,
+                totalServiceFees: 0,
+                memberCheckOut: 0,
+              }
+            
+              let bookie = _.groupBy(member['GambleGame-Bucket-MemberRecords'], 'isBookie')
+              if (bookie.false) {
+                row.memberEarned = _.sumBy(bookie.false, 'earned');
+                row.memberServiceFees = _.sumBy(bookie.false, 'serviceFees')*agent.feeRatio/100;
+              }
+              if (bookie.true) {
+                row.bookieEarned = _.sumBy(bookie.true, 'earned');
+                row.bookieServiceFees = _.sumBy(bookie.true, (item) => { return item.serviceFees-500; })*agent.feeRatio/100;
+              }
+              row.totalServiceFees = new Decimal(row.bookieServiceFees).plus(row.memberServiceFees).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.bookieServiceFees + item.
+            memberServiceFees})
+            agent.all = allUp+allDown-allChips-allServiceFees
+            this.list.push(agent)
+            
+            this.listLoading = false
+          })
+        })
         this.total = response.data.count
         this.listLoading = false
       })