dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
PQZ 2024-09-09 23:24:18 +08:00
parent 120dabb9df
commit c4e7d2059e
4 changed files with 249 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

241
fuintAdmin/src/views/EventMarketing/center/index.vue
View File

@ -196,16 +196,8 @@
<div class="bai-box" v-show="tabindex == 1" >
<div class="b-d">
<div class="d-s">
<el-input v-model="ruleForm.input" placeholder="请输入活动名称" style=" width: 260px; margin-right: 15px"></el-input>
<el-select v-model="ruleForm.value" placeholder="请选择活动类型" style=" width: 260px; margin-right: 15px">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-select v-model="ruleForm.value" placeholder="请选择状态" style=" width: 260px; margin-right: 15px">
<el-input v-model="queryParams.name" placeholder="请输入活动名称" style=" width: 260px; margin-right: 15px"></el-input>
<el-select v-model="queryParams.type" placeholder="请选择活动类型" style=" width: 260px; margin-right: 15px">
<el-option
v-for="item in options"
:key="item.value"
@ -215,8 +207,8 @@
</el-select>
</div>
<div class="d-s">
<el-button type="primary" icon="el-icon-search">搜索</el-button>
<el-button icon="el-icon-refresh-right">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh-right" @click="resetQuery">重置</el-button>
</div>
</div>
<el-table
@ -233,7 +225,7 @@
width="55">
</el-table-column>
<el-table-column
prop="type"
prop="typeText"
label="活动类型"
>
</el-table-column>
@ -262,18 +254,33 @@
label="已领数量"
>
</el-table-column>
<el-table-column
prop="sendNum"
label="已领数量"
>
</el-table-column>
<el-table-column
prop="activeStatus"
label="状态"
>
<template slot-scope="scope">
<el-switch
v-model="scope.row.activeStatus"
active-color="#13ce66"
inactive-color="#ff4949"
active-value="1"
inactive-value="2">
</el-switch>
</template>
</el-table-column>
<el-table-column
prop="name"
prop="createBy"
label="创建人"
>
</el-table-column>
<el-table-column
prop="date"
prop="createTime"
label="创建时间"
>
</el-table-column>
@ -282,7 +289,7 @@
<el-button
size="mini"
type="text"
@click="routerPush(scope.row.type)"
>修改</el-button>
<el-button
size="mini"
@ -305,7 +312,125 @@
@pagination="getList"
/>
</div>
<div class="bai-box" v-show="tabindex == 2"></div>
<div class="bai-box" v-show="tabindex == 2">
<div class="b-d">
<div class="d-s">
<el-input v-model="queryParams.name" placeholder="请输入活动名称" style=" width: 260px; margin-right: 15px"></el-input>
<el-select v-model="queryParams.type" placeholder="请选择活动类型" style=" width: 260px; margin-right: 15px">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
<div class="d-s">
<el-button type="primary" icon="el-icon-search" @click="handleOldQuery">搜索</el-button>
<el-button icon="el-icon-refresh-right" @click="resetOldQuery">重置</el-button>
</div>
</div>
<el-table
:data="oldTableData"
border
style="width: 100%">
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column
type="index"
label="序号"
width="55">
</el-table-column>
<el-table-column
prop="typeText"
label="活动类型"
>
</el-table-column>
<el-table-column
prop="name"
label="活动名称"
>
</el-table-column>
<el-table-column
prop="discountActiveDescribe"
label="活动内容"
>
</el-table-column>
<el-table-column
prop="time"
label="活动时间"
>
</el-table-column>
<el-table-column
prop="adaptUserType"
label="适用会员等级"
>
</el-table-column>
<el-table-column
prop="name"
label="已领数量"
>
</el-table-column>
<el-table-column
prop="sendNum"
label="已领数量"
>
</el-table-column>
<el-table-column
prop="activeStatus"
label="状态"
>
<template slot-scope="scope">
<el-switch
v-model="scope.row.activeStatus"
active-color="#13ce66"
inactive-color="#ff4949"
active-value="1"
inactive-value="2">
</el-switch>
</template>
</el-table-column>
<el-table-column
prop="createBy"
label="创建人"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
>
</el-table-column>
<el-table-column prop="date" label="操作" align="center" >
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="routerPush(scope.row.type)"
>修改</el-button>
<el-button
size="mini"
type="text"
slot="reference"
>删除</el-button>
<el-button
size="mini"
type="text"
>停用</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="oldTotal>0"
:total="oldTotal"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@pagination="getOldList"
/>
</div>
</div>
<!-- <div class="fji" >-->
@ -396,21 +521,34 @@ export default {
ruleForm:{},
value:1,
tabindex:0,
//类型 1:储值卡 2：囤油卡 3：立减营销 4：立减营销 5：消费有礼 6：开卡有礼 7：邀请有礼 8分时优惠 9限时特价
options: [{
value: '选项1',
label: '黄金糕1'
value: '1',
label: '储值卡'
}, {
value: '选项2',
label: '双皮奶'
value: '2',
label: '囤油卡'
}, {
value: '选项3',
label: '蚵仔煎'
value: '3',
label: '立减营销'
}, {
value: '选项4',
label: '龙须面'
value: '4',
label: '立减营销'
}, {
value: '选项5',
label: '北京烤鸭'
value: '5',
label: '立减营销'
}, {
value: '6',
label: '开卡有礼'
}, {
value: '7',
label: '邀请有礼'
}, {
value: '8',
label: '分时优惠'
}, {
value: '9',
label: '限时特价'
}],
tableData: [{
date: '2016-05-02',
@ -429,6 +567,7 @@ export default {
name: '王小虎',
address: '上海市普陀区金沙江路 1516 弄'
}],
oldTableData:[],
tablist:[
"营销活动",
"当前活动列表",
@ -436,13 +575,19 @@ export default {
],
queryParams:{
page:0,
pageSize:10
pageSize:10,
name:'',
type:'',
activeStatus:'1'
},
total:0
total:0,
oldTotal:0
}
},
created() {
this.getList();
this.getOldList()
},
components:{
activeNewlyweds,activeConsumption,activeDiscount,activeFullminus,activeRecommend
@ -453,12 +598,50 @@ export default {
* 查询列表
*/
getList() {
this.queryParams.activeStatus = '1'
pageActive(this.queryParams).then(res=>{
this.tableData = res.data.records
this.total = res.data.total
})
},
handleQuery() {
this.queryParams.page = 1;
this.getList();
},
resetQuery() {
this.queryParams.page = 1
this.queryParams.name = null
this.queryParams.type = null
this.getList()
},
/**
* 查询历史列表
*/
getOldList() {
this.queryParams.activeStatus = '2'
pageActive(this.queryParams).then(res=>{
this.oldTableData = res.data.records
this.oldTotal = res.data.total
})
},
handleOldQuery() {
this.queryParams.activeStatus = '2'
this.queryParams.page = 1;
this.getOldList();
},
resetOldQuery() {
this.queryParams.page = 1
this.queryParams.activeStatus = '2'
this.queryParams.name = null
this.queryParams.type = null
this.getOldList()
},
routerPush(id){
this.$router.push({

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeApplet/entity/ActiveApplet.java
View File

@ -3,8 +3,10 @@ package com.fuint.business.marketingActivity.activeApplet.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
@ -51,10 +53,13 @@ public class ActiveApplet extends Model<ActiveApplet> {
//创建者
private String createBy;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date createTime;
//更新者
private String updateBy;
//更新时间
private Date updateTime;
@TableField(exist = false)
private String typeText;
}

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeApplet/mapper/xml/ActiveAppletMapper.xml
View File

@ -38,6 +38,9 @@
<if test="entity.name != null and entity.name != ''">
AND type = #{entity.type}
</if>
<if test="entity.activeStatus != null and entity.activeStatus != ''">
AND active_status = #{entity.activeStatus}
</if>
</where>
ORDER BY create_time desc
</select>

30
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeApplet/service/impl/ActiveAppletServiceImpl.java
View File

@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.business.marketingActivity.activeApplet.mapper.ActiveAppletMapper;
import com.fuint.business.marketingActivity.activeApplet.entity.ActiveApplet;
import com.fuint.business.marketingActivity.activeApplet.service.ActiveAppletService;
import com.fuint.utils.StringUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -61,7 +62,34 @@ public class ActiveAppletServiceImpl extends ServiceImpl<ActiveAppletMapper, Act
**/
@Override
public IPage<ActiveApplet> pageActive(Page<ActiveApplet> page, ActiveApplet activeApplet) {
return activeAppletMapper.pageActive(page,activeApplet);
IPage<ActiveApplet> result = activeAppletMapper.pageActive(page,activeApplet);
result.getRecords().forEach(item -> {
item.setTypeText(replaceType(item.getType()));
});
return result;
}
/**
* 类型转换
* @author PQZ
* @date 22:34 2024/9/9
* @param type 活动类型
* @return java.lang.String
**/
public String replaceType(String type) {
if (StringUtil.isNotBlank(type)) {
type = type.replace("1", "储值卡");
type = type.replace("2", "囤油卡");
type = type.replace("3", "立减营销");
type = type.replace("4", "立减营销");
type = type.replace("5", "消费有礼");
type = type.replace("6", "开卡有礼");
type = type.replace("7", "邀请有礼");
type = type.replace("8", "分时优惠");
type = type.replace("9", "限时特价");
} else {
type = "无";
}
return type;
}
}