.

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

@@ -28,6 +28,9 @@ public class AirDrop extends BaseEntity {
     @ApiModelProperty("备注")
     private String remark;
 
+    @ApiModelProperty("空投类型")
+    private String type;
+
     @ApiModelProperty("兑换券名称")
     private String couponName;
 
@@ -44,8 +47,8 @@ public class AirDrop extends BaseEntity {
     @ApiModelProperty("用户ID")
     private List<Long> userIds;
 
-    @ApiModelProperty("空投类型")
-    private String type;
+    @ApiModelProperty("藏品ID")
+    private Long collectionId;
 
     @Column(columnDefinition = "TEXT")
     private String result;

src/main/java/com/izouma/nineth/repo/UserRepo.java

@@ -91,4 +91,6 @@ public interface UserRepo extends JpaRepository<User, Long>, JpaSpecificationExe
             "    asset.minter_avatar = user.avatar " +
             "where user.id = ?1", nativeQuery = true)
     void updateMinterForAsset(Long userId);
+
+    List<User> findByPhoneInAndDelFalse(Iterable<String> phone);
 }

src/main/java/com/izouma/nineth/service/UserService.java

@@ -367,7 +367,24 @@ public class UserService {
         map.put("id", user.getId());
         map.put("avatar", user.getAvatar());
         map.put("phone", user.getPhone().replaceAll("(?<=.{3}).*(?=.{4})", "****"));
-        map.put("realName", user.getRealName().replaceAll(".*(?=.)", "**"));
+        map.put("realName", Optional.ofNullable(user.getRealName()).orElse("").replaceAll(".*(?=.)", "**"));
+        return map;
+    }
+
+
+    public Map<String, Object> searchByPhoneAdmin(String phoneStr) {
+        List<String> phone = Arrays.stream(phoneStr.replaceAll("\n", " ")
+                        .replaceAll("\r\n", "")
+                        .split(" "))
+                .map(String::trim)
+                .filter(s -> !StringUtils.isEmpty(s))
+                .collect(Collectors.toList());
+        List<User> users = userRepo.findByPhoneInAndDelFalse(phone);
+        Map<String, Object> map = new HashMap<>();
+        map.put("users", users);
+        List<String> notFound = phone.stream().filter(p -> users.stream().noneMatch(u -> p.equals(u.getPhone())))
+                .collect(Collectors.toList());
+        map.put("notFound", notFound);
         return map;
     }
 }

src/main/java/com/izouma/nineth/web/UserController.java

@@ -189,6 +189,12 @@ public class UserController extends BaseController {
     public Map<String, Object> searchByPhone(@RequestParam String phone) {
         return userService.searchByPhone(phone);
     }
+
+    @PreAuthorize("hasAnyRole('ADMIN', 'OPERATOR')")
+    @PostMapping("/searchByPhoneAdmin")
+    public Map<String, Object> searchByPhoneAdmin(@RequestParam String phone) {
+        return userService.searchByPhoneAdmin(phone);
+    }
 }
 
 

src/main/vue/src/views/AirDropEdit.vue

@@ -2,49 +2,51 @@
     <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="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">
-                <el-form :model="formData" :rules="rules" ref="form" label-width="94px" label-position="right"
-                         size="small"
-                         style="max-width: 500px;">
-                        <el-form-item prop="name" label="空投名称">
-                                    <el-input v-model="formData.name"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="remark" label="备注">
-                                    <el-input v-model="formData.remark"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="couponName" label="兑换券名称">
-                                    <el-input v-model="formData.couponName"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="couponRemark" label="兑换券备注">
-                                    <el-input v-model="formData.couponRemark"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="phone" label="手机号">
-                                    <el-input type="textarea" v-model="formData.phone"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="userIds" label="用户ID">
-                        </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 prop="result" label="result">
-                        </el-form-item>
+                <el-form
+                    :model="formData"
+                    :rules="rules"
+                    ref="form"
+                    label-width="94px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 500px"
+                >
+                    <el-form-item prop="name" label="空投名称">
+                        <el-input v-model="formData.name"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="remark" label="备注">
+                        <el-input v-model="formData.remark"></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 prop="couponName" label="兑换券名称" v-if="formData.type === 'coupon'">
+                        <el-input v-model="formData.couponName"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="couponRemark" label="兑换券备注" v-if="formData.type === 'coupon'">
+                        <el-input v-model="formData.couponRemark"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="phone" label="手机号">
+                        <el-input type="textarea" v-model="formData.phone"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="userIds" label="用户ID"> </el-form-item>
+
+                    <el-form-item prop="result" label="result"> </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>
@@ -53,96 +55,106 @@
                 </el-form>
             </div>
         </div>
+
+        <el-dialog :visible.sync="showPhoneDialog">
+            <el-input v-model="phone" ></el-input>
+        </el-dialog>
     </div>
 </template>
 <script>
-    export default {
-        name: 'AirDropEdit',
-        created() {
-            if (this.$route.query.id) {
-                this.$http
-                    .get('airDrop/get/' + this.$route.query.id)
-                    .then(res => {
-                        this.formData = res;
-                    })
-                    .catch(e => {
-                        console.log(e);
-                        this.$message.error(e.error);
-                    });
-            }
-        },
-        data() {
-            return {
-                saving: false,
-                formData: {
-                },
-                rules: {
-                    name: [
-                        {
-                            required: true,
-                            message: '请输入空投名称',
-                            trigger: 'blur'
-                        },
-                    ],
-                    phone: [
-                        {
-                            required: true,
-                            message: '请输入手机号',
-                            trigger: 'blur'
-                        },
-                    ],
-                    type: [
-                        {
-                            required: true,
-                            message: '请输入空投类型',
-                            trigger: 'blur'
-                        },
-                    ],
-                },
-                typeOptions: [{"label":"藏品","value":"asset"},{"label":"兑换券","value":"coupon"}],
-            }
-        },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
+export default {
+    name: 'AirDropEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('airDrop/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
                 });
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+                name: [
+                    {
+                        required: true,
+                        message: '请输入空投名称',
+                        trigger: 'blur'
+                    }
+                ],
+                phone: [
+                    {
+                        required: true,
+                        message: '请输入手机号',
+                        trigger: 'blur'
+                    }
+                ],
+                type: [
+                    {
+                        required: true,
+                        message: '请输入空投类型',
+                        trigger: 'blur'
+                    }
+                ]
             },
-            submit() {
-                let data = {...this.formData};
+            typeOptions: [
+                { label: '藏品', value: 'asset' },
+                { label: '兑换券', value: 'coupon' }
+            ],
+            phone: ''
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
 
-                this.saving = true;
-                this.$http
-                    .post('/airDrop/save', data, {body: 'json'})
-                    .then(res => {
-                        this.saving = false;
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    })
-                    .catch(e => {
-                        console.log(e);
-                        this.saving = false;
-                        this.$message.error(e.error);
-                    });
-            },
-            onDelete() {
-                this.$confirm('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post(`/airDrop/del/${this.formData.id}`)
-                }).then(() => {
+            this.saving = true;
+            this.$http
+                .post('/airDrop/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$confirm('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/airDrop/del/${this.formData.id}`);
+                })
+                .then(() => {
                     this.$message.success('删除成功');
                     this.$router.go(-1);
-                }).catch(e => {
+                })
+                .catch(e => {
                     if (e !== 'cancel') {
                         console.log(e);
                         this.$message.error((e || {}).error || '删除失败');
                     }
-                })
-            },
+                });
         }
     }
+};
 </script>
 <style lang="less" scoped></style>

src/main/vue/src/views/AirDropList.vue

@@ -1,57 +1,53 @@
 <template>
-    <div  class="list-view">
+    <div class="list-view">
         <page-title>
-            <el-button @click="addRow" type="primary" icon="el-icon-plus" :disabled="fetchingData || downloading" class="filter-item">
+            <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 @click="download" icon="el-icon-upload2" :loading="downloading" :disabled="fetchingData" class="filter-item">
                 导出
-            </el-button>
+            </el-button> -->
         </page-title>
         <div class="filters-container">
             <el-input
-                    placeholder="搜索..."
-                    v-model="search"
-                    clearable
-                    class="filter-item search"
-                    @keyup.enter.native="getData"
+                placeholder="搜索..."
+                v-model="search"
+                clearable
+                class="filter-item search"
+                @keyup.enter.native="getData"
             >
                 <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
             </el-input>
         </div>
-        <el-table :data="tableData" row-key="id" ref="table"
-                  header-row-class-name="table-header-row"
-                  header-cell-class-name="table-header-cell"
-                  row-class-name="table-row" cell-class-name="table-cell"
-                  :height="tableHeight" 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="name" label="空投名称"
->
-                    </el-table-column>
-                    <el-table-column prop="couponName" label="兑换券名称"
->
-                    </el-table-column>
-                    <el-table-column prop="phone" label="手机号"
->
-                    </el-table-column>
-                    <el-table-column prop="type" label="空投类型"
-                            :formatter="typeFormatter"
-                        >
-                    </el-table-column>
-            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    width="150">
-                <template slot-scope="{row}">
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+            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="name" label="空投名称"> </el-table-column>
+            <el-table-column prop="type" label="空投类型" :formatter="typeFormatter"> </el-table-column>
+            <el-table-column prop="couponName" label="兑换券名称"> </el-table-column>
+            <el-table-column prop="phone" label="手机号"> </el-table-column>
+            <!-- <el-table-column label="操作" align="center" fixed="right" width="150">
+                <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>
                 </template>
-            </el-table-column>
+            </el-table-column> -->
         </el-table>
         <div class="pagination-wrapper">
             <!-- <div class="multiple-mode-wrapper">
@@ -62,120 +58,127 @@
                     <el-button @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div> -->
-            <el-pagination background @size-change="onSizeChange"
-                           @current-change="onCurrentChange" :current-page="page"
-                           :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
-                           layout="total, sizes, prev, pager, next, jumper"
-                           :total="totalElements">
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
             </el-pagination>
         </div>
-
     </div>
 </template>
 <script>
-    import { mapState } from "vuex";
-    import pageableTable from "@/mixins/pageableTable";
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
 
-    export default {
-        name: 'AirDropList',
-        mixins: [pageableTable],
-        data() {
-            return {
-                multipleMode: false,
-                search: "",
-                url: "/airDrop/all",
-                downloading: false,
-                        typeOptions:[{"label":"藏品","value":"asset"},{"label":"兑换券","value":"coupon"}],
+export default {
+    name: 'AirDropList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/airDrop/all',
+            downloading: false,
+            typeOptions: [
+                { label: '藏品', value: 'asset' },
+                { label: '兑换券', value: 'coupon' }
+            ]
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        typeFormatter(row, column, cellValue, index) {
+            let selectedOption = this.typeOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
             }
+            return '';
+        },
+        beforeGetData() {
+            return { search: this.search, query: { del: false } };
         },
-        computed: {
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
             }
         },
-        methods: {
-                    typeFormatter(row, column, cellValue, index) {
-                        let selectedOption = this.typeOptions.find(i => i.value === cellValue);
-                        if (selectedOption) {
-                            return selectedOption.label;
-                        }
-                        return '';
-                    },
-            beforeGetData() {
-                return { search: this.search, query: { del: false } };
-            },
-            toggleMultipleMode(multipleMode) {
-                this.multipleMode = multipleMode;
-                if (!multipleMode) {
-                    this.$refs.table.clearSelection();
+        addRow() {
+            this.$router.push({
+                path: '/airDropEdit',
+                query: {
+                    ...this.$route.query
                 }
-            },
-            addRow() {
-                this.$router.push({
-                    path: "/airDropEdit",
-                    query: {
-                        ...this.$route.query
-                    }
-                });
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: "/airDropEdit",
-                    query: {
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/airDropEdit',
+                query: {
                     id: row.id
-                    }
-                });
-            },
-            download() {
-                this.downloading = true;
-                this.$axios
-                    .get("/airDrop/excel", { 
-                        responseType: "blob",
-                        params: { size: 10000 }
-                    })
-                    .then(res => {
-                        console.log(res);
-                        this.downloading = false;
-                        const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
-                        const link = document.createElement("a");
-                        link.href = downloadUrl;
-                        link.setAttribute(
-                            "download",
-                            res.headers["content-disposition"].split("filename=")[1]
-                        );
-                        document.body.appendChild(link);
-                        link.click();
-                        link.remove();
-                    })
-                    .catch(e => {
-                        console.log(e);
-                        this.downloading = false;
-                        this.$message.error(e.error);
-                    });
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/airDrop/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
                 });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post(`/airDrop/del/${row.id}`)
-                }).then(() => {
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/airDrop/del/${row.id}`);
+                })
+                .then(() => {
                     this.$message.success('删除成功');
                     this.getData();
-                }).catch(e => {
+                })
+                .catch(e => {
                     if (e !== 'cancel') {
                         this.$message.error(e.error);
                     }
-                })
-            },
+                });
         }
     }
+};
 </script>
 <style lang="less" scoped>
 </style>