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

Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-07-26 10:35:29 +08:00
commit 2451c45f7d
37 changed files with 1455 additions and 724 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,26 @@
</el-dropdown-menu>
</el-dropdown>
</div>
<el-dialog
title="提示"
:visible.sync="dialogVisible"
width="30%"
:before-close="handleClose">
<el-form-item label="密码" prop="name">
<el-input v-model="ruleForm.name"></el-input>
</el-form-item>
<el-form-item label="新密码" prop="name">
<el-input v-model="ruleForm.name"></el-input>
</el-form-item>
<el-form-item label="确认密码" prop="name">
<el-input v-model="ruleForm.name"></el-input>
</el-form-item>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="prsswrod()">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
@ -62,6 +82,11 @@ import FuintDoc from '@/components/Fuint/Doc'
import confirmLog from "@/views/coupon/confirmLog/index.vue";
export default {
data() {
return {
dialogVisible: false
}
},
components: {
Breadcrumb,
TopNav,
@ -96,8 +121,18 @@ export default {
}
},
methods: {
handleClose(done) {
this.$confirm('确认关闭？')
.then(_ => {
done();
})
.catch(_ => {});
}
},
prsswrod(){
console.log('方法')
this.dialogVisible = false
},
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
@ -113,7 +148,7 @@ export default {
})
}).catch(() => {});
}
}
}
</script>

18
fuintAdmin_zt/src/views/Service/index.vue
View File

@ -251,23 +251,7 @@ export default {
label: '北京烤鸭'
}],
value: '',
tableData: [{
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
}, {
date: '2016-05-04',
name: '王小虎',
address: '上海市普陀区金沙江路 1517 弄'
}, {
date: '2016-05-01',
name: '王小虎',
address: '上海市普陀区金沙江路 1519 弄'
}, {
date: '2016-05-03',
name: '王小虎',
address: '上海市普陀区金沙江路 1516 弄'
}],
tableData: [],
form: {
name: '',
region: '',

46
fuintAdmin_zt/src/views/Site/add.vue
View File

@ -33,51 +33,7 @@ export default {
],
},
dutyId:'',
tableData: [{
id: 1,
label: '系统首页',
list: [{show: true, name: '选中'},]
}, {
id: 2,
label: '机构管理',
childrens: [
{
id: 3,
label: '组织架构',
name: '王小虎',
address: '上海市普陀区金沙江路 1519 弄',
childrens: [{
id: 31,
label: '用户信息',
list: [{show: true, name: '新增'}, {show: true, name: '修改'}, {show: true, name: '重置密码'},]
}, {
id: 32,
label: '机构信息',
list: [{show: true, name: '保存'},]
}]
},
]
// list:[{show:true,name:'选项一'},{show:true,name:'选项二'},{show:true,name:'选项三'},]
}, {
id: 4,
label: '财务报表',
childrens: [{
id: 33,
label: '交易对账',
list: [{show: true, name: '导出订单'}]
}, {
id: 34,
label: '流水分析',
list: [{show: true, name: '导出订单'},]
}],
}],
tableData: [],
deptListSelect: [],
};
},

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

@ -579,6 +579,7 @@
active-value="A"
inactive-value="N"
@change="handleStatusChangeDuty(scope.row)"
:disabled="scope.row.dutyId==2"
></el-switch>
</template>
</el-table-column>
@ -595,6 +596,7 @@
icon="el-icon-edit"
v-hasPermi="['role:edit']"
@click="handleUpdate1(scope.row)"
:disabled="scope.row.dutyId==2"
>修改</el-button>
<el-button
size="mini"
@ -602,6 +604,7 @@
icon="el-icon-delete"
v-hasPermi="['role:delete']"
@click="handleDelete1(scope.row)"
:disabled="scope.row.dutyId==2"
>删除</el-button>
</template>
</el-table-column>

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

@ -3,104 +3,80 @@
<div style="margin-top: 0px">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
<el-select
v-model="queryParams.deptId"
clearable
placeholder="所属机构"
>
<el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" style="width: 180px">
<el-input placeholder="请输入油号" v-model="queryParams.orderNo"></el-input>
</el-form-item>
<el-form-item label="" prop="payChannel" style="width: 180px">
<el-select
v-model="queryParams.payChannel"
clearable
placeholder="订单类型"
>
<el-option label="小程序" value="applet"/>
<el-option label="收银台" value="cashier"/>
<el-option label="POS端" value="POS"/>
</el-select>
</el-form-item>
<el-form-item label="" prop="payType" style="width: 180px">
<el-select
v-model="queryParams.payType"
clearable
placeholder="支付方式"
>
<el-option label="现金" value="CASH"/>
<el-option label="微信" value="WECHAT"/>
<el-option label="支付宝" value="ALIPAY"/>
<el-option label="余额" value="balance"/>
</el-select>
</el-form-item>
<el-form-item label="" prop="status" style="width: 180px">
<el-select
v-model="queryParams.status"
clearable
placeholder="支付状态"
>
<el-option label="已支付" value="paid"/>
<el-option label="未支付" value="unpaid"/>
<el-option label="已退款" value="refund"/>
</el-select>
</el-form-item>
<el-form-item label="">
<div class="d-s" style="margin-bottom: 15px">
<div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList"
:key="index" @click="editColor(index)">
{{ item }}
</div>
<el-date-picker
v-model="beginTime"
style="width: 140px"
type="date"
placeholder="交易开始日期">
v-model="value2"
type="datetimerange"
range-separator="至"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期" @click="handleQuery">
</el-date-picker>
至
<el-date-picker
v-model="endTime"
style="width: 140px"
type="date"
placeholder="交易结束日期">
</el-date-picker>
</el-form-item>
<el-form-item class="" 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>
<div style="margin-left: 15px;margin-top: 15px">
<el-form-item label="" prop="deptId" style="width: 180px">
<el-select
v-model="queryParams.deptId"
clearable
placeholder="所属机构"
>
<el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
</el-option>
</el-select>
</el-form-item>
<el-form-item class="" 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>
</div>
</div>
</el-form>
<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="size_" style="margin-bottom: 0px">交易金额汇总数（万元）/交易笔数</div>
<div class="title_">{{ orderStatistics.payMoney }}/{{ 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="k_" id="k_2" v-for="item in orderStatistics.fenxiByDaili2ByData">
<div class="size_">{{ item.paymentChannel }}交易金额（万元）</div>
<div class="title_">{{ item.payMoneyChannel }}</div>
</div>
</div>
</el-card>
<el-card class="box-card">
</el-card>
<el-card class="box-card">
<div class="table-box">
<el-table
:data="orderList"
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column align="center" prop="storeName" label="机构名称"></el-table-column>
<el-table-column align="center" prop="deptName" label="所属机构"></el-table-column>
<el-table-column align="center" prop="parentName" label="所属机构"></el-table-column>
<el-table-column align="center" prop="payMoney" label="累计交易金额"></el-table-column>
<el-table-column align="center" prop="count" label="累计交易笔数"></el-table-column>
<el-table-column align="center" label="支付通道交易信息：金额（万元），笔数（万笔），占比（%）">
<template>
<el-table-column align="center" prop="amount92" label="富友交易金额"></el-table-column>
<el-table-column align="center" prop="count92" label="拉卡拉交易笔数"></el-table-column>
<el-table-column align="center" prop="count92" label="拉卡拉交易占比"></el-table-column>
<el-table-column align="center" prop="fuYouAmount" label="富友交易金额">
<template slot-scope="scope">
<span>{{scope.row.fuYouAmount || 0}}</span>
</template>
</el-table-column>
<el-table-column align="center" prop="laKaLaAmount" label="拉卡拉交易笔数">
<template slot-scope="scope">
<span>{{scope.row.laKaLaAmount || 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>
</template>
</el-table-column>
</template>
</el-table-column>
<el-table-column align="center" prop="date" label="统计日期" >
<el-table-column align="center" prop="date" label="统计日期">
<template>
<!-- {{this.beginTime}} -{{this.endTime}}-->
<!-- {{this.beginTime}} -{{this.endTime}}-->
</template>
</el-table-column>
</el-table>
@ -127,136 +103,183 @@ import {
getTradingPageApi
} from "@/api/allOrder";
import {getFenXiOilOrderDataApi, getFenXiOilOrderListApi} from "@/api/financialStatement/yunyingfenxi";
import {parseTime} from "@/utils/fuint";
export default {
name: "dai_yunyingfenxi-paym",
data(){
return{
radio1:"油号选错",
loading:false,
dialogVisible:false,
// 员工列表
staffList:[],
ordersInfo:{},
// 日期范围
dateRange: [],
beginTime:"",
endTime:"",
// 是否为当天时间
isSysDate:false,
// 收银台订单列表
orderList:[],
deptList:[],
// 查询参数
queryParams: {
page: 1,
pageSize: 10,
beginTime:"",
endTime:"",
orderNo:"",
status:"",
payType:"",
payChannel:"",
deptType:"3",
storeId:"",
deptId:"",
},
orderStatistics:{
count:'0',
payMoney:'0',
fenxiByDaili2ByData: []
},
total:0,
}
},
created() {
let start = new Date();
start.setHours(0)
start.setMinutes(0)
start.setSeconds(0)
start.setMilliseconds(0)
this.dateRange = [start,new Date()];
this.beginTime = start
this.endTime = new Date()
this.isSysDate = true
this.getList();
this.getDeptList();
},
methods:{
getDeptList() {
getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
this.deptList = response.data.records;
})
},
exportExcelCashier() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
exportExcelTradingApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
this.$download.saveAs(blob,'交易明细统计.xLsx')
})
},
// 获取订单统计信息
getOrderStatistics() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFenxiByDailiByDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
this.orderStatistics = res.data
console.log("res.data1111",res.data)
})
},
export default {
name: "dai_yunyingfenxi-paym",
data() {
return {
radio1: "油号选错",
loading: false,
dialogVisible: false,
// 员工列表
staffList: [],
ordersInfo: {},
// 日期范围
dateRange: [],
beginTime: "",
endTime: "",
// 是否为当天时间
isSysDate: false,
// 收银台订单列表
orderList: [],
deptList: [],
// 获取列表信息
getList(val){
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFenxiByDailiApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false
})
this.getOrderStatistics()
timeList: [
"今日",
"近一周",
"近一月",
"近一年",
],
timeIndex: 0,
value2: [],
// 查询参数
queryParams: {
page: 1,
pageSize: 10,
beginTime: "",
endTime: "",
orderNo: "",
status: "",
payType: "",
payChannel: "",
deptType: "3",
storeId: "",
deptId: "",
},
getOrdersInfo(data) {
this.dialogVisible = true;
this.ordersInfo = data
},
// 搜索按钮操作
handleQuery() {
this.queryParams.page = 1;
this.getList();
},
// 重置按钮操作
resetQuery() {
this.dateRange = [];
this.queryParams = {
page: 1,
pageSize: 10,
}
this.beginTime = ""
this.endTime = ""
this.handleQuery();
orderStatistics: {
count: '0',
payMoney: '0',
fenxiByDaili2ByData: []
},
total: 0,
}
},
created() {
let start = new Date();
start.setHours(0)
start.setMinutes(0)
start.setSeconds(0)
start.setMilliseconds(0)
this.dateRange = [start, new Date()];
this.beginTime = start
this.endTime = new Date()
this.isSysDate = true
let start1 = new Date();
start1.setHours(0)
start1.setMinutes(0)
start1.setSeconds(0)
start1.setMilliseconds(0)
this.value2 = [parseTime(start1), parseTime(new Date())];
this.getList();
this.getDeptList();
},
methods: {
editColor(index) {
this.timeIndex = index
if (this.timeList[index] == '今日') {
let start = new Date();
start.setHours(0)
start.setMinutes(0)
start.setSeconds(0)
start.setMilliseconds(0)
this.value2 = [start, new Date()];
} else if (this.timeList[index] == '近一周') {
let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
this.value2 = [parseTime(oneWeekAgo), parseTime(nowDate)]
} else if (this.timeList[index] == '近一月') {
let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getTime() - 30 * 24 * 60 * 60 * 1000)
this.value2 = [parseTime(oneWeekAgo), parseTime(nowDate)]
} else if (this.timeList[index] == '近一年') {
let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
this.value2 = [parseTime(oneWeekAgo), parseTime(nowDate)]
}
this.handleQuery()
},
getDeptList() {
getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then(response => {
this.deptList = response.data.records;
})
},
exportExcelCashier() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
exportExcelTradingApi(this.addDateRange(this.queryParams, dateRange)).then(res => {
const blob = new Blob([res], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
this.$download.saveAs(blob, '交易明细统计.xLsx')
})
},
// 获取订单统计信息
getOrderStatistics() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFenxiByDailiByDataApi(this.addDateRange(this.queryParams, this.value2)).then(res => {
this.orderStatistics = res.data
console.log("res.data1111", res.data)
})
},
// 获取列表信息
getList(val) {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFenxiByDailiApi(this.addDateRange(this.queryParams, this.value2)).then(response => {
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false
})
this.getOrderStatistics()
},
getOrdersInfo(data) {
this.dialogVisible = true;
this.ordersInfo = data
},
// 搜索按钮操作
handleQuery() {
this.queryParams.page = 1;
this.getList();
},
// 重置按钮操作
resetQuery() {
this.dateRange = [];
this.queryParams = {
page: 1,
pageSize: 10,
}
this.beginTime = ""
this.endTime = ""
let start1 = new Date();
start1.setHours(0)
start1.setMinutes(0)
start1.setSeconds(0)
start1.setMilliseconds(0)
this.value2 = [parseTime(start1), parseTime(new Date())];
this.timeIndex = 0
this.handleQuery();
},
}
}
</script>
<style scoped>
.box-card{
.box-card {
width: 100%;
margin: 0px 20px 20px 20px;
}
@ -265,16 +288,18 @@ import {getFenXiOilOrderDataApi, getFenXiOilOrderListApi} from "@/api/financialS
margin-right: 20px;
}
.table-box{
.table-box {
width: 100%;
}
.wrap-boxs{
.wrap-boxs {
width: 100%;
display: flex;
align-items: center;
margin-bottom: 15px;
}
.k_{
.k_ {
width: 200px;
height: 80px;
margin-right: 20px;
@ -284,51 +309,84 @@ import {getFenXiOilOrderDataApi, getFenXiOilOrderListApi} from "@/api/financialS
color: #333333;
}
.size_{
.size_ {
font-weight: 400;
font-size: 14px;
color: #333333;
margin-bottom: 20px;
}
.title_{
.title_ {
font-weight: 600;
font-size: 24px;
color: #333333;
}
#k_1{
#k_1 {
background: url("../imgs/k1.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_2{
#k_2 {
background: url("../imgs/k2.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_3{
#k_3 {
background: url("../imgs/k3.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_4{
#k_4 {
background: url("../imgs/k4.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_5{
#k_5 {
background: url("../imgs/k5.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_6{
#k_6 {
background: url("../imgs/k6.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_7{
#k_7 {
background: url("../imgs/k7.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
.d-s {
display: flex;
align-items: center;
}
.anniu-h {
width: 80px;
height: 26px;
background: #FAFAFA;
border-radius: 4px 4px 4px 4px;
border: 1px solid #DDDDDD;
display: flex;
align-items: center;
justify-content: center;
color: #777777;
margin-right: 20px;
}
.anniu-act {
background: #FF9655 !important;
border: 1px solid #FF9655 !important;
color: #fff;
}
</style>

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

@ -3,63 +3,79 @@
<div style="margin-top: 0px">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
<el-select
v-model="queryParams.deptId"
clearable
placeholder="所属机构"
>
<el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
</el-option>
</el-select>
</el-form-item>
<div class="d-s">
<div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList"
:key="index" @click="editColor(index)">
{{ item }}
</div>
<el-date-picker
v-model="value2"
type="datetimerange"
range-separator="至"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期" @click="handleQuery">
</el-date-picker>
<div style="margin-left: 15px;margin-top: 15px">
<el-form-item label="" prop="deptId" style="width: 180px">
<el-select
v-model="queryParams.deptId"
clearable
placeholder="所属机构"
>
<el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
</el-option>
</el-select>
</el-form-item>
<el-form-item class="" 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>
</div>
</div>
<!-- <el-form-item class="" 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>-->
<!-- <el-card class="box-card">-->
<!-- </el-card>-->
<!-- <el-card class="box-card">-->
<div class="wrap-boxs">
<div class="k_" id="k_1">
<div class="size_" style="margin-bottom: 0px">活跃油站汇总总数/合作油站汇总总数</div>
<div class="title_">{{orderStatistics.sumnum}}/0</div>
<div class="title_">{{ orderStatistics.sumnum }}/0</div>
</div>
<div class="k_" id="k_2">
<div class="size_" style="margin-bottom: 0px" >交易金额汇总数（万元）/交易笔数</div>
<div class="title_">{{orderStatistics.tongjMoney}}</div>
<div class="size_" style="margin-bottom: 0px">交易金额汇总数（万元）/交易笔数</div>
<div class="title_">{{ orderStatistics.tongjMoney }}</div>
</div>
<div class="k_" id="k_3">
<div class="size_">退款金额（元）/退款笔数</div>
<div class="title_">{{orderStatistics.tongjXfMoney}}</div>
<div class="title_">{{ orderStatistics.tongjXfMoney }}</div>
</div>
<div class="k_" id="k_4">
<div class="size_">新增油站数（万元）</div>
<div class="title_">0</div>
</div>
</div>
</el-card>
<el-card class="box-card">
</el-card>
<el-card class="box-card">
<div class="table-box">
<el-table
:data="orderList"
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="storeName" align="center" label="机构名称"> </el-table-column>
<el-table-column prop="parentName" align="center" label="所属机构" > </el-table-column>
<el-table-column prop="storeName" align="center" label="机构名称"></el-table-column>
<el-table-column prop="parentName" align="center" label="所属机构"></el-table-column>
<el-table-column prop="payMoney" align="center" label="累计交易金额（万元）"></el-table-column>
<el-table-column prop="count" align="center" label="累计交易笔数"></el-table-column>
<el-table-column prop="storeName" align="center" label="交易金额">
<el-table-column prop="wechatMoney" align="center" label="微信" > </el-table-column>
<el-table-column prop="alipayMoney" align="center" label="支付宝" > </el-table-column>
<!-- <el-table-column prop="gradeName" align="center" label="云闪付" > </el-table-column>-->
<el-table-column prop="cashMoney" align="center" label="现金" > </el-table-column>
<el-table-column prop="balanceMoney" align="center" label="其他" > </el-table-column>
<el-table-column prop="wechatMoney" align="center" label="微信"></el-table-column>
<el-table-column prop="alipayMoney" align="center" label="支付宝"></el-table-column>
<!-- <el-table-column prop="gradeName" align="center" label="云闪付" > </el-table-column>-->
<el-table-column prop="cashMoney" align="center" label="现金"></el-table-column>
<el-table-column prop="balanceMoney" align="center" label="其他"></el-table-column>
</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 prop="refMoney" align="center" label="累计退款金额（元）"></el-table-column>
<el-table-column prop="refCount" align="center" label="累计退款笔数"></el-table-column>
</el-table>
</div>
<pagination
@ -83,205 +99,289 @@ import {
getTradingPageApi
} from "@/api/allOrder";
import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/financialStatement/yunyingfenxi";
import {parseTime} from "@/utils/fuint";
export default {
name: "dai_yunyingfenxi-payType",
data(){
return{
radio1:"油号选错",
loading:false,
dialogVisible:false,
// 员工列表
staffList:[],
ordersInfo:{},
// 日期范围
dateRange: [],
beginTime:"",
endTime:"",
// 是否为当天时间
isSysDate:false,
// 收银台订单列表
orderList:[],
deptList:[],
export default {
name: "dai_yunyingfenxi-payType",
data() {
return {
radio1: "油号选错",
loading: false,
dialogVisible: false,
// 员工列表
staffList: [],
ordersInfo: {},
// 查询参数
queryParams: {
page: 1,
pageSize: 10,
beginTime:"",
endTime:"",
orderNo:"",
status:"",
payType:"",
payChannel:"",
deptType:"3",
storeId:"",
deptId:"",
},
orderStatistics:{
sumnum:'', // 会员总数
balanceSum:'', // 会员余额
tongjMoney:'', // 累计冲纸
tongjXfMoney:'', // 总消费
},
total:0,
}
},
created() {
let start = new Date();
start.setHours(0)
start.setMinutes(0)
start.setSeconds(0)
start.setMilliseconds(0)
this.dateRange = [start,new Date()];
this.beginTime = start
this.endTime = new Date()
this.isSysDate = true
this.getList();
this.getDeptList();
timeList: [
"今日",
"近一周",
"近一月",
"近一年",
],
timeIndex: 0,
value2: [],
// 日期范围
dateRange: [],
beginTime: "",
endTime: "",
// 是否为当天时间
isSysDate: false,
// 收银台订单列表
orderList: [],
deptList: [],
},
methods:{
getDeptList() {
getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
this.deptList = response.data.records;
})
// 查询参数
queryParams: {
page: 1,
pageSize: 10,
beginTime: "",
endTime: "",
orderNo: "",
status: "",
payType: "",
payChannel: "",
deptType: "3",
storeId: "",
deptId: "",
},
exportExcelCashier() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
exportExcelTradingApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
this.$download.saveAs(blob,'交易明细统计.xLsx')
})
},
// 获取订单统计信息
getOrderStatistics() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFenXiUserbalanceDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
this.orderStatistics = res.data
console.log("res.data1111",res.data)
})
},
// 获取列表信息
getList(val){
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFenxiByDailiTypeApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false
})
this.getOrderStatistics()
},
getOrdersInfo(data) {
this.dialogVisible = true;
this.ordersInfo = data
},
// 搜索按钮操作
handleQuery() {
this.queryParams.page = 1;
this.getList();
},
// 重置按钮操作
resetQuery() {
this.dateRange = [];
this.queryParams = {
page: 1,
pageSize: 10,
}
this.beginTime = ""
this.endTime = ""
this.handleQuery();
orderStatistics: {
sumnum: '', // 会员总数
balanceSum: '', // 会员余额
tongjMoney: '', // 累计冲纸
tongjXfMoney: '', // 总消费
},
total: 0,
}
},
created() {
let start = new Date();
start.setHours(0)
start.setMinutes(0)
start.setSeconds(0)
start.setMilliseconds(0)
this.dateRange = [start, new Date()];
this.beginTime = start
this.endTime = new Date()
this.isSysDate = true
let start1 = new Date();
start1.setHours(0)
start1.setMinutes(0)
start1.setSeconds(0)
start1.setMilliseconds(0)
this.value2 = [parseTime(start1), parseTime(new Date())];
this.getList();
this.getDeptList();
},
methods: {
editColor(index) {
this.timeIndex = index
if (this.timeList[index] == '今日') {
let start = new Date();
start.setHours(0)
start.setMinutes(0)
start.setSeconds(0)
start.setMilliseconds(0)
this.value2 = [start, new Date()];
} else if (this.timeList[index] == '近一周') {
let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
this.value2 = [parseTime(oneWeekAgo), parseTime(nowDate)]
} else if (this.timeList[index] == '近一月') {
let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getTime() - 30 * 24 * 60 * 60 * 1000)
this.value2 = [parseTime(oneWeekAgo), parseTime(nowDate)]
} else if (this.timeList[index] == '近一年') {
let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
this.value2 = [parseTime(oneWeekAgo), parseTime(nowDate)]
}
this.handleQuery()
},
getDeptList() {
getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then(response => {
this.deptList = response.data.records;
})
},
exportExcelCashier() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
exportExcelTradingApi(this.addDateRange(this.queryParams, dateRange)).then(res => {
const blob = new Blob([res], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
this.$download.saveAs(blob, '交易明细统计.xLsx')
})
},
// 获取订单统计信息
getOrderStatistics() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFenXiUserbalanceDataApi(this.addDateRange(this.queryParams, this.value2)).then(res => {
this.orderStatistics = res.data
console.log("res.data1111", res.data)
})
},
// 获取列表信息
getList(val) {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFenxiByDailiTypeApi(this.addDateRange(this.queryParams, this.value2)).then(response => {
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false
})
this.getOrderStatistics()
},
getOrdersInfo(data) {
this.dialogVisible = true;
this.ordersInfo = data
},
// 搜索按钮操作
handleQuery() {
this.queryParams.page = 1;
this.getList();
},
// 重置按钮操作
resetQuery() {
this.dateRange = [];
this.queryParams = {
page: 1,
pageSize: 10,
}
this.beginTime = ""
this.endTime = ""
let start1 = new Date();
start1.setHours(0)
start1.setMinutes(0)
start1.setSeconds(0)
start1.setMilliseconds(0)
this.value2 = [parseTime(start1), parseTime(new Date())];
this.timeIndex = 0
this.handleQuery();
},
}
}
</script>
<style scoped>
.box-card{
width: 100%;
margin: 0px 20px 20px 20px;
}
.box-card {
width: 100%;
margin: 0px 20px 20px 20px;
}
.el-form--inline .el-form-item {
margin-right: 20px;
}
.el-form--inline .el-form-item {
margin-right: 20px;
}
.table-box {
width: 100%;
}
.wrap-boxs {
width: 100%;
display: flex;
align-items: center;
margin-bottom: 15px;
}
.k_ {
width: 200px;
height: 80px;
margin-right: 20px;
box-sizing: border-box;
padding: 15px 10px;
padding-top: 5px;
color: #333333;
}
.size_ {
font-weight: 400;
font-size: 14px;
color: #333333;
margin-bottom: 20px;
}
.title_ {
font-weight: 600;
font-size: 24px;
color: #333333;
}
#k_1 {
background: url("../imgs/k1.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_2 {
background: url("../imgs/k2.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_3 {
background: url("../imgs/k3.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_4 {
background: url("../imgs/k4.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_5 {
background: url("../imgs/k5.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_6 {
background: url("../imgs/k6.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_7 {
background: url("../imgs/k7.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
.d-s {
display: flex;
align-items: center;
}
.anniu-h {
width: 80px;
height: 26px;
background: #FAFAFA;
border-radius: 4px 4px 4px 4px;
border: 1px solid #DDDDDD;
display: flex;
align-items: center;
justify-content: center;
color: #777777;
margin-right: 20px;
}
.anniu-act {
background: #FF9655 !important;
border: 1px solid #FF9655 !important;
color: #fff;
}
.table-box{
width: 100%;
}
.wrap-boxs{
width: 100%;
display: flex;
align-items: center;
margin-bottom: 15px;
}
.k_{
width: 200px;
height: 80px;
margin-right: 20px;
box-sizing: border-box;
padding: 15px 10px;
padding-top: 5px;
color: #333333;
}
.size_{
font-weight: 400;
font-size: 14px;
color: #333333;
margin-bottom: 20px;
}
.title_{
font-weight: 600;
font-size: 24px;
color: #333333;
}
#k_1{
background: url("../imgs/k1.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_2{
background: url("../imgs/k2.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_3{
background: url("../imgs/k3.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_4{
background: url("../imgs/k4.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_5{
background: url("../imgs/k5.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_6{
background: url("../imgs/k6.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_7{
background: url("../imgs/k7.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
</style>

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

@ -3,41 +3,57 @@
<div style="margin-top: 0px">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
<el-select
v-model="queryParams.deptId"
clearable
placeholder="所属机构"
>
<el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
</el-option>
</el-select>
</el-form-item>
<el-form-item class="" 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>
<div class="d-s">
<div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList"
:key="index" @click="editColor(index)">
{{ item }}
</div>
<el-date-picker
v-model="value2"
type="datetimerange"
range-separator="至"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期" @click="handleQuery">
</el-date-picker>
<div style="margin-left: 15px;margin-top: 15px">
<el-form-item label="" prop="deptId" style="width: 180px">
<el-select
v-model="queryParams.deptId"
clearable
placeholder="所属机构"
>
<el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
</el-option>
</el-select>
</el-form-item>
<el-form-item class="" 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>
</div>
</div>
</el-form>
<div class="wrap-box">
<div class="k_" id="k_1">
<div class="size_">累计交易金额（万元）</div>
<div class="title_">{{orderStatistics.paidInfo}}</div>
<div class="title_">{{ orderStatistics.paidInfo || 0 }}</div>
</div>
<div class="k_" id="k_2">
<div class="size_">累计交易笔数</div>
<div class="title_">{{orderStatistics.count}}</div>
<div class="title_">{{ orderStatistics.count || 0 }}</div>
</div>
<div class="k_" id="k_3">
<div class="size_">累计兑换商品数量</div>
<div class="title_">{{orderStatistics.exchangeQuantity}}</div>
<div class="title_">{{ orderStatistics.exchangeQuantity || 0 }}</div>
</div>
<div class="k_" id="k_4">
<div class="size_">累计消耗积分</div>
<div class="title_">{{orderStatistics.integrals}}</div>
<div class="title_">{{ orderStatistics.integrals || 0 }}</div>
</div>
</div>
</el-card>
<el-card class="box-card">
</el-card>
<el-card class="box-card">
<div class="table-box">
<el-table
:data="orderList"
@ -49,10 +65,11 @@
<el-table-column prop="exchangeQuantity" label="兑换商品数量" width="150" align="center"></el-table-column>
<el-table-column prop="integral" label="累计消费积分" width="150" align="center"></el-table-column>
<el-table-column label="热门商品信息" align="center">
<el-table-column prop="giftName" label="商品名称" width="150" align="center"></el-table-column>
<el-table-column prop="exchangeQuantityBy" label="兑换数量 (件)" width="150" align="center"></el-table-column>
<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 prop="giftName" label="商品名称" width="150" align="center"></el-table-column>
<el-table-column prop="exchangeQuantityBy" label="兑换数量 (件)" width="150"
align="center"></el-table-column>
<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>
@ -80,134 +97,181 @@ import {
getTradingPageApi
} from "@/api/allOrder";
import {getFenXiIntegralDataApi, getFenXiIntegralListApi} from "@/api/financialStatement/yunyingfenxi";
import {parseTime} from "@/utils/fuint";
export default {
name: "yunyingfenxi-int",
data(){
return{
radio1:"油号选错",
loading:false,
dialogVisible:false,
// 员工列表
staffList:[],
ordersInfo:{},
// 日期范围
dateRange: [],
beginTime:"",
endTime:"",
// 是否为当天时间
isSysDate:false,
// 收银台订单列表
orderList:[],
deptList:[],
export default {
name: "yunyingfenxi-int",
data() {
return {
radio1: "油号选错",
loading: false,
dialogVisible: false,
// 员工列表
staffList: [],
ordersInfo: {},
// 查询参数
queryParams: {
page: 1,
pageSize: 10,
beginTime:"",
endTime:"",
orderNo:"",
status:"",
payType:"",
payChannel:"",
deptType:"3",
storeId:"",
deptId:"",
},
orderStatistics:{
paidInfo:'0',
count:'0',
exchangeQuantity:'0',
integrals:'0',
},
total:0,
}
},
created() {
let start = new Date();
start.setHours(0)
start.setMinutes(0)
start.setSeconds(0)
start.setMilliseconds(0)
this.dateRange = [start,new Date()];
this.beginTime = start
this.endTime = new Date()
this.isSysDate = true
this.getList();
this.getDeptList();
timeList: [
"今日",
"近一周",
"近一月",
"近一年",
],
timeIndex: 0,
value2: [],
// 日期范围
dateRange: [],
beginTime: "",
endTime: "",
// 是否为当天时间
isSysDate: false,
// 收银台订单列表
orderList: [],
deptList: [],
},
methods:{
getDeptList() {
getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
this.deptList = response.data.records;
})
// 查询参数
queryParams: {
page: 1,
pageSize: 10,
beginTime: "",
endTime: "",
orderNo: "",
status: "",
payType: "",
payChannel: "",
deptType: "3",
storeId: "",
deptId: "",
},
exportExcelCashier() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
exportExcelTradingApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
this.$download.saveAs(blob,'交易明细统计.xLsx')
})
},
// 获取订单统计信息
getOrderStatistics() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFenXiIntegralDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
this.orderStatistics = res.data
console.log("res.data1111",res.data)
})
},
// 获取列表信息
getList(val){
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFenXiIntegralListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false
})
this.getOrderStatistics()
},
getOrdersInfo(data) {
this.dialogVisible = true;
this.ordersInfo = data
},
// 搜索按钮操作
handleQuery() {
this.queryParams.page = 1;
this.getList();
},
// 重置按钮操作
resetQuery() {
this.dateRange = [];
this.queryParams = {
page: 1,
pageSize: 10,
}
this.beginTime = ""
this.endTime = ""
this.handleQuery();
orderStatistics: {
paidInfo: '0',
count: '0',
exchangeQuantity: '0',
integrals: '0',
},
total: 0,
}
},
created() {
let start = new Date();
start.setHours(0)
start.setMinutes(0)
start.setSeconds(0)
start.setMilliseconds(0)
this.dateRange = [start, new Date()];
this.beginTime = start
this.endTime = new Date()
this.isSysDate = true
let start1 = new Date();
start1.setHours(0)
start1.setMinutes(0)
start1.setSeconds(0)
start1.setMilliseconds(0)
this.value2 = [parseTime(start1), parseTime(new Date())];
this.getList();
this.getDeptList();
},
methods: {
editColor(index){
this.timeIndex = index
if (this.timeList[index]=='今日'){
let start = new Date();
start.setHours(0)
start.setMinutes(0)
start.setSeconds(0)
start.setMilliseconds(0)
this.value2 = [start,new Date()];
} else if (this.timeList[index]=='近一周'){
let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
} else if (this.timeList[index]=='近一月'){
let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getTime() - 30 * 24 * 60 * 60 * 1000)
this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
} else if (this.timeList[index]=='近一年'){
let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
}
this.handleQuery()
},
getDeptList() {
getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then(response => {
this.deptList = response.data.records;
})
},
exportExcelCashier() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
exportExcelTradingApi(this.addDateRange(this.queryParams, dateRange)).then(res => {
const blob = new Blob([res], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
this.$download.saveAs(blob, '交易明细统计.xLsx')
})
},
// 获取订单统计信息
getOrderStatistics() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFenXiIntegralDataApi(this.addDateRange(this.queryParams, this.value2)).then(res => {
this.orderStatistics = res.data
console.log("res.data1111", res.data)
})
},
// 获取列表信息
getList(val) {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFenXiIntegralListApi(this.addDateRange(this.queryParams, this.value2)).then(response => {
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false
})
this.getOrderStatistics()
},
getOrdersInfo(data) {
this.dialogVisible = true;
this.ordersInfo = data
},
// 搜索按钮操作
handleQuery() {
this.queryParams.page = 1;
this.getList();
},
// 重置按钮操作
resetQuery() {
this.dateRange = [];
this.queryParams = {
page: 1,
pageSize: 10,
}
this.beginTime = ""
this.endTime = ""
let start1 = new Date();
start1.setHours(0)
start1.setMinutes(0)
start1.setSeconds(0)
start1.setMilliseconds(0)
this.value2 = [parseTime(start1), parseTime(new Date())];
this.timeIndex = 0
this.handleQuery();
},
}
}
</script>
<style scoped>
.box-card{
.box-card {
width: 100%;
margin: 0px 20px 20px 20px;
}
@ -216,16 +280,18 @@ import {getFenXiIntegralDataApi, getFenXiIntegralListApi} from "@/api/financialS
margin-right: 20px;
}
.table-box{
.table-box {
width: 100%;
}
.wrap-box{
.wrap-box {
width: 100%;
display: flex;
align-items: center;
margin-bottom: 15px;
}
.k_{
.k_ {
width: 200px;
height: 80px;
margin-right: 20px;
@ -233,51 +299,85 @@ import {getFenXiIntegralDataApi, getFenXiIntegralListApi} from "@/api/financialS
padding: 15px 10px;
color: #333333;
}
.size_{
.size_ {
font-weight: 400;
font-size: 14px;
color: #333333;
margin-bottom: 10px;
}
.title_{
.title_ {
font-weight: 600;
font-size: 24px;
color: #333333;
}
#k_1{
#k_1 {
background: url("../imgs/k1.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_2{
#k_2 {
background: url("../imgs/k2.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_3{
#k_3 {
background: url("../imgs/k3.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_4{
#k_4 {
background: url("../imgs/k4.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_5{
#k_5 {
background: url("../imgs/k5.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_6{
#k_6 {
background: url("../imgs/k6.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
#k_7{
#k_7 {
background: url("../imgs/k7.png");
background-size: cover; /* 背景图片铺满盒子 */
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
.d-s {
display: flex;
align-items: center;
}
.anniu-h {
width: 80px;
height: 26px;
background: #FAFAFA;
border-radius: 4px 4px 4px 4px;
border: 1px solid #DDDDDD;
display: flex;
align-items: center;
justify-content: center;
color: #777777;
margin-right: 20px;
}
.anniu-act {
background: #FF9655 !important;
border: 1px solid #FF9655 !important;
color: #fff;
}
</style>

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

@ -3,47 +3,62 @@
<div style="margin-top: 0px">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
<el-select
v-model="queryParams.deptId"
clearable
placeholder="所属机构"
>
<el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
</el-option>
</el-select>
</el-form-item>
<div class="d-s">
<div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList" :key="index" @click="editColor(index)">
{{item}}
</div>
<el-date-picker
v-model="value2"
type="datetimerange"
range-separator="至"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期" @click="handleQuery">
</el-date-picker>
<div style="margin-left: 15px;margin-top: 15px">
<el-form-item label="" prop="deptId" style="width: 180px">
<el-select
v-model="queryParams.deptId"
clearable
placeholder="所属机构"
>
<el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
</el-option>
</el-select>
</el-form-item>
<el-form-item class="" 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>
</div>
</div>
<el-form-item class="" 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>
<div class="wrap-box">
<div class="k_" id="k_1">
<div class="size_">累计交易金额（万元）</div>
<div class="title_">{{orderStatistics.amount}}</div>
<div class="title_">{{orderStatistics.amount || 0}}</div>
</div>
<div class="k_" id="k_2">
<div class="size_">累计交易升数</div>
<div class="title_">{{orderStatistics.num}}</div>
<div class="title_">{{orderStatistics.num || 0}}</div>
</div>
<div class="k_" id="k_3">
<div class="size_">92#汽油交易金额（万元）</div>
<div class="title_">{{orderStatistics.amount92}}</div>
<div class="title_">{{orderStatistics.amount92 || 0}}</div>
</div>
<div class="k_" id="k_4">
<div class="size_">95#汽油交易金额（万元）</div>
<div class="title_">{{orderStatistics.amount95}}</div>
<div class="title_">{{orderStatistics.amount95 || 0}}</div>
</div>
<div class="k_" id="k_5">
<div class="size_">98#汽油交易金额（万元）</div>
<div class="title_">{{orderStatistics.amount98}}</div>
<div class="title_">{{orderStatistics.amount98 || 0}}</div>
</div>
<div class="k_" id="k_5">
<div class="size_">0#柴油交易金额（万元）</div>
<div class="title_">{{orderStatistics.amount0}}</div>
<div class="title_">{{orderStatistics.amount0 || 0}}</div>
</div>
</div>
</el-card>
@ -108,6 +123,7 @@ import {
getTradingPageApi
} from "@/api/allOrder";
import {getFenXiOilOrderDataApi, getFenXiOilOrderListApi} from "@/api/financialStatement/yunyingfenxi";
import {parseTime} from "@/utils/fuint";
export default {
name: "yunyingfenxi-oil",
@ -129,6 +145,14 @@ import {getFenXiOilOrderDataApi, getFenXiOilOrderListApi} from "@/api/financialS
orderList:[],
deptList:[],
timeList:[
"今日",
"近一周",
"近一月",
"近一年",
],
timeIndex:0,
value2: [],
// 查询参数
queryParams: {
page: 1,
@ -164,11 +188,41 @@ import {getFenXiOilOrderDataApi, getFenXiOilOrderListApi} from "@/api/financialS
this.beginTime = start
this.endTime = new Date()
this.isSysDate = true
let start1 = new Date();
start1.setHours(0)
start1.setMinutes(0)
start1.setSeconds(0)
start1.setMilliseconds(0)
this.value2 = [parseTime(start1),parseTime(new Date())];
this.getList();
this.getDeptList();
},
methods:{
editColor(index){
this.timeIndex = index
if (this.timeList[index]=='今日'){
let start = new Date();
start.setHours(0)
start.setMinutes(0)
start.setSeconds(0)
start.setMilliseconds(0)
this.value2 = [start,new Date()];
} else if (this.timeList[index]=='近一周'){
let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
} else if (this.timeList[index]=='近一月'){
let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getTime() - 30 * 24 * 60 * 60 * 1000)
this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
} else if (this.timeList[index]=='近一年'){
let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
}
this.handleQuery()
},
getDeptList() {
getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
this.deptList = response.data.records;
@ -193,7 +247,7 @@ import {getFenXiOilOrderDataApi, getFenXiOilOrderListApi} from "@/api/financialS
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFenXiOilOrderDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
getFenXiOilOrderDataApi(this.addDateRange(this.queryParams, this.value2)).then(res=>{
this.orderStatistics = res.data
console.log("res.data1111",res.data)
})
@ -201,12 +255,12 @@ import {getFenXiOilOrderDataApi, getFenXiOilOrderListApi} from "@/api/financialS
// 获取列表信息
getList(val){
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFenXiOilOrderListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
// let dateRange = []
// if (this.beginTime && this.endTime) {
// dateRange.push(this.beginTime.toLocaleDateString())
// dateRange.push(this.endTime.toLocaleDateString())
// }
getFenXiOilOrderListApi(this.addDateRange(this.queryParams,this.value2)).then( response => {
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false
@ -231,6 +285,13 @@ import {getFenXiOilOrderDataApi, getFenXiOilOrderListApi} from "@/api/financialS
}
this.beginTime = ""
this.endTime = ""
let start1 = new Date();
start1.setHours(0)
start1.setMinutes(0)
start1.setSeconds(0)
start1.setMilliseconds(0)
this.value2 = [parseTime(start1),parseTime(new Date())];
this.timeIndex = 0
this.handleQuery();
},
}
@ -311,4 +372,26 @@ import {getFenXiOilOrderDataApi, getFenXiOilOrderListApi} from "@/api/financialS
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
.d-s{
display: flex;
align-items: center;
}
.anniu-h{
width: 80px;
height: 26px;
background: #FAFAFA;
border-radius: 4px 4px 4px 4px;
border: 1px solid #DDDDDD;
display: flex;
align-items: center;
justify-content: center;
color: #777777;
margin-right: 20px;
}
.anniu-act{
background: #FF9655 !important;
border: 1px solid #FF9655 !important;
color: #fff;
}
</style>

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

@ -2,39 +2,55 @@
<template>
<div style="margin-top: 0px">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
<el-select
v-model="queryParams.deptId"
clearable
placeholder="所属机构"
>
<el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
</el-option>
</el-select>
</el-form-item>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" >
<div class="d-s">
<div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList" :key="index" @click="editColor(index)">
{{item}}
</div>
<el-date-picker
v-model="value2"
type="datetimerange"
range-separator="至"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期" @click="handleQuery">
</el-date-picker>
<div style="margin-left: 15px;margin-top: 15px">
<el-form-item label="" prop="deptId" style="width: 180px;">
<el-select
v-model="queryParams.deptId"
clearable
placeholder="所属机构"
>
<el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
</el-option>
</el-select>
</el-form-item>
<el-form-item class="" 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>
</div>
</div>
<el-form-item class="" 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>
<div class="wrap-box">
<div class="k_" id="k_1">
<div class="size_">累计交易金额（万元）</div>
<div class="title_">{{orderStatistics.payAmount}}</div>
<div class="title_">{{orderStatistics.payAmount || 0}}</div>
</div>
<div class="k_" id="k_2">
<div class="size_">累计交易笔数</div>
<div class="title_">{{orderStatistics.count}}</div>
<div class="title_">{{orderStatistics.count || 0}}</div>
</div>
<div class="k_" id="k_3">
<div class="size_">累计销售商品数量</div>
<div class="title_">{{orderStatistics.goodsNum}}</div>
<div class="title_">{{orderStatistics.goodsNum || 0}}</div>
</div>
<div class="k_" id="k_4">
<div class="size_">热销品类数量</div>
<div class="title_">{{orderStatistics.cvg}}</div>
<div class="title_">{{orderStatistics.cvg || 0}}</div>
</div>
</div>
</el-card>
@ -93,6 +109,7 @@ import {
getTradingPageApi
} from "@/api/allOrder";
import {getFenXiStoreDataApi, getFenXiStoreListApi} from "@/api/financialStatement/yunyingfenxi";
import {parseTime} from "@/utils/fuint";
export default {
name: "yunyingfenxi-store",
@ -104,6 +121,15 @@ import {getFenXiStoreDataApi, getFenXiStoreListApi} from "@/api/financialStateme
// 员工列表
staffList:[],
ordersInfo:{},
timeList:[
"今日",
"近一周",
"近一月",
"近一年",
],
timeIndex:0,
value2: [],
// 日期范围
dateRange: [],
beginTime:"",
@ -147,11 +173,41 @@ import {getFenXiStoreDataApi, getFenXiStoreListApi} from "@/api/financialStateme
this.beginTime = start
this.endTime = new Date()
this.isSysDate = true
let start1 = new Date();
start1.setHours(0)
start1.setMinutes(0)
start1.setSeconds(0)
start1.setMilliseconds(0)
this.value2 = [parseTime(start1),parseTime(new Date())];
this.getList();
this.getDeptList();
},
methods:{
editColor(index){
this.timeIndex = index
if (this.timeList[index]=='今日'){
let start = new Date();
start.setHours(0)
start.setMinutes(0)
start.setSeconds(0)
start.setMilliseconds(0)
this.value2 = [start,new Date()];
} else if (this.timeList[index]=='近一周'){
let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
} else if (this.timeList[index]=='近一月'){
let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getTime() - 30 * 24 * 60 * 60 * 1000)
this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
} else if (this.timeList[index]=='近一年'){
let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
}
this.handleQuery()
},
getDeptList() {
getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then( response => {
this.deptList = response.data.records;
@ -176,7 +232,7 @@ import {getFenXiStoreDataApi, getFenXiStoreListApi} from "@/api/financialStateme
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFenXiStoreDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
getFenXiStoreDataApi(this.addDateRange(this.queryParams, this.value2)).then(res=>{
this.orderStatistics = res.data
console.log("res.data1111",res.data)
})
@ -189,7 +245,7 @@ import {getFenXiStoreDataApi, getFenXiStoreListApi} from "@/api/financialStateme
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFenXiStoreListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
getFenXiStoreListApi(this.addDateRange(this.queryParams,this.value2)).then( response => {
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false
@ -214,6 +270,13 @@ import {getFenXiStoreDataApi, getFenXiStoreListApi} from "@/api/financialStateme
}
this.beginTime = ""
this.endTime = ""
let start1 = new Date();
start1.setHours(0)
start1.setMinutes(0)
start1.setSeconds(0)
start1.setMilliseconds(0)
this.value2 = [parseTime(start1),parseTime(new Date())];
this.timeIndex = 0
this.handleQuery();
},
}
@ -294,4 +357,27 @@ import {getFenXiStoreDataApi, getFenXiStoreListApi} from "@/api/financialStateme
background-repeat: no-repeat; /* 禁止背景图片重复 */
}
.d-s{
display: flex;
align-items: center;
}
.anniu-h{
width: 80px;
height: 26px;
background: #FAFAFA;
border-radius: 4px 4px 4px 4px;
border: 1px solid #DDDDDD;
display: flex;
align-items: center;
justify-content: center;
color: #777777;
margin-right: 20px;
}
.anniu-act{
background: #FF9655 !important;
border: 1px solid #FF9655 !important;
color: #fff;
}
</style>

2
fuintAdmin_zt/src/views/homeComponents/agent.vue
View File

@ -237,7 +237,7 @@ export default {
},
methods:{
getNoticeList(){
getNotificationlogList({pageNo: 1, pageSize: 3,sentTo:this.accountId}).then(res => {
getNotificationlogList({pageNo: 1, pageSize: 4,sentTo:this.accountId}).then(res => {
this.noticeList = res.data.records
})
},

2
fuintAdmin_zt/src/views/homeComponents/manage.vue
View File

@ -243,7 +243,7 @@ export default {
},
methods:{
getNoticeList(){
getNotificationlogList({pageNo: 1, pageSize: 3,sentTo:this.accountId}).then(res => {
getNotificationlogList({pageNo: 1, pageSize: 4,sentTo:this.accountId}).then(res => {
this.noticeList = res.data.records
})
},

2
fuintAdmin_zt/src/views/homeComponents/shopowner.vue
View File

@ -241,7 +241,7 @@ export default {
},
methods:{
getNoticeList(){
getNotificationlogList({pageNo: 1, pageSize: 3,sentTo:this.accountId}).then(res => {
getNotificationlogList({pageNo: 1, pageSize: 4,sentTo:this.accountId}).then(res => {
this.noticeList = res.data.records
})
},

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

@ -30,6 +30,7 @@
<el-button
type="primary"
@click="handleAdd"
v-hasPermi="['setting:app:add']"
>新增小程序配置</el-button>
</el-form-item>
</el-form>
@ -65,12 +66,14 @@
type="text"
icon="el-icon-view"
@click="edit(scope.row)"
v-hasPermi="['setting:app:edit']"
>编辑</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="del(scope.row)"
v-hasPermi="['setting:app:delete']"
>删除</el-button>
</template>
</el-table-column>

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

@ -44,6 +44,7 @@
type="primary"
icon="el-icon-plus"
@click="handleAdd"
v-hasPermi="['setting:banner:add']"
>新增banner图</el-button>
</el-form-item>
</el-form>
@ -90,12 +91,14 @@
type="text"
icon="el-icon-view"
@click="edit(scope.row)"
v-hasPermi="['setting:banner:edit']"
>编辑</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="del(scope.row)"
v-hasPermi="['setting:banner:delete']"
>删除</el-button>
</template>
</el-table-column>

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

@ -41,6 +41,7 @@
type="primary"
icon="el-icon-plus"
@click="handleAdd"
v-hasPermi="['setting:hardware:add']"
>新增商品</el-button>
</el-form-item>
</el-form>
@ -75,6 +76,7 @@
type="text"
icon="el-icon-view"
@click="edit(scope.row)"
v-hasPermi="['setting:hardware:edit']"
>编辑</el-button>
<el-button
size="mini"
@ -82,6 +84,7 @@
icon="el-icon-top"
v-if="scope.row.status == 0 "
@click="shangjia(scope.row)"
v-hasPermi="['setting:hardware:grounding']"
>上架</el-button>
<el-button
size="mini"
@ -89,12 +92,14 @@
icon="el-icon-bottom"
v-if="scope.row.status == 1 "
@click="shangjia(scope.row)"
v-hasPermi="['setting:hardware:offShelf']"
>下架</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="del(scope.row)"
v-hasPermi="['setting:hardware:delete']"
>删除</el-button>
</template>
</el-table-column>

3
fuintAdmin_zt/src/views/setting/message.vue
View File

@ -32,6 +32,7 @@
type="primary"
icon="el-icon-plus"
@click="handleAdd"
v-hasPermi="['setting:message:add']"
>新增短信模板</el-button>
</el-form-item>
</el-form>
@ -68,12 +69,14 @@
type="text"
icon="el-icon-view"
@click="edit(scope.row)"
v-hasPermi="['setting:message:edit']"
>编辑</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="del(scope.row)"
v-hasPermi="['setting:message:delete']"
>删除</el-button>
</template>
</el-table-column>

29
fuintAdmin_zt/src/views/setting/pay/index.vue
View File

@ -53,6 +53,7 @@
<el-button
type="primary"
@click="handleAdd"
v-hasPermi="['setting:pay:add']"
>新增支付参数</el-button>
</el-form-item>
</el-form>
@ -73,6 +74,7 @@
</el-table-column>
<el-table-column prop="paymentChannel" label="支付通道"></el-table-column>
<el-table-column prop="appKey" label="密钥">
<el-table-column prop="insCd" label="机构号"> </el-table-column>
<el-table-column prop="publicKey" label="公钥">
<template slot-scope="scope">
<div class="single-row">{{scope.row.publicKey}}</div>
@ -107,12 +109,14 @@
type="text"
icon="el-icon-view"
@click="edit(scope.row)"
v-hasPermi="['setting:pay:edit']"
>编辑</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="del(scope.row)"
v-hasPermi="['setting:pay:delete']"
>删除</el-button>
</template>
</el-table-column>
@ -158,6 +162,9 @@
/>
</el-select>
</el-form-item>
<el-form-item label="机构号" prop="insCd">
<el-input v-model="deviceInfo.insCd"></el-input>
</el-form-item>
<el-form-item label="公钥" prop="publicKey">
<el-input v-model="deviceInfo.publicKey"></el-input>
</el-form-item>
@ -239,6 +246,9 @@ export default {
paymentChannel: [
{required: true, message: '请选择支付通道', trigger: 'blur'},
],
insCd: [
{required: true, message: '请填写机构号', trigger: 'blur'},
],
publicKey: [
{required: true, message: '请填写公钥信息', trigger: 'blur'},
],
@ -288,14 +298,15 @@ export default {
});
},
submitDeviceInfo() {
// 在这里调用接口提交设备信息数据
console.log('提交设备信息数据:', this.deviceInfo);
// 在这里调用接口提交支付参数信息数据
if (this.deviceInfo.id) {
editPaymentParameter(this.deviceInfo).then(res => {
if (res.data === 1) {
this.$modal.msgSuccess("修改成功")
this.getList()
this.open = false
} else {
this.$modal.msgError("修改失败，当前机构的支付通道已存在！")
}
})
}else {
@ -304,10 +315,8 @@ export default {
this.$modal.msgSuccess("添加成功");
this.getList()
this.open = false
} else if (res.data == 0) {
this.$modal.msgError("添加失败，当前通道未配置")
}else {
this.$modal.msgError("商户编号不可重复")
} else {
this.$modal.msgError("添加失败，当前机构的支付通道已存在！")
}
})
}
@ -326,17 +335,17 @@ export default {
handleAdd(e) {
this.clean()
this.open = true;
this.title = "增加设备"
this.title = "增加支付参数"
// this.selectChildByDeptIdApi();
},
edit(e) {
this.clean()
// this.open = true;
// this.title = "编辑设备"
// this.title = "编辑支付参数"
// this.deviceInfo = e
getPaymentParameter(e.id).then(res => {
this.open = true;
this.title = "编辑设备"
this.title = "编辑支付参数"
this.deviceInfo = res.data
})
},
@ -348,7 +357,7 @@ export default {
del(e) {
this.$confirm('此操作将永久删除该设备, 是否继续?', '提示', {
this.$confirm('此操作将永久删除该支付参数, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'

5
fuintAdmin_zt/src/views/system/menu/index.vue
View File

@ -8,7 +8,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:menu:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
@ -56,21 +55,18 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:menu:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-plus"
@click="handleAdd(scope.row)"
v-hasPermi="['system:menu:add']"
>新增</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:menu:delete']"
>删除</el-button>
</template>
</el-table-column>
@ -323,6 +319,7 @@ export default {
this.getList();
});
} else {
if(!this.form.merchantId) this.form.merchantId = "0"
addMenu(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;

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

@ -41,6 +41,7 @@
<el-button
type="primary"
@click="handleAdd"
v-hasPermi="['system:notify:addTemplate']"
>新增通知模板</el-button>
</el-form-item>
</el-form>
@ -69,12 +70,14 @@
type="text"
icon="el-icon-view"
@click="edit(scope.row)"
v-hasPermi="['system:notify:editTemplate']"
>编辑</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="del(scope.row)"
v-hasPermi="['system:notify:deleteTemplate']"
>删除</el-button>
</template>
</el-table-column>

4
fuintAdmin_zt/src/views/system/notify/page/record.vue
View File

@ -41,6 +41,7 @@
<el-button
type="primary"
@click="handleAdd"
v-hasPermi="['system:notify:addRecord']"
>新增通知</el-button>
</el-form-item>
</el-form>
@ -66,18 +67,21 @@
type="text"
icon="el-icon-view"
@click="edit(scope.row)"
v-hasPermi="['system:notify:editRecord']"
>编辑</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="del(scope.row)"
v-hasPermi="['system:notify:deleteRecord']"
>删除</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="send(scope.row.id)"
v-hasPermi="['system:notify:send']"
>发送通知</el-button>
</template>
</el-table-column>

4
fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/PaymentParameterConfig.java
View File

@ -37,6 +37,10 @@ public class PaymentParameterConfig extends BaseEntity implements Serializable {
* 支付通道：数据字典
*/
private String paymentChannel;
/**
* 机构号
*/
private String insCd;
/**
* 公钥
*/

1
fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/xml/PaymentParameterConfigMapper.xml
View File

@ -23,6 +23,7 @@
and ppc.status = #{entity.status}
</if>
</where>
order by ppc.dept_id,ppc.create_time desc
</select>
<select id="selectInfoById" resultType="com.fuint.api.fuyou.vo.PaymentParameterConfigVo">
SELECT ppc.*,sd.dept_name,sd.dept_type,ta.real_name FROM `payment_parameter_config` ppc

28
fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/PaymentParameterConfigService.java
View File

@ -7,6 +7,8 @@ import com.fuint.api.fuyou.vo.PaymentParameterConfigVo;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.PageRequest;
import java.util.List;
/**
* 支付参数配置表(PaymentParameterConfig)表服务接口
*
@ -47,8 +49,32 @@ public interface PaymentParameterConfigService {
*/
int deleteById(Integer id);
/**
* 根据条件分页查询
* @param page
* @param paymentParameterConfigVo
* @return
*/
IPage<PaymentParameterConfigVo> selectListPage(Page page, PaymentParameterConfigVo paymentParameterConfigVo);
/**
* 根据id查询配置参数信息
* @param id
* @return
*/
PaymentParameterConfigVo selectInfoById(Integer id);
/**
* 根据deptId查询参数配置信息
* @param deptId
* @return
*/
List<PaymentParameterConfig> selectListByDeptID(Integer deptId);
/**
* 根据deptId和支付通道查询参数配置信息
* @param deptId
* @return
*/
PaymentParameterConfig selectByDeptIDAndChannel(Integer deptId,String paymentChannel);
}

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

@ -7,10 +7,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.api.fuyou.entity.FuYouPublicMerchant;
import com.fuint.api.fuyou.entity.MerchantConfig;
import com.fuint.api.fuyou.entity.PaymentParameterConfig;
import com.fuint.api.fuyou.entity.PaymentRuleConfig;
import com.fuint.api.fuyou.mapper.MerchantConfigMapper;
import com.fuint.api.fuyou.service.MerchantConfigService;
import com.fuint.api.fuyou.service.OilConfigService;
import com.fuint.api.fuyou.service.PaymentParameterConfigService;
import com.fuint.api.fuyou.service.PaymentRuleConfigService;
import com.fuint.api.fuyou.vo.MerchantConfigVo;
import com.fuint.business.storeInformation.entity.LJStore;
@ -42,7 +44,7 @@ public class MerchantConfigServiceImpl extends ServiceImpl<MerchantConfigMapper,
@Autowired
@Lazy
private ILJStoreService storeService;
private PaymentParameterConfigService paymentParameterConfigService;
@Override
public MerchantConfig selectMeChByIsUse(String isUse) {
@ -225,6 +227,12 @@ public class MerchantConfigServiceImpl extends ServiceImpl<MerchantConfigMapper,
row = 0;
return row;
}
PaymentParameterConfig paymentParameterConfig = paymentParameterConfigService.selectByDeptIDAndChannel(merchantConfig.getDeptId(), merchantConfig.getMerchantName());
if (ObjectUtil.isNotEmpty(paymentParameterConfig)){
merchantConfig.setInsCd(paymentParameterConfig.getInsCd());
merchantConfig.setPublicKey(paymentParameterConfig.getPublicKey());
merchantConfig.setPrivateKey(paymentParameterConfig.getPrivateKey());
}
merchantConfig.setAppid(FuYouPublicMerchant.appid);
merchantConfig.setAlipayAppid(FuYouPublicMerchant.alipayAppid);
MerchantConfig merchantConfig1 = this.selectMeChByIdIsUse1(storeId);

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

@ -1,5 +1,8 @@
package com.fuint.api.fuyou.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -12,6 +15,7 @@ import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
import javax.annotation.Resource;
import java.util.List;
/**
* 支付参数配置表(PaymentParameterConfig)表服务实现类
@ -41,6 +45,16 @@ public class PaymentParameterConfigServiceImpl extends ServiceImpl<PaymentParame
*/
@Override
public int insert(PaymentParameterConfigVo paymentParameterConfig) {
List<PaymentParameterConfig> paymentParameterConfigs = selectListByDeptID(paymentParameterConfig.getDeptId());
boolean flag = false;
if (CollectionUtil.isNotEmpty(paymentParameterConfigs)){
for (PaymentParameterConfig parameterConfig : paymentParameterConfigs) {
if (parameterConfig.getPaymentChannel().equals(paymentParameterConfig.getPaymentChannel())){
flag = true;
}
}
}
if (flag) return 0;
return baseMapper.insert(paymentParameterConfig);
}
@ -52,6 +66,17 @@ public class PaymentParameterConfigServiceImpl extends ServiceImpl<PaymentParame
*/
@Override
public int update(PaymentParameterConfig paymentParameterConfig) {
List<PaymentParameterConfig> paymentParameterConfigs = selectListByDeptID(paymentParameterConfig.getDeptId());
boolean flag = false;
if (CollectionUtil.isNotEmpty(paymentParameterConfigs)){
for (PaymentParameterConfig parameterConfig : paymentParameterConfigs) {
if (parameterConfig.getPaymentChannel().equals(paymentParameterConfig.getPaymentChannel())
&& paymentParameterConfig.getId() != parameterConfig.getId()){
flag = true;
}
}
}
if (flag) return 0;
return baseMapper.updateById(paymentParameterConfig);
}
@ -75,4 +100,19 @@ public class PaymentParameterConfigServiceImpl extends ServiceImpl<PaymentParame
public PaymentParameterConfigVo selectInfoById(Integer id) {
return baseMapper.selectInfoById(id);
}
@Override
public List<PaymentParameterConfig> selectListByDeptID(Integer deptId) {
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("dept_id",deptId);
return baseMapper.selectList(queryWrapper);
}
@Override
public PaymentParameterConfig selectByDeptIDAndChannel(Integer deptId, String paymentChannel) {
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("dept_id",deptId);
queryWrapper.eq("payment_channel",paymentChannel);
return baseMapper.selectOne(queryWrapper);
}
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralOrdersMapper.java
View File

@ -44,9 +44,9 @@ public interface IntegralOrdersMapper {
IPage<IntegralOrdersVO> queryByPageUni(@Param("page") Page page, @Param("integralOrders") IntegralOrdersDTO integralOrders);
IPage<IntegralOrdersVO> queryByPageFenxiByZtDz(@Param("page") Page page, @Param("integralOrders") IntegralOrdersDTO integralOrders);
IPage<IntegralOrdersVO> queryByPageFenxiByZtDz(@Param("page") Page page, @Param("order") IntegralOrdersDTO integralOrders);
IntegralOrdersVO getInfoByStoreId(@Param("integralOrders") IntegralOrdersDTO integralOrders);
Map<String, String> getIntFenxiDataByZtDz(IntegralOrdersDTO integralOrders);
Map<String, String> getIntFenxiDataByZtDz(@Param("order") IntegralOrdersDTO integralOrders);
/**
* 统计总行数

28
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml
View File

@ -639,6 +639,20 @@
sum(exchange_quantity) exchangeQuantity,
sum(integral) integral
from integral_orders
<where>
<if test="order.storeIds != null">
store_id in
<foreach collection="order.storeIds" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
</if>
<if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
</if>
</where>
group by
store_id
@ -665,6 +679,20 @@ limit 1
sum(integral) integrals
from integral_orders
<where>
<if test="order.storeIds != null">
store_id in
<foreach collection="order.storeIds" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
</if>
<if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
</if>
</where>
</select>

16
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
View File

@ -135,6 +135,14 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
@Override
public IPage<IntegralOrdersVO> queryByPageFenxiByZtDz(Page page, IntegralOrdersDTO integralOrders) {
if (ObjectUtil.isEmpty(integralOrders.getDeptId())) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
integralOrders.setDeptId(nowAccountInfo.getDeptId());
}
List<Long> strings = sysDeptMapper.selectChildByDeptIdR(integralOrders.getDeptId());
List<Long> longs = mtStoreMapper.queryStoresByDeptIdsR(strings);
integralOrders.setStoreIds(longs);
IPage<IntegralOrdersVO> integralOrdersVOIPage = integralOrdersDao.queryByPageFenxiByZtDz(page, integralOrders);
for (IntegralOrdersVO record : integralOrdersVOIPage.getRecords()) {
MtStore mtStore = mtStoreMapper.selectById(record.getStoreId());
@ -157,6 +165,14 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
@Override
public Map<String, String> getIntFenxiDataByZtDz(IntegralOrdersDTO integralOrders) {
if (ObjectUtil.isEmpty(integralOrders.getDeptId())) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
integralOrders.setDeptId(nowAccountInfo.getDeptId());
}
List<Long> strings = sysDeptMapper.selectChildByDeptIdR(integralOrders.getDeptId());
List<Long> longs = mtStoreMapper.queryStoresByDeptIdsR(strings);
integralOrders.setStoreIds(longs);
return integralOrdersDao.getIntFenxiDataByZtDz(integralOrders);
}

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

@ -95,5 +95,9 @@ public class AllOrderInfo extends BaseEntity implements Serializable {
private String refBy;
@TableField(exist = false)
List<allorderVOo> fenxiByDaili2;
@TableField(exist = false)
private Long deptId;
@TableField(exist = false)
private List<Long> storeIds;
}

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

@ -22,11 +22,11 @@ import java.util.Map;
public interface AllOrderInfoMapper extends BaseMapper<AllOrderInfo> {
IPage<AllOrderInfoVo> getPageList(@Param("page") Page page, @Param("allOrderInfo") AllOrderInfo allOrderInfo);
IPage<AllOrderInfoVo> getFenxiByDaili(@Param("page") Page page, @Param("allOrderInfo") AllOrderInfo allOrderInfo);
IPage<AllOrderInfoVo> getFenxiByDailiType(@Param("page") Page page, @Param("allOrderInfo") AllOrderInfo allOrderInfo);
IPage<AllOrderInfoVo> getFenxiByDaili(@Param("page") Page page, @Param("order") AllOrderInfo allOrderInfo);
IPage<AllOrderInfoVo> getFenxiByDailiType(@Param("page") Page page, @Param("order") AllOrderInfo allOrderInfo);
List<allorderVOo> getFenxiByDaili2(@Param("allOrderInfo") AllOrderInfo allOrderInfo);
Map<String, Object> getFenxiByDailiBydata(@Param("allOrderInfo") AllOrderInfo allOrderInfo);
List<AllOrderInfoVo> getFenxiByDaili2ByData(@Param("allOrderInfo") AllOrderInfo allOrderInfo);
Map<String, Object> getFenxiByDailiBydata(@Param("order") AllOrderInfo allOrderInfo);
List<AllOrderInfoVo> getFenxiByDaili2ByData(@Param("order") AllOrderInfo allOrderInfo);
String sumPayMoney(@Param("allOrderInfo") AllOrderInfo allOrderInfo);
// 根据storeId List查询总流水
@ -80,5 +80,5 @@ public interface AllOrderInfoMapper extends BaseMapper<AllOrderInfo> {
Double selectAllAmount(@Param("allOrderInfo") AllOrderInfo allOrderInfo);
Map<String, Object> getLeiJiInfo(UserBalanceVo record);
Map<String, Object> getShuJuVipInfo(UserBalanceVo record);
Map<String, Object> getShuJuVipInfo(@Param("order") UserBalanceVo record);
}

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java
View File

@ -39,8 +39,8 @@ public interface LJOrderMapper extends BaseMapper<LJOrder> {
LJOrder getStatisticsByTime(@Param("time") Date time,@Param("goodsId") Integer goodsId,@Param("payType") String payType);
IPage<LJOrderVo> selectOrderFenxiListByZtDz(Page page, LJOrderVo order);
IPage<LJOrderVo> selectOrderFenxiListByZtDz(Page page, @Param("order") LJOrderVo order);
Map<String,Object> selectOrderFenxiDataByZtDz(LJOrderVo order);
Map<String,Object> selectOrderFenxiDataByZtDz2(LJOrderVo order);
Map<String,Object> selectOrderFenxiDataByZtDz(@Param("order") LJOrderVo order);
Map<String,Object> selectOrderFenxiDataByZtDz2(@Param("order") LJOrderVo order);
}

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

@ -484,6 +484,20 @@
SUM(CASE WHEN content = "储值卡充值" THEN pay_money ELSE 0 END) AS tongjMoney, -- 累计充值金额
SUM(CASE WHEN type = 3 THEN pay_money ELSE 0 END) AS tongjXfMoney -- 累计消费金额
from all_order_info
<where>
<if test="order.storeIds != null">
store_id in
<foreach collection="order.storeIds" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
</if>
<if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
</if>
</where>
</select>
<select id="getFenxiByDaili" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
@ -492,6 +506,29 @@
SUM(pay_money) payMoney,
count(*) count
from all_order_info
<where>
<if test="order.storeIds != null">
store_id in
<foreach collection="order.storeIds" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="order.status != null and order.status != ''">
and status = #{order.status}
</if>
<if test="order.payChannel != null and order.payChannel != ''">
and pay_channel = #{order.payChannel}
</if>
<if test="order.payType != null and order.payType != ''">
and pay_type = #{order.payType}
</if>
<if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
</if>
<if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
</if>
</where>
group by store_id
</select>
<select id="getFenxiByDailiType" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
@ -506,6 +543,20 @@
sum(CASE WHEN status = 'refund' THEN pay_money ELSE 0 END) refMoney,
count(CASE WHEN status = 'refund' THEN pay_money ELSE 0 END) refCount
from all_order_info
<where>
<if test="order.storeIds != null">
store_id in
<foreach collection="order.storeIds" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
</if>
<if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
</if>
</where>
group by store_id
</select>
<select id="getFenxiByDaili2" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
@ -529,6 +580,20 @@
SUM(pay_money) payMoneyChannel,
count(*) countChannel
from all_order_info
<where>
<if test="order.storeIds != null">
store_id in
<foreach collection="order.storeIds" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
</if>
<if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
</if>
</where>
group by payment_channel
</select>
<select id="getFenxiByDailiBydata" resultType="java.util.Map">
@ -536,6 +601,20 @@
SUM(pay_money) payMoney,
count(*) count
from all_order_info
<where>
<if test="order.storeIds != null">
store_id in
<foreach collection="order.storeIds" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
</if>
<if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
</if>
</where>
</select>
<select id="getFenxiByDailiTypeDaty" resultType="com.fuint.business.order.vo.AllOrderInfoVo">

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

@ -260,6 +260,20 @@
count(*) counts,
sum(goods_num) goodsNums
from mt_order
<where>
<if test="order.storeIds != null">
store_id in
<foreach collection="order.storeIds" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
</if>
<if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
</if>
</where>
group by store_id
</select>
@ -269,6 +283,20 @@
count(*) count,
sum(goods_num) goodsNum
from mt_order
<where>
<if test="order.storeIds != null">
store_id in
<foreach collection="order.storeIds" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
</if>
<if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
</if>
</where>
</select>
<select id="selectOrderFenxiDataByZtDz2" resultType="java.util.Map">
@ -277,6 +305,20 @@
from mt_order mo
left join mt_order_goods mog on mog.goods_id = mo.id
left join mt_goods mg on mog.goods_id = mg.id
<where>
<if test="order.storeIds != null">
mo.store_id in
<foreach collection="order.storeIds" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(mo.create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
</if>
<if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(mo.create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
</if>
</where>
</select>
</mapper>

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

@ -724,6 +724,13 @@
#{item}
</foreach>
</if>
<if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
</if>
<if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
</if>
</where>
group by store_id
</select>
@ -744,6 +751,12 @@
#{item}
</foreach>
</if>
<if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
</if>
<if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
</if>
</where>
</select>

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

@ -144,6 +144,15 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
}
public IPage<AllOrderInfoVo> getFenxiByDaili(Page page, AllOrderInfo allOrderInfo) {
if (ObjectUtil.isEmpty(allOrderInfo.getDeptId())) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
allOrderInfo.setDeptId(nowAccountInfo.getDeptId());
}
List<Long> strings = sysDeptMapper.selectChildByDeptIdR(allOrderInfo.getDeptId());
List<Long> longs = mtStoreMapper.queryStoresByDeptIdsR(strings);
allOrderInfo.setStoreIds(longs);
IPage<AllOrderInfoVo> fenxiByDaili = allOrderInfoMapper.getFenxiByDaili(page, allOrderInfo);
for (AllOrderInfoVo record : fenxiByDaili.getRecords()) {
MtStore mtStore = mtStoreMapper.selectById(record.getStoreId());
@ -152,6 +161,13 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
SysDept byId2 = deptService.getById(byId.getParentId());
record.setStoreName(byId.getDeptName());
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);
}
List<allorderVOo> fenxiByDaili2 = allOrderInfoMapper.getFenxiByDaili2(allOrderInfo);
@ -162,6 +178,14 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
// getFenxiByDailiBydata
@Override
public Map<String, Object> getFenxiByDailiBydata(AllOrderInfo allOrderInfo) {
if (ObjectUtil.isEmpty(allOrderInfo.getDeptId())) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
allOrderInfo.setDeptId(nowAccountInfo.getDeptId());
}
List<Long> strings = sysDeptMapper.selectChildByDeptIdR(allOrderInfo.getDeptId());
List<Long> longs = mtStoreMapper.queryStoresByDeptIdsR(strings);
allOrderInfo.setStoreIds(longs);
Map<String, Object> fenxiByDailiBydata = allOrderInfoMapper.getFenxiByDailiBydata(allOrderInfo);
List<AllOrderInfoVo> fenxiByDaili2ByData = allOrderInfoMapper.getFenxiByDaili2ByData(allOrderInfo);
fenxiByDailiBydata.put("fenxiByDaili2ByData",fenxiByDaili2ByData);
@ -169,6 +193,14 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
return fenxiByDailiBydata;
}
public IPage<AllOrderInfoVo> getFenxiByDailiType(Page page, AllOrderInfo allOrderInfo) {
if (ObjectUtil.isEmpty(allOrderInfo.getDeptId())) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
allOrderInfo.setDeptId(nowAccountInfo.getDeptId());
}
List<Long> strings = sysDeptMapper.selectChildByDeptIdR(allOrderInfo.getDeptId());
List<Long> longs = mtStoreMapper.queryStoresByDeptIdsR(strings);
allOrderInfo.setStoreIds(longs);
IPage<AllOrderInfoVo> fenxiByDaili = allOrderInfoMapper.getFenxiByDailiType(page, allOrderInfo);
for (AllOrderInfoVo record : fenxiByDaili.getRecords()) {
MtStore mtStore = mtStoreMapper.selectById(record.getStoreId());

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

@ -76,5 +76,9 @@ public class AllOrderInfoVo extends AllOrderInfo {
private String count;
private String refCount;
@TableField(exist = false)
private Double fuYouAmount;
@TableField(exist = false)
private Double laKaLaAmount;
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSourceController.java
View File

@ -120,11 +120,13 @@ public class BackendSourceController extends BaseController {
String icon = param.get("icon").toString();
String path = param.get("path").toString();
String sort = param.get("sort").toString();
String merchantId = param.get("merchantId").toString();
Integer isMenu = param.get("isMenu") == null ? 1 : Integer.parseInt(param.get("isMenu").toString());
TSource addSource = new TSource();
addSource.setSourceName(name);
addSource.setMerchantId(accountInfo.getMerchantId());
// addSource.setMerchantId(accountInfo.getMerchantId());
addSource.setMerchantId(Integer.valueOf(merchantId));
addSource.setStatus(status);
addSource.setNewIcon(icon);
addSource.setIsLog(1);