Skip to content

R
remarketing-yunying
Commit 1530b8ef authored by yaobeibei's avatar yaobeibei
Browse files
Options

masteroem

parent f11c0e21
Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 34 deletions
api/api.js
View file @ 1530b8ef
......@@ -703,6 +703,7 @@ app.post('/checkCall', async function (req, res) {
let dataArr = []
callName.forEach(x => {
let item = {}
item.oem = '微聚和'
item.preNum = x.preNum / 3
if (x.pre === false) {
item.sendNum = x.number / 3
......@@ -710,7 +711,7 @@ app.post('/checkCall', async function (req, res) {
item.sendNum = 0
}
item.time = moment(x.createdAt).format('YYYY-MM-DD HH:mm')
console.log(item.time)
comapnyName.forEach(y => {
if (x.accountID + '' === y._id + '' || x.accountID === y._id) {
item.companyName = y.company
......@@ -787,13 +788,15 @@ app.post('/checkCall', async function (req, res) {
let oem_comapnyName = await db_oem_mtty.collection('account').find({}).sort({ 'date': -1 }).toArray()
let oem_callName = await db_oem_mtty.collection('bills').find({ 'type': 'dspbuynumber', 'groupID': { $exists: 1 }, 'createdAt': { $gt: startTime, $lte: endTime }, 'oemCheckStatus': 1, 'checkStatus': {$exists: false}}).toArray()
let oem_callName = await db_oem_mtty.collection('bills').find({ 'type': 'dspbuynumber', 'groupID': { $exists: 1 }, 'createdAt': { $gt: startTime, $lte: endTime }, 'oemCheckStatus': 1}).toArray()
let oem_dspCallGroupsName = await db_oem_mtty.collection('dspCallGroups').find().toArray()
oem_callName.forEach(x => {
let item = {}
item.oem = x.oem
item.preNum = x.preNum / 3
if (x.pre === false) {
item.sendNum = x.number / 3
......@@ -802,12 +805,12 @@ app.post('/checkCall', async function (req, res) {
}
item.time = moment(x.createdAt).format('YYYY-MM-DD HH:mm')
console.log(item.time)
comapnyName.forEach(y => {
oem_comapnyName.forEach(y => {
if (x.accountID + '' === y._id + '' || x.accountID === y._id) {
item.companyName = y.company
}
})
dspCallGroupsName.forEach(z => {
oem_dspCallGroupsName.forEach(z => {
if (x.groupID + '' === z._id + '' || x.groupID === z._id) {
console.log(z.dspgroup)
item.name = x._id
......@@ -840,21 +843,18 @@ app.post('/checkCall', async function (req, res) {
console.log(choose)
item.status = '未审核'
dataArr.push(item)
item = {}
}
if (choose === 'one' && x.checkStatus === 0) {
console.log(choose)
item.status = '审核未通过'
item.disable = true
dataArr.push(item)
item = {}
}
if (choose === 'two' && (x.checkStatus === 1)) {
console.log(choose)
item.status = '审核通过'
item.disable = true
dataArr.push(item)
item = {}
}
if (choose === 'all') {
console.log(choose)
......@@ -872,7 +872,6 @@ app.post('/checkCall', async function (req, res) {
}
// console.log(item)
dataArr.push(item)
item = {}
}
}
})
......@@ -894,22 +893,37 @@ app.post('/checkCall', async function (req, res) {
app.post('/send', async function (req, res) {
console.log('进入send')
console.log(req.body)
let {taskId, groupId, interestlist, hostlist, status, sessionID} = req.body
let {taskId, groupId, interestlist, hostlist, status, oem} = req.body
// getSession(sessionID, res)
if (status === 8) {
await db.collection('bills').update({ '_id': mongodb.ObjectId(taskId) }, { $unset: { 'checkStatus': '' } })
if (oem === '微聚合') {
await db.collection('bills').update({ '_id': mongodb.ObjectId(taskId) }, { $unset: { 'checkStatus': '' } })
} else {
await db_oem_mtty.collection('bills').update({ '_id': mongodb.ObjectId(taskId) }, { $unset: { 'checkStatus': '' } })
}
res.send({ status: 200, message: '状态已重置' })
}
if (status === 0) {
await db.collection('bills').update({ '_id': mongodb.ObjectId(taskId) }, { $set: { 'checkStatus': 0, pre: false, number: 0 } })
if (oem === '微聚合') {
await db.collection('bills').update({ '_id': mongodb.ObjectId(taskId) }, { $set: { 'checkStatus': 0, pre: false, number: 0 } })
} else {
await db_oem_mtty.collection('bills').update({ '_id': mongodb.ObjectId(taskId) }, { $set: { 'checkStatus': 0, pre: false, number: 0 } })
}
res.send({ status: 200, message: '审核未通过' })
}
if (status === 1) {
await db.collection('bills').update({ '_id': mongodb.ObjectId(taskId) }, { $set: { 'checkStatus': 1 } })
await db.collection('dspCallGroups').update({ '_id': mongodb.ObjectId(groupId) }, { $set: { 'interestlist': interestlist, 'hostlist': hostlist } })
if (oem === '微聚合') {
await db.collection('bills').update({ '_id': mongodb.ObjectId(taskId) }, { $set: { 'checkStatus': 1 } })
await db.collection('dspCallGroups').update({ '_id': mongodb.ObjectId(groupId) }, { $set: { 'interestlist': interestlist, 'hostlist': hostlist } })
} else {
await db_oem_mtty.collection('bills').update({ '_id': mongodb.ObjectId(taskId) }, { $set: { 'checkStatus': 1 } })
await db_oem_mtty.collection('dspCallGroups').update({ '_id': mongodb.ObjectId(groupId) }, { $set: { 'interestlist': interestlist, 'hostlist': hostlist } })
}
res.send({ status: 200, message: '审核通过' })
}
})
......@@ -928,6 +942,8 @@ app.post('/getCheckNote', async function (req, res) {
startTime = moment(startTime).startOf('day').toDate()
endTime = moment(endTime).endOf('day').toDate()
// 获取remarketing数据库
console.log(startTime)
console.log(endTime)
let comapnyName = await db.collection('account').find({}).sort({ 'date': -1 }).toArray()
......@@ -939,9 +955,10 @@ app.post('/getCheckNote', async function (req, res) {
let dspTask = await db.collection('dspTask').find({ 'createdAt': { $gte: startTime, $lte: endTime } }).sort({ 'date': 1 }).toArray()
let dataArr = []
let item = {}
dspTask.forEach(x => {
let item = {}
item.taskID = x._id
item.oem = '微聚合'
item.taskName = x.taskName
item.accountID = x.accountID
item.sendTime = moment(x.sendTime).format('YYYY-MM-DD HH:mm:ss')
......@@ -1010,8 +1027,97 @@ app.post('/getCheckNote', async function (req, res) {
dataArr.push(item)
}
}
item = {}
})
// 获取oem
let oem_comapnyName = await db_oem_mtty.collection('account').find({}).sort({ 'date': -1 }).toArray()
let oem_msgTagName = await db_oem_mtty.collection('msgTemps').find().sort({ 'date': -1 }).toArray()
let oem_dspGroupsName = await db_oem_mtty.collection('dspGroups').find().sort({ 'date': -1 }).toArray()
let oem_dspTask = await db_oem_mtty.collection('dspTask').find({ 'createdAt': { $gte: startTime, $lte: endTime }, 'oemCheckStatus': 1 }).sort({ 'date': 1 }).toArray()
oem_dspTask.forEach(x => {
let item = {}
item.taskID = x._id
item.oem = x.oem
item.taskName = x.taskName
item.accountID = x.accountID
item.sendTime = moment(x.sendTime).format('YYYY-MM-DD HH:mm:ss')
item.preSendNum = x.nums
if (x.sendNum === null) {
item.sendNum = 0
} else {
item.sendNum = x.sendNum
}
item.createdAt = moment(x.createdAt).format('YYYY-MM-DD HH:mm:ss')
oem_comapnyName.forEach(y => {
if (x.accountID + '' === y._id + '') {
item.companyName = y.company
}
})
oem_msgTagName.forEach(z => {
if (x.templateId + '' === z._id + '' && x.accountID + '' === z.accountID + '') {
item.msgName = z.name
item.msgContent = z.content
}
})
oem_dspGroupsName.forEach(m => {
if (x.groupID + '' === m._id + '' && x.accountID === m.accountID) {
item.popover = {
sexlist: m.sexlist,
agelist: m.agelist,
businesstypelist: m.businesstypelist,
phonelist: m.phonelist,
opsystemlist: m.opsystemlist,
consumelist: m.consumelist,
flowlist: m.flowlist,
citylist: m.citylist,
hobbylist: m.hobbylist
}
if (m.operator) {
item.popover.operator = m.operator
}
}
})
if (operatorId + '' === '联通' + '' && (item.popover.operator === undefined || item.popover.operator === '联通' + '')) {
if (x.checkStatus === 0) {
item.status = '审核未通过'
item.disable = true
} else if (x.checkStatus === 1) {
item.status = '审核通过'
item.disable = true
} else {
item.status = '未审核'
item.disable = false
}
dataArr.push(item)
} else {
if (item.popover.operator + '' === operatorId + '') {
if (x.status === 0 || x.status === undefined) {
item.status = '未审核'
item.disable = false
}
if (x.status === 1) {
item.status = '审核未通过'
item.disable = true
}
if (x.status === 2) {
item.status = '审核通过'
item.disable = true
}
dataArr.push(item)
}
}
})
dataArr = dataArr.reverse()
let dataStatus = []
let dataTotal = dataArr.length
......@@ -1057,7 +1163,7 @@ app.post('/getCheckNote', async function (req, res) {
app.post('/sendCheckNote', async function (req, res) {
console.log('进入send')
console.log(req.body)
let { taskId, status, sendNum, operatorId, sessionID} = req.body
let { taskId, status, sendNum, operatorId, oem} = req.body
// getSession(sessionID, res)
if (status === 8) {
......@@ -1068,13 +1174,24 @@ app.post('/sendCheckNote', async function (req, res) {
if (operatorId === '联通') {
await db.collection('dspTask').find({ '_id': mongodb.ObjectId(taskId) }).toArray(async (err, rep) => {
if (status === 1) {
await db.collection('dspTask').update({ '_id': mongodb.ObjectId(taskId) }, { $set: { 'checkStatus': 0 } })
await db.collection('dspTask').update({ '_id': mongodb.ObjectId(taskId) }, { $set: { 'status': 1 } })
await db.collection('bills').update({ taskID: mongodb.ObjectId(taskId), pre: true }, { $set: { pre: false, number: 0 } })
res.send({ status: 200, message: '审核未通过' })
if (oem === '微聚合') {
await db.collection('dspTask').update({ '_id': mongodb.ObjectId(taskId) }, { $set: { 'checkStatus': 0 } })
await db.collection('dspTask').update({ '_id': mongodb.ObjectId(taskId) }, { $set: { 'status': 1 } })
await db.collection('bills').update({ taskID: mongodb.ObjectId(taskId), pre: true }, { $set: { pre: false, number: 0 } })
} else {
await db_oem_mtty.collection('dspTask').update({ '_id': mongodb.ObjectId(taskId) }, { $set: { 'checkStatus': 0 } })
await db_oem_mtty.collection('dspTask').update({ '_id': mongodb.ObjectId(taskId) }, { $set: { 'status': 1 } })
await db_oem_mtty.collection('bills').update({ taskID: mongodb.ObjectId(taskId), pre: true }, { $set: { pre: false, number: 0 } })
}
res.send({ status: 200, message: '审核未通过' })
}
if (status === 2) {
await db.collection('dspTask').update({ '_id': mongodb.ObjectId(taskId) }, { $set: { 'checkStatus': 1 } })
if (oem === '微聚合') {
await db.collection('dspTask').update({ '_id': mongodb.ObjectId(taskId) }, { $set: { 'checkStatus': 1 } })
} else {
await db_oem_mtty.collection('dspTask').update({ '_id': mongodb.ObjectId(taskId) }, { $set: { 'checkStatus': 1 } })
}
res.send({ status: 200, message: '审核通过' })
}
})
......@@ -1083,13 +1200,25 @@ app.post('/sendCheckNote', async function (req, res) {
console.log(rep)
if (!rep[0].status) {
if (status === 2) {
let setdata = await db.collection('dspTask').update({ '_id': mongodb.ObjectId(taskId) }, { $set: { 'status': 2, 'sendNum': sendNum } })
await db.collection('bills').update({ taskID: mongodb.ObjectId(taskId), pre: true }, { $set: { pre: false, number: sendNum * 0.5 } });
if (oem === '微聚合') {
await db.collection('dspTask').update({ '_id': mongodb.ObjectId(taskId) }, { $set: { 'status': 2, 'sendNum': sendNum } })
await db.collection('bills').update({ taskID: mongodb.ObjectId(taskId), pre: true }, { $set: { pre: false, number: sendNum * 0.5 } });
} else {
await db_oem_mtty.collection('dspTask').update({ '_id': mongodb.ObjectId(taskId) }, { $set: { 'status': 2, 'sendNum': sendNum } })
await db_oem_mtty.collection('bills').update({ taskID: mongodb.ObjectId(taskId), pre: true }, { $set: { pre: false, number: sendNum * 0.5 } });
}
res.send({ status: 200, message: '审核通过，短信发送中' })
}
if (status === 1) {
let setdata = await db.collection('dspTask').update({ '_id': mongodb.ObjectId(taskId) }, { $set: { 'status': 1 } })
await db.collection('bills').update({ taskID: mongodb.ObjectId(taskId), pre: true }, { $set: { pre: false, number: 0 } });
if (oem === '微聚合') {
await db.collection('dspTask').update({ '_id': mongodb.ObjectId(taskId) }, { $set: { 'status': 1 } })
await db.collection('bills').update({ taskID: mongodb.ObjectId(taskId), pre: true }, { $set: { pre: false, number: 0 } });
} else {
await db_oem_mtty.collection('dspTask').update({ '_id': mongodb.ObjectId(taskId) }, { $set: { 'status': 1 } })
await db_oem_mtty.collection('bills').update({ taskID: mongodb.ObjectId(taskId), pre: true }, { $set: { pre: false, number: 0 } });
}
res.send({ status: 200, message: '审核未通过，任务驳回' })
}
} else {
......
src/components/checkCall.vue
View file @ 1530b8ef
......@@ -67,6 +67,7 @@
</template>
</el-table-column>
<el-table-column label='预计筛选用户数' prop='preNum' width=130></el-table-column>
<el-table-column label='oem' prop='oem' width=130></el-table-column>
<el-table-column label='状态' prop='status' :filters="[{ text: '审核未通过', value: '审核未通过' }, { text: '审核通过', value: '审核通过'}]" :filter-method='filterTag' filter-placement="bottom-end"></el-table-column>
<el-table-column label='操作' width=180>
<template slot-scope="scope">
......@@ -231,12 +232,13 @@
},
methods: {
openForm (data, index) {
this.interestlist = []
this.hostlist = []
this.dialogFormVisible = true
console.log(data)
this.interestlist = data.popover.interestlist
this.hostlist = data.popover.hostlist
this.currentdata = data
this.currentIndex = index
// scope.row.status = '审核通过'
// scope.row.disable = true
},
closeFrom () {
this.dialogFormVisible = false
......@@ -348,14 +350,14 @@
let interestlist = this.interestlist
let hostlist = this.hostlist
let currentdata = this.currentdata
let sessionID = this.sessionID
let oem = currentdata ? currentdata.name : row.oem
let taskId = currentdata ? currentdata.name : row.name
let groupId = currentdata ? currentdata.groupID : row.groupID
this.dialogFormVisible = false
fetch('/api/send', {
method: 'POST',
headers: {'Content-Type': 'application/json;charset=UTF-8'},
body: JSON.stringify({taskId, groupId, interestlist, hostlist, status, sessionID})
body: JSON.stringify({taskId, groupId, interestlist, hostlist, status, oem})
}).then(res => {
return res.json()
}).then(data => {
......
src/components/checkNote.vue
View file @ 1530b8ef
......@@ -71,6 +71,7 @@
<el-table-column label='预计发送数量' prop='preSendNum'></el-table-column>
<el-table-column label='短信内容' prop='msgContent'></el-table-column>
<el-table-column label='预计发送时间' prop='sendTime'></el-table-column>
<el-table-column label='oem' prop='oem'></el-table-column>
<el-table-column label='实际发送数量' prop='sendNum' v-if="operatorId !== '联通'"></el-table-column>
<el-table-column label='审核状态' prop='status' :filters="[{ text: '未审核', value: '未审核' }, { text: '审核通过', value: '审核通过' }, { text: '审核不通过', value: '审核未通过'}]" :filter-method='filterTag' filter-placement="bottom-end"></el-table-column>
<el-table-column label='操作' width=150>
......@@ -260,6 +261,7 @@
suerSend (row, taskId, status, sendNum) {
let self = this
let operatorId = self.operatorId
let oem = row.oem
if (operatorId !== '联通') {
if (sendNum === null || sendNum === undefined) {
sendNum = row.preSendNum
......@@ -279,14 +281,14 @@
if (status === 1) {
console.log('不通过')
row.visible1 = false
row.sendNum = 0
row.sendNum = 0
row.status = '审核未通过'
row.disable = true
}
fetch('/api/sendCheckNote', {
method: 'POST',
headers: {'Content-Type': 'application/json;charset=UTF-8'},
body: JSON.stringify({taskId, status, sendNum, operatorId, sessionID: self.sessionID})
body: JSON.stringify({taskId, status, sendNum, operatorId, oem})
}).then(res => { return res.json() }).then(data => {
console.log(data)
self.$message({
......@@ -320,7 +322,7 @@
fetch('/api/sendCheckNote', {
method: 'POST',
headers: {'Content-Type': 'application/json;charset=UTF-8'},
body: JSON.stringify({taskId, status, sendNum, operatorId, sessionID: self.sessionID})
body: JSON.stringify({taskId, status, sendNum, operatorId, oem})
}).then(res => { return res.json() }).then(data => {
console.log(data)
self.$message({
......
src/components/login.vue
View file @ 1530b8ef
<template>
<el-container>
<el-main>
<div class="title">
<p>运营审核平台</p>
</div>
<div style='margin: 100px auto'>
<el-row type="flex" justify="center" style="width: 100%;height: 100%">
<el-col :span="12">
......@@ -78,5 +81,12 @@
</script>
<style scoped>
.title {
font-size: 24px;
font-weight: 800;
text-align: center;
width: 100%;
margin: 40px auto;
letter-spacing: 3px;
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment