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

Compare commits

base: dianliang:aab5f350a0c0d71e3dd5d1e3e8f996a47a7bf7d3
Branches Tags
dianliang:main
dianliang:master
..
compare: dianliang:ef50840e2a90147fb86841701a7b075993aad917
Branches Tags
dianliang:main
dianliang:master

No commits in common. "aab5f350a0c0d71e3dd5d1e3e8f996a47a7bf7d3" and "ef50840e2a90147fb86841701a7b075993aad917" have entirely different histories.
aab5f350a0 ... ef50840e2a

11 changed files with 194 additions and 464 deletions
Show Stats Expand all files Collapse all files

35
fuintAdmin/src/api/allOrder.js
View File

@ -331,39 +331,4 @@ export function getInstituionListApi9(query) {
}) })
} }
export function getInstituionListApi11(query) {
return request({
url: 'business/allOrderInfo/getInstituionListApi11',
method: 'get',
params: query
})
}
export function getRunningWaterByDataApi13(query) {
return request({
url: 'business/allOrderInfo/getRunningWaterByDataApi13',
method: 'get',
params: query
})
}
export function getInstituionListApi15(query) {
return request({
url: 'business/allOrderInfo/getInstituionListApi15',
method: 'get',
params: query
})
}
export function getRunningWaterByDataApi17(query) {
return request({
url: 'business/allOrderInfo/getRunningWaterByDataApi17',
method: 'get',
params: query
})
}

37
fuintAdmin/src/views/financialStatement/buy/tab/em.vue
View File

@ -6,15 +6,21 @@
<div style="display: flex;align-items: center "> <div style="display: flex;align-items: center ">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label=""> <el-form-item label="">
<el-date-picker <el-date-picker
v-model="queryParams.dataRange" v-model="beginTime"
type="daterange" style="width: 140px"
range-separator="至" type="date"
start-placeholder="开始日期" @change="getDays()"
end-placeholder="结束日期" placeholder="开始日期">
format="yyyy-MM-dd" </el-date-picker>
value-format="yyyy-MM-dd" 至
> <el-date-picker
v-model="endTime"
style="width: 140px"
type="date"
@change="getDays()"
placeholder="结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -27,7 +33,7 @@
<div class="wit_box"> <div class="wit_box">
<div class="box-gang"> <div class="box-gang">
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="总加油升数" placement="top-start"> <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
<div class="size-bole" style="color: #0DC291">0</div> <div class="size-bole" style="color: #0DC291">0</div>
</el-tooltip> </el-tooltip>
<div class="size-hui"> <div class="size-hui">
@ -36,17 +42,17 @@
</div> </div>
</div> </div>
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="总加油笔数" placement="top-start"> <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
<div class="size-bole" style="color:#00CAFF;">0</div> <div class="size-bole" style="color:#00CAFF;">0</div>
</el-tooltip> </el-tooltip>
<div class="size-hui"> <div class="size-hui">
<div class="dian" style="background: #00CAFF"></div> <div class="dian" style="background: #00CAFF"></div>
<div class="nei">总加油笔数</div> <div class="nei">总加油笔数（元）</div>
</div> </div>
</div> </div>
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="订单总金额（元）" placement="top-start"> <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
<div class="size-bole" style="color:#F44522;" >0</div> <div class="size-bole" style="color:#F44522;" >0</div>
</el-tooltip> </el-tooltip>
@ -56,7 +62,7 @@
</div> </div>
</div> </div>
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="优惠总金额（元）" placement="top-start"> <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
<div class="size-bole" style="color:#FF7E00;" >0</div> <div class="size-bole" style="color:#FF7E00;" >0</div>
</el-tooltip> </el-tooltip>
@ -67,7 +73,7 @@
</div> </div>
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="实收总金额（元）" placement="top-start"> <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
<div class="size-bole" style="color:#E05295;" >0</div> <div class="size-bole" style="color:#E05295;" >0</div>
</el-tooltip> </el-tooltip>
<div class="size-hui"> <div class="size-hui">
@ -76,7 +82,7 @@
</div> </div>
</div> </div>
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="退款总金额" placement="top-start"> <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
<div class="size-bole" style="color:#0047FF;" >0</div> <div class="size-bole" style="color:#0047FF;" >0</div>
</el-tooltip> </el-tooltip>
<div class="size-hui"> <div class="size-hui">
@ -154,7 +160,6 @@ export default {
beginTime:"", beginTime:"",
endTime:"", endTime:"",
deptType:"3", deptType:"3",
dataRange:[]
}, },
orderStatistics:{ orderStatistics:{

154
fuintAdmin/src/views/financialStatement/buy/tab/gun.vue
View File

@ -5,15 +5,21 @@
<div style="display: flex;align-items: center "> <div style="display: flex;align-items: center ">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label=""> <el-form-item label="">
<el-date-picker <el-date-picker
v-model="queryParams.dataRange" v-model="beginTime"
type="daterange" style="width: 140px"
range-separator="至" type="date"
start-placeholder="开始日期" @change="getDays()"
end-placeholder="结束日期" placeholder="开始日期">
format="yyyy-MM-dd" </el-date-picker>
value-format="yyyy-MM-dd" 至
> <el-date-picker
v-model="endTime"
style="width: 140px"
type="date"
@change="getDays()"
placeholder="结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -26,8 +32,8 @@
<div class="wit_box"> <div class="wit_box">
<div class="box-gang"> <div class="box-gang">
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="总加油升数" placement="top-start"> <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
<div class="size-bole" style="color: #0DC291">{{orderStatistics.addOilMl}}</div> <div class="size-bole" style="color: #0DC291">0</div>
</el-tooltip> </el-tooltip>
<div class="size-hui"> <div class="size-hui">
<div class="dian" style="background: #0DC291"></div> <div class="dian" style="background: #0DC291"></div>
@ -35,8 +41,8 @@
</div> </div>
</div> </div>
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="总加油笔数" placement="top-start"> <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
<div class="size-bole" style="color:#00CAFF;">{{orderStatistics.addOilNum}}</div> <div class="size-bole" style="color:#00CAFF;">0</div>
</el-tooltip> </el-tooltip>
<div class="size-hui"> <div class="size-hui">
@ -45,8 +51,8 @@
</div> </div>
</div> </div>
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="订单总金额（元）" placement="top-start"> <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
<div class="size-bole" style="color:#F44522;" >{{orderStatistics.orderNum}}</div> <div class="size-bole" style="color:#F44522;" >0</div>
</el-tooltip> </el-tooltip>
<div class="size-hui"> <div class="size-hui">
@ -55,8 +61,8 @@
</div> </div>
</div> </div>
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="优惠总金额（元）" placement="top-start"> <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
<div class="size-bole" style="color:#FF7E00;" >{{orderStatistics.discountAmount}}</div> <div class="size-bole" style="color:#FF7E00;" >0</div>
</el-tooltip> </el-tooltip>
<div class="size-hui"> <div class="size-hui">
@ -66,8 +72,8 @@
</div> </div>
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="实收总金额（元）" placement="top-start"> <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
<div class="size-bole" style="color:#E05295;" >{{orderStatistics.payAmount}}</div> <div class="size-bole" style="color:#E05295;" >0</div>
</el-tooltip> </el-tooltip>
<div class="size-hui"> <div class="size-hui">
<div class="dian" style="background: #E05295"></div> <div class="dian" style="background: #E05295"></div>
@ -75,8 +81,8 @@
</div> </div>
</div> </div>
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="退款总金额" placement="top-start"> <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
<div class="size-bole" style="color:#0047FF;" >{{orderStatistics.refMoney}}</div> <div class="size-bole" style="color:#0047FF;" >0</div>
</el-tooltip> </el-tooltip>
<div class="size-hui"> <div class="size-hui">
<div class="dian" style="background: #0047FF"></div> <div class="dian" style="background: #0047FF"></div>
@ -86,27 +92,32 @@
</div> </div>
<div class="table-box"> <div class="table-box">
<el-table <el-table
:data="soieorderStatistics" :data="orderList"
border border
style="width: 100%;margin-top: 15px"> style="width: 100%;margin-top: 15px">
<el-table-column type="index" width="50" align="center" label="序号"/> <el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="gunName" align="center" label="油枪名称"> </el-table-column> <el-table-column prop="content" align="center" label="油枪名称"> </el-table-column>
<el-table-column prop="addOilMl" align="center" label="加油升数（元）"> </el-table-column> <el-table-column prop="content" align="center" label="加油升数（元）"> </el-table-column>
<el-table-column prop="addOilNum" align="center" label="加油笔数"> </el-table-column> <el-table-column prop="content" align="center" label="加油笔数"> </el-table-column>
<el-table-column prop="orderNum" align="center" label="订单金额（元）"> </el-table-column> <el-table-column prop="content" align="center" label="订单金额（元）"> </el-table-column>
<el-table-column prop="discountAmount" align="center" label="优惠金额（元）"> </el-table-column> <el-table-column prop="content" align="center" label="优惠金额（元）"> </el-table-column>
<el-table-column prop="refMoney" align="center" label="退款金额（元）"> </el-table-column> <el-table-column prop="content" align="center" label="退款金额（元）"> </el-table-column>
<el-table-column prop="payAmount" align="center" label="实收金额（元）"> </el-table-column> <el-table-column prop="content" align="center" label="实收金额（元）"> </el-table-column>
<el-table-column prop="days" align="center" label="统计周期"> </el-table-column> <el-table-column prop="content" align="center" label="统计周期"> </el-table-column>
</el-table> </el-table>
</div> </div>
<pagination <div class="pagination-box">
v-show="total>0" <el-pagination
:total="total" background
:page.sync="queryParams.page" v-show="total>0"
:limit.sync="queryParams.pageSize" layout="prev, pager, next"
@pagination="getList" :total="total"
/> :page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@current-change="getList">
</el-pagination>
</div>
</div> </div>
</div> </div>
</template> </template>
@ -118,9 +129,7 @@ import {
getRunningWaterByDataApi, getRunningWaterByDataApi,
exportExcelOilDeptApi, exportExcelOilDeptApi,
getmyDataApi, getmyDataApi,
getInstituionListApi2, getInstituionListApi2
getInstituionListApi15,
getRunningWaterByDataApi17
} from "@/api/allOrder"; } from "@/api/allOrder";
export default { export default {
@ -145,27 +154,15 @@ export default {
beginTime:"", beginTime:"",
endTime:"", endTime:"",
deptType:"3", deptType:"3",
dataRange:[]
}, },
orderStatistics:{ orderStatistics:{
gunName:'0', numberOfStrokes:'0',
addOilMl:'0', theTotalAmountOfTheOrder:'0',
addOilNum:'0', theTotalAmountPaid:'0',
orderNum:'0', oilDiscounts:'0',
discountAmount:'0', theTotalAmountOfOil:'0',
refMoney:'0', theTotalAmountOfTheItem:'0',
payAmount:'0',
},
soieorderStatistics:{
days:'',
gunName:'0',
addOilMl:'0',
addOilNum:'0',
orderNum:'0',
discountAmount:'0',
refMoney:'0',
payAmount:'0',
}, },
total:0, total:0,
timeDifference:1, timeDifference:1,
@ -177,14 +174,17 @@ export default {
start.setMinutes(0) start.setMinutes(0)
start.setSeconds(0) start.setSeconds(0)
start.setMilliseconds(0) start.setMilliseconds(0)
let year = start.getFullYear(); // 获取年份 this.dateRange = [start,new Date()];
let month = String(start.getMonth() + 1).padStart(2, '0'); // 获取月份，月份从0开始所以要+1 this.beginTime = start
let date = String(start.getDate()).padStart(2, '0'); // 获取日期 this.endTime = new Date()
this.queryParams.dataRange = [ year+'-'+month+'-'+date, year+'-'+month+'-'+date];
this.timeDifferenceMilliseconds = this.endTime - this.beginTime;
this.timeDifference = timeDifferenceMilliseconds / (1000 * 60 * 60 * 24);
console.log("timeDifference",this.timeDifference)
this.isSysDate = true this.isSysDate = true
await this.getDeptList(); await this.getDeptList();
this.getList(); this.getList();
this.getOrderStatistics()
}, },
methods:{ methods:{
@ -209,7 +209,12 @@ export default {
// 获取订单统计信息 // 获取订单统计信息
getOrderStatistics() { getOrderStatistics() {
getRunningWaterByDataApi17(this.queryParams).then(res=>{ let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getRunningWaterByDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
this.orderStatistics = res.data this.orderStatistics = res.data
}) })
}, },
@ -221,11 +226,17 @@ export default {
// 获取列表信息 // 获取列表信息
getList(val){ getList(val){
getInstituionListApi15(this.queryParams).then( response => { let dateRange = []
this.soieorderStatistics = response.data.records; if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getInstituionListApi2(this.addDateRange(this.queryParams,dateRange)).then( response => {
this.orderList = response.data.records;
this.total = response.data.total; this.total = response.data.total;
this.isSysDate = false this.isSysDate = false
}) })
this.getOrderStatistics()
}, },
// 搜索按钮操作 // 搜索按钮操作
@ -233,7 +244,6 @@ export default {
this.queryParams.page = 1; this.queryParams.page = 1;
await this.getDeptList(); await this.getDeptList();
this.getList(); this.getList();
this.getOrderStatistics()
}, },
// 重置按钮操作 // 重置按钮操作
@ -245,16 +255,8 @@ export default {
deptType:"3", deptType:"3",
} }
let start = new Date(); this.beginTime = ""
start.setHours(0) this.endTime = ""
start.setMinutes(0)
start.setSeconds(0)
start.setMilliseconds(0)
let year = start.getFullYear(); // 获取年份
let month = String(start.getMonth() + 1).padStart(2, '0'); // 获取月份，月份从0开始所以要+1
let date = String(start.getDate()).padStart(2, '0'); // 获取日期
this.queryParams.dataRange = [ year+'-'+month+'-'+date, year+'-'+month+'-'+date];
this.isSysDate = true
await this.getDeptList() await this.getDeptList()
this.handleQuery(); this.handleQuery();
}, },

137
fuintAdmin/src/views/financialStatement/buy/tab/oil.vue
View File

@ -6,15 +6,21 @@
<div style="display: flex;align-items: center "> <div style="display: flex;align-items: center ">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label=""> <el-form-item label="">
<el-date-picker <el-date-picker
v-model="queryParams.dataRange" v-model="beginTime"
type="daterange" style="width: 140px"
range-separator="至" type="date"
start-placeholder="开始日期" @change="getDays()"
end-placeholder="结束日期" placeholder="开始日期">
format="yyyy-MM-dd" </el-date-picker>
value-format="yyyy-MM-dd" 至
> <el-date-picker
v-model="endTime"
style="width: 140px"
type="date"
@change="getDays()"
placeholder="结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -27,8 +33,8 @@
<div class="wit_box"> <div class="wit_box">
<div class="box-gang"> <div class="box-gang">
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="总加油升数" placement="top-start"> <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
<div class="size-bole" style="color: #0DC291">{{orderStatistics.addOilMl}}</div> <div class="size-bole" style="color: #0DC291">0</div>
</el-tooltip> </el-tooltip>
<div class="size-hui"> <div class="size-hui">
<div class="dian" style="background: #0DC291"></div> <div class="dian" style="background: #0DC291"></div>
@ -36,8 +42,8 @@
</div> </div>
</div> </div>
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="总加油笔数（元）" placement="top-start"> <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
<div class="size-bole" style="color:#00CAFF;">{{orderStatistics.addOilNum}}</div> <div class="size-bole" style="color:#00CAFF;">0</div>
</el-tooltip> </el-tooltip>
<div class="size-hui"> <div class="size-hui">
@ -46,8 +52,8 @@
</div> </div>
</div> </div>
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="订单总金额（元）" placement="top-start"> <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
<div class="size-bole" style="color:#F44522;" >{{orderStatistics.orderNum}}</div> <div class="size-bole" style="color:#F44522;" >0</div>
</el-tooltip> </el-tooltip>
<div class="size-hui"> <div class="size-hui">
@ -56,8 +62,8 @@
</div> </div>
</div> </div>
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="优惠总金额（元）" placement="top-start"> <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
<div class="size-bole" style="color:#FF7E00;" >{{orderStatistics.discountAmount}}</div> <div class="size-bole" style="color:#FF7E00;" >0</div>
</el-tooltip> </el-tooltip>
<div class="size-hui"> <div class="size-hui">
@ -67,8 +73,8 @@
</div> </div>
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="实收总金额（元）" placement="top-start"> <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
<div class="size-bole" style="color:#E05295;" >{{orderStatistics.payAmount}}</div> <div class="size-bole" style="color:#E05295;" >0</div>
</el-tooltip> </el-tooltip>
<div class="size-hui"> <div class="size-hui">
<div class="dian" style="background: #E05295"></div> <div class="dian" style="background: #E05295"></div>
@ -76,8 +82,8 @@
</div> </div>
</div> </div>
<div class="box"> <div class="box">
<el-tooltip class="item" effect="dark" content="退款总金额" placement="top-start"> <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
<div class="size-bole" style="color:#0047FF;" >{{orderStatistics.refMoney}}</div> <div class="size-bole" style="color:#0047FF;" >0</div>
</el-tooltip> </el-tooltip>
<div class="size-hui"> <div class="size-hui">
<div class="dian" style="background: #0047FF"></div> <div class="dian" style="background: #0047FF"></div>
@ -87,18 +93,18 @@
</div> </div>
<div class="table-box"> <div class="table-box">
<el-table <el-table
:data="soieorderStatistics" :data="orderList"
border border
style="width: 100%;margin-top: 15px"> style="width: 100%;margin-top: 15px">
<el-table-column type="index" width="50" align="center" label="序号"/> <el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="oilNum" align="center" label="油品油号"> </el-table-column> <el-table-column prop="content" align="center" label="油品油号"> </el-table-column>
<el-table-column prop="addOilMl" align="center" label="加油升数（ml）"> </el-table-column> <el-table-column prop="content" align="center" label="加油升数（元）"> </el-table-column>
<el-table-column prop="addOilNum" align="center" label="加油笔数"> </el-table-column> <el-table-column prop="content" align="center" label="加油笔数"> </el-table-column>
<el-table-column prop="orderNum" align="center" label="订单金额（元）"> </el-table-column> <el-table-column prop="content" align="center" label="订单金额（元）"> </el-table-column>
<el-table-column prop="discountAmount" align="center" label="优惠金额（元）"> </el-table-column> <el-table-column prop="content" align="center" label="优惠金额（元）"> </el-table-column>
<el-table-column prop="refMoney" align="center" label="退款金额（元）"> </el-table-column> <el-table-column prop="content" align="center" label="退款金额（元）"> </el-table-column>
<el-table-column prop="payAmount" align="center" label="实收金额（元）"> </el-table-column> <el-table-column prop="content" align="center" label="实收金额（元）"> </el-table-column>
<el-table-column prop="days" align="center" label="统计周期"> </el-table-column> <el-table-column prop="content" align="center" label="统计周期"> </el-table-column>
<!-- <div slot="empty" class="empty">--> <!-- <div slot="empty" class="empty">-->
<!-- <el-empty description="暂无数据"></el-empty>--> <!-- <el-empty description="暂无数据"></el-empty>-->
<!-- </div>--> <!-- </div>-->
@ -127,9 +133,7 @@ import {
getRunningWaterByDataApi, getRunningWaterByDataApi,
exportExcelOilDeptApi, exportExcelOilDeptApi,
getmyDataApi, getmyDataApi,
getInstituionListApi2, getInstituionListApi2
getInstituionListApi11,
getRunningWaterByDataApi13
} from "@/api/allOrder"; } from "@/api/allOrder";
export default { export default {
@ -154,26 +158,15 @@ export default {
beginTime:"", beginTime:"",
endTime:"", endTime:"",
deptType:"3", deptType:"3",
dataRange:[],
}, },
orderStatistics:{ orderStatistics:{
oilNum:'0', numberOfStrokes:'0',
addOilMl:'0', theTotalAmountOfTheOrder:'0',
addOilNum:'0', theTotalAmountPaid:'0',
orderNum:'0', oilDiscounts:'0',
discountAmount:'0', theTotalAmountOfOil:'0',
refMoney:'0', theTotalAmountOfTheItem:'0',
payAmount:'0',
},
soieorderStatistics:{
days:'',
oilNum:'0',
addOilMl:'0',
addOilNum:'0',
orderNum:'0',
discountAmount:'0',
refMoney:'0',
payAmount:'0',
}, },
total:0, total:0,
timeDifference:1, timeDifference:1,
@ -185,14 +178,18 @@ export default {
start.setMinutes(0) start.setMinutes(0)
start.setSeconds(0) start.setSeconds(0)
start.setMilliseconds(0) start.setMilliseconds(0)
let year = start.getFullYear(); // 获取年份 this.dateRange = [start,new Date()];
let month = String(start.getMonth() + 1).padStart(2, '0'); // 获取月份，月份从0开始所以要+1 this.beginTime = start
let date = String(start.getDate()).padStart(2, '0'); // 获取日期 this.endTime = new Date()
this.queryParams.dataRange = [ year+'-'+month+'-'+date, year+'-'+month+'-'+date];
this.timeDifferenceMilliseconds = this.endTime - this.beginTime;
this.timeDifference = timeDifferenceMilliseconds / (1000 * 60 * 60 * 24);
console.log("timeDifference",this.timeDifference)
this.isSysDate = true this.isSysDate = true
await this.getDeptList(); await this.getDeptList();
this.getList(); this.getList();
this.getOrderStatistics()
}, },
methods:{ methods:{
getDays(){ getDays(){
@ -216,7 +213,12 @@ export default {
// 获取订单统计信息 // 获取订单统计信息
getOrderStatistics() { getOrderStatistics() {
getRunningWaterByDataApi13(this.queryParams).then(res=>{ let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getRunningWaterByDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
this.orderStatistics = res.data this.orderStatistics = res.data
}) })
}, },
@ -228,12 +230,17 @@ export default {
// 获取列表信息 // 获取列表信息
getList(val){ getList(val){
getInstituionListApi11(this.queryParams).then( response => { let dateRange = []
this.soieorderStatistics = response.data.records; if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getInstituionListApi2(this.addDateRange(this.queryParams,dateRange)).then( response => {
this.orderList = response.data.records;
this.total = response.data.total; this.total = response.data.total;
this.isSysDate = false this.isSysDate = false
}) })
this.getOrderStatistics()
}, },
// 搜索按钮操作 // 搜索按钮操作
@ -241,7 +248,6 @@ export default {
this.queryParams.page = 1; this.queryParams.page = 1;
await this.getDeptList(); await this.getDeptList();
this.getList(); this.getList();
this.getOrderStatistics()
}, },
// 重置按钮操作 // 重置按钮操作
@ -253,15 +259,8 @@ export default {
deptType:"3", deptType:"3",
} }
start.setHours(0) this.beginTime = ""
start.setMinutes(0) this.endTime = ""
start.setSeconds(0)
start.setMilliseconds(0)
let year = start.getFullYear(); // 获取年份
let month = String(start.getMonth() + 1).padStart(2, '0'); // 获取月份，月份从0开始所以要+1
let date = String(start.getDate()).padStart(2, '0'); // 获取日期
this.queryParams.dataRange = [ year+'-'+month+'-'+date, year+'-'+month+'-'+date];
this.isSysDate = true
await this.getDeptList() await this.getDeptList()
this.handleQuery(); this.handleQuery();
}, },

54
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
View File

@ -3,7 +3,10 @@ package com.fuint.business.order.controller;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.integral.entity.IntegralDetail; import com.fuint.business.integral.entity.IntegralDetail;
import com.fuint.business.order.dto.*; import com.fuint.business.order.dto.AllOrderInfoDto;
import com.fuint.business.order.dto.AllOrderInfoRes;
import com.fuint.business.order.dto.StatisticsOneDayOrderAllDto;
import com.fuint.business.order.dto.StatisticsOrderAllDto;
import com.fuint.business.order.entity.AllOrderInfo; import com.fuint.business.order.entity.AllOrderInfo;
import com.fuint.business.order.entity.CardBalanceChange; import com.fuint.business.order.entity.CardBalanceChange;
import com.fuint.business.order.entity.CashierOrder; import com.fuint.business.order.entity.CashierOrder;
@ -569,53 +572,4 @@ public class AllOrderInfoController extends BaseController {
StatisticsOneDayOrderAllDto map = allOrderInfoService.getInstituionListApi9(allOrderInfoRes); StatisticsOneDayOrderAllDto map = allOrderInfoService.getInstituionListApi9(allOrderInfoRes);
return getSuccessResult(map); return getSuccessResult(map);
} }
/**
* 油品销售统计
* @param allOrderInfoRes
* @return
*/
@GetMapping("/getInstituionListApi11")
public ResponseObject getInstituionListApi11(AllOrderInfoRes allOrderInfoRes,
@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
Page page =new Page(pageNo,pageSize);
IPage<StatisticsSaleOilOrderDto> map = allOrderInfoService.getInstituionListApi11(page,allOrderInfoRes);
return getSuccessResult(map);
}
/**
* 油品销售统计
* @param allOrderInfoRes
* @return
*/
@GetMapping("/getRunningWaterByDataApi13")
public ResponseObject getRunningWaterByDataApi13(AllOrderInfoRes allOrderInfoRes){
StatisticsSaleOilOrderDto map = allOrderInfoService.getRunningWaterByDataApi13(allOrderInfoRes);
return getSuccessResult(map);
}
/**
* 油枪销售统计
* @param allOrderInfoRes
* @return
*/
@GetMapping("/getInstituionListApi15")
public ResponseObject getInstituionListApi15(AllOrderInfoRes allOrderInfoRes,
@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
Page page =new Page(pageNo,pageSize);
IPage<StatisticsSaleOilOrderByGunDto> map = allOrderInfoService.getInstituionListApi15(page,allOrderInfoRes);
return getSuccessResult(map);
}
/**
* 油枪销售统计
* @param allOrderInfoRes
* @return
*/
@GetMapping("/getRunningWaterByDataApi17")
public ResponseObject getRunningWaterByDataApi17(AllOrderInfoRes allOrderInfoRes){
StatisticsSaleOilOrderByGunDto map = allOrderInfoService.getRunningWaterByDataApi17(allOrderInfoRes);
return getSuccessResult(map);
}
} }

27
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/StatisticsSaleOilOrderByGunDto.java
View File

@ -1,27 +0,0 @@
package com.fuint.business.order.dto;
import lombok.Data;
import java.io.Serializable;
@Data
public class StatisticsSaleOilOrderByGunDto implements Serializable {
private static final long serialVersionUID = 1L;
//统计周期
private String days;
//加油油号
private String gunName;
//加油升数
private String addOilMl;
//加油笔数
private String addOilNum;
//订单金额
private String orderNum;
//优惠金额
private String discountAmount;
//退款金额
private String refMoney;
//实收金额
private String payAmount;
}

26
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/dto/StatisticsSaleOilOrderDto.java
View File

@ -1,26 +0,0 @@
package com.fuint.business.order.dto;
import lombok.Data;
import java.io.Serializable;
@Data
public class StatisticsSaleOilOrderDto implements Serializable {
private static final long serialVersionUID = 1L;
//统计周期
private String days;
//加油油号
private String oilNum;
//加油升数
private String addOilMl;
//加油笔数
private String addOilNum;
//订单金额
private String orderNum;
//优惠金额
private String discountAmount;
//退款金额
private String refMoney;
//实收金额
private String payAmount;
}

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

@ -6,7 +6,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders; import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders;
import com.fuint.business.marketingActivity.cardValueRule.dto.CardValueOrdersDTO; import com.fuint.business.marketingActivity.cardValueRule.dto.CardValueOrdersDTO;
import com.fuint.business.marketingActivity.cardValueRule.vo.CardValueOrdersVo; import com.fuint.business.marketingActivity.cardValueRule.vo.CardValueOrdersVo;
import com.fuint.business.order.dto.*; import com.fuint.business.order.dto.AllOrderInfoDto;
import com.fuint.business.order.dto.AllOrderInfoRes;
import com.fuint.business.order.dto.StatisticsOneDayOrderAllDto;
import com.fuint.business.order.dto.StatisticsOrderAllDto;
import com.fuint.business.order.entity.AllOrderInfo; import com.fuint.business.order.entity.AllOrderInfo;
import com.fuint.business.order.entity.CardBalanceChange; import com.fuint.business.order.entity.CardBalanceChange;
import com.fuint.business.order.entity.HandoverRecord; import com.fuint.business.order.entity.HandoverRecord;
@ -142,18 +145,4 @@ public interface AllOrderInfoMapper extends BaseMapper<AllOrderInfo> {
StatisticsOneDayOrderAllDto getInstituionListApi9(@Param("obj") AllOrderInfoRes allOrderInfoRes, StatisticsOneDayOrderAllDto getInstituionListApi9(@Param("obj") AllOrderInfoRes allOrderInfoRes,
@Param("beginTime") String beginTime, @Param("endTime") String endTime); @Param("beginTime") String beginTime, @Param("endTime") String endTime);
IPage<StatisticsSaleOilOrderDto> getInstituionListApi11(@Param("page") Page page, @Param("obj") AllOrderInfoRes allOrderInfoRes,
@Param("beginTime") String beginTime, @Param("endTime") String endTime);
StatisticsSaleOilOrderDto getRunningWaterByDataApi13(@Param("obj") AllOrderInfoRes allOrderInfoRes,
@Param("beginTime") String beginTime, @Param("endTime") String endTime);
IPage<StatisticsSaleOilOrderByGunDto> getInstituionListApi15(@Param("page") Page page, @Param("obj") AllOrderInfoRes allOrderInfoRes,
@Param("beginTime") String beginTime, @Param("endTime") String endTime);
StatisticsSaleOilOrderByGunDto getRunningWaterByDataApi17(@Param("obj") AllOrderInfoRes allOrderInfoRes,
@Param("beginTime") String beginTime, @Param("endTime") String endTime);
} }

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

@ -1398,10 +1398,10 @@
where 1=1 and aoi.store_id = #{obj.storeId} and where 1=1 and aoi.store_id = #{obj.storeId} and
aoi.type='1' aoi.type='1'
<if test="beginTime != null and beginTime != ''"> <if test="beginTime != null and beginTime != ''">
<![CDATA[and aoi.create_time >= concat(#{beginTime},' 00:00:00') ]]> <![CDATA[and aoi.create_time >= #{beginTime} ]]>
</if> </if>
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
<![CDATA[ and aoi.create_time <= concat(#{endTime},' 00:00:00')]]> <![CDATA[ and aoi.create_time <= #{endTime} ]]>
</if> </if>
union all union all
select select
@ -1419,10 +1419,10 @@
where 1=1 and aoi.store_id = #{obj.storeId} and where 1=1 and aoi.store_id = #{obj.storeId} and
aoi.type='4' aoi.type='4'
<if test="beginTime != null and beginTime != ''"> <if test="beginTime != null and beginTime != ''">
<![CDATA[and aoi.create_time >= concat(#{beginTime},' 00:00:00') ]]> <![CDATA[and aoi.create_time >= #{beginTime} ]]>
</if> </if>
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
<![CDATA[ and aoi.create_time <= concat(#{endTime},' 00:00:00')]]> <![CDATA[ and aoi.create_time <= #{endTime} ]]>
</if> </if>
union all union all
select select
@ -1440,10 +1440,10 @@
where 1=1 and aoi.store_id = #{obj.storeId} and where 1=1 and aoi.store_id = #{obj.storeId} and
aoi.type='6' aoi.type='6'
<if test="beginTime != null and beginTime != ''"> <if test="beginTime != null and beginTime != ''">
<![CDATA[and aoi.create_time >= concat(#{beginTime},' 00:00:00') ]]> <![CDATA[and aoi.create_time >= #{beginTime} ]]>
</if> </if>
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
<![CDATA[ and aoi.create_time <= concat(#{endTime},' 00:00:00')]]> <![CDATA[ and aoi.create_time <= #{endTime} ]]>
</if> </if>
union all union all
select select
@ -1462,10 +1462,10 @@
where 1=1 and aoi.store_id = #{obj.storeId} and where 1=1 and aoi.store_id = #{obj.storeId} and
aoi.type = '7' aoi.type = '7'
<if test="beginTime != null and beginTime != ''"> <if test="beginTime != null and beginTime != ''">
<![CDATA[and aoi.create_time >= concat(#{beginTime},' 00:00:00') ]]> <![CDATA[and aoi.create_time >= #{beginTime} ]]>
</if> </if>
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
<![CDATA[ and aoi.create_time <= concat(#{endTime},' 00:00:00')]]> <![CDATA[ and aoi.create_time <= #{endTime} ]]>
</if> </if>
</select> </select>
@ -1485,10 +1485,10 @@
where 1=1 and aoi.store_id = #{obj.storeId} and where 1=1 and aoi.store_id = #{obj.storeId} and
(aoi.type='1' or aoi.type='4' or aoi.type='6' or aoi.type='7') (aoi.type='1' or aoi.type='4' or aoi.type='6' or aoi.type='7')
<if test="beginTime != null and beginTime != ''"> <if test="beginTime != null and beginTime != ''">
<![CDATA[and aoi.create_time >= concat(#{beginTime},' 00:00:00') ]]> <![CDATA[and aoi.create_time >= #{beginTime} ]]>
</if> </if>
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
<![CDATA[ and aoi.create_time <= concat(#{endTime},' 00:00:00')]]> <![CDATA[ and aoi.create_time <= #{endTime} ]]>
</if> </if>
</select> </select>
@ -1583,7 +1583,7 @@
LEFT JOIN hang_bill hb on aoi.user_id=hb.id LEFT JOIN hang_bill hb on aoi.user_id=hb.id
LEFT JOIN mt_user mu on aoi.user_id = mu.id LEFT JOIN mt_user mu on aoi.user_id = mu.id
LEFT JOIN card_value_orders cvo on aoi.order_no= cvo.order_no LEFT JOIN card_value_orders cvo on aoi.order_no= cvo.order_no
where 1=1 and aoi.store_id = #{obj.storeId} and where 1=1 and aoi.store_id = 157 and
(aoi.type='1' or aoi.type='4' or aoi.type='6' or aoi.type='7') (aoi.type='1' or aoi.type='4' or aoi.type='6' or aoi.type='7')
<if test="beginTime != null and beginTime != ''"> <if test="beginTime != null and beginTime != ''">
<![CDATA[and aoi.create_time >= concat(#{beginTime},' 00:00:00') ]]> <![CDATA[and aoi.create_time >= concat(#{beginTime},' 00:00:00') ]]>
@ -1592,100 +1592,4 @@
<![CDATA[ and aoi.create_time <= concat(#{endTime},' 23:59:59') ]]> <![CDATA[ and aoi.create_time <= concat(#{endTime},' 23:59:59') ]]>
</if> </if>
</select> </select>
<select id="getInstituionListApi11" resultType="com.fuint.business.order.dto.StatisticsSaleOilOrderDto">
SELECT
non.oil_name oilNum,
IFNULL(sum(oo.oil_num),0) addOilMl,
IFNULL(count(oo.oils),0) addOilNum,
IFNULL(sum(oo.order_amount),0) orderNum,
IFNULL(sum(oo.discount_amount),0) discountAmount,
IFNULL(sum(oo.ref_money),0) refMoney,
IFNULL(sum(oo.pay_amount),0) payAmount,
concat(#{beginTime},'-',#{endTime}) days
FROM
oil_gun og
LEFT JOIN oil_number as ons on og.number_id=ons.number_id
LEFT JOIN oil_name non on non.id=ons.oil_name
LEFT JOIN oil_order oo on oo.oils=non.id and oo.create_time
<if test="beginTime != null and beginTime != ''">
<![CDATA[and oo.create_time >= concat(#{beginTime},' 00:00:00') ]]>
</if>
<if test="endTime != null and endTime != ''">
<![CDATA[ and oo.create_time <= concat(#{endTime},' 23:59:59') ]]>
</if>
where og.store_id=#{obj.storeId}
GROUP BY og.number_id
</select>
<select id="getRunningWaterByDataApi13" resultType="com.fuint.business.order.dto.StatisticsSaleOilOrderDto">
SELECT
non.oil_name oilNum,
IFNULL(sum(oo.oil_num),0) addOilMl,
IFNULL(count(oo.oils),0) addOilNum,
IFNULL(sum(oo.order_amount),0) orderNum,
IFNULL(sum(oo.discount_amount),0) discountAmount,
IFNULL(sum(oo.ref_money),0) refMoney,
IFNULL(sum(oo.pay_amount),0) payAmount,
concat(#{beginTime},'-',#{endTime}) days
FROM
oil_gun og
LEFT JOIN oil_number as ons on og.number_id=ons.number_id
LEFT JOIN oil_name non on non.id=ons.oil_name
LEFT JOIN oil_order oo on oo.oils=non.id and oo.create_time
<if test="beginTime != null and beginTime != ''">
<![CDATA[and oo.create_time >= concat(#{beginTime},' 00:00:00') ]]>
</if>
<if test="endTime != null and endTime != ''">
<![CDATA[ and oo.create_time <= concat(#{endTime},' 23:59:59') ]]>
</if>
where og.store_id=#{obj.storeId}
</select>
<select id="getInstituionListApi15" resultType="com.fuint.business.order.dto.StatisticsSaleOilOrderByGunDto">
SELECT
og.gun_name gunName,
IFNULL(sum(oo.oil_num),0) addOilMl,
IFNULL(count(oo.oils),0) addOilNum,
IFNULL(sum(oo.order_amount),0) orderNum,
IFNULL(sum(oo.discount_amount),0) discountAmount,
IFNULL(sum(oo.ref_money),0) refMoney,
IFNULL(sum(oo.pay_amount),0) payAmount,
concat(#{beginTime},'-',#{endTime}) days
from oil_gun og
LEFT JOIN oil_order oo on og.id=oo.oil_gun_num
<if test="beginTime != null and beginTime != ''">
<![CDATA[and oo.create_time >= concat(#{beginTime},' 00:00:00') ]]>
</if>
<if test="endTime != null and endTime != ''">
<![CDATA[ and oo.create_time <= concat(#{endTime},' 23:59:59') ]]>
</if>
where og.store_id=#{obj.storeId}
GROUP BY og.id
</select>
<select id="getRunningWaterByDataApi17" resultType="com.fuint.business.order.dto.StatisticsSaleOilOrderByGunDto">
SELECT
og.gun_name gunName,
IFNULL(sum(oo.oil_num),0) addOilMl,
IFNULL(count(oo.oils),0) addOilNum,
IFNULL(sum(oo.order_amount),0) orderNum,
IFNULL(sum(oo.discount_amount),0) discountAmount,
IFNULL(sum(oo.ref_money),0) refMoney,
IFNULL(sum(oo.pay_amount),0) payAmount,
concat(#{beginTime},'-',#{endTime}) days
from oil_gun og
LEFT JOIN oil_order oo on og.id=oo.oil_gun_num
<if test="beginTime != null and beginTime != ''">
<![CDATA[and oo.create_time >= concat(#{beginTime},' 00:00:00') ]]>
</if>
<if test="endTime != null and endTime != ''">
<![CDATA[ and oo.create_time <= concat(#{endTime},' 23:59:59') ]]>
</if>
where og.store_id=#{obj.storeId}
</select>
</mapper> </mapper>

13
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java
View File

@ -3,7 +3,10 @@ package com.fuint.business.order.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders; import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders;
import com.fuint.business.order.dto.*; import com.fuint.business.order.dto.AllOrderInfoDto;
import com.fuint.business.order.dto.AllOrderInfoRes;
import com.fuint.business.order.dto.StatisticsOneDayOrderAllDto;
import com.fuint.business.order.dto.StatisticsOrderAllDto;
import com.fuint.business.order.entity.AllOrderInfo; import com.fuint.business.order.entity.AllOrderInfo;
import com.fuint.business.order.entity.CashierOrder; import com.fuint.business.order.entity.CashierOrder;
import com.fuint.business.order.entity.HandoverRecord; import com.fuint.business.order.entity.HandoverRecord;
@ -222,12 +225,4 @@ AllOrderActivityVo getOneByOrderId(Integer orderId);
IPage<StatisticsOneDayOrderAllDto> getInstituionListApi7(Page page,AllOrderInfoRes allOrderInfoRes); IPage<StatisticsOneDayOrderAllDto> getInstituionListApi7(Page page,AllOrderInfoRes allOrderInfoRes);
StatisticsOneDayOrderAllDto getInstituionListApi9(AllOrderInfoRes allOrderInfoRes); StatisticsOneDayOrderAllDto getInstituionListApi9(AllOrderInfoRes allOrderInfoRes);
IPage<StatisticsSaleOilOrderDto> getInstituionListApi11(Page page, AllOrderInfoRes allOrderInfoRes);
StatisticsSaleOilOrderDto getRunningWaterByDataApi13(AllOrderInfoRes allOrderInfoRes);
IPage<StatisticsSaleOilOrderByGunDto> getInstituionListApi15(Page page, AllOrderInfoRes allOrderInfoRes);
StatisticsSaleOilOrderByGunDto getRunningWaterByDataApi17(AllOrderInfoRes allOrderInfoRes);
} }

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

@ -37,7 +37,10 @@ import com.fuint.business.marketingActivity.cardFule.entity.CardFuelRecord;
import com.fuint.business.marketingActivity.cardFule.mapper.CardFuelChangeMapper; import com.fuint.business.marketingActivity.cardFule.mapper.CardFuelChangeMapper;
import com.fuint.business.marketingActivity.cardFule.mapper.CardFuelRecordMapper; import com.fuint.business.marketingActivity.cardFule.mapper.CardFuelRecordMapper;
import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders; import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders;
import com.fuint.business.order.dto.*; import com.fuint.business.order.dto.AllOrderInfoDto;
import com.fuint.business.order.dto.AllOrderInfoRes;
import com.fuint.business.order.dto.StatisticsOneDayOrderAllDto;
import com.fuint.business.order.dto.StatisticsOrderAllDto;
import com.fuint.business.order.entity.*; import com.fuint.business.order.entity.*;
import com.fuint.business.order.mapper.AllOrderInfoMapper; import com.fuint.business.order.mapper.AllOrderInfoMapper;
import com.fuint.business.order.mapper.CardBalanceChangeMapper; import com.fuint.business.order.mapper.CardBalanceChangeMapper;
@ -2738,37 +2741,4 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
allOrderInfoRes.getDataRange() == null ? "" : allOrderInfoRes.getDataRange()[0], allOrderInfoRes.getDataRange() == null ? "" : allOrderInfoRes.getDataRange()[0],
allOrderInfoRes.getDataRange() == null ? "" : allOrderInfoRes.getDataRange()[1]); allOrderInfoRes.getDataRange() == null ? "" : allOrderInfoRes.getDataRange()[1]);
} }
@Override
public IPage<StatisticsSaleOilOrderDto> getInstituionListApi11(Page page, AllOrderInfoRes allOrderInfoRes) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
allOrderInfoRes.setStoreId(nowAccountInfo.getStoreId());
return allOrderInfoMapper.getInstituionListApi11(page,allOrderInfoRes,
allOrderInfoRes.getDataRange()==null?"":allOrderInfoRes.getDataRange()[0],
allOrderInfoRes.getDataRange()==null?"":allOrderInfoRes.getDataRange()[1]);
}
@Override
public StatisticsSaleOilOrderDto getRunningWaterByDataApi13(AllOrderInfoRes allOrderInfoRes) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
allOrderInfoRes.setStoreId(nowAccountInfo.getStoreId());
return allOrderInfoMapper.getRunningWaterByDataApi13(allOrderInfoRes,
allOrderInfoRes.getDataRange()==null?"":allOrderInfoRes.getDataRange()[0],
allOrderInfoRes.getDataRange()==null?"":allOrderInfoRes.getDataRange()[1]);
}
@Override
public IPage<StatisticsSaleOilOrderByGunDto> getInstituionListApi15(Page page, AllOrderInfoRes allOrderInfoRes) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
allOrderInfoRes.setStoreId(nowAccountInfo.getStoreId());
return allOrderInfoMapper.getInstituionListApi15(page,allOrderInfoRes,
allOrderInfoRes.getDataRange()==null?"":allOrderInfoRes.getDataRange()[0],
allOrderInfoRes.getDataRange()==null?"":allOrderInfoRes.getDataRange()[1]);
}
@Override
public StatisticsSaleOilOrderByGunDto getRunningWaterByDataApi17(AllOrderInfoRes allOrderInfoRes) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
allOrderInfoRes.setStoreId(nowAccountInfo.getStoreId());
return allOrderInfoMapper.getRunningWaterByDataApi17(allOrderInfoRes,
allOrderInfoRes.getDataRange()==null?"":allOrderInfoRes.getDataRange()[0],
allOrderInfoRes.getDataRange()==null?"":allOrderInfoRes.getDataRange()[1]);
}
} }