diff --git a/fuintAdmin_zt/src/layout/components/Navbar.vue b/fuintAdmin_zt/src/layout/components/Navbar.vue index 1fab8e120..6e6862513 100644 --- a/fuintAdmin_zt/src/layout/components/Navbar.vue +++ b/fuintAdmin_zt/src/layout/components/Navbar.vue @@ -46,6 +46,26 @@ + + + + + + + + + + + + 取 消 + 确 定 + + + @@ -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(() => {}); } - } + } diff --git a/fuintAdmin_zt/src/views/Service/index.vue b/fuintAdmin_zt/src/views/Service/index.vue index 2b37e6226..47df0a5f3 100644 --- a/fuintAdmin_zt/src/views/Service/index.vue +++ b/fuintAdmin_zt/src/views/Service/index.vue @@ -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: '', diff --git a/fuintAdmin_zt/src/views/Site/add.vue b/fuintAdmin_zt/src/views/Site/add.vue index 4968524c3..6aa56c9aa 100644 --- a/fuintAdmin_zt/src/views/Site/add.vue +++ b/fuintAdmin_zt/src/views/Site/add.vue @@ -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: [], }; }, diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue index fedaff5e1..e10350331 100644 --- a/fuintAdmin_zt/src/views/Site/index.vue +++ b/fuintAdmin_zt/src/views/Site/index.vue @@ -579,6 +579,7 @@ active-value="A" inactive-value="N" @change="handleStatusChangeDuty(scope.row)" + :disabled="scope.row.dutyId==2" > @@ -595,6 +596,7 @@ icon="el-icon-edit" v-hasPermi="['role:edit']" @click="handleUpdate1(scope.row)" + :disabled="scope.row.dutyId==2" >修改 删除 diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue index cf6232f62..bc8def229 100644 --- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue +++ b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue @@ -3,104 +3,80 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
+ {{ item }} +
+ v-model="value2" + type="datetimerange" + range-separator="至" + value-format="yyyy-MM-dd HH:mm:ss" + start-placeholder="开始日期" + end-placeholder="结束日期" @click="handleQuery"> - 至 - - - - - 搜索 - 重置 - +
+ + + + + + + + 搜索 + 重置 + +
+
-
交易金额汇总数（万元）/交易笔数
-
{{orderStatistics.payMoney}}/{{orderStatistics.count}}
+
交易金额汇总数（万元）/交易笔数
+
{{ orderStatistics.payMoney }}/{{ orderStatistics.count }}
-
-
{{item.paymentChannel}}交易金额（万元）
-
{{item.payMoneyChannel}}
+
+
{{ item.paymentChannel }}交易金额（万元）
+
{{ item.payMoneyChannel }}
- - + +
- + - + @@ -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(); + }, } +} diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue index c6a3727a7..5a0856fc5 100644 --- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue +++ b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue @@ -3,63 +3,79 @@
- - - - - - +
+
+ {{ item }} +
+ + +
+ + + + + + + + 搜索 + 重置 + +
+
- - - - - - + +
活跃油站汇总总数/合作油站汇总总数
-
{{orderStatistics.sumnum}}/0
+
{{ orderStatistics.sumnum }}/0
-
交易金额汇总数（万元）/交易笔数
-
{{orderStatistics.tongjMoney}}
+
交易金额汇总数（万元）/交易笔数
+
{{ orderStatistics.tongjMoney }}
退款金额（元）/退款笔数
-
{{orderStatistics.tongjXfMoney}}
+
{{ orderStatistics.tongjXfMoney }}
新增油站数（万元）
0
- - + +
- - + + - - - - - + + + + + - - + +
{ - 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(); + }, } +} diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue index 7cc68a5f7..aff33cb00 100644 --- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue +++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue @@ -3,41 +3,57 @@
- - - - - - - - 搜索 - 重置 - +
+
+ {{ item }} +
+ + +
+ + + + + + + + 搜索 + 重置 + +
+
累计交易金额（万元）
-
{{orderStatistics.paidInfo}}
+
{{ orderStatistics.paidInfo || 0 }}
累计交易笔数
-
{{orderStatistics.count}}
+
{{ orderStatistics.count || 0 }}
累计兑换商品数量
-
{{orderStatistics.exchangeQuantity}}
+
{{ orderStatistics.exchangeQuantity || 0 }}
累计消耗积分
-
{{orderStatistics.integrals}}
+
{{ orderStatistics.integrals || 0 }}
- - + +
- - - - + + + + @@ -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(); + }, } +} diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue index 4739b0014..402918b36 100644 --- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue +++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue @@ -3,47 +3,62 @@
- - - - - - +
+
+ {{item}} +
+ + +
+ + + + + + + + 搜索 + 重置 + +
+
- - 搜索 - 重置 -
累计交易金额（万元）
-
{{orderStatistics.amount}}
+
{{orderStatistics.amount || 0}}
累计交易升数
-
{{orderStatistics.num}}
+
{{orderStatistics.num || 0}}
92#汽油交易金额（万元）
-
{{orderStatistics.amount92}}
+
{{orderStatistics.amount92 || 0}}
95#汽油交易金额（万元）
-
{{orderStatistics.amount95}}
+
{{orderStatistics.amount95 || 0}}
98#汽油交易金额（万元）
-
{{orderStatistics.amount98}}
+
{{orderStatistics.amount98 || 0}}
0#柴油交易金额（万元）
-
{{orderStatistics.amount0}}
+
{{orderStatistics.amount0 || 0}}
 @@ -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; + +} diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue index 605ff607e..20d0ae79f 100644 --- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue +++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue @@ -2,39 +2,55 @@ diff --git a/fuintAdmin_zt/src/views/setting/banner/index.vue b/fuintAdmin_zt/src/views/setting/banner/index.vue index 6055546d1..52fa797d0 100644 --- a/fuintAdmin_zt/src/views/setting/banner/index.vue +++ b/fuintAdmin_zt/src/views/setting/banner/index.vue @@ -44,6 +44,7 @@ type="primary" icon="el-icon-plus" @click="handleAdd" + v-hasPermi="['setting:banner:add']" >新增banner图 @@ -90,12 +91,14 @@ type="text" icon="el-icon-view" @click="edit(scope.row)" + v-hasPermi="['setting:banner:edit']" >编辑 删除 diff --git a/fuintAdmin_zt/src/views/setting/hardware.vue b/fuintAdmin_zt/src/views/setting/hardware.vue index 43d352c88..0b9147e53 100644 --- a/fuintAdmin_zt/src/views/setting/hardware.vue +++ b/fuintAdmin_zt/src/views/setting/hardware.vue @@ -41,6 +41,7 @@ type="primary" icon="el-icon-plus" @click="handleAdd" + v-hasPermi="['setting:hardware:add']" >新增商品 @@ -75,6 +76,7 @@ type="text" icon="el-icon-view" @click="edit(scope.row)" + v-hasPermi="['setting:hardware:edit']" >编辑 上架 下架 删除 diff --git a/fuintAdmin_zt/src/views/setting/message.vue b/fuintAdmin_zt/src/views/setting/message.vue index 690b5aa11..86fb18fed 100644 --- a/fuintAdmin_zt/src/views/setting/message.vue +++ b/fuintAdmin_zt/src/views/setting/message.vue @@ -32,6 +32,7 @@ type="primary" icon="el-icon-plus" @click="handleAdd" + v-hasPermi="['setting:message:add']" >新增短信模板 @@ -68,12 +69,14 @@ type="text" icon="el-icon-view" @click="edit(scope.row)" + v-hasPermi="['setting:message:edit']" >编辑 删除 diff --git a/fuintAdmin_zt/src/views/setting/pay/index.vue b/fuintAdmin_zt/src/views/setting/pay/index.vue index 960ca1dae..c3eba09f4 100644 --- a/fuintAdmin_zt/src/views/setting/pay/index.vue +++ b/fuintAdmin_zt/src/views/setting/pay/index.vue @@ -53,6 +53,7 @@ 新增支付参数 @@ -73,6 +74,7 @@ + @@ -158,6 +162,9 @@ /> + + + @@ -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' diff --git a/fuintAdmin_zt/src/views/system/menu/index.vue b/fuintAdmin_zt/src/views/system/menu/index.vue index e560ee545..e397a4cbe 100644 --- a/fuintAdmin_zt/src/views/system/menu/index.vue +++ b/fuintAdmin_zt/src/views/system/menu/index.vue @@ -8,7 +8,6 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['system:menu:add']" >新增 @@ -56,21 +55,18 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['system:menu:edit']" >修改 新增 删除 @@ -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; diff --git a/fuintAdmin_zt/src/views/system/notify/page/mode.vue b/fuintAdmin_zt/src/views/system/notify/page/mode.vue index 83074152c..f070232f1 100644 --- a/fuintAdmin_zt/src/views/system/notify/page/mode.vue +++ b/fuintAdmin_zt/src/views/system/notify/page/mode.vue @@ -41,6 +41,7 @@ 新增通知模板 @@ -69,12 +70,14 @@ type="text" icon="el-icon-view" @click="edit(scope.row)" + v-hasPermi="['system:notify:editTemplate']" >编辑 删除 diff --git a/fuintAdmin_zt/src/views/system/notify/page/record.vue b/fuintAdmin_zt/src/views/system/notify/page/record.vue index 8dbebbb6a..a7766c453 100644 --- a/fuintAdmin_zt/src/views/system/notify/page/record.vue +++ b/fuintAdmin_zt/src/views/system/notify/page/record.vue @@ -41,6 +41,7 @@ 新增通知 @@ -66,18 +67,21 @@ type="text" icon="el-icon-view" @click="edit(scope.row)" + v-hasPermi="['system:notify:editRecord']" >编辑 删除 发送通知 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/PaymentParameterConfig.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/PaymentParameterConfig.java index 81a2088db..fdf90ac85 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/PaymentParameterConfig.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/PaymentParameterConfig.java @@ -37,6 +37,10 @@ public class PaymentParameterConfig extends BaseEntity implements Serializable { * 支付通道：数据字典 */ private String paymentChannel; + /** + * 机构号 + */ + private String insCd; /** * 公钥 */ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/xml/PaymentParameterConfigMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/xml/PaymentParameterConfigMapper.xml index 1ccbc7136..19b464c74 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/xml/PaymentParameterConfigMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/xml/PaymentParameterConfigMapper.xml @@ -23,6 +23,7 @@ and ppc.status = #{entity.status} + order by ppc.dept_id,ppc.create_time desc diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java index 6919aebef..05eacc737 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java @@ -135,6 +135,14 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService { @Override public IPage queryByPageFenxiByZtDz(Page page, IntegralOrdersDTO integralOrders) { + if (ObjectUtil.isEmpty(integralOrders.getDeptId())) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + integralOrders.setDeptId(nowAccountInfo.getDeptId()); + } + + List strings = sysDeptMapper.selectChildByDeptIdR(integralOrders.getDeptId()); + List longs = mtStoreMapper.queryStoresByDeptIdsR(strings); + integralOrders.setStoreIds(longs); IPage 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 getIntFenxiDataByZtDz(IntegralOrdersDTO integralOrders) { + if (ObjectUtil.isEmpty(integralOrders.getDeptId())) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + integralOrders.setDeptId(nowAccountInfo.getDeptId()); + } + + List strings = sysDeptMapper.selectChildByDeptIdR(integralOrders.getDeptId()); + List longs = mtStoreMapper.queryStoresByDeptIdsR(strings); + integralOrders.setStoreIds(longs); return integralOrdersDao.getIntFenxiDataByZtDz(integralOrders); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/AllOrderInfo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/AllOrderInfo.java index 21e6be12e..d939c645b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/AllOrderInfo.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/AllOrderInfo.java @@ -95,5 +95,9 @@ public class AllOrderInfo extends BaseEntity implements Serializable { private String refBy; @TableField(exist = false) List fenxiByDaili2; + @TableField(exist = false) + private Long deptId; + @TableField(exist = false) + private List storeIds; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java index 29b8604a7..fcfa712da 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java @@ -22,11 +22,11 @@ import java.util.Map; public interface AllOrderInfoMapper extends BaseMapper { IPage getPageList(@Param("page") Page page, @Param("allOrderInfo") AllOrderInfo allOrderInfo); - IPage getFenxiByDaili(@Param("page") Page page, @Param("allOrderInfo") AllOrderInfo allOrderInfo); - IPage getFenxiByDailiType(@Param("page") Page page, @Param("allOrderInfo") AllOrderInfo allOrderInfo); + IPage getFenxiByDaili(@Param("page") Page page, @Param("order") AllOrderInfo allOrderInfo); + IPage getFenxiByDailiType(@Param("page") Page page, @Param("order") AllOrderInfo allOrderInfo); List getFenxiByDaili2(@Param("allOrderInfo") AllOrderInfo allOrderInfo); - Map getFenxiByDailiBydata(@Param("allOrderInfo") AllOrderInfo allOrderInfo); - List getFenxiByDaili2ByData(@Param("allOrderInfo") AllOrderInfo allOrderInfo); + Map getFenxiByDailiBydata(@Param("order") AllOrderInfo allOrderInfo); + List getFenxiByDaili2ByData(@Param("order") AllOrderInfo allOrderInfo); String sumPayMoney(@Param("allOrderInfo") AllOrderInfo allOrderInfo); // 根据storeId List查询总流水 @@ -80,5 +80,5 @@ public interface AllOrderInfoMapper extends BaseMapper { Double selectAllAmount(@Param("allOrderInfo") AllOrderInfo allOrderInfo); Map getLeiJiInfo(UserBalanceVo record); - Map getShuJuVipInfo(UserBalanceVo record); + Map getShuJuVipInfo(@Param("order") UserBalanceVo record); } \ No newline at end of file diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java index bea579808..506a4fd7e 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java @@ -39,8 +39,8 @@ public interface LJOrderMapper extends BaseMapper { LJOrder getStatisticsByTime(@Param("time") Date time,@Param("goodsId") Integer goodsId,@Param("payType") String payType); - IPage selectOrderFenxiListByZtDz(Page page, LJOrderVo order); + IPage selectOrderFenxiListByZtDz(Page page, @Param("order") LJOrderVo order); - Map selectOrderFenxiDataByZtDz(LJOrderVo order); - Map selectOrderFenxiDataByZtDz2(LJOrderVo order); + Map selectOrderFenxiDataByZtDz(@Param("order") LJOrderVo order); + Map selectOrderFenxiDataByZtDz2(@Param("order") LJOrderVo order); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml index 9abbfef2c..34b749fec 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml @@ -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 + + + store_id in + + #{item} + + + + and date_format(create_time,'%y%m%d') >= date_format(#{order.params.beginTime},'%y%m%d') + + + and date_format(create_time,'%y%m%d') <= date_format(#{order.params.endTime},'%y%m%d') + + @@ -269,6 +283,20 @@ count(*) count, sum(goods_num) goodsNum from mt_order + + + store_id in + + #{item} + + + + and date_format(create_time,'%y%m%d') >= date_format(#{order.params.beginTime},'%y%m%d') + + + and date_format(create_time,'%y%m%d') <= date_format(#{order.params.endTime},'%y%m%d') + + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml index 713e63c14..9467daf49 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml @@ -724,6 +724,13 @@ #{item} + + + and date_format(create_time,'%y%m%d') >= date_format(#{order.params.beginTime},'%y%m%d') + + + and date_format(create_time,'%y%m%d') <= date_format(#{order.params.endTime},'%y%m%d') + group by store_id @@ -744,6 +751,12 @@ #{item} + + and date_format(create_time,'%y%m%d') >= date_format(#{order.params.beginTime},'%y%m%d') + + + and date_format(create_time,'%y%m%d') <= date_format(#{order.params.endTime},'%y%m%d') + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java index e6fc1aad8..81561f29c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java @@ -144,6 +144,15 @@ public class AllOrderInfoServiceImpl extends ServiceImpl getFenxiByDaili(Page page, AllOrderInfo allOrderInfo) { + if (ObjectUtil.isEmpty(allOrderInfo.getDeptId())) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + allOrderInfo.setDeptId(nowAccountInfo.getDeptId()); + } + + List strings = sysDeptMapper.selectChildByDeptIdR(allOrderInfo.getDeptId()); + List longs = mtStoreMapper.queryStoresByDeptIdsR(strings); + allOrderInfo.setStoreIds(longs); + IPage 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 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 fenxiByDaili2 = allOrderInfoMapper.getFenxiByDaili2(allOrderInfo); @@ -162,6 +178,14 @@ public class AllOrderInfoServiceImpl extends ServiceImpl getFenxiByDailiBydata(AllOrderInfo allOrderInfo) { + if (ObjectUtil.isEmpty(allOrderInfo.getDeptId())) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + allOrderInfo.setDeptId(nowAccountInfo.getDeptId()); + } + + List strings = sysDeptMapper.selectChildByDeptIdR(allOrderInfo.getDeptId()); + List longs = mtStoreMapper.queryStoresByDeptIdsR(strings); + allOrderInfo.setStoreIds(longs); Map fenxiByDailiBydata = allOrderInfoMapper.getFenxiByDailiBydata(allOrderInfo); List fenxiByDaili2ByData = allOrderInfoMapper.getFenxiByDaili2ByData(allOrderInfo); fenxiByDailiBydata.put("fenxiByDaili2ByData",fenxiByDaili2ByData); @@ -169,6 +193,14 @@ public class AllOrderInfoServiceImpl extends ServiceImpl getFenxiByDailiType(Page page, AllOrderInfo allOrderInfo) { + if (ObjectUtil.isEmpty(allOrderInfo.getDeptId())) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + allOrderInfo.setDeptId(nowAccountInfo.getDeptId()); + } + + List strings = sysDeptMapper.selectChildByDeptIdR(allOrderInfo.getDeptId()); + List longs = mtStoreMapper.queryStoresByDeptIdsR(strings); + allOrderInfo.setStoreIds(longs); IPage fenxiByDaili = allOrderInfoMapper.getFenxiByDailiType(page, allOrderInfo); for (AllOrderInfoVo record : fenxiByDaili.getRecords()) { MtStore mtStore = mtStoreMapper.selectById(record.getStoreId()); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java index 15b09defc..9e4ef2410 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java @@ -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; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSourceController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSourceController.java index 51cb12613..f3c822826 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSourceController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSourceController.java @@ -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);