9.11
This commit is contained in:
parent
d182ba99ad
commit
afe8f64d05
@ -9,7 +9,7 @@
|
||||
</div>
|
||||
<div class="rp-box">
|
||||
<!-- 营销活动-->
|
||||
<div class="bai-box" v-show="tabindex == 0">
|
||||
<div class="bai-box" style="height: 84.5vh;overflow: auto" v-show="tabindex == 0">
|
||||
<div class="d-s">
|
||||
<div class="gang"></div>
|
||||
<div style="font-weight: bold">会员营销</div>
|
||||
@ -216,63 +216,65 @@
|
||||
<el-button icon="el-icon-refresh-right" @click="resetQuery">重置</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<el-table
|
||||
:data="tableData"
|
||||
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="活动时间">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.time==0">不限时间</span>
|
||||
<span v-else>{{ scope.row.activeStartTime }} ~ {{ scope.row.activeEndTime }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="adaptUserType" label="适用会员等级">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.adaptUserType || "--" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="name" 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="createName" 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>
|
||||
<div style="height: 70vh;overflow: auto">
|
||||
<el-table
|
||||
:data="tableData"
|
||||
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="活动时间">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.time==0">不限时间</span>
|
||||
<span v-else>{{ scope.row.activeStartTime }} ~ {{ scope.row.activeEndTime }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="userGradeName" label="适用会员等级">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.userGradeName || "--" }}</span>
|
||||
</template>
|
||||
</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="createName" 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>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
@ -302,67 +304,69 @@
|
||||
<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="活动时间">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.time==0">不限时间</span>
|
||||
<span v-else>{{ scope.row.activeStartTime }} ~ {{ scope.row.activeEndTime }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="adaptUserType" label="适用会员等级">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.adaptUserType || "--" }}</span>
|
||||
</template>
|
||||
</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>
|
||||
<div style="height: 70vh;overflow: auto">
|
||||
<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="活动时间">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.time==0">不限时间</span>
|
||||
<span v-else>{{ scope.row.activeStartTime }} ~ {{ scope.row.activeEndTime }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="userGradeName" label="适用会员等级">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.userGradeName || "--" }}</span>
|
||||
</template>
|
||||
</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="createName" 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-column prop="createName" 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>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<pagination
|
||||
v-show="oldTotal>0"
|
||||
:total="oldTotal"
|
||||
@ -400,7 +404,7 @@ export default {
|
||||
}, {
|
||||
value: '3',
|
||||
label: '立减营销'
|
||||
},{
|
||||
}, {
|
||||
value: '4',
|
||||
label: '生日有礼'
|
||||
}, {
|
||||
@ -418,7 +422,7 @@ export default {
|
||||
}, {
|
||||
value: '9',
|
||||
label: '推荐会员消费有礼'
|
||||
},{
|
||||
}, {
|
||||
value: '10',
|
||||
label: '弹窗营销'
|
||||
}],
|
||||
@ -471,12 +475,12 @@ export default {
|
||||
},
|
||||
|
||||
methods: {
|
||||
getindex(index){
|
||||
getindex(index) {
|
||||
this.tabindex = index
|
||||
if (index == 1){
|
||||
if (index == 1) {
|
||||
this.queryParams.type = ""
|
||||
this.handleQuery()
|
||||
}else {
|
||||
} else {
|
||||
this.queryParams.type = ""
|
||||
this.getOldList()
|
||||
}
|
||||
|
||||
@ -73,5 +73,10 @@ public class ActiveApplet extends Model<ActiveApplet> {
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String createName;
|
||||
/**
|
||||
* 创建人名称
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String userGradeName;
|
||||
}
|
||||
|
||||
|
||||
@ -8,9 +8,12 @@ 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.business.userManager.entity.LJUserGrade;
|
||||
import com.fuint.business.userManager.service.LJUserGradeService;
|
||||
import com.fuint.common.dto.AccountInfo;
|
||||
import com.fuint.common.util.TokenUtil;
|
||||
import com.fuint.utils.StringUtil;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
@ -27,6 +30,8 @@ public class ActiveAppletServiceImpl extends ServiceImpl<ActiveAppletMapper, Act
|
||||
|
||||
@Resource
|
||||
private ActiveAppletMapper activeAppletMapper;
|
||||
@Autowired
|
||||
private LJUserGradeService userGradeService;
|
||||
|
||||
@Override
|
||||
public List<ActiveApplet> applet(ActiveApplet activeApplet) {
|
||||
@ -65,8 +70,22 @@ public class ActiveAppletServiceImpl extends ServiceImpl<ActiveAppletMapper, Act
|
||||
@Override
|
||||
public IPage<ActiveApplet> pageActive(Page<ActiveApplet> page, ActiveApplet activeApplet) {
|
||||
IPage<ActiveApplet> result = activeAppletMapper.pageActive(page,activeApplet);
|
||||
// 查询用户等级信息
|
||||
List<LJUserGrade> ljUserGrades = userGradeService.selectUserGradeAll(TokenUtil.getNowAccountInfo().getStoreId());
|
||||
result.getRecords().forEach(item -> {
|
||||
item.setTypeText(replaceType(item.getType()));
|
||||
String userGradeName = "";
|
||||
if (ObjectUtil.isNotEmpty(item.getAdaptUserType())){
|
||||
String[] gradeIds = item.getAdaptUserType().split(",");
|
||||
for (String gradeId : gradeIds) {
|
||||
for (LJUserGrade ljUserGrade : ljUserGrades) {
|
||||
if (gradeId.equals(ljUserGrade.getId().toString())){
|
||||
userGradeName += ljUserGrade.getName() + ",";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
item.setUserGradeName(userGradeName);
|
||||
});
|
||||
return result;
|
||||
}
|
||||
@ -88,16 +107,16 @@ public class ActiveAppletServiceImpl extends ServiceImpl<ActiveAppletMapper, Act
|
||||
**/
|
||||
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", "推荐会员消费有礼");
|
||||
type = type.replace("10", "弹窗营销");
|
||||
type = type.replace("9", "推荐会员消费有礼");
|
||||
type = type.replace("8", "推荐会员充值有礼");
|
||||
type = type.replace("7", "邀请有礼");
|
||||
type = type.replace("6", "开卡有礼");
|
||||
type = type.replace("5", "消费有礼");
|
||||
type = type.replace("4", "生日有礼");
|
||||
type = type.replace("3", "立减营销");
|
||||
type = type.replace("2", "囤油卡");
|
||||
type = type.replace("1", "储值卡");
|
||||
} else {
|
||||
type = "无";
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user