agentManagememt

src/api/agnetManagement.js

@@ -27,11 +27,11 @@ export function createAgent(data) {
 
 export function fetchMemberList(data, query) {
   return request({
-    url: `/agents/${data.GambleMember.id}/gambleMembers`,
+    url: `/agents/${data.GambleMember.id}/gambleMembers/detail`,
     method: 'get',
     params: {
-      limit: query.limit,
-      offset: (query.page - 1) * query.limit
+      startAt: query.startAt,
+      endAt: query.endAt
       // name: query.name
     //   chipsSort: query.chipsSort,
     //   updatedSort: query.updatedSort

src/views/agnetManagement/gambleMemberManagement/index.vue

@@ -16,29 +16,91 @@
               <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">搜尋</el-button>
           </div>
       </div>
-      <el-table :data="list" v-loading.body="listLoading" element-loading-text="Loading" border fit highlight-current-row>
-        <el-table-column label="我的會員" align="center">
+      <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">
+              <span>{{scope.row.name}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="總上分額" align="center">
+            <template slot-scope="scope">
+               <span :style="moneyColor(scope.row.allUp)">{{scope.row.allUp}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="總下分額" align="center">
+            <template slot-scope="scope">
+              <span :style="moneyColor(scope.row.allDown)">{{scope.row.allDown}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="所有會員點數" align="center">
+            <template slot-scope="scope">
+              <span :style="moneyColor(scope.row.allChips)">{{scope.row.allChips}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="總投注量" align="center">
+            <template slot-scope="scope">
+              <span :style="moneyColor(scope.row.allEarned)">{{scope.row.allEarned}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="總水量" align="center">
+            <template slot-scope="scope">
+              <span :style="moneyColor(scope.row.allServiceFees)">{{scope.row.allServiceFees}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="上繳工作室金額" align="center">
+            <template slot-scope="scope">
+              <span :style="moneyColor(all(scope))">{{all(scope)}}</span>
+            </template>
+          </el-table-column>
+      </el-table>
+      <el-table :data="combine" v-loading.body="listLoading" element-loading-text="Loading" border fit highlight-current-row>
+        <el-table-column :label="`${this.agent.GambleMember.name}的會員`" align="center">
           <el-table-column label="名稱" align="center">
             <template slot-scope="scope">
               <span>{{scope.row.name}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="分數" align="center">
+          <el-table-column label="會員當前分數" align="center">
+            <template slot-scope="scope">
+              <span>{{scope.row.chips}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="總上分額" align="center">
+            <template slot-scope="scope">
+              <span :style="moneyColor(scope.row.totalUp)">{{scope.row.totalUp}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="總下分額" align="center">
+            <template slot-scope="scope">
+              <span :style="moneyColor(scope.row.totalDown)">{{scope.row.totalDown}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="有效投注量(莊家)" align="center">
+            <template slot-scope="scope">
+              <span :style="moneyColor(scope.row.bookieEarned)">{{scope.row.bookieEarned}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="有效投注量(閒家)" align="center">
+            <template slot-scope="scope">
+              <span :style="moneyColor(scope.row.memberEarned)">{{scope.row.memberEarned}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="莊家抽水" align="center">
             <template slot-scope="scope">
-              {{scope.row.chips}}
+              <span :style="moneyColor(scope.row.bookieServiceFees)">{{scope.row.bookieServiceFees}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="投注量" align="center">
+          <el-table-column label="閒家抽水" align="center">
             <template slot-scope="scope">
-              <span :style="moneyColor(scope.row.amount)">{{scope.row.amount}}</span>
+              <span :style="moneyColor(scope.row.memberServiceFees)">{{scope.row.memberServiceFees}}</span>
             </template>
           </el-table-column>
           <el-table-column label="總退水" align="center">
             <template slot-scope="scope">
-              <span :style="moneyColor(scope.row.wallet)">{{scope.row.wallet}}</span>
+              <span :style="moneyColor(scope.row.wallet)">{{scope.row.totalServiceFees}}</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="操作" width="250">
+          <el-table-column align="center" label="操作" width="100">
             <template slot-scope="scope">
                 <router-link to="/agent/index/gambleMemberManagement/index/gameHistory">
                     <el-button type="primary" size="mini" icon="el-icon-tickets" @click="handlePersonDetail(scope.row)">紀錄</el-button>  
@@ -48,12 +110,6 @@
         </el-table-column>      
       </el-table>
 
-      <div v-show="!listLoading" class="pagination-container">
-        <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.page"
-          :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit" layout="total, sizes, prev, pager, next, jumper" :total="total">
-        </el-pagination>
-      </div>
-
     </div>
     <router-view :member="member"></router-view>
   </div>
@@ -81,11 +137,13 @@ export default {
       dialogList: null,
       total: null,
       listLoading: true,
+      allCombine: [],
+      combine: [],
       listQuery: {
-        page: 1,
-        limit: 20,
-        startAt: null,
-        endAt: null
+        // 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)
       },
       pickerOptions: {
         shortcuts: [{
@@ -125,20 +183,67 @@ export default {
     ]),
     getList() {
       this.listLoading = true
+      this.allCombine = []
+      this.combine = []
       fetchMemberList(this.agent, this.listQuery).then(response => {
-        this.list = response.data
-        console.log(response.data)
+        // this.memberRecord = response.data.rows
+        response.data.rows.map(member => {
+          let row = {
+            id: member.id,
+            name: member.name,
+            chips: member.chips,
+            totalUp: 0,
+            totalDown: 0,
+            bookieEarned: 0,
+            memberEarned: 0,
+            bookieServiceFees: 0,
+            memberServiceFees: 0,
+            totalServiceFees: 0,
+          }
+        
+          let bookie = _.groupBy(member['GambleGame-Bucket-MemberRecords'], 'isBookie')
+          if (bookie.false) {
+            row.memberEarned = _.sumBy(bookie.false, 'earned');
+            row.memberServiceFees = _.sumBy(bookie.false, 'serviceFees')*this.agent.feeRatio/100;
+          }
+          if (bookie.true) {
+            row.bookieEarned = _.sumBy(bookie.true, 'earned');
+            row.bookieServiceFees = _.sumBy(bookie.true, (item) => { return item.serviceFees-500; })*this.agent.feeRatio/100;
+          }
+          row.totalServiceFees = row.bookieServiceFees + row.memberServiceFees
+
+          let chipsLog = _.groupBy(member.GambleMemberChipsLogs, 'type')
+          if (chipsLog['0']) {
+            row.totalUp = _.sumBy(chipsLog['0'], (item) => { 
+              return item.chips > 0 ? item.chips : false
+            })
+            row.totalDown = _.sumBy(chipsLog['0'], (item) => { 
+              return item.chips < 0 ? item.chips : false
+            })
+          }
+          // TODO CHECK 是否需要
+          if(chipsLog['1']) {
+
+          }
+          console.log('www',row)
+
+          this.combine.push(row)
+        })
+
+        this.allCombine.push({
+          name: this.agent.GambleMember.name,
+          allUp: _.sumBy(this.combine, 'totalUp'),
+          allDown: _.sumBy(this.combine, 'totalDown'),
+          allChips: _.sumBy(this.combine, 'chips'),
+          allEarned: _.sumBy(this.combine, (item) => {return item.bookieEarned + item.memberEarned}),
+          allServiceFees: _.sumBy(this.combine, (item) => {return item.bookieServiceFees + item.
+          memberServiceFees}),
+        })
         this.listLoading = false
       })
       
     },
     handlePersonDetail(row) {
-    //   this.listLoading = true
-    //   this.dialogFormVisible = true
-    //   fetchPersonGameDetail(this.member.id, row.id).then(response => {
-    //     this.dialogList = response.data.rows
-    //     this.listLoading = false
-    //   })
       const temp = Object.assign({}, row) // copy obj
       this.SetVisible(3)
       this.member = temp
@@ -186,6 +291,9 @@ export default {
     // },
     moneyColor(money) {
       return money >= 0 ? { color: '#67C23A' } : { color: '#FA5555' }
+    },
+    all(scope) {
+      return scope.row.allUp+scope.row.allDown-scope.row.allChips-scope.row.allServiceFees
     }
   },
   destroyed() {