活动收集

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

@@ -35,7 +35,7 @@ public class ActivityCollectionController extends BaseController {
             ObjUtils.merge(orig, record);
             return activityCollectionRepo.save(orig);
         }
-        record.setStock(record.getStock());
+        record.setStock(record.getTotal());
         return activityCollectionRepo.save(record);
     }
 

src/main/vue/src/router.js

@@ -440,37 +440,53 @@ const router = new Router({
                     }
                 },
                 {
-                    path: '/assetPostEdit',
-                    name: 'AssetPostEdit',
-                    component: () => import(/* webpackChunkName: "assetPostEdit" */ '@/views/AssetPostEdit.vue'),
+                    path: '/adapayMerchantEdit',
+                    name: 'AdapayMerchantEdit',
+                    component: () => import(/* webpackChunkName: "adapayMerchantEdit" */ '@/views/AdapayMerchantEdit.vue'),
                     meta: {
-                        title: '邮寄衍生品编辑'
-                    }
+                       title: 'ada编辑',
+                    },
                 },
                 {
-                    path: '/assetPostList',
-                    name: 'AssetPostList',
-                    component: () => import(/* webpackChunkName: "assetPostList" */ '@/views/AssetPostList.vue'),
+                    path: '/adapayMerchantList',
+                    name: 'AdapayMerchantList',
+                    component: () => import(/* webpackChunkName: "adapayMerchantList" */ '@/views/AdapayMerchantList.vue'),
                     meta: {
-                        title: '邮寄衍生品'
-                    }
+                       title: 'ada',
+                    },
+               },
+                {
+                    path: '/activityCollectionEdit',
+                    name: 'ActivityCollectionEdit',
+                    component: () => import(/* webpackChunkName: "activityCollectionEdit" */ '@/views/ActivityCollectionEdit.vue'),
+                    meta: {
+                       title: '活动收集编辑',
+                    },
                 },
                 {
-                    path: '/derivativeEdit',
-                    name: 'DerivativeEdit',
-                    component: () => import(/* webpackChunkName: "derivativeEdit" */ '@/views/DerivativeEdit.vue'),
+                    path: '/activityCollectionList',
+                    name: 'ActivityCollectionList',
+                    component: () => import(/* webpackChunkName: "activityCollectionList" */ '@/views/ActivityCollectionList.vue'),
                     meta: {
-                        title: '藏品管理编辑'
-                    }
+                       title: '活动收集',
+                    },
+               },
+                {
+                    path: '/activityOrderEdit',
+                    name: 'ActivityOrderEdit',
+                    component: () => import(/* webpackChunkName: "activityOrderEdit" */ '@/views/ActivityOrderEdit.vue'),
+                    meta: {
+                       title: '收集记录编辑',
+                    },
                 },
                 {
-                    path: '/derivativeList',
-                    name: 'DerivativeList',
-                    component: () => import(/* webpackChunkName: "derivativeList" */ '@/views/DerivativeList.vue'),
+                    path: '/activityOrderList',
+                    name: 'ActivityOrderList',
+                    component: () => import(/* webpackChunkName: "activityOrderList" */ '@/views/ActivityOrderList.vue'),
                     meta: {
-                        title: '藏品管理'
-                    }
-                }
+                       title: '收集记录',
+                    },
+               }
                 /**INSERT_LOCATION**/
             ]
         },
@@ -530,4 +546,4 @@ router.beforeEach((to, from, next) => {
     }
 });
 
-export default router;
+export default router;

src/main/vue/src/views/ActivityCollectionEdit.vue

@@ -0,0 +1,256 @@
+<template>
+    <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>
+        </page-title>
+        <div class="edit-view__content-wrapper">
+            <div class="edit-view__content-section">
+                <el-form
+                    :model="formData"
+                    :rules="rules"
+                    ref="form"
+                    label-width="108px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 500px"
+                >
+                    <el-form-item label="项目" prop="projectId">
+                        <el-select v-model="formData.projectId" @change="changeProject" :disabled="!canEdit">
+                            <el-option :value="0" label="第九空间"></el-option>
+                            <el-option :value="1" label="cosmos art"></el-option>
+                            <!-- <el-option :value="2" label="modern point"></el-option> -->
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="name" label="活动名称">
+                        <el-input v-model="formData.name" :disabled="!canEdit"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="pic" label="图片">
+                        <single-upload v-model="formData.pic"></single-upload>
+                    </el-form-item>
+                    <el-form-item prop="collectionId" label="兑换藏品">
+                        <el-select
+                            v-model="formData.collectionId"
+                            filterable
+                            :filter-method="filterCollection"
+                            style="width: 100%"
+                            @change="changCollection"
+                            :disabled="!canEdit"
+                        >
+                            <el-option v-for="item in filterOptions" :label="item.name" :value="item.id" :key="item.id">
+                                <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">#{{ item.id }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="num" label="兑换数量">
+                        <el-input-number type="number" v-model="formData.num" :disabled="!canEdit"></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="total" label="发行数量">
+                        <el-input-number type="number" v-model="formData.total" :disabled="!canEdit"></el-input-number>
+                    </el-form-item>
+                    <el-form-item prop="awardCollectionId" label="获得藏品">
+                        <el-select
+                            v-model="formData.awardCollectionId"
+                            filterable
+                            :filter-method="filterCollection1"
+                            style="width: 100%"
+                            @change="changAwardCollection"
+                            :disabled="!canEdit"
+                        >
+                            <el-option
+                                v-for="item in filterOptions1"
+                                :label="item.name"
+                                :value="item.id"
+                                :key="item.id"
+                            >
+                                <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">#{{ item.id }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item class="form-submit">
+                        <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="$router.go(-1)" :disabled="saving">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    name: 'ActivityCollectionEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('activityCollection/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+        this.$http
+            .post(
+                '/collection/all',
+                {
+                    size: 10000,
+                    sort: 'sort,desc;createdAt,desc',
+                    query: { del: false, source: 'OFFICIAL', type: 'DEFAULT' }
+                },
+                { body: 'json' }
+            )
+            .then(res => {
+                this.options = res.content;
+                this.filterOptions = this.options.filter(i => i.projectId == this.$store.state.projectId);
+                this.filterOptions1 = this.options.filter(i => i.projectId == this.$store.state.projectId);
+            });
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {
+                projectId: this.$store.state.projectId
+            },
+            rules: {
+                name: [
+                    {
+                        required: true,
+                        message: '请输入名称',
+                        trigger: 'blur'
+                    }
+                ],
+                pic: [
+                    {
+                        required: true,
+                        message: '请上传图片',
+                        trigger: 'blur'
+                    }
+                ],
+                collectionId: [
+                    {
+                        required: true,
+                        message: '请选择兑换藏品',
+                        trigger: 'blur'
+                    }
+                ],
+                num: [
+                    {
+                        required: true,
+                        message: '请输入兑换数量',
+                        trigger: 'blur'
+                    }
+                ],
+                total: [
+                    {
+                        required: true,
+                        message: '请输入发行数量',
+                        trigger: 'blur'
+                    }
+                ],
+                awardCollectionId: [
+                    {
+                        required: true,
+                        message: '请选择获得藏品',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+            options: [],
+            filterOptions: [],
+            filterOptions1: []
+        };
+    },
+    computed: {
+        canEdit() {
+            return !!!this.$route.query.id;
+        }
+    },
+    methods: {
+        filterCollection(val) {
+            this.filterOptions = this.options.filter(
+                i => i.projectId == this.formData.projectId && (i => i.name.includes(val) || i.id == val)
+            );
+        },
+        filterCollection1(val) {
+            this.filterOptions1 = this.options.filter(
+                i => i.projectId == this.formData.projectId && (i.name.includes(val) || i.id == val)
+            );
+        },
+        changeProject(val) {
+            this.filterOptions = this.options.filter(i => i.projectId == val);
+            this.filterOptions1 = this.options.filter(i => i.projectId == val);
+        },
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+
+            this.saving = true;
+            this.$http
+                .post('/activityCollection/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(`/activityCollection/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                });
+        },
+        changAwardCollection(row) {
+            let data = this.options.find(item => {
+                return item.id === row;
+            });
+            this.formData.awardCollectionName = data.name;
+            console.log(this.formData.awardCollectionName);
+        },
+        changCollection(row) {
+            let data = this.options.find(item => {
+                return item.id === row;
+            });
+            this.formData.collectionName = data.name;
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+/deep/.el-input.is-disabled .el-input__inner {
+    color: #7c7e7e;
+}
+/deep/.el-radio__input.is-disabled + span.el-radio__label {
+    color: #7c7e7e;
+}
+</style>

src/main/vue/src/views/ActivityCollectionList.vue

@@ -0,0 +1,193 @@
+<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>
+        <div class="filters-container">
+            <el-input
+                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="pic" label="图片">
+                <template slot-scope="{ row }">
+                    <el-image
+                        style="width: 30px; height: 30px"
+                        :src="row.pic"
+                        fit="cover"
+                        :preview-src-list="[row.pic]"
+                    ></el-image>
+                </template>
+            </el-table-column>
+            <el-table-column prop="collectionName" label="藏品名称"> </el-table-column>
+            <el-table-column prop="collectionId" label="藏品ID"> </el-table-column>
+            <el-table-column prop="num" label="藏品数量"> </el-table-column>
+            <el-table-column prop="stock" label="剩余数量"> </el-table-column>
+            <el-table-column prop="total" label="发行数量"> </el-table-column>
+            <el-table-column prop="awardCollectionId" label="领取藏品ID"> </el-table-column>
+            <el-table-column prop="awardCollectionName" 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>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <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>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'ActivityCollectionList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/activityCollection/all',
+            downloading: false
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            return { search: this.search, query: { del: false, projectId: this.$store.state.projectId } };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/activityCollectionEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/activityCollectionEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/activityCollection/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
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/activityCollection/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/ActivityOrderEdit.vue

@@ -0,0 +1,112 @@
+<template>
+    <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>
+        </page-title>
+        <div class="edit-view__content-wrapper">
+            <div class="edit-view__content-section">
+                <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right"
+                         size="small"
+                         style="max-width: 500px;">
+                        <el-form-item prop="userId" label="用户ID">
+                                    <el-input-number type="number" v-model="formData.userId"></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="phone" label="手机号">
+                                    <el-input v-model="formData.phone"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="activityCollectionId" label="活动ID">
+                                    <el-input-number type="number" v-model="formData.activityCollectionId"></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="activityCollection" label="活动名称">
+                                    <el-input v-model="formData.activityCollection"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="material" label="material">
+                                    <el-input v-model="formData.material"></el-input>
+                        </el-form-item>
+                    <el-form-item class="form-submit">
+                        <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="$router.go(-1)" :disabled="saving">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    export default {
+        name: 'ActivityOrderEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('activityOrder/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: {
+                },
+            }
+        },
+        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('/activityOrder/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(`/activityOrder/del/${this.formData.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/ActivityOrderList.vue

@@ -0,0 +1,175 @@
+<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>
+        <div class="filters-container">
+            <el-input
+                    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="userId" label="用户ID"
+>
+                    </el-table-column>
+                    <el-table-column prop="phone" label="手机号"
+>
+                    </el-table-column>
+                    <el-table-column prop="activityCollectionId" label="活动ID"
+>
+                    </el-table-column>
+                    <el-table-column prop="activityCollection" label="活动名称"
+>
+                    </el-table-column>
+                    <el-table-column prop="material" label="material"
+>
+                    </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>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <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>
+        </div>
+
+    </div>
+</template>
+<script>
+    import { mapState } from "vuex";
+    import pageableTable from "@/mixins/pageableTable";
+
+    export default {
+        name: 'ActivityOrderList',
+        mixins: [pageableTable],
+        data() {
+            return {
+                multipleMode: false,
+                search: "",
+                url: "/activityOrder/all",
+                downloading: false,
+            }
+        },
+        computed: {
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            beforeGetData() {
+                return { search: this.search, query: { del: false } };
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            addRow() {
+                this.$router.push({
+                    path: "/activityOrderEdit",
+                    query: {
+                        ...this.$route.query
+                    }
+                });
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: "/activityOrderEdit",
+                    query: {
+                    id: row.id
+                    }
+                });
+            },
+            download() {
+                this.downloading = true;
+                this.$axios
+                    .get("/activityOrder/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
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/activityOrder/del/${row.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/AdapayMerchantEdit.vue

@@ -0,0 +1,133 @@
+<template>
+    <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>
+        </page-title>
+        <div class="edit-view__content-wrapper">
+            <div class="edit-view__content-section">
+                <el-form
+                    :model="formData"
+                    :rules="rules"
+                    ref="form"
+                    label-width="89px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 500px"
+                >
+                    <el-form-item prop="name" label="name">
+                        <el-input v-model="formData.name"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="appId" label="appId">
+                        <el-input v-model="formData.appId"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="apiKey" label="apiKey">
+                        <el-input v-model="formData.apiKey"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="mockKey" label="mockKey">
+                        <el-input v-model="formData.mockKey"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="publicKey" label="publicKey">
+                        <el-input v-model="formData.publicKey" type="textarea"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="privKey" label="privKey">
+                        <el-input v-model="formData.privKey" type="textarea"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="wxAppId" label="wxAppId">
+                        <el-input v-model="formData.wxAppId"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="status" label="status">
+                        <el-input v-model="formData.status"></el-input>
+                    </el-form-item>
+                    <el-form-item class="form-submit">
+                        <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="$router.go(-1)" :disabled="saving">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    name: 'AdapayMerchantEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('adapayMerchant/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: [
+                    {
+                        pattern: /^[a-z0-9-]+$/,
+                        message: '只能包含小写字母和数字-',
+                        trigger: 'blur'
+                    }
+                ]
+            }
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+            data.name = data.name.toLowerCase();
+
+            this.saving = true;
+            this.$http
+                .post('/adapayMerchant/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(`/adapayMerchant/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/AdapayMerchantList.vue

@@ -0,0 +1,298 @@
+<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>
+        <div class="filters-container">
+            <el-button class="filter-item" @click="showQueryDialog = true">查询</el-button>
+            <el-button class="filter-item" @click="showRefundDialog = true">退款</el-button>
+            <el-input
+                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="name"> </el-table-column>
+            <el-table-column prop="appId" label="appId" width="330"> </el-table-column>
+            <el-table-column prop="status" label="status"> </el-table-column>
+            <el-table-column prop="selected" label="selected" align="center">
+                <template v-slot="{ row }">
+                    <el-tag :type="row.selected ? 'success' : 'info'">{{ row.selected ? '是' : '否' }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="right" fixed="right" width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="select(row)" type="primary" size="mini" plain v-if="!row.selected"
+                        >切换</el-button
+                    >
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <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>
+        </div>
+        <el-dialog title="查询订单" :visible.sync="showQueryDialog" width="650px">
+            <el-form label-position="right" label-width="100px">
+                <el-form-item label="商户">
+                    <el-select v-model="merchantId">
+                        <el-option
+                            v-for="item in tableData"
+                            :label="item.name"
+                            :value="item.id"
+                            :key="item.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="订单流水号">
+                    <el-input v-model="orderId"></el-input>
+                </el-form-item>
+                <el-form-item v-if="queryResult" label="结果">
+                    <pre v-html="queryResult" style="line-height: 1.5"></pre>
+                </el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="query" :loading="querying">查询</el-button>
+            </div>
+        </el-dialog>
+
+        <el-dialog title="订单退款" :visible.sync="showRefundDialog" width="650px">
+            <el-form label-position="right" label-width="100px">
+                <el-form-item label="商户">
+                    <el-select v-model="merchantId">
+                        <el-option
+                            v-for="item in tableData"
+                            :label="item.name"
+                            :value="item.id"
+                            :key="item.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="订单流水号">
+                    <el-input v-model="orderId"></el-input>
+                </el-form-item>
+                <el-form-item v-if="refundResult" label="结果">
+                    <pre v-html="refundResult" style="line-height: 1.5"></pre>
+                </el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="refund" :loading="querying">退款</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'AdapayMerchantList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/adapayMerchant/all',
+            downloading: false,
+            merchantId: null,
+            orderId: null,
+            showQueryDialog: false,
+            showRefundDialog: false,
+            querying: false,
+            queryResult: null,
+            refundResult: null
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        beforeGetData() {
+            return { search: this.search, query: { del: false } };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/adapayMerchantEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/adapayMerchantEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/adapayMerchant/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
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/adapayMerchant/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        },
+        select(row) {
+            this.$alert('确认切换？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/adapayMerchant/select`, { id: row.id });
+                })
+                .then(() => {
+                    this.$message.success('切换成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        },
+        query() {
+            this.querying = true;
+            this.$http
+                .post('/adapayMerchant/query', {
+                    id: this.merchantId,
+                    orderId: this.orderId
+                })
+                .then(res => {
+                    this.querying = false;
+                    console.log(res);
+                    this.queryResult = JSON.stringify(res, null, 4);
+                })
+                .catch(e => {
+                    this.querying = false;
+                    this.$message.error(e.error || '失败');
+                });
+        },
+        refund() {
+            this.$alert('确认退款？', '警告', { type: 'error' })
+                .then(() => {
+                    this.querying = true;
+                    this.$http
+                        .post('/adapayMerchant/refund', {
+                            id: this.merchantId,
+                            orderId: this.orderId
+                        })
+                        .then(res => {
+                            this.querying = false;
+                            console.log(res);
+                            this.refundResult = JSON.stringify(res, null, 4);
+                        })
+                        .catch(e => {
+                            this.querying = false;
+                            this.$message.error(e.error || '失败');
+                        });
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+</style>