This commit is contained in:
dute7liang
2024-01-06 00:16:28 +08:00
parent c084e9f849
commit 7721f963c7
14 changed files with 402 additions and 26 deletions

View File

@@ -31,6 +31,14 @@
/>
</el-select>
</el-form-item>
<el-form-item label="链路号" prop="traceId">
<el-input
v-model="queryParams.traceId"
placeholder="请输入链路号"
clearable
@keyup.enter.native="handleQuery"
/>
</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>
@@ -59,8 +67,16 @@
</template>
</el-table-column>
<el-table-column label="操作时间" align="center" prop="createTime" />
<el-table-column label="链路号" align="center" prop="traceId" show-overflow-tooltip/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template v-slot="scope">
<el-button
size="mini"
type="text"
icon="el-icon-info"
v-if="scope.row.traceId"
@click="handleInfo(scope.row)"
>关联业务</el-button>
</template>
</el-table-column>
</el-table>
@@ -72,18 +88,24 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<recharge-order-info v-if="rechargeOrderInfoVisible" ref="rechargeOrderInfo" />
</div>
</template>
<script>
import {listAccountChangeLog, listChangeType} from "@/api/cai/accountChangeLog";
import {accountTypeList, yesOrNoList} from "@/constant/statusMap";
import RechargeOrderInfo from "@/views/cai/rechargeOrder/recharge-order-info";
export default {
name: "AccountChangeLog",
components: {
RechargeOrderInfo
},
data() {
return {
accountTypeList,yesOrNoList,
rechargeOrderInfoVisible: false,
// 遮罩层
loading: true,
// 选中数组
@@ -104,7 +126,8 @@ export default {
pageSize: 10,
usercode: undefined,
accountType: undefined,
cateId: undefined
cateId: undefined,
traceId:undefined
},
changeTypeList:[],
};
@@ -141,6 +164,31 @@ export default {
this.single = selection.length!==1
this.multiple = !selection.length
},
handleInfo(row){
const command = row.traceLinkType
switch (command) {
case "RECHARGE":
this.rechargeOrderInfoVisible = true
this.$nextTick(() => {
this.$refs.rechargeOrderInfo.traceIdInit(row.traceId)
})
break;
case "GIFT":
this.handleResetPwd(row);
break;
case "GUARD":
this.handleResetMobile(row);
break;
case "VIDEO":
this.handleResetMobile(row);
break;
case "WITHDRAW":
this.handleResetMobile(row);
break;
default:
break;
}
}
}
};
</script>

View File

@@ -12,6 +12,9 @@
<el-descriptions-item label="是否计算">
<cai-dict-tag :options="consumeLogCalculateStatusList" :value="info.calculateStatus" />
</el-descriptions-item>
<el-descriptions-item label="类型">
<cai-dict-tag :options="consumeLogStatusList" :value="info.status" />
</el-descriptions-item>
<el-descriptions-item label="后台操作?">
<cai-dict-tag :options="booleanList" :value="info.admin" />
</el-descriptions-item>
@@ -21,6 +24,9 @@
<el-descriptions-item label="创建时间">
{{info.createTime}}
</el-descriptions-item>
<el-descriptions-item label="链路号">
{{info.traceId}}
</el-descriptions-item>
</el-descriptions>
</el-collapse-item>
<el-collapse-item title="消费方" name="source">
@@ -102,9 +108,10 @@ import {
booleanList,
consumeLogCalculateStatusList,
consumeLogStatusList,
consumeLogTypeList, isAnchorList
consumeLogTypeList,
isAnchorList
} from '@/constant/statusMap'
import {getConsumeLog} from "@/api/cai/consumeLog";
import {getConsumeLog, getConsumeLogTraceId} from "@/api/cai/consumeLog";
export default {
name: "UserInfo",
@@ -139,7 +146,13 @@ export default {
this.open = true;
this.id = id;
getConsumeLog(this.id).then(response => {
this.info = response.data;
this.info = response.data?response.data:{};
});
},
traceIdInit(traceId){
this.open = true;
getConsumeLogTraceId(traceId).then(response => {
this.info = response.data?response.data:{};
});
},
}

View File

@@ -33,6 +33,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="链路号" prop="traceId">
<el-input
v-model="queryParams.traceId"
placeholder="请输入链路号"
clearable
@keyup.enter.native="handleQuery"
/>
</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>
@@ -106,6 +114,7 @@
</template>
</el-table-column>
<el-table-column label="分销时间" align="center" prop="opCreate" width="180" />
<el-table-column label="链路号" align="center" prop="traceId" show-overflow-tooltip/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="80" fixed="right">
<template v-slot="scope">
<el-button
@@ -165,7 +174,8 @@ export default {
unionUsercode: undefined,
oneUsercode: undefined,
targetUsercode: undefined,
sourceUsercode: undefined
sourceUsercode: undefined,
traceId: undefined
},
};
},

View File

@@ -0,0 +1,94 @@
<template>
<el-dialog title="守护流水详情" :close-on-click-modal="false" :visible.sync="open" width="1200px" append-to-body>
<el-descriptions :contentStyle="CS" :label-style="LS " class="margin-top" :column="3" size="medium" border>
<el-descriptions-item label="赠送蜜瓜号">
{{info.fromUsercode}}
</el-descriptions-item>
<el-descriptions-item label="赠送手机号" :span="2">
{{info.fromMobile}}
</el-descriptions-item>
<el-descriptions-item label="接受蜜瓜号">
{{info.toUsercode}}
</el-descriptions-item>
<el-descriptions-item label="接受手机号" :span="2">
{{info.toMobile}}
</el-descriptions-item>
<el-descriptions-item label="发生时间">
{{info.createTime}}
</el-descriptions-item>
<el-descriptions-item label="个数">
{{info.guardNum}}
</el-descriptions-item>
<el-descriptions-item label="守护值">
{{info.guardValue}}
</el-descriptions-item>
<el-descriptions-item label="单价">
{{info.guardPrice}}
</el-descriptions-item>
<el-descriptions-item label="链路号">
{{info.traceId}}
</el-descriptions-item>
</el-descriptions>
</el-dialog>
</template>
<script>
import {userGiftTypeList} from '@/constant/statusMap'
import {getGuardLog} from "@/api/cai/guardLog";
export default {
name: "UserInfo",
data() {
return {
userGiftTypeList,
CS: {
'text-align': 'center', //文本居中
'min-width': '250px', //最小宽度
'word-break': 'break-all' //过长时自动换行
},
LS: {
// 'color': '#000',
'text-align': 'center',
// 'font-weight': '600',
'height': '40px',
// 'background-color': 'rgba(255, 97, 2, 0.1)',
'min-width': '110px',
'word-break': 'keep-all'
},
open:false,
info:{},
};
},
created() {
},
methods: {
init(id){
this.open = true;
getGuardLog(id).then(response => {
this.info = response.data;
});
},
traceIdInit(traceId){
this.open = true;
getGuardLogByTraceId(traceId).then(response => {
this.info = response.data;
});
},
}
};
</script>
<style lang="scss" scoped>
.el-row {
margin-bottom: -15px;
display: flex;
flex-wrap: wrap
}
/* .el-card {
min-width: 100%;
height: 80%; // 高度要设置百分比才可以
margin-right: 20px;
transition: all .5s;
}*/
</style>

View File

@@ -33,6 +33,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="链路号" prop="traceId">
<el-input
v-model="queryParams.traceId"
placeholder="请输入链路号"
clearable
@keyup.enter.native="handleQuery"
/>
</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>
@@ -53,16 +61,23 @@
<el-table-column label="个数" align="center" prop="guardNum" />
<el-table-column label="守护值" align="center" prop="guardValue" />
<el-table-column label="单价" align="center" prop="guardPrice" />
<el-table-column label="链路号" align="center" prop="traceId" show-overflow-tooltip/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template v-slot="scope">
<el-button
size="mini"
type="text"
icon="el-icon-info"
v-if="scope.row.consumerLogId"
v-if="scope.row.traceId"
@click="handleConsumerLog(scope.row)"
>分销记录
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-info"
@click="handleInfo(scope.row)"
>详情</el-button>
</template>
</el-table-column>
</el-table>
@@ -75,21 +90,24 @@
@pagination="getList"
/>
<consume-log-info v-if="consumeLogInfoVisible" ref="consumeLogInfo" />
<guard-log-info v-if="guardLogInfoVisible" ref="guardLogInfo"/>
</div>
</template>
<script>
import {listGuardLog} from "@/api/cai/guardLog";
import ConsumeLogInfo from "@/views/cai/consumeLog/consume-log-info";
import GuardLogInfo from "@/views/cai/guardLog/guard-log-info";
export default {
name: "GuardLog",
components: {
ConsumeLogInfo
ConsumeLogInfo,GuardLogInfo
},
data() {
return {
consumeLogInfoVisible: false,
guardLogInfoVisible: false,
// 遮罩层
loading: true,
// 选中数组
@@ -112,6 +130,7 @@ export default {
toMobile: undefined,
fromUsercode: undefined,
fromMobile: undefined,
traceId:undefined,
},
};
},
@@ -147,9 +166,15 @@ export default {
handleConsumerLog(row) {
this.consumeLogInfoVisible = true
this.$nextTick(() => {
this.$refs.consumeLogInfo.init(row.consumerLogId)
this.$refs.consumeLogInfo.traceIdInit(row.traceId)
})
},
handleInfo(row){
this.guardLogInfoVisible = true
this.$nextTick(() => {
this.$refs.guardLogInfo.init(row.id)
})
}
}
};
</script>

View File

@@ -54,13 +54,6 @@
<el-table-column label="守护值" align="center" prop="guardValue" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template v-slot="scope">
<el-button
size="mini"
type="text"
icon="el-icon-info"
@click="handleConsumerLog(scope.row)"
>分销记录
</el-button>
</template>
</el-table-column>
</el-table>
@@ -76,7 +69,7 @@
</template>
<script>
import { listGuardTotal, getGuardTotal, delGuardTotal, addGuardTotal, updateGuardTotal } from "@/api/cai/guardTotal";
import {listGuardTotal} from "@/api/cai/guardTotal";
export default {
name: "GuardTotal",
@@ -136,8 +129,6 @@ export default {
this.single = selection.length!==1
this.multiple = !selection.length
},
handleConsumerLog(row) {
},
}
};
</script>

View File

@@ -36,6 +36,14 @@
/>
</el-select>
</el-form-item>
<el-form-item label="链路号" prop="traceId">
<el-input
v-model="queryParams.traceId"
placeholder="请输入链路号"
clearable
@keyup.enter.native="handleQuery"
/>
</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>
@@ -48,7 +56,7 @@
<el-table v-loading="loading" :data="rechargeOrderList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="订单号" align="center" prop="orderNo" />
<el-table-column label="订单号" align="center" prop="orderNo" show-overflow-tooltip/>
<el-table-column label="蜜瓜号" align="center" prop="usercode" />
<el-table-column label="昵称" align="center" prop="nickname" />
<el-table-column label="手机" align="center" prop="mobile" />
@@ -81,8 +89,17 @@
<cai-dict-tag :options="booleanList" :value="scope.row.admin" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="链路号" align="center" prop="traceId" show-overflow-tooltip/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140">
<template v-slot="scope">
<el-button
size="mini"
type="text"
icon="el-icon-info"
v-if="scope.row.traceId && scope.row.admin===false"
@click="handleConsumerLog(scope.row)"
>分销记录
</el-button>
<el-button
size="mini"
type="text"
@@ -100,6 +117,7 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<consume-log-info v-if="consumeLogInfoVisible" ref="consumeLogInfo" />
<recharge-order-info v-if="rechargeOrderInfoVisible" ref="rechargeOrderInfo" />
</div>
</template>
@@ -116,17 +134,19 @@ import {
yesOrNoList
} from '@/constant/statusMap'
import RechargeOrderInfo from "@/views/cai/rechargeOrder/recharge-order-info";
import ConsumeLogInfo from "@/views/cai/consumeLog/consume-log-info";
export default {
name: "RechargeOrder",
components:{
RechargeOrderInfo
RechargeOrderInfo,ConsumeLogInfo
},
data() {
return {
genderList,memberTypeList,yesOrNoList,memberStatusList,booleanList,platformTypeList,
payStatusList,
rechargeOrderInfoVisible: false,
consumeLogInfoVisible: false,
// 遮罩层
loading: true,
// 选中数组
@@ -148,7 +168,8 @@ export default {
payStatus: undefined,
usercode: undefined,
mobile: undefined,
orderNo: undefined
orderNo: undefined,
traceId: undefined
},
};
},
@@ -181,6 +202,12 @@ export default {
this.single = selection.length!==1
this.multiple = !selection.length
},
handleConsumerLog(row) {
this.consumeLogInfoVisible = true
this.$nextTick(() => {
this.$refs.consumeLogInfo.traceIdInit(row.traceId)
})
},
handleInfo(row) {
this.rechargeOrderInfoVisible = true
this.$nextTick(() => {

View File

@@ -46,6 +46,9 @@
<el-descriptions-item label="appid">
{{info.appid}}
</el-descriptions-item>
<el-descriptions-item label="链路号">
{{info.traceId}}
</el-descriptions-item>
<el-descriptions-item label="第三方回调数据" :span="3">
{{info.returnContent}}
</el-descriptions-item>
@@ -63,7 +66,7 @@ import {
platformTypeList,
yesOrNoList
} from '@/constant/statusMap'
import { getRechargeOrder } from '@/api/cai/rechargeOrder'
import {getRechargeOrder, getRechargeOrderByTraceId} from '@/api/cai/rechargeOrder'
export default {
name: "UserInfo",
@@ -100,6 +103,12 @@ export default {
this.info = response.data;
});
},
traceIdInit(traceId){
this.open = true;
getRechargeOrderByTraceId(traceId).then(response => {
this.info = response.data;
});
},
}
};
</script>

View File

@@ -33,6 +33,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="链路号" prop="traceId">
<el-input
v-model="queryParams.traceId"
placeholder="请输入链路号"
clearable
@keyup.enter.native="handleQuery"
/>
</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>
@@ -63,16 +71,23 @@
<el-table-column label="礼物价格" align="center" prop="giftPrice"/>
<el-table-column label="礼物数量" align="center" prop="giftCount"/>
<el-table-column label="礼物总额" align="center" prop="giftAmount"/>
<el-table-column label="链路号" align="center" prop="traceId" show-overflow-tooltip/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template v-slot="scope">
<el-button
size="mini"
type="text"
icon="el-icon-info"
v-if="scope.row.consumerLogId"
v-if="scope.row.traceId"
@click="handleConsumerLog(scope.row)"
>分销记录
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-info"
@click="handleInfo(scope.row)"
>详情</el-button>
</template>
</el-table-column>
</el-table>
@@ -85,6 +100,7 @@
@pagination="getList"
/>
<consume-log-info v-if="consumeLogInfoVisible" ref="consumeLogInfo" />
<user-gift-info v-if="userGiftInfoVisible" ref="userGiftInfo" />
</div>
</template>
@@ -92,16 +108,18 @@
import {listUserGift} from "@/api/cai/userGift";
import {userGiftTypeList} from "@/constant/statusMap";
import ConsumeLogInfo from "@/views/cai/consumeLog/consume-log-info";
import UserGiftInfo from "@/views/cai/userGift/user-gift-info";
export default {
name: "UserGift",
components: {
ConsumeLogInfo
ConsumeLogInfo,UserGiftInfo
},
data() {
return {
userGiftTypeList,
consumeLogInfoVisible: false,
userGiftInfoVisible: false,
// 遮罩层
loading: true,
// 选中数组
@@ -125,6 +143,7 @@ export default {
toMobile: undefined,
fromUsercode: undefined,
fromMobile: undefined,
traceId: undefined
},
};
},
@@ -160,9 +179,15 @@ export default {
handleConsumerLog(row) {
this.consumeLogInfoVisible = true
this.$nextTick(() => {
this.$refs.consumeLogInfo.init(row.consumerLogId)
this.$refs.consumeLogInfo.traceIdInit(row.traceId)
})
},
handleInfo(row){
this.userGiftInfoVisible = true
this.$nextTick(() => {
this.$refs.userGiftInfo.traceIdInit(row.id)
})
}
}
};
</script>

View File

@@ -0,0 +1,101 @@
<template>
<el-dialog title="礼物流水详情" :close-on-click-modal="false" :visible.sync="open" width="1200px" append-to-body>
<el-descriptions :contentStyle="CS" :label-style="LS " class="margin-top" :column="3" size="medium" border>
<el-descriptions-item label="类型">
<cai-dict-tag :options="userGiftTypeList" :value="info.type"/>
</el-descriptions-item>
<el-descriptions-item label="发生时间">
{{info.createTime}}
</el-descriptions-item>
<el-descriptions-item label="礼物">
<image-preview :src="info.giftImg" :width="50" :height="50"/>
</el-descriptions-item>
<el-descriptions-item label="赠送蜜瓜号">
{{info.fromUsercode}}
</el-descriptions-item>
<el-descriptions-item label="赠送手机号" :span="2">
{{info.fromMobile}}
</el-descriptions-item>
<el-descriptions-item label="接受蜜瓜号">
{{info.toUsercode}}
</el-descriptions-item>
<el-descriptions-item label="接受手机号" :span="2">
{{info.toMobile}}
</el-descriptions-item>
<el-descriptions-item label="礼物价格">
{{info.giftPrice}}
</el-descriptions-item>
<el-descriptions-item label="礼物数量">
{{info.giftCount}}
</el-descriptions-item>
<el-descriptions-item label="礼物总额">
{{info.giftAmount}}
</el-descriptions-item>
<el-descriptions-item label="链路号">
{{info.traceId}}
</el-descriptions-item>
</el-descriptions>
</el-dialog>
</template>
<script>
import {userGiftTypeList} from '@/constant/statusMap'
import {getUserGift, getUserGiftByTraceId} from "@/api/cai/userGift";
export default {
name: "UserInfo",
data() {
return {
userGiftTypeList,
activeName:['base','account','userAlbums'],
CS: {
'text-align': 'center', //文本居中
'min-width': '250px', //最小宽度
'word-break': 'break-all' //过长时自动换行
},
LS: {
// 'color': '#000',
'text-align': 'center',
// 'font-weight': '600',
'height': '40px',
// 'background-color': 'rgba(255, 97, 2, 0.1)',
'min-width': '110px',
'word-break': 'keep-all'
},
open:false,
info:{},
};
},
created() {
},
methods: {
init(id){
this.open = true;
getUserGift(id).then(response => {
this.info = response.data;
});
},
traceIdInit(traceId){
this.open = true;
getUserGiftByTraceId(traceId).then(response => {
this.info = response.data;
});
},
}
};
</script>
<style lang="scss" scoped>
.el-row {
margin-bottom: -15px;
display: flex;
flex-wrap: wrap
}
/* .el-card {
min-width: 100%;
height: 80%; // 高度要设置百分比才可以
margin-right: 20px;
transition: all .5s;
}*/
</style>