拍卖管理后台

src/main/java/com/izouma/nineth/domain/AuctionOrder.java

@@ -25,6 +25,7 @@ public class AuctionOrder extends BaseEntityNoID {
     private Long id;
 
     @ApiModelProperty("用户ID")
+    @SearchableOne
     private Long userId;
 
     private String nickname;

src/main/vue/src/router.js

@@ -724,6 +724,14 @@ const router = new Router({
                         title: '拍卖订单'
                     }
                 },
+                {
+                    path: '/auctionOrderUsedList',
+                    name: 'AuctionOrderUsedList',
+                    component: () => import(/* webpackChunkName: "auctionOrderList" */ '@/views/AuctionOrderUsedList.vue'),
+                    meta: {
+                        title: '拍卖订单'
+                    }
+                },
                 {
                     path: '/auctionActivityEdit',
                     name: 'AuctionActivityEdit',

src/main/vue/src/views/AuctionOrderEdit.vue

@@ -2,8 +2,8 @@
     <div class="edit-view">
         <page-title>
             <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
-            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
-            <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+            <!-- <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id"> 删除 </el-button>
+            <el-button @click="onSave" :loading="saving" type="primary">保存</el-button> -->
         </page-title>
         <div class="edit-view__content-wrapper">
             <div class="edit-view__content-section">
@@ -14,52 +14,47 @@
                     label-width="94px"
                     label-position="right"
                     size="small"
-                    style="max-width: 500px"
+                    style="max-width: 700px"
                 >
-                    <el-form-item prop="id" label="id">
-                        <el-input-number type="number" v-model="formData.id"></el-input-number>
+                    <el-form-item prop="userId" label="用户信息">
+                        <el-input-number type="number" v-model="formData.userId" disabled></el-input-number>
+                        <el-input
+                            v-model="formData.nickname"
+                            disabled
+                            style="margin-left: 6px; width: 200px"
+                        ></el-input>
                     </el-form-item>
-                    <el-form-item prop="userId" label="用户ID">
-                        <el-input-number type="number" v-model="formData.userId"></el-input-number>
+                    <el-form-item prop="auctionId" label="拍卖信息">
+                        <el-input-number type="number" v-model="formData.auctionId" disabled></el-input-number>
+                        <el-input v-model="formData.name" disabled style="margin-left: 6px; width: 200px"></el-input>
                     </el-form-item>
-                    <el-form-item prop="nickname" label="昵称">
-                        <el-input v-model="formData.nickname"></el-input>
+                    <el-form-item prop="pic" label="">
+                        <object-upload :value="pic" disabled></object-upload>
                     </el-form-item>
-                    <el-form-item prop="auctionId" label="拍卖ID">
-                        <el-input-number type="number" v-model="formData.auctionId"></el-input-number>
-                    </el-form-item>
-                    <el-form-item prop="name" label="名称">
-                        <el-input v-model="formData.name"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="pic" label="图片">
-                        <el-input v-model="formData.pic"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="detail" label="详情">
-                        <el-input v-model="formData.detail"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="properties" label="特性">
+                    <!-- <el-form-item prop="properties" label="特性">
                         <el-input v-model="formData.properties"></el-input>
                     </el-form-item>
                     <el-form-item prop="privileges" label="特权">
                         <el-input v-model="formData.privileges"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="royalties" label="版税比例">
-                        <el-input v-model="formData.royalties"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="serviceCharge" label="手续费比例">
-                        <el-input v-model="formData.serviceCharge"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="type" label="类型">
-                        <el-select v-model="formData.type" clearable filterable placeholder="请选择">
-                            <el-option
-                                v-for="item in typeOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
-                            >
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
+                    </el-form-item> -->
+                    <div class="inline-wrapper">
+                        <el-form-item prop="royalties" label="版税(%)">
+                            <el-input-number v-model="formData.royalties" :min="0" :max="99" disabled>
+                            </el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="serviceCharge" label="手续费(%)">
+                            <el-input-number v-model="formData.serviceCharge" :min="0" :max="99" disabled>
+                            </el-input-number>
+                        </el-form-item>
+                    </div>
+                    <div class="inline-wrapper">
+                        <el-form-item prop="price" label="价格">
+                            <el-input-number type="number" v-model="formData.price" disabled></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="totalPrice" label="总价">
+                            <el-input-number type="number" v-model="formData.totalPrice" disabled></el-input-number>
+                        </el-form-item>
+                    </div>
                     <el-form-item prop="source" label="来源">
                         <el-select v-model="formData.source" clearable filterable placeholder="请选择">
                             <el-option
@@ -82,15 +77,6 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item prop="price" label="价格">
-                        <el-input-number type="number" v-model="formData.price"></el-input-number>
-                    </el-form-item>
-                    <el-form-item prop="gasPrice" label="gas费">
-                        <el-input-number type="number" v-model="formData.gasPrice"></el-input-number>
-                    </el-form-item>
-                    <el-form-item prop="totalPrice" label="总价">
-                        <el-input-number type="number" v-model="formData.totalPrice"></el-input-number>
-                    </el-form-item>
                     <el-form-item prop="status" label="状态">
                         <el-select v-model="formData.status" clearable filterable placeholder="请选择">
                             <el-option
@@ -102,20 +88,37 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item prop="payMethod" label="支付方式">
-                        <el-select v-model="formData.payMethod" clearable filterable placeholder="请选择">
-                            <el-option
-                                v-for="item in payMethodOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
+                    <div v-if="formData.status != 'CANCELLED' && formData.status != 'NOT_PAID'">
+                        <el-form-item prop="transactionId" label="交易订单号">
+                            <el-input v-model="formData.transactionId" disabled></el-input>
+                        </el-form-item>
+                        <el-form-item prop="payMethod" label="支付信息">
+                            <el-select
+                                v-model="formData.payMethod"
+                                clearable
+                                filterable
+                                placeholder="支付方式"
+                                disabled
                             >
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item prop="transactionId" label="交易ID">
-                        <el-input v-model="formData.transactionId"></el-input>
-                    </el-form-item>
+                                <el-option
+                                    v-for="item in payMethodOptions"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"
+                                >
+                                </el-option>
+                            </el-select>
+                            <el-date-picker
+                                v-model="formData.payAt"
+                                type="datetime"
+                                value-format="yyyy-MM-dd HH:mm:ss"
+                                placeholder="支付时间"
+                                style="margin-left: 6px"
+                                disabled
+                            >
+                            </el-date-picker>
+                        </el-form-item>
+                    </div>
                     <el-form-item prop="payTime" label="支付时间">
                         <el-date-picker
                             v-model="formData.payTime"
@@ -125,29 +128,31 @@
                         >
                         </el-date-picker>
                     </el-form-item>
-                    <el-form-item prop="cancelTime" label="取消时间">
+                    <el-form-item prop="cancelTime" label="取消时间" v-if="formData.status == 'CANCELLED'">
                         <el-date-picker
                             v-model="formData.cancelTime"
                             type="datetime"
                             value-format="yyyy-MM-dd HH:mm:ss"
                             placeholder="选择日期时间"
+                            disabled
                         >
                         </el-date-picker>
                     </el-form-item>
-                    <el-form-item prop="contactName" label="收货人">
-                        <el-input v-model="formData.contactName"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="contactPhone" label="收货电话">
-                        <el-input v-model="formData.contactPhone"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="address" label="收货地址">
-                        <el-input v-model="formData.address"></el-input>
+                    <el-form-item label="收货信息">
+                        <el-input v-model="formData.contactName" style="width: 180px; margin-right: 6px"></el-input>
+                        <el-input v-model="formData.contactPhone" style="width: 240px"></el-input>
+                        <el-input
+                            type="textarea"
+                            size="2"
+                            v-model="formData.address"
+                            style="margin-top: 6px"
+                        ></el-input>
                     </el-form-item>
                     <el-form-item class="form-submit">
-                        <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
+                        <!-- <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
                         <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
                             删除
-                        </el-button>
+                        </el-button> -->
                         <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
                     </el-form-item>
                 </el-form>
@@ -176,34 +181,40 @@ export default {
             saving: false,
             formData: {},
             rules: {},
-            typeOptions: [
-                { label: '默认', value: 'DEFAULT' },
-                { label: '盲盒', value: 'BLIND_BOX' },
-                { label: '拍卖', value: 'AUCTION' },
-                { label: '展厅', value: 'SHOWROOM' }
-            ],
             sourceOptions: [
                 { label: '官方拍卖', value: 'OFFICIAL' },
                 { label: '转让拍卖', value: 'TRANSFER' }
             ],
             paymentTypeOptions: [
-                { label: '保证金', value: 'deposit' },
-                { label: '成交金', value: 'purchase_price' },
+                { label: '保证金', value: 'DEPOSIT' },
+                { label: '成交金', value: 'PURCHASE_PRICE' },
                 { label: '一口价', value: 'FIXED_PRICE' }
             ],
             statusOptions: [
                 { label: '未支付', value: 'NOT_PAID' },
-                { label: '已支付，处理中', value: 'PROCESSING' },
                 { label: '已完成', value: 'FINISH' },
-                { label: '已取消', value: 'CANCELLED' }
+                { label: '已取消', value: 'CANCELLED' },
+                { label: '退款中', value: 'REFUNDING' },
+                { label: '已退款', value: 'REFUNDED' },
+                { label: '待发货', value: 'DELIVERY' },
+                { label: '待收货', value: 'RECEIVE' }
             ],
             payMethodOptions: [
                 { label: '微信', value: 'WEIXIN' },
                 { label: '支付宝', value: 'ALIPAY' },
-                { label: '无GAS费', value: 'FREE' }
+                { label: '无GAS费', value: 'FREE' },
+                { label: '衫德支付', value: 'SANDPAY' },
+                { label: '河马支付', value: 'HMPAY' },
+                { label: '首信易', value: 'PAYEASE' },
+                { label: '余额支付', value: 'BALANCE' }
             ]
         };
     },
+    computed: {
+        pic() {
+            return (this.formData.pic || [])[0] || {};
+        }
+    },
     methods: {
         onSave() {
             this.$refs.form.validate(valid => {
@@ -250,4 +261,10 @@ export default {
     }
 };
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.inline-wrapper {
+    .el-form-item {
+        display: inline-block;
+    }
+}
+</style>

src/main/vue/src/views/AuctionOrderList.vue

@@ -1,28 +1,9 @@
 <template>
     <div class="list-view">
-        <page-title>
-            <!-- <el-button
-                @click="addRow"
-                type="primary"
-                icon="el-icon-plus"
-                :disabled="fetchingData || downloading"
-                class="filter-item"
-            >
-                新增
-            </el-button> -->
-            <el-button
-                @click="download"
-                icon="el-icon-upload2"
-                :loading="downloading"
-                :disabled="fetchingData"
-                class="filter-item"
-            >
-                导出
-            </el-button>
-        </page-title>
+        <page-title> </page-title>
         <div class="filters-container">
             <el-input
-                placeholder="搜索..."
+                placeholder="搜索交易ID..."
                 v-model="search"
                 clearable
                 class="filter-item search"
@@ -30,6 +11,31 @@
             >
                 <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
             </el-input>
+            <el-select v-model="status" placeholder="筛选状态" clearable @change="getData" class="filter-item">
+                <el-option
+                    v-for="item in statusOptions"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+                ></el-option>
+            </el-select>
+            <el-input
+                placeholder="搜索拍卖名称"
+                v-model="name"
+                clearable
+                class="filter-item"
+                @keyup.enter.native="getData"
+            >
+            </el-input>
+            <el-input
+                placeholder="搜索用户ID"
+                v-model="userId"
+                clearable
+                class="filter-item"
+                @keyup.enter.native="getData"
+            >
+            </el-input>
+            <created-at-picker v-model="createdAt" @input="getData" name="下单" class="filter-item"></created-at-picker>
         </div>
         <el-table
             :data="tableData"
@@ -43,23 +49,28 @@
             v-loading="fetchingData"
         >
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
-            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="155"> </el-table-column>
             <el-table-column prop="userId" label="用户ID"> </el-table-column>
             <el-table-column prop="nickname" label="昵称"> </el-table-column>
             <el-table-column prop="auctionId" label="拍卖ID"> </el-table-column>
             <el-table-column prop="name" label="名称"> </el-table-column>
-            <el-table-column prop="pic" label="图片"> </el-table-column>
-            <el-table-column prop="detail" label="详情"> </el-table-column>
-            <el-table-column prop="royalties" label="版税比例"> </el-table-column>
-            <el-table-column prop="serviceCharge" label="手续费比例"> </el-table-column>
-            <el-table-column prop="type" label="类型" :formatter="typeFormatter"> </el-table-column>
+            <el-table-column prop="pic" label="图片">
+                <template slot-scope="{ row }">
+                    <el-image
+                        style="width: 30px; height: 30px"
+                        :src="row.pic[0].thumb || row.pic[0].url"
+                        fit="cover"
+                        :preview-src-list="row.pic.map(i => i.thumb || i.url)"
+                    ></el-image>
+                </template>
+            </el-table-column>
             <el-table-column prop="source" label="来源" :formatter="sourceFormatter"> </el-table-column>
             <el-table-column prop="paymentType" label="支付类型" :formatter="paymentTypeFormatter"> </el-table-column>
             <!-- <el-table-column prop="price" label="价格"> </el-table-column> -->
             <!-- <el-table-column prop="gasPrice" label="gas费"> </el-table-column> -->
             <el-table-column prop="totalPrice" label="总价"> </el-table-column>
             <el-table-column prop="status" label="状态" :formatter="statusFormatter"> </el-table-column>
-            <!-- <el-table-column prop="payMethod" label="支付方式" :formatter="payMethodFormatter"> </el-table-column> -->
+            <el-table-column prop="payMethod" label="支付方式" :formatter="payMethodFormatter"> </el-table-column>
             <el-table-column prop="transactionId" label="交易ID"> </el-table-column>
             <el-table-column prop="createdAt" label="下单时间"> </el-table-column>
             <el-table-column prop="payTime" label="支付时间"> </el-table-column>
@@ -72,10 +83,10 @@
                     <span>{{ row.address }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" width="150">
+            <el-table-column label="操作" align="center" fixed="right" width="120">
                 <template slot-scope="{ row }">
-                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
-                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>查看</el-button>
+                    <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
                 </template>
             </el-table-column>
         </el-table>
@@ -115,32 +126,37 @@ export default {
             search: '',
             url: '/auctionOrder/all',
             downloading: false,
-            typeOptions: [
-                { label: '默认', value: 'DEFAULT' },
-                { label: '盲盒', value: 'BLIND_BOX' },
-                { label: '拍卖', value: 'AUCTION' },
-                { label: '展厅', value: 'SHOWROOM' }
-            ],
             sourceOptions: [
                 { label: '官方拍卖', value: 'OFFICIAL' },
                 { label: '转让拍卖', value: 'TRANSFER' }
             ],
             paymentTypeOptions: [
-                { label: '保证金', value: 'deposit' },
-                { label: '成交金', value: 'purchase_price' },
+                { label: '保证金', value: 'DEPOSIT' },
+                { label: '成交金', value: 'PURCHASE_PRICE' },
                 { label: '一口价', value: 'FIXED_PRICE' }
             ],
             statusOptions: [
                 { label: '未支付', value: 'NOT_PAID' },
-                { label: '已支付，处理中', value: 'PROCESSING' },
                 { label: '已完成', value: 'FINISH' },
-                { label: '已取消', value: 'CANCELLED' }
+                { label: '已取消', value: 'CANCELLED' },
+                { label: '退款中', value: 'REFUNDING' },
+                { label: '已退款', value: 'REFUNDED' },
+                { label: '待发货', value: 'DELIVERY' },
+                { label: '待收货', value: 'RECEIVE' }
             ],
             payMethodOptions: [
                 { label: '微信', value: 'WEIXIN' },
                 { label: '支付宝', value: 'ALIPAY' },
-                { label: '无GAS费', value: 'FREE' }
-            ]
+                { label: '无GAS费', value: 'FREE' },
+                { label: '衫德支付', value: 'SANDPAY' },
+                { label: '河马支付', value: 'HMPAY' },
+                { label: '首信易', value: 'PAYEASE' },
+                { label: '余额支付', value: 'BALANCE' }
+            ],
+            name: '',
+            userId: '',
+            status: '',
+            createdAt: ''
         };
     },
     computed: {
@@ -185,7 +201,17 @@ export default {
             return '';
         },
         beforeGetData() {
-            return { search: this.search, query: { del: false } };
+            return {
+                search: this.search,
+                query: {
+                    del: false,
+                    source: 'OFFICIAL',
+                    name: this.name,
+                    userId: this.userId,
+                    status: this.status,
+                    createdAt: this.createdAt
+                }
+            };
         },
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;
@@ -260,5 +286,4 @@ export default {
     }
 };
 </script>
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>

src/main/vue/src/views/MintOrderList.vue

@@ -23,7 +23,7 @@
         <div class="filters-container">
             <created-at-picker v-model="createdAt" @input="getData" name="支付" class="filter-item"></created-at-picker>
             <el-input
-                placeholder="搜索..."
+                placeholder="搜索手机号..."
                 v-model="search"
                 clearable
                 class="filter-item search"

src/test/java/com/izouma/nineth/repo/UserPropertyRepoTest.java

@@ -8,10 +8,10 @@ import com.izouma.nineth.domain.UserProperty;
 import com.izouma.nineth.dto.AirDropExcelDTO;
 import com.izouma.nineth.enums.AssetStatus;
 import com.izouma.nineth.utils.excel.UploadDataListener;
+import org.apache.commons.lang3.ObjectUtils;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.io.DataOutput;
 import java.io.File;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -170,23 +170,40 @@ public class UserPropertyRepoTest extends ApplicationTests {
 
     @Test
     public void setById() {
-        File file = new File("/Users/qiufangchao/Desktop/VIP.xlsx");
+//        userPropertyRepo.deleteAll();
+        File file = new File("/Users/sunnianwen/Desktop/all1.xlsx");
+        File file2 = new File("/Users/sunnianwen/Desktop/123.xlsx");
+
         UploadDataListener<AirDropExcelDTO> listener = new UploadDataListener<>();
         List<AirDropExcelDTO> dtos = EasyExcel.read(file, AirDropExcelDTO.class, listener)
                 .sheet()
                 .doReadSync();
-        Set<String> userIds = dtos.stream()
-                .map(AirDropExcelDTO::getPhone)
-                .collect(Collectors.toSet());
-        System.out.println(userIds);
-        userIds.forEach(id -> {
+        List<AirDropExcelDTO> dtos2 = EasyExcel.read(file2, AirDropExcelDTO.class, listener)
+                .sheet()
+                .doReadSync();
+//        Set<String> userIds = dtos.stream()
+//                .map(AirDropExcelDTO::getPhone)
+//                .collect(Collectors.toSet());
+//        System.out.println(userIds);
+        dtos.forEach(id -> {
+            UserProperty userProperty = userPropertyRepo.findById(Long.parseLong(id.getPhone()))
+                    .orElse(new UserProperty(Long.parseLong(id.getPhone()), 0));
+            userProperty.setMaxCount(Integer.parseInt(id.getName()));
+//            if (userProperty.getMaxCount() > 6) {
+//                userProperty.setMaxCount(6);
+//            }
+            userPropertyRepo.save(userProperty);
+        });
+        dtos2.forEach(id -> {
 
-            UserProperty userProperty = userPropertyRepo.findById(Long.parseLong(id))
-                    .orElse(new UserProperty(Long.parseLong(id), 0));
-            userProperty.setMaxCount(userProperty.getMaxCount() + 1);
-            if (userProperty.getMaxCount() > 6) {
-                userProperty.setMaxCount(6);
+            UserProperty userProperty = userPropertyRepo.findById(Long.parseLong(id.getPhone()))
+                    .orElse(null);
+            if (ObjectUtils.isEmpty(userProperty)) {
+                userProperty = new UserProperty(Long.parseLong(id.getPhone()), Integer.parseInt(id.getName()));
+            } else {
+                userProperty.setMaxCount(userProperty.getMaxCount() + 1);
             }
+
             userPropertyRepo.save(userProperty);
         });
     }
@@ -226,14 +243,80 @@ public class UserPropertyRepoTest extends ApplicationTests {
     }
 
     @Test
-    public void test(){
+    public void test() {
         Iterable<UserProperty> all = userPropertyRepo.findAll();
+//        System.out.println(all);
+        AtomicInteger sum = new AtomicInteger();
         all.forEach(p -> {
-            if (p.getMaxCount() > 1) {
-                p.setMaxCount(p.getMaxCount() - 1);
-                userPropertyRepo.save(p);
-            }
+            sum.getAndIncrement();
         });
+        System.out.println(sum.get());
     }
 
+    @Test
+    public void heji() {
+        Map<String, Integer> map = new HashMap<>();
+        UploadDataListener<AirDropExcelDTO> listener = new UploadDataListener<>();
+
+//        File fileLei = new File("/Users/sunnianwen/Desktop/lei.xlsx");
+//        List<AirDropExcelDTO> leis = EasyExcel.read(fileLei, AirDropExcelDTO.class, listener)
+//                .sheet()
+//                .doReadSync();
+//        leis.forEach(dto -> map.merge(dto.getPhone(), Integer.parseInt(dto.getName()), Integer::sum));
+//
+//        File fileTuan = new File("/Users/sunnianwen/Desktop/tuan.xlsx");
+//        List<AirDropExcelDTO> tuans = EasyExcel.read(fileTuan, AirDropExcelDTO.class, listener)
+//                .sheet()
+//                .doReadSync();
+//        tuans.forEach(dto -> map.merge(dto.getPhone(), Integer.parseInt(dto.getName()), Integer::sum));
+//
+//        File fileDi = new File("/Users/sunnianwen/Desktop/di.xlsx");
+//        List<AirDropExcelDTO> dis = EasyExcel.read(fileDi, AirDropExcelDTO.class, listener)
+//                .sheet()
+//                .doReadSync();
+//        dis.forEach(dto -> map.merge(dto.getPhone(), Integer.parseInt(dto.getName()), Integer::sum));
+//
+//        File fileTop1 = new File("/Users/sunnianwen/Desktop/top20_1.xlsx");
+//        List<AirDropExcelDTO> top1s = EasyExcel.read(fileTop1, AirDropExcelDTO.class, listener)
+//                .sheet()
+//                .doReadSync();
+//        top1s.forEach(dto -> map.merge(dto.getPhone(), Integer.parseInt(dto.getName()), Integer::sum));
+//
+//        File fileTop2 = new File("/Users/sunnianwen/Desktop/top20_2.xlsx");
+//        List<AirDropExcelDTO> top2s = EasyExcel.read(fileTop2, AirDropExcelDTO.class, listener)
+//                .sheet()
+//                .doReadSync();
+//        top2s.forEach(dto -> map.merge(dto.getPhone(), Integer.parseInt(dto.getName()), Integer::sum));
+//
+//        File vipLou = new File("/Users/sunnianwen/Desktop/vip_man_lou.xlsx");
+//        List<AirDropExcelDTO> lou1s = EasyExcel.read(vipLou, AirDropExcelDTO.class, listener)
+//                .sheet()
+//                .doReadSync();
+//        lou1s.forEach(dto -> map.merge(dto.getPhone(), Integer.parseInt(dto.getName()), Integer::sum));
+//
+//        File baiLou = new File("/Users/sunnianwen/Desktop/bai_lou.xlsx");
+//        List<AirDropExcelDTO> lou2s = EasyExcel.read(baiLou, AirDropExcelDTO.class, listener)
+//                .sheet()
+//                .doReadSync();
+//        lou2s.forEach(dto -> map.merge(dto.getPhone(), Integer.parseInt(dto.getName()), Integer::sum));
+//
+//        File vip = new File("/Users/sunnianwen/Desktop/vip.xlsx");
+//        List<AirDropExcelDTO> vips = EasyExcel.read(vip, AirDropExcelDTO.class, listener)
+//                .sheet()
+//                .doReadSync();
+//        vips.forEach(dto -> map.merge(dto.getPhone(), Integer.parseInt(dto.getName()), Integer::sum));
+
+        File all = new File("/Users/sunnianwen/Desktop/123.xlsx");
+        List<AirDropExcelDTO> alls = EasyExcel.read(all, AirDropExcelDTO.class, listener)
+                .sheet()
+                .doReadSync();
+        alls.forEach(dto -> map.merge(dto.getPhone(), Integer.parseInt(dto.getName()), Integer::sum));
+
+        map.forEach((key, value) -> System.out.println(key + "," + value));
+        AtomicInteger sum = new AtomicInteger();
+        map.forEach((key, value) -> sum.addAndGet(value));
+        System.out.println(sum.get());
+    }
+
+
 }