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

no message

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-07-29 15:46:30 +08:00
parent 7fe593c9a1
commit ea14824ab8
26 changed files with 573 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
fuintAdmin_zt/src/layout/components/Navbar.vue
View File

@ -54,16 +54,16 @@
width="30%"
:before-close="handleClose">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
<el-form-item label="密码" prop="name">
<el-input v-model="ruleForm.password"></el-input>
<el-form-item label="新密码" prop="password">
<el-input type="password" v-model="ruleForm.password" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="新密码" prop="name">
<el-input v-model="ruleForm.passwords"></el-input>
<el-form-item label="重复密码" prop="passwords">
<el-input type="password" v-model="ruleForm.passwords" autocomplete="off"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="xg = false">取 消</el-button>
<el-button type="primary" @click="postparssword()">确 定</el-button>
<el-button type="primary" @click="postparssword('ruleForm')">确 定</el-button>
</span>
</el-dialog>
@ -86,19 +86,48 @@ import confirmLog from "@/views/coupon/confirmLog/index.vue";
export default {
data() {
var validatePass = (rule, value, callback) => {
if (value === '') {
callback(new Error('请输入密码'));
} else {
if (this.ruleForm.passwords !== '') {
this.$refs.ruleForm.validateField('passwords');
}
callback();
}
};
var validatePass2 = (rule, value, callback) => {
if (value === '') {
callback(new Error('请再次输入密码'));
} else if (value !== this.ruleForm.password) {
callback(new Error('两次输入密码不一致!'));
} else {
callback();
}
};
return {
ruleForm: {
password:'',
passwords:''
},
rules:{
// password: [
// { required: true, message: '请输入密码', trigger: 'blur' },
// { min: 3, max: 15, message: '长度在 3 到 15 个字符', trigger: 'blur' }
// ],
// passwords: [
// { required: true, message: '请输入新密码', trigger: 'blur' },
// { min: 3, max: 15, message: '长度在 3 到 15 个字符', trigger: 'blur' }
// ],
password: [
{ required: true, message: '请输入密码', trigger: 'blur' },
{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
{ required: true, message: '请输入新密码', trigger: 'blur' },
{ min: 3, max: 15, message: '长度在 3 到 15 个字符', trigger: 'blur' },
{ validator: validatePass, trigger: 'blur' }
],
passwords: [
{ required: true, message: '请输入新密码', trigger: 'blur' },
{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
{ required: true, message: '请输入密码', trigger: 'blur' },
{ min: 3, max: 15, message: '长度在 3 到 15 个字符', trigger: 'blur' },
{ validator: validatePass2, trigger: 'blur' }
],
},
xg: false
@ -155,19 +184,36 @@ export default {
})
},
postparssword(){
let data = {
acctId : this.accountId,
password: this.ruleForm.password,
postparssword(ruleForm){
if (this.ruleForm.password !== this.ruleForm.passwords) {
this.$message({
type: 'info',
message: '两次密码不一致'
});
return
}
resetPwd(data).then(res=>{
console.log(res)
if(res.code == 200){
this.xg =false
}
console.log(111111111111111111111)
this.$refs[ruleForm].validate((valid) => {
if (valid) {
let data = {
acctId : this.accountId,
password: this.ruleForm.password,
}
resetPwd(data).then(res=>{
console.log(res)
if(res.code == 200){
this.xg =false
}
})
}else {
console.log('error submit!!');
return false;
}
})
},
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')

3
fuintAdmin_zt/src/views/Site/index.vue
View File

@ -593,8 +593,9 @@
icon="el-icon-edit"
v-hasPermi="['role:edit']"
@click="handleUpdate1(scope.row)"
:disabled="scope.row.dutyId==2"
>修改</el-button>
<!-- :disabled="scope.row.dutyId==2"-->
<el-button
size="mini"
type="text"

58
fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="margin-top: 0px">
<div style="margin-top: 0px;margin-right: 40px">
<el-card class="box-card" style="margin-top: 0px;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" >
<div class="d-s" style="margin-bottom: 15px;justify-content: space-between">
@ -43,11 +43,11 @@
<div class="wrap-boxs">
<div class="k_" id="k_1">
<div class="size_" style="margin-bottom: 0px">交易金额汇总数（万元）/交易笔数</div>
<div class="title_">{{ orderStatistics.payMoney }}/{{ orderStatistics.count }}</div>
<div class="title_">{{ orderStatistics.payMoney?orderStatistics.payMoney/10000:0 }}/{{ orderStatistics.count }}</div>
</div>
<div class="k_" id="k_2" v-for="item in orderStatistics.fenxiByDaili2ByData">
<div class="size_">{{ item.paymentChannel }}交易金额（万元）</div>
<div class="title_">{{ item.payMoneyChannel }}</div>
<div class="title_">{{ item.payMoneyChannel?item.payMoneyChannel/10000:0 }}</div>
</div>
</div>
</el-card>
@ -65,24 +65,39 @@
<template>
<el-table-column align="center" prop="fuYouAmount" label="富友交易金额">
<template slot-scope="scope">
<span>{{scope.row.fuYouAmount || 0}}</span>
<span>{{scope.row.fuYouAmount/100000 || 0}}</span>
</template>
</el-table-column>
<el-table-column align="center" prop="laKaLaAmount" label="拉卡拉交易笔数">
<el-table-column align="center" prop="fuYouCount" label="富友交易笔数">
<template slot-scope="scope">
<span>{{scope.row.laKaLaAmount || 0}}</span>
<span>{{scope.row.fuYouCount/1000 || 0}}</span>
</template>
</el-table-column>
<el-table-column align="center" prop="fuYouAmount" label="富友交易占比">
<template slot-scope="scope">
<span>{{(scope.row.fuYouAmount/(scope.row.payMoney)).toFixed(2) || 0}}</span>
</template>
</el-table-column>
<el-table-column align="center" prop="laKaLaAmount" label="拉卡拉交易金额">
<template slot-scope="scope">
<span>{{scope.row.laKaLaAmount/100000 || 0}}</span>
</template>
</el-table-column>
<el-table-column align="center" prop="laKaLaCount" label="拉卡拉交易笔数">
<template slot-scope="scope">
<span>{{scope.row.laKaLaCount/1000 || 0}}</span>
</template>
</el-table-column>
<el-table-column align="center" prop="count92" label="拉卡拉交易占比">
<template slot-scope="scope">
<span>{{scope.row.laKaLaAmount/(scope.row.fuYouAmount+scope.row.laKaLaAmount) || 0}}</span>
<span>{{(scope.row.laKaLaAmount/(scope.row.payMoney)).toFixed(2) || 0}}</span>
</template>
</el-table-column>
</template>
</el-table-column>
<el-table-column align="center" prop="date" label="统计日期">
<template>
<!-- {{this.beginTime}} -{{this.endTime}}-->
{{this.value2[0]}} 至 {{this.value2[1]}}
</template>
</el-table-column>
</el-table>
@ -160,7 +175,16 @@ export default {
count: '0',
payMoney: '0',
fenxiByDaili2ByData: []
fenxiByDaili2ByData: [
{
paymentChannel:'富友',
payMoneyChannel:'0'
},
{
paymentChannel:'拉卡拉',
payMoneyChannel:'0'
},
]
},
total: 0,
}
@ -239,6 +263,22 @@ export default {
}
getFenxiByDailiByDataApi(this.addDateRange(this.queryParams, this.value2)).then(res => {
this.orderStatistics = res.data
if(this.orderStatistics.
fenxiByDaili2ByData.length==0) {
this.orderStatistics.fenxiByDaili2ByData = [{
paymentChannel:'交易',
payMoneyChannel:'0'
},
{
paymentChannel:'富友',
payMoneyChannel:'0'
},
{
paymentChannel:'拉卡拉',
payMoneyChannel:'0'
}
]
}
console.log("res.data1111", res.data)
})
},

7
fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="margin-top: 0px">
<div style="margin-top: 0px;margin-right: 40px">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<div class="d-s" style="justify-content: space-between">
@ -81,6 +81,11 @@
</el-table-column>
<el-table-column prop="refMoney" align="center" label="累计退款金额（元）"></el-table-column>
<el-table-column prop="refCount" align="center" label="累计退款笔数"></el-table-column>
<el-table-column align="center" prop="date" label="统计日期">
<template>
{{this.value2[0]}} 至 {{this.value2[1]}}
</template>
</el-table-column>
</el-table>
</div>
<pagination

6
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
View File

@ -76,7 +76,11 @@
<el-table-column prop="paidInfo" label="销售金额 (元)" width="150" align="center"></el-table-column>
<el-table-column prop="integralBy" label="消费积分" width="150" align="center"></el-table-column>
</el-table-column>
<el-table-column prop="statDate" label="统计日期" width="200" align="center"></el-table-column>
<el-table-column prop="statDate" label="统计日期" width="200" align="center">
<template>
{{this.value2[0]}} 至 {{this.value2[1]}}
</template>
</el-table-column>
</el-table>
</div>

4
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
View File

@ -102,7 +102,9 @@
</el-table-column>
<el-table-column align="center" prop="date" label="统计日期" >
<template>
<!-- {{this.beginTime}} -{{this.endTime}}-->
<template>
{{this.value2[0]}} 至 {{this.value2[1]}}
</template>
</template>
</el-table-column>
</el-table>

4
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
View File

@ -88,7 +88,9 @@
<el-table-column prop="goodsAmount" label="销售金额 (元)" width="150" align="center"></el-table-column>
<!-- <el-table-column prop="supplierName" label="供应商名称" width="100" align="center"></el-table-column>-->
</el-table-column>
<el-table-column prop="statDate" label="统计日期" width="200" align="center"></el-table-column>
<el-table-column prop="statDate" label="统计日期" width="200" align="center">
</el-table-column>
</el-table>
</div>

11
fuintAdmin_zt/src/views/indexBanner/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div>
<el-card class="card">
<div style="margin: 20px">
<el-card class="card" style="margin-bottom: 20px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="店铺" prop="storeId">
<el-select v-model="queryParams.storeId" filterable placeholder="请选择店铺" clearable style="width: 100%">
@ -19,7 +19,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-form-item style="float: right;margin-right: 0px">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<!-- <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>-->
@ -28,15 +28,16 @@
</el-card>
<el-card class="card">
<div>
<div style="margin-bottom: 10px">
<el-button
type="primary"
icon="el-icon-plus"
@click="handleAdd"
>新增配置</el-button>
</div>
<el-table ref="tables" v-loading="loading" :data="list">
<el-table ref="tables" v-loading="loading" :data="list" border>
<el-table-column label="ID" align="center" prop="id" width="80" />
<el-table-column label="店铺" align="center" prop="storeId" >
<template slot-scope="scope">

10
fuintAdmin_zt/src/views/setting/app/index.vue
View File

@ -38,7 +38,7 @@
<!-- 列表信息-->
<el-card style="margin-top: 20px" >
<el-table :data="tableData" style="width: 100%">
<el-table :data="tableData" style="width: 100%" border="">
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="orgName" label="机构名称"></el-table-column>
<el-table-column prop="unifiedSocialCreditCode" label="统一社会信用代码"></el-table-column>
@ -245,19 +245,19 @@ export default {
handleAdd(e) {
this.clean()
this.open = true;
this.title = "增加设备"
this.title = "增加小程序配置"
},
edit(e) {
this.clean()
this.open = true;
this.title = "编辑设备"
this.title = "编辑小程序配置"
this.deviceInfo = e
console.log('提交设备信息数据:', this.deviceInfo);
console.log('提交小程序配置信息数据:', this.deviceInfo);
},
del(e) {
this.$confirm('此操作将永久删除该设备, 是否继续?', '提示', {
this.$confirm('此操作将永久删除该小程序配置, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'

2
fuintAdmin_zt/src/views/setting/banner/index.vue
View File

@ -54,7 +54,7 @@
<!-- <el-card style="margin-top: 20px" >-->
<el-table :data="tableData" style="width: 100%">
<el-table :data="tableData" style="width: 100%;" border>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="bannerName" label="banner名称"></el-table-column>
<el-table-column prop="productImage" label="图片">

2
fuintAdmin_zt/src/views/setting/hardware.vue
View File

@ -46,7 +46,7 @@
</el-form-item>
</el-form>
<el-table :data="tableData" style="width: 100%">
<el-table :data="tableData" style="width: 100%" border>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="name" label="商品名称"></el-table-column>
<el-table-column prop="categoryName" label="商品分类"></el-table-column>

2
fuintAdmin_zt/src/views/setting/sysLog.vue
View File

@ -91,7 +91,7 @@
</el-form-item>
</el-form>
<el-table :data="tableData" style="width: 100%">
<el-table :data="tableData" style="width: 100%" border>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="createAccount" label="登录账号"></el-table-column>
<el-table-column prop="createName" label="操作用户"></el-table-column>

2
fuintAdmin_zt/src/views/system/logs/index.vue
View File

@ -58,7 +58,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table ref="tables" border v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column label="ID" prop="id" width="80"/>
<el-table-column label="操作内容" align="center" prop="module" width="200" :show-overflow-tooltip="true" />
<el-table-column label="耗时" align="center" prop="timeConsuming"/>

314
fuintAdmin_zt/src/views/system/notify/page/getNotify.vue Normal file
View File

@ -0,0 +1,314 @@
<template>
<div class="app-container">
<el-card >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="" prop="deptName">
<el-input
v-model="queryParams.notificationName"
placeholder="请输入选择通知名称"
clearable
style="width: 240px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="notificationType">
<el-select v-model="queryParams.notificationType" placeholder="请选择通知类型" clearable style="width: 240px;">
<el-option label="到期提醒" value="到期提醒"></el-option>
<el-option label="库存预警" value="库存预警"></el-option>
<!-- 添加其他选项 -->
</el-select>
</el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- </el-card>-->
<!-- &lt;!&ndash; &ndash;&gt;-->
<!-- &lt;!&ndash; 列表信息&ndash;&gt;-->
<!-- <el-card style="margin-top: 20px" >-->
<el-table :data="tableData" style="width: 100%" border>
<el-table-column align="center" type="index" label="序号"></el-table-column>
<el-table-column align="center" prop="notificationName" label="通知名称"></el-table-column>
<el-table-column align="center" prop="notificationType" label="通知类型"></el-table-column>
<el-table-column align="center" prop="templateContent" label="通知内容"></el-table-column>
<!-- <el-table-column align="center" prop="sendStatus" label="通知状态"></el-table-column>-->
<el-table-column align="center" prop="createName" label="创建人"></el-table-column>
<el-table-column align="center" prop="createTime" label="创建时间"></el-table-column>
<el-table-column align="center" prop="createTime" label="发送时间"></el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-card>
</div>
</template>
<script>
import {deleteAppApi, getAppListApi, saveAppApi, updateAppApi} from "@/api/sys/app";
import {listUser} from "@/api/system/Site/site";
import {dutyList, getByRoleIdApi} from "@/api/duty/duty";
import {getNotificationlogList, saveSysNotificationApi, updateSysNotificationApi} from "@/api/sys/sysNotificationlog";
import {getSendNotifyApi, getSysNotifyList, saveSysNotifyApi, updateSysNotifyApi} from "@/api/sys/sysNotify";
export default {
name: "notify-record",
data() {
return {
tableData: [],
form: {
notificationName: '',
notificationType: '',
templateContent: '',
recipientRoles: [],
templateStatus: true,
// conditions: [
// { field: '', operator: '', value: '' }
// ],
recipientUser:[
]
},
// dutyList:[],
dutyList1:[],
// 用户表格数据
userList: null,
// 是否显示弹出层
open: false,
open1: false,
title:"",
total:0,
// 查询参数
queryParams: {
page: 1,
pageSize: 10,
deptName:'',
legalRepresentativeContact:'',
appStatus:'',
},
// 查询参数
queryParamsUser: {
page: 1,
pageSize: 10000
},
linshicunshu:[],
};
},
created() {
this.getList()
},
methods: {
getList(){
getNotificationlogList(this.queryParams).then(res=>{
this.tableData = res.data.records;
this.total = res.data.total
})
},
submitForm(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
// 表单验证通过，可以提交数据
// 示例：调用 API 提交数据
this.submitDeviceInfo();
} else {
// 表单验证失败，不执行任何操作
return false;
}
});
},
// 发送通知
send(data) {
getSendNotifyApi({id :data}).then(res=>{
if(res.code === 200) {
this.getList()
}
})
},
getUserByRoles() {
if (this.form.recipientRoles.length === 0) {
this.form.recipientRoles = []
return
}
console.log("123",this.form.recipientRoles)
this.form.recipientUser = []
let ids = this.form.recipientRoles.join(',')
getByRoleIdApi({roleIds:ids}).then(res=>{
const getUsertList = res.data;
// recipientUser
this.form.recipientUser = []
getUsertList.forEach(item => {
this.form.recipientUser.push({
id: item.acctId,
userName: item.accountName,
})
})
})
},
handleQuery(){
this.getList()
},
resetQuery(){
this.queryParams = {
page: 1,
pageSize: 10,
deviceName:'',
},
this.getList()
},
handleAdd(e) {
this.clean()
this.open = true;
this.getDutyList()
this.title = "新增通知"
},
userEnter1(){
// 在这里调用接口提交设备信息数据
console.log('提交设备信息数据:', this.form);
this.form.recipientUser = JSON.stringify(this.form.recipientUser)
this.form.recipientRoles = JSON.stringify(this.form.recipientRoles)
if (this.form.id) {
updateSysNotifyApi(this.form).then(res=>{
if(res.code === 200) {
this.getList()
this.open = false
}
})
}else {
saveSysNotifyApi(this.form).then(res=>{
if(res.code === 200) {
this.getList()
this.open = false
}
})
}
},
userCe2(){
},
edit(e) {
this.clean()
this.open = true;
this.title = "编辑通知"
this.form = e
this.form.recipientUser = JSON.parse(this.form.recipientUser)
this.form.recipientRoles = JSON.parse(this.form.recipientRoles)
this.getDutyList()
console.log('提交设备信息数据:', this.deviceInfo);
},
del(e) {
this.$confirm('此操作将永久删除该设备, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteAppApi(e.id).then(res=>{
if (res.code == 200) {
this.$message({
type: 'success',
message: '删除成功!'
});
this.getList()
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
});
},
handleSelectionChange(val) {
console.log("val",val)
val.forEach(item => {
this.linshicunshu.push(
{
staffId:val.staffId,
userName:val.realName
}
)
})
},
onlyGetUser(){
// this.loading = true;
// console.log(this.queryParams,222)
// this.addDateRange(this.queryParams, this.dateRange)
listUser(this.queryParamsUser).then(response => {
this.userList = response.data.records;
// this.total = response.data.total;
// this.total = response.data.total;
// this.loading = false;
}
);
},
clickUser(id) {
this.form.recipientUser = this.form.recipientUser.filter(item => item.id !== id);
},
clickAdd() {
this.linshicunshu = []
this.open1 = true;
this.onlyGetUser()
},
userEnter(){
this.open1 = false
this.form.recipientUser = this.linshicunshu
} ,
userCe(){
this.open1 = false
this.linshicunshu = []
},
getDutyList(){
// this.loading = true;
let queryParams1={
page: 1,
pageSize: 10000
}
dutyList(queryParams1).then(res => {
this.dutyList1 = res.data.records;
// this.total1 = res.data.total;
// this.loading = false;
})
},
clean() {
this.deviceInfo= {
id: null, // 自增id
orgName: '', // 机构名称
unifiedSocialCreditCode: '', // 统一社会信用代码
appId: '', // 小程序appID
appKey: '', // 密钥
legalRepresentativeName: '', // 法人姓名
legalRepresentativeWeChat: '', // 法人微信
legalRepresentativeContact: '', // 法人联系方式
appStatus: false, // 小程序状态
createByName: '',
}
},
}
};
</script>
<style lang="scss" scoped>
.common-dialog >>> .el-upload--picture-card {
width: 60px;
height: 50px;
line-height: 60px;
}
</style>

48
fuintAdmin_zt/src/views/system/notify/page/mode.vue
View File

@ -110,6 +110,12 @@
<!-- 通知模板 -->
<el-form-item label="通知模板" :required="true">
<el-input type="textarea" v-model="form.templateContent" :rows="3" placeholder="请输入通知内容" :maxlength="200" show-word-limit style="width: 300px"></el-input>
<div>
<span @click = "insertText('{系统到期日期}')">{系统到期日期}</span>
<span @click = "insertText('{剩余交易流量}')">{剩余交易流量}</span>
<span @click = "insertText('{系统服务费统计}')">{系统服务费统计}</span>
</div>
</el-form-item>
<!-- 接收角色 -->
@ -126,8 +132,8 @@
<!-- 发送条件 -->
<el-form-item label="发送条件" style="margin-bottom: 10px" :required="true">
<div v-for="(condition, index) in form.conditions" :key="index" class="condition-group">
<el-select v-model="condition.field" placeholder="请选择条件" style="width: 150px;margin-right: 10px">
<div v-for="(condition, index) in form.conditions" :key="index" class="condition-group" style="margin-bottom: 10px">
<el-select v-model="condition.field" placeholder="请选择条件" style="width: 150px;margin-right: 10px" @change="changeField(index)">
<el-option label="系统到期日期" value="系统到期日期"></el-option>
<el-option label="剩余交易量" value="剩余交易量"></el-option>
<el-option label="系统服务费统计" value="系统服务费统计"></el-option>
@ -139,12 +145,12 @@
<!-- <el-option label="小于" value="小于"></el-option>-->
<!-- &lt;!&ndash; 添加其他选项 &ndash;&gt;-->
<!-- </el-select>-->
<el-input v-model="condition.value" placeholder="请输入数值" style="width: 150px;margin-right: 10px">
<el-input v-model="condition.value" placeholder="请输入数值" style="width: 200px;margin-right: 10px">
<template slot="append">{{ condition.field === '剩余交易量' || condition.field === '系统服务有效期' ? '万元' : '天' }}</template>
</el-input>
<el-button @click="removeCondition(index)" type="danger" icon="el-icon-delete" circle></el-button>
</div>
<el-button @click="addCondition" type="primary" icon="el-icon-plus">添加条件</el-button>
<el-button @click="addCondition(index)" type="primary" icon="el-icon-plus">添加条件</el-button>
</el-form-item>
<!-- 操作按钮 -->
@ -224,7 +230,24 @@ export default {
this.total = res.data.total
})
},
changeField(index){
console.log("123",this.form.conditions)
console.log("123",index)
let field = this.form.conditions[index].field
let sum = 0
this.form.conditions.forEach(res=>{
if (res.field === field) {
sum++
}
})
if (sum > 1) {
this.form.conditions.splice(index, 1)
this.$message({
type: 'info',
message: '条件不允许重复!'
});
}
},
// submitForm(formName) {
// this.$refs[formName].validate(valid => {
@ -255,7 +278,7 @@ export default {
this.form.conditions = JSON.stringify(this.form.conditions)
}
this.form.recipientRoles = JSON.stringify(this.form.recipientRoles)
if (this.form.id) {
updateSysNotifyApi(this.form).then(res=>{
if(res.code === 200) {
@ -333,8 +356,19 @@ export default {
});
});
},
insertText(data) {
this.form.templateContent = this.form.templateContent+data
},
addCondition() {
this.form.conditions.push({ field: '', operator: '', value: '' });
if (this.form.conditions.length > 2) {
this.$message({
type: 'info',
message: '最多添加3个条件!'
});
return
}else {
this.form.conditions.push({ field: '', operator: '', value: '' });
}
},
removeCondition(index) {
this.form.conditions.splice(index, 1);

1
fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java
View File

@ -129,6 +129,7 @@ public interface MerchantConfigService extends IService<MerchantConfig> {
* @return
*/
Double selectAllAmount(String merchantName,List<Integer> storeIds);
Double selectAllCount(String merchantName, List<Integer> storeIds);
/**
* 分页查询

19
fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
View File

@ -293,6 +293,25 @@ public class MerchantConfigServiceImpl extends ServiceImpl<MerchantConfigMapper,
return amount;
}
@Override
public Double selectAllCount(String merchantName, List<Integer> storeIds) {
// QueryWrapper queryWrapper = new QueryWrapper<>();
// if (ObjectUtil.isNotEmpty(merchantName)){
// queryWrapper.eq("merchant_name",merchantName);
// }
// if (ObjectUtil.isNotEmpty(storeIds)){
// queryWrapper.in("store_id",storeIds);
// }
// queryWrapper.select("count(*) as count");
// MerchantConfig merchantConfig = baseMapper.selectOne(queryWrapper);
// Integer count = 0;
// if (ObjectUtil.isNotEmpty(merchantConfig) && ObjectUtil.isNotEmpty(merchantConfig.getAmount())){
// amount = merchantConfig.getAmount();
// }
// return amount;
return null;
}
@Override
public IPage<MerchantConfigVo> selectListPage(Page page, MerchantConfigVo merchantConfig) {
return baseMapper.selectListPage(page,merchantConfig);

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/AllOrderInfo.java
View File

@ -88,6 +88,9 @@ public class AllOrderInfo extends BaseEntity implements Serializable {
* 退款原因
*/
private String reasonRefund;
private String mchntCd;
private String paymentChannel;
private Long mId;
/**
* 退款订单
*/

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
View File

@ -83,4 +83,6 @@ public interface AllOrderInfoMapper extends BaseMapper<AllOrderInfo> {
Map<String, Object> getLeiJiInfo(@Param("order") UserBalanceVo record);
Map<String, Object> getShuJuVipInfo(@Param("order") UserBalanceVo record);
AllOrderInfoVo getPaymentChannelData(Integer storeId);
}

17
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
View File

@ -635,7 +635,7 @@
SUM(pay_money) payMoney,
count(*) count,
sum(CASE WHEN status = 'refund' THEN pay_money ELSE 0 END) refMoney,
count(CASE WHEN status = 'refund' THEN pay_money ELSE 0 END) refCount
count(CASE WHEN status = 'refund' THEN 1 ELSE 0 END) refCount
from all_order_info
<where>
<if test="order.storeIds != null">
@ -652,6 +652,21 @@
</if>
</where>
</select>
<select id="getPaymentChannelData" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
SELECT
sum(CASE WHEN payment_channel = '富友' THEN pay_money ELSE 0 END) fuYouAmount,
sum(CASE WHEN payment_channel = '拉卡拉' THEN pay_money ELSE 0 END) laKaLaAmount,
count(CASE WHEN payment_channel = '富友' THEN 1 ELSE 0 END) AS fuYouCount,
count(CASE WHEN payment_channel = '拉卡拉' THEN 1 ELSE 0 END) AS laKaLaCount
from all_order_info
<where>
store_id = #{storeId}
</where>
</select>
<!-- SUM(CASE WHEN transaction_type = 'sale' THEN amount ELSE 0 END) AS total_sales-->
<!-- COUNT(CASE WHEN pay_type = 'WECHAT' THEN 0 END) AS wechat, &#45;&#45; 微信-->

15
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
View File

@ -164,11 +164,16 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
record.setParentName(byId2.getDeptName());
List<Integer> storeIds = new ArrayList<>();
storeIds.add(mtStore.getId());
Double fuYouAmount = merchantConfigService.selectAllAmount("富友", storeIds);
Double laKaLaAmount = merchantConfigService.selectAllAmount("拉卡拉", storeIds);
record.setFuYouAmount(ObjectUtil.isNotEmpty(fuYouAmount) ? fuYouAmount : 0.0);
record.setLaKaLaAmount(ObjectUtil.isNotEmpty(laKaLaAmount) ? laKaLaAmount : 0.0);
// storeIds.add(mtStore.getId());
AllOrderInfoVo paymentChannelData = allOrderInfoMapper.getPaymentChannelData(record.getStoreId());
record.setFuYouAmount(paymentChannelData.getFuYouAmount());
record.setFuYouCount(paymentChannelData.getFuYouCount());
record.setLaKaLaAmount(paymentChannelData.getLaKaLaAmount());
record.setLaKaLaCount(paymentChannelData.getLaKaLaCount());
// Double fuYouAmount = merchantConfigService.selectAllAmount("富友", storeIds);
// Double laKaLaAmount = merchantConfigService.selectAllAmount("拉卡拉", storeIds);
// record.setFuYouAmount(ObjectUtil.isNotEmpty(fuYouAmount) ? fuYouAmount : 0.0);
// record.setLaKaLaAmount(ObjectUtil.isNotEmpty(laKaLaAmount) ? laKaLaAmount : 0.0);
}
List<allorderVOo> fenxiByDaili2 = allOrderInfoMapper.getFenxiByDaili2(allOrderInfo);

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java
View File

@ -80,5 +80,9 @@ public class AllOrderInfoVo extends AllOrderInfo {
private Double fuYouAmount;
@TableField(exist = false)
private Double laKaLaAmount;
@TableField(exist = false)
private Double fuYouCount;
@TableField(exist = false)
private Double laKaLaCount;
}

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/entity/SysNotificationlog.java
View File

@ -3,6 +3,7 @@ package com.fuint.business.sys.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.fuint.repository.model.base.BaseEntity;
import lombok.Data;
@ -44,6 +45,11 @@ public class SysNotificationlog extends BaseEntity {
*/
private String errorMessage;
private String content;
@TableField(exist = false)
private String notificationName;
@TableField(exist = false)
private String notificationType;

9
fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysNotificationlogMapper.xml
View File

@ -22,7 +22,8 @@ id,notify_id,sent_to,sent_at,status,error_message
<!--查询指定行数据-->
<select id="queryAllByLimit" resultType="com.fuint.business.sys.vo.SysNotificationlogVo">
select
snl.*,sn.notification_name,sn.notification_type,sn.template_content
snl.*,sn.notification_name,sn.notification_type,sn.template_content,
sn.create_name
from sys_notificationlog snl LEFT JOIN sys_notify sn on snl.notify_id = sn.id
<where>
<if test="entity.id != null">
@ -43,6 +44,12 @@ id,notify_id,sent_to,sent_at,status,error_message
<if test="entity.errorMessage != null and entity.errorMessage != ''">
and snl.error_message = #{entity.errorMessage}
</if>
<if test="entity.notificationName != null and entity.notificationName != ''">
and sn.notification_name = #{entity.notificationName}
</if>
<if test="entity.notificationType != null and entity.notificationType != ''">
and sn.notification_type = #{entity.notificationType}
</if>
</where>
ORDER BY snl.create_time DESC
</select>

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/service/impl/SysNotificationlogServiceImpl.java
View File

@ -49,6 +49,7 @@ public class SysNotificationlogServiceImpl extends ServiceImpl<SysNotificationlo
public IPage<SysNotificationlogVo> queryByPage(@Param("page") Page page, SysNotificationlog sysNotificationlog) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
// sysNotificationlog.setStoreId(nowAccountInfo.getStoreId());
sysNotificationlog.setSentTo(nowAccountInfo.getId().toString());
return this.sysNotificationlogMapper.queryAllByLimit(page, sysNotificationlog);
}

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/vo/SysNotificationlogVo.java
View File

@ -8,4 +8,5 @@ public class SysNotificationlogVo extends SysNotificationlog {
private String notificationName;
private String notificationType;
private String templateContent;
private String createName;
}