新人有礼
This commit is contained in:
parent
1c320b17c1
commit
8581ade77e
@ -3,7 +3,7 @@ import request from '@/utils/request'
|
||||
// 查询新人有礼活动列表
|
||||
export function listActiveNewlyweds(query) {
|
||||
return request({
|
||||
url: '/business/marketingActivity/activeNewlyweds/list',
|
||||
url: '/business/marketingActivity/activeNewlyweds',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
|
||||
@ -1,22 +1,7 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="所属连锁店id" prop="chainStoreId">
|
||||
<el-input
|
||||
v-model="queryParams.chainStoreId"
|
||||
placeholder="请输入所属连锁店id"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="所属店铺id" prop="storeId">
|
||||
<el-input
|
||||
v-model="queryParams.storeId"
|
||||
placeholder="请输入所属店铺id"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<div class="">
|
||||
<el-card style="margin-bottom: 20px">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
|
||||
<el-form-item label="活动名称" prop="name">
|
||||
<el-input
|
||||
v-model="queryParams.name"
|
||||
@ -25,137 +10,70 @@
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="活动开始时间" prop="activeStartTime">
|
||||
<el-date-picker clearable
|
||||
v-model="queryParams.activeStartTime"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择活动开始时间">
|
||||
</el-date-picker>
|
||||
<el-form-item label="状态">
|
||||
<el-select v-model="queryParams.status" clearable placeholder="请选择活动状态">
|
||||
<el-option label="启用" value="0"></el-option>
|
||||
<el-option label="禁用" value="1"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="活动结束时间" prop="activeEndTime">
|
||||
<el-date-picker clearable
|
||||
v-model="queryParams.activeEndTime"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择活动结束时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="有礼奖励 0：优惠券 1：兑换券 2：成长值 3：积分" prop="courtesyReward">
|
||||
<el-input
|
||||
v-model="queryParams.courtesyReward"
|
||||
placeholder="请输入有礼奖励 0：优惠券 1：兑换券 2：成长值 3：积分"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否在线 0：在线 1： 下线" prop="isonline">
|
||||
<el-input
|
||||
v-model="queryParams.isonline"
|
||||
placeholder="请输入是否在线 0：在线 1： 下线"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="活动剩余天数" prop="remainderTotal">
|
||||
<el-input
|
||||
v-model="queryParams.remainderTotal"
|
||||
placeholder="请输入活动剩余天数"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="赠送积分" prop="points">
|
||||
<el-input
|
||||
v-model="queryParams.points"
|
||||
placeholder="请输入赠送积分"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="赠送成长值" prop="growthValue">
|
||||
<el-input
|
||||
v-model="queryParams.growthValue"
|
||||
placeholder="请输入赠送成长值"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
<el-form-item label="上线/下线">
|
||||
<el-select v-model="queryParams.isonline" clearable placeholder="请选择是否上线">
|
||||
<el-option label="上线" value="0"></el-option>
|
||||
<el-option label="已下线" value="1"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-card>
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['business/marketingActivity:activeNewlyweds:add']"
|
||||
>新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
v-hasPermi="['business/marketingActivity:activeNewlyweds:edit']"
|
||||
>修改</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
v-hasPermi="['business/marketingActivity:activeNewlyweds:remove']"
|
||||
>删除</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['business/marketingActivity:activeNewlyweds:export']"
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
<el-card style="margin-bottom: 20px">
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
|
||||
>新增</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="activeNewlywedsList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="主键id" align="center" prop="id" />
|
||||
<el-table-column label="所属连锁店id" align="center" prop="chainStoreId" />
|
||||
<el-table-column label="所属店铺id" align="center" prop="storeId" />
|
||||
<el-table-column label="活动id" align="center" prop="id" />
|
||||
<el-table-column label="活动名称" align="center" prop="name" />
|
||||
<el-table-column label="活动开始时间" align="center" prop="activeStartTime" width="180">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.activeStartTime, '{y}-{m}-{d}') }}</span>
|
||||
<span>{{scope.row.activeStartTime}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="活动结束时间" align="center" prop="activeEndTime" width="180">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.activeEndTime, '{y}-{m}-{d}') }}</span>
|
||||
<span>{{scope.row.activeEndTime}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="有礼奖励 有礼奖励 0：优惠券 1：兑换券" align="center" prop="courtesyReward" >
|
||||
<template slot-scope="scope">
|
||||
<span v-for="(item,index) in scope.row.courtesyReward "> V{{item}}会员 </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="活动码" align="center" prop="activeCode" />
|
||||
|
||||
<el-table-column label="活动状态" align="center" prop="status" >
|
||||
<template slot-scope="scope">
|
||||
|
||||
<span v-if="scope.row.status == 0">启用</span>
|
||||
<span v-if="scope.row.status == 1">禁用</span>
|
||||
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="有礼奖励 0：优惠券 1：兑换券 2：成长值 3：积分" align="center" prop="courtesyReward" />
|
||||
<el-table-column label="是否在线 0：在线 1： 下线" align="center" prop="isonline" />
|
||||
<el-table-column label="活动状态 0：进行中 1： 待生效 2：已结束" align="center" prop="status" />
|
||||
<el-table-column label="活动剩余天数" align="center" prop="remainderTotal" />
|
||||
<el-table-column label="赠送积分" align="center" prop="points" />
|
||||
<el-table-column label="赠送成长值" align="center" prop="growthValue" />
|
||||
<el-table-column label="自定义规则" align="center" prop="remark" />
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
@ -183,43 +101,32 @@
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</el-card>
|
||||
|
||||
<!-- 添加或修改新人有礼活动对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-form-item label="所属连锁店id" prop="chainStoreId">
|
||||
<el-input v-model="form.chainStoreId" placeholder="请输入所属连锁店id" />
|
||||
</el-form-item>
|
||||
<el-form-item label="所属店铺id" prop="storeId">
|
||||
<el-input v-model="form.storeId" placeholder="请输入所属店铺id" />
|
||||
</el-form-item>
|
||||
<el-form-item label="活动名称" prop="name">
|
||||
<el-input v-model="form.name" placeholder="请输入活动名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="活动开始时间" prop="activeStartTime">
|
||||
<el-date-picker clearable
|
||||
v-model="form.activeStartTime"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择活动开始时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="活动结束时间" prop="activeEndTime">
|
||||
<el-date-picker clearable
|
||||
v-model="form.activeEndTime"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择活动结束时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="有礼奖励 0：优惠券 1：兑换券 2：成长值 3：积分" prop="courtesyReward">
|
||||
<el-input v-model="form.courtesyReward" placeholder="请输入有礼奖励 0：优惠券 1：兑换券 2：成长值 3：积分" />
|
||||
</el-form-item>
|
||||
<el-form-item label="是否在线 0：在线 1： 下线" prop="isonline">
|
||||
<el-input v-model="form.isonline" placeholder="请输入是否在线 0：在线 1： 下线" />
|
||||
</el-form-item>
|
||||
<el-form-item label="活动剩余天数" prop="remainderTotal">
|
||||
<el-input v-model="form.remainderTotal" placeholder="请输入活动剩余天数" />
|
||||
<el-form-item label="有礼奖励 " prop="courtesyReward">
|
||||
<el-input v-model="form.courtesyReward" placeholder="请输入有礼奖励 " />
|
||||
</el-form-item>
|
||||
<el-form-item label="赠送积分" prop="points">
|
||||
<el-input v-model="form.points" placeholder="请输入赠送积分" />
|
||||
@ -274,6 +181,7 @@ export default {
|
||||
activeStartTime: null,
|
||||
activeEndTime: null,
|
||||
courtesyReward: null,
|
||||
activeCode: null,
|
||||
isonline: null,
|
||||
status: null,
|
||||
remainderTotal: null,
|
||||
@ -295,8 +203,8 @@ export default {
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listActiveNewlyweds(this.queryParams).then(response => {
|
||||
this.activeNewlywedsList = response.rows;
|
||||
this.total = response.total;
|
||||
this.activeNewlywedsList = response.data.records;
|
||||
this.total = response.data.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
@ -314,7 +222,8 @@ export default {
|
||||
name: null,
|
||||
activeStartTime: null,
|
||||
activeEndTime: null,
|
||||
courtesyReward: null,
|
||||
courtesyReward: [],
|
||||
activeCode: null,
|
||||
isonline: null,
|
||||
status: null,
|
||||
remainderTotal: null,
|
||||
|
||||
@ -27,6 +27,8 @@ public class ActiveNewlywedsVO implements Serializable {
|
||||
private Date activeEndTime;
|
||||
//有礼奖励 0：优惠券 1：兑换券 2：成长值 3：积分
|
||||
private String[] courtesyReward;
|
||||
//活动码
|
||||
private String activeCode;
|
||||
//是否在线 0：在线 1： 下线
|
||||
private String isonline;
|
||||
//活动状态 0：进行中 1： 待生效 2：已结束
|
||||
@ -52,6 +54,14 @@ public class ActiveNewlywedsVO implements Serializable {
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime;
|
||||
|
||||
public String getActiveCode() {
|
||||
return activeCode;
|
||||
}
|
||||
|
||||
public void setActiveCode(String activeCode) {
|
||||
this.activeCode = activeCode;
|
||||
}
|
||||
|
||||
public Integer getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
@ -27,6 +27,8 @@ public class ActiveNewlywedsDTO implements Serializable {
|
||||
private Date activeEndTime;
|
||||
//有礼奖励 0：优惠券 1：兑换券 2：成长值 3：积分
|
||||
private String[] courtesyReward;
|
||||
//活动码
|
||||
private String activeCode;
|
||||
//是否在线 0：在线 1： 下线
|
||||
private String isonline;
|
||||
//活动状态 0：进行中 1： 待生效 2：已结束
|
||||
@ -52,6 +54,14 @@ public class ActiveNewlywedsDTO implements Serializable {
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime;
|
||||
|
||||
public String getActiveCode() {
|
||||
return activeCode;
|
||||
}
|
||||
|
||||
public void setActiveCode(String activeCode) {
|
||||
this.activeCode = activeCode;
|
||||
}
|
||||
|
||||
public Integer getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
@ -34,6 +34,8 @@ public class ActiveNewlyweds extends Model<ActiveNewlyweds> {
|
||||
private Date activeEndTime;
|
||||
//有礼奖励 0：优惠券 1：兑换券 2：成长值 3：积分
|
||||
private String courtesyReward;
|
||||
//活动码
|
||||
private String activeCode;
|
||||
//是否在线 0：在线 1： 下线
|
||||
private String isonline;
|
||||
//活动状态 0：进行中 1： 待生效 2：已结束
|
||||
@ -57,6 +59,13 @@ public class ActiveNewlyweds extends Model<ActiveNewlyweds> {
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime;
|
||||
|
||||
public String getActiveCode() {
|
||||
return activeCode;
|
||||
}
|
||||
|
||||
public void setActiveCode(String activeCode) {
|
||||
this.activeCode = activeCode;
|
||||
}
|
||||
|
||||
public Integer getId() {
|
||||
return id;
|
||||
|
||||
@ -95,12 +95,10 @@ public class ActiveRecommendServiceImpl extends ServiceImpl<ActiveRecommendMappe
|
||||
queryWrapper.eq(ActiveRecommendChild::getActiveRecommendId,id);
|
||||
queryWrapper.orderByDesc(ActiveRecommendChild::getCreateTime);
|
||||
List<ActiveRecommendChild> activeRecommendChildList = activeRecommendChildService.list(queryWrapper);
|
||||
if (CollectionUtils.isNotEmpty(activeRecommendChildList)){
|
||||
//封装VO返回
|
||||
BeanUtils.copyProperties(activeRecommend,activeRecommendVO);
|
||||
activeRecommendVO.setInviterGiftType(activeRecommend.getInviterGiftType().split(","));
|
||||
activeRecommendVO.setActiveRecommendChildList(activeRecommendChildList);
|
||||
}
|
||||
BeanUtils.copyProperties(activeRecommend,activeRecommendVO);
|
||||
activeRecommendVO.setInviterGiftType(activeRecommend.getInviterGiftType().split(","));
|
||||
activeRecommendVO.setActiveRecommendChildList(activeRecommendChildList);
|
||||
}
|
||||
return activeRecommendVO;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user