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

no message

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-08-13 16:31:10 +08:00
parent 4a6cef4f32
commit 8778b7a49f
11 changed files with 661 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fuintAdmin/src/api/handover/handover.js
View File

@ -7,6 +7,13 @@ export function getHandoverApi() {
// params: query
})
}
export function getHandoverApi2() {
return request({
url: '/business/handoverRecord/handover2',
method: 'get',
// params: query
})
}
export function getHandoverListApi(query) {
return request({

432
fuintAdmin/src/views/handover/HandoverDetails.vue
View File

@ -6,7 +6,7 @@
{{item}}
</div>
</div>
<div v-if="tabindex == 0">
<div v-if="tabindex == 0">
<div class="card-box" style="width: 98%;margin: 10px auto;background: #fff;box-sizing: border-box;padding-top: 15px" >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
<el-form-item label="" prop="status">
@ -39,63 +39,63 @@
<div class="title_">门店交接单</div>
<div class="d-s-b">
<div>油站名称</div>
<div>中建锦绣二期站</div>
<div>{{baseInfo.storeName}}</div>
</div>
<div class="d-s-b">
<div>油站站长</div>
<div>中建锦绣二期站</div>
<div>{{baseInfo.realName}}</div>
</div>
<div class="d-s-b">
<div>交班方式</div>
<div>中建锦绣二期站</div>
<div>{{baseInfo.handoverType}}</div>
</div>
<div class="d-s-b">
<div>开始时间</div>
<div>中建锦绣二期站</div>
<div>{{baseInfo.startTime}}</div>
</div>
<div class="d-s-b">
<div>结束时间</div>
<div>中建锦绣二期站</div>
<div>{{baseInfo.endTime}}</div>
</div>
<div class="d-s-b">
<div>订单金额</div>
<div>中建锦绣二期站</div>
<div>{{orderSummary.oilOrder}}</div>
</div>
<div class="d-s-b">
<div>优惠金额</div>
<div>中建锦绣二期站</div>
<div>--</div>
</div>
<div class="d-s-b">
<div>退款金额</div>
<div>中建锦绣二期站</div>
<div>{{orderSummary.oilRefund}}</div>
</div>
<div class="d-s-b">
<div>挂账金额</div>
<div>中建锦绣二期站</div>
<div>--</div>
</div>
<div class="d-s-b">
<div>会员消费</div>
<div>中建锦绣二期站</div>
<div>--</div>
</div>
<div class="d-s-b">
<div>实收金额</div>
<div>中建锦绣二期站</div>
<div>--</div>
</div>
<div class="d-s-b">
<div>充值金额</div>
<div>中建锦绣二期站</div>
<div>{{orderSummary.cardPaid}}</div>
</div>
<div class="d-s-b">
<div>充值赠送</div>
<div>中建锦绣二期站</div>
<div>{{orderSummary.cardGiftPaid}}</div>
</div>
<div class="d-s-b">
<div>会员总余额</div>
<div>中建锦绣二期站</div>
<div>{{orderSummary.points}}</div>
</div>
<div class="d-s-b">
<div>会员总积分</div>
<div>中建锦绣二期站</div>
<div>{{orderSummary.sumnum}}</div>
</div>
<div class="xxing"></div>
<div class="for-box">
@ -125,124 +125,213 @@
<div class="r-size">￥50682.05</div>
</div>
</div>
<div class="for-box">
<div class="for-title">
<div class="x-"></div>
<div>支付方式统计</div>
<div class="x-"></div>
</div>
<div class="d-s-b" style="font-weight: 600">
<div class="l-size">支付方式</div>
<div class="f-size">笔数</div>
<div class="r-size">实收金额</div>
</div>
<div class="d-s-b" v-for="item in paymentAggregation" v-if="item.flag == 'all'">
<div class="l-size">{{calculateThePaymentMethod(item.payType)}}</div>
<div class="s-size">39566.58</div>
<div class="r-size">￥{{item.paidAmount}}</div>
</div>
</div>
<div class="for-box">
<div class="for-title">
<div class="x-"></div>
<div>油品实收统计</div>
<div class="x-"></div>
</div>
<div class="d-s-b" style="font-weight: 600">
<div class="l-size">油号</div>
<div class="f-size">笔数</div>
<div class="r-size">实收金额</div>
</div>
<div class="d-s-b" v-for="item in oilNumberStatistics">
<div class="l-size">{{item.oilName}}</div>
<div class="s-size">--</div>
<div class="r-size">￥{{item.paidAmount}}</div>
</div>
</div>
<div class="for-box">
<div class="for-title">
<div class="x-"></div>
<div>优惠统计</div>
<div class="x-"></div>
</div>
<div class="d-s-b" style="font-weight: 600">
<div class="l-size">油号</div>
<div class="f-size">笔数</div>
<div class="r-size">实收金额</div>
</div>
<div class="d-s-b" v-for="item in oilNumberStatistics">
<div class="l-size">{{item.oilName}}</div>
<div class="s-size">--</div>
<div class="r-size">￥{{item.paidAmount}}</div>
</div>
</div>
<div class="for-box">
<div class="for-title">
<div class="x-"></div>
<div>退款统计</div>
<div class="x-"></div>
</div>
<div class="d-s-b" style="font-weight: 600">
<div class="l-size">类型</div>
<div class="f-size">笔数</div>
<div class="r-size">实收金额</div>
</div>
<div class="d-s-b" v-for="item in oilNumberStatistics">
<div class="l-size">{{item.oilName}}</div>
<div class="s-size">--</div>
<div class="r-size">￥{{item.paidAmount}}</div>
</div>
</div>
<div class="for-box">
<div class="for-title">
<div class="x-"></div>
<div>挂账统计</div>
<div class="x-"></div>
</div>
<div class="d-s-b" style="font-weight: 600">
<div class="l-size">挂账单位</div>
<div class="f-size">笔数</div>
<div class="r-size">实收金额</div>
</div>
<div class="d-s-b" v-for="item in paymentAggregation" v-if="item.flag == 'all' && item.payType == 'balance'">
<div class="l-size">{{item.name}}</div>
<div class="s-size">{{item.numberOfDeals?item.numberOfDeals:'--'}}</div>
<div class="r-size">￥{{item.paidAmount?item.paidAmount:'--'}}</div>
</div>
</div>
<div class="for-box">
<div class="for-title">
<div class="x-"></div>
<div>会员消费统计</div>
<div class="x-"></div>
</div>
<div class="d-s-b" style="font-weight: 600">
<div class="l-size">支付方式</div>
<div class="f-size">笔数</div>
<div class="r-size">实收金额</div>
</div>
<div class="d-s-b" v-for="item in paymentAggregation" v-if="item.flag == 'all' && item.payType == 'balance'">
<div class="l-size">合计</div>
<div class="s-size">{{item.numberOfDeals?item.numberOfDeals:'--'}}</div>
<div class="r-size">￥{{item.paidAmount?item.paidAmount:'--'}}</div>
</div>
</div>
<div class="for-box">
<div class="for-title">
<div class="x-"></div>
<div>便利店统计</div>
<div class="x-"></div>
</div>
<div class="d-s-b" style="font-weight: 600">
<div class="l-size">支付方式</div>
<div class="f-size">笔数</div>
<div class="r-size">实收金额</div>
</div>
<div class="d-s-b" v-for="item in paymentAggregation" v-if="item.flag == 'goods'">
<div class="l-size">{{calculateThePaymentMethod(item.payType)}}</div>
<div class="s-size">{{item.numberOfDeals?item.numberOfDeals:'--'}}</div>
<div class="r-size">￥{{item.paidAmount?item.paidAmount:'--'}}</div>
</div>
</div>
<div class="for-box">
<div class="for-title">
<div class="x-"></div>
<div>积分商城统计</div>
<div class="x-"></div>
</div>
<div class="d-s-b" style="font-weight: 600">
<div class="l-size">支付方式</div>
<div class="f-size">笔数</div>
<div class="r-size">实收金额</div>
</div>
<div class="d-s-b" v-for="item in paymentAggregation" v-if="item.flag == 'point'">
<div class="l-size">{{calculateThePaymentMethod(item.payType)}}</div>
<div class="s-size">{{item.numberOfDeals?item.numberOfDeals:'--'}}</div>
<div class="r-size">￥{{item.paidAmount?item.paidAmount:'--'}}</div>
</div>
</div>
<div class="for-box">
<div class="for-title">
<div class="x-"></div>
<div>新增会员统计(再处理)</div>
<div class="x-"></div>
</div>
<div class="d-s-b" style="font-weight: 600">
<div class="l-size">新增会员数</div>
<!-- <div class="f-size">笔数</div>-->
<div class="r-size">0</div>
</div>
</div>
<div class="for-box">
<div class="for-title">
<div class="x-"></div>
<div>挂账归还统计(再处理)</div>
<div class="x-"></div>
</div>
<div class="d-s-b" style="font-weight: 600">
<div class="l-size">支付方式</div>
<div class="f-size">笔数</div>
<div class="r-size">实收金额</div>
</div>
<div class="d-s-b" v-for="item in returnedToTheAccount">
<div class="l-size">{{item.name?item.name:'--'}}</div>
<div class="s-size">{{item.numberOfDeals?item.numberOfDeals:'--'}}</div>
<div class="r-size">￥{{item.paidAmount?item.paidAmount:'--'}}</div>
</div>
</div>
<div class="for-box">
<div class="for-title">
<div class="x-"></div>
<div>员工实收统计</div>
<div class="x-"></div>
</div>
<div class="d-s-b" style="font-weight: 600">
<div class="l-size">员工</div>
<div class="f-size">笔数</div>
<div class="r-size">实收金额</div>
</div>
<div class="d-s-b" v-for="item in employeeStatistics">
<div class="l-size">{{item.name?item.name:'--'}}</div>
<div class="s-size">{{item.numberOfDeals?item.numberOfDeals:'--'}}</div>
<div class="r-size">￥{{item.paidAmount?item.paidAmount:'--'}}</div>
</div>
</div>
</el-card>
<div style="width: 98%; margin: 20px auto;display: flex;align-items: center;justify-content: center; background: #fff;box-sizing: border-box;padding: 15px " >
<el-button type="primary">交班</el-button>
</div>
</div>
<div v-if="tabindex == 1">
<div class="table-boxs">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
<el-form-item label="" prop="status">
<el-select v-model="queryParams.status" style="width: 150px" placeholder="交班方式" clearable>
<el-option label="统一交班" value="统一交班">统一交班</el-option>
<el-option label="个人交班" value="个人交班">个人交班</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="staffId">
<el-select v-model="queryParams.staffId" style="width: 150px" placeholder="交班员工" clearable>
<el-option
v-for="option in staffList"
:key="option.id"
:label="option.realName"
:value="option.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="staffId">
<el-date-picker
v-model="value"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item class="flex-container" style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table
:data="tableData"
border
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column
prop="name"
label="交班人员">
</el-table-column>
<el-table-column
prop="name"
label="交班方式">
</el-table-column>
<el-table-column
prop="date"
label="开始时间">
</el-table-column>
<el-table-column
prop="date"
label="结束时间">
</el-table-column>
<el-table-column
prop="price"
label="订单金额"
width="80"
>
</el-table-column>
<el-table-column
prop="price"
label="优惠金额"
width="80"
>
</el-table-column>
<el-table-column
prop="price"
label="实收金额"
width="80"
>
</el-table-column>
<el-table-column
prop="price"
label="退款金额"
width="80"
>
</el-table-column>
<el-table-column
prop="date"
label="创建时间">
</el-table-column>
<el-table-column label="操作" align="center" fixed='right'>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
>查看详情</el-button>
<el-button
size="mini"
type="text"
>交易明细</el-button>
<el-button
size="mini"
type="text"
>商品汇总</el-button>
<el-button
size="mini"
type="text"
>打印</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
<HandoverRecord></HandoverRecord>
</div>
<el-dialog title="订单详情" :visible.sync="openDetail" width="600px" append-to-body :close-on-click-modal="false">
<!-- <detail :dataForm = "recordData"></detail>-->
@ -251,42 +340,23 @@
</div>
</template>
<script>
import {getHandoverListApi,printLocallyApi} from "@/api/handover/handover";
import {getHandoverApi, getHandoverApi2, getHandoverListApi, printLocallyApi} from "@/api/handover/handover";
import {getStatisticsApi } from "@/api/order/order";
import {getDicts} from "@/api/order/data";
import HandoverOnly from "@/views/handover/HandoverOnly.vue";
import {listStaff} from "@/api/order/staff";
import HandoverRecord from "@/views/handover/HandoverRecord.vue";
export default {
name: "pointsCashier",
components: {HandoverOnly},
components: {HandoverRecord, HandoverOnly},
// dicts: ['zhzt'],
data() {
return {
tableData: [{
price:120,
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
}, {
price:120,
date: '2016-05-04',
name: '王小虎',
address: '上海市普陀区金沙江路 1517 弄'
}, {
price:120,
date: '2016-05-01',
name: '王小虎',
address: '上海市普陀区金沙江路 1519 弄'
}, {
price:120,
date: '2016-05-03',
name: '王小虎',
address: '上海市普陀区金沙江路 1516 弄'
}],
tabs:[
"交接班",
"交班记录"
@ -299,6 +369,17 @@ export default {
recordData:'',
zhztList:'',
shiftHandoverList:'',
handoverList : {},
handoverData:{},
baseInfo:{},
billingDetails:[],
employeeStatistics:[],
greaseGunStatistics:[],
oilNumberStatistics:[],
orderSummary:{},
paymentAggregation:[],
returnedToTheAccount:[],
// base
queryParams: {
status: '',
@ -325,11 +406,28 @@ export default {
},
created() {
this.getList();
this.getHandover();
this.getStatistics();
this.getStatus();
this.getStaffList();
},
methods: {
getHandover() {
getHandoverApi2().then(res=>{
// this.handoverList = res.data;
this.handoverData = res.data;
this.baseInfo = this.handoverData.baseInfo,
this.billingDetails = this.handoverData.billingDetails,
this.employeeStatistics = this.handoverData.employeeStatistics,
this.greaseGunStatistics = this.handoverData.greaseGunStatistics,
this.oilNumberStatistics = this.handoverData.oilNumberStatistics,
this.orderSummary = this.handoverData.orderSummary,
this.paymentAggregation = this.handoverData.paymentAggregation,
this.returnedToTheAccount = this.handoverData.returnedToTheAccount,
console.log("this.handoverList",this.handoverList)
})
},
getindex(index){
this.tabindex = index
},
@ -410,7 +508,37 @@ export default {
id:9
}
});
}
},
billingDetails() {
let count = [];
if (this.billingDetails) {
return this.billingDetails
}
return count;
},
calculateThePaymentMethod(payType) {
switch (payType) {
case 'ALIPAY':
return '支付宝'
break;
case 'WECHAT':
return '微信'
break;
case 'UNIONPAY':
return '银联二维码'
break;
case 'CASH':
return '现金'
break;
case 'balance':
return '余额'
break;
case 'oilCard':
return '油卡'
break;
}
return '未知'
},
}
}
</script>

17
fuintAdmin/src/views/handover/HandoverOnly.vue
View File

@ -388,8 +388,8 @@ import {getLodop} from "@/api/LodopFuncs";
created() {
console.log("12312231",this.recordData)
this.handoverList = JSON.parse(this.recordData)
// this.getHandover();
// this.handoverList = JSON.parse(this.recordData)
this.getHandover();
},
methods: {
printLocally() {
@ -397,6 +397,13 @@ import {getLodop} from "@/api/LodopFuncs";
})
},
getHandover() {
getHandoverApi().then(res=>{
this.handoverList = res.data;
console.log("this.handoverList",this.handoverList)
})
},
printLocally1() {
// const printHTML = document.querySelector('#report').innerHTML
// // 将打印的区域赋值，进行打印
@ -478,12 +485,6 @@ import {getLodop} from "@/api/LodopFuncs";
// console.log("preview",preview);
LODOP.PRINT();
},
// getHandover() {
// getHandoverApi().then(res=>{
// this.handoverList = res.data;
// console.log("this.handoverList",this.handoverList)
// })
// },
getList(){
getHandoverListApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{

209
fuintAdmin/src/views/handover/HandoverRecord.vue
View File

@ -1,13 +1,218 @@
<script>
import {listStaff} from "@/api/order/staff";
export default {
name: "HandoverRecord"
name: "HandoverRecord",
data() {
return {
tableData: [{
price:120,
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
}, {
price:120,
date: '2016-05-04',
name: '王小虎',
address: '上海市普陀区金沙江路 1517 弄'
}, {
price:120,
date: '2016-05-01',
name: '王小虎',
address: '上海市普陀区金沙江路 1519 弄'
}, {
price:120,
date: '2016-05-03',
name: '王小虎',
address: '上海市普陀区金沙江路 1516 弄'
}],
tabs:[
"交接班",
"交班记录"
],
value:'',
tabindex:0,
openDetail:false,
dataForm:{},
dataList:[],
recordData:'',
zhztList:'',
shiftHandoverList:'',
queryParams: {
status: '',
type: '',
page:null,
pageSize:null
},
loading: false,
dateRange: [new Date(),new Date()],
beginTime:new Date(),
endTime:new Date(),
defaultSort: {prop: 'createTime', order: 'descending'},
total: 0,
staffList:[],
}
},
methods: {
getStaffList() {
listStaff(this.addDateRange({ page: 1,
pageSize: 10000})).then(response => {
this.staffList = response.data.records;
}
);
},
}
}
</script>
<template>
$END$
<div class="">
<div class="table-boxs">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
<el-form-item label="" prop="status">
<el-select v-model="queryParams.status" style="width: 150px" placeholder="交班方式" clearable>
<el-option label="统一交班" value="统一交班">统一交班</el-option>
<el-option label="个人交班" value="个人交班">个人交班</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="staffId">
<el-select v-model="queryParams.staffId" style="width: 150px" placeholder="交班员工" clearable>
<el-option
v-for="option in staffList"
:key="option.id"
:label="option.realName"
:value="option.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="staffId">
<el-date-picker
v-model="value"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item class="flex-container" style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table
:data="tableData"
border
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column
prop="name"
label="交班人员">
</el-table-column>
<el-table-column
prop="name"
label="交班方式">
</el-table-column>
<el-table-column
prop="date"
label="开始时间">
</el-table-column>
<el-table-column
prop="date"
label="结束时间">
</el-table-column>
<el-table-column
prop="price"
label="订单金额"
width="80"
>
</el-table-column>
<el-table-column
prop="price"
label="优惠金额"
width="80"
>
</el-table-column>
<el-table-column
prop="price"
label="实收金额"
width="80"
>
</el-table-column>
<el-table-column
prop="price"
label="退款金额"
width="80"
>
</el-table-column>
<el-table-column
prop="date"
label="创建时间">
</el-table-column>
<el-table-column label="操作" align="center" fixed='right'>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
>查看详情</el-button>
<el-button
size="mini"
type="text"
>交易明细</el-button>
<el-button
size="mini"
type="text"
>商品汇总</el-button>
<el-button
size="mini"
type="text"
>打印</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</div>
</template>
<style scoped lang="scss">
.app-containers {
width: 100%;
height: 100vh;
background: #f6f8f9;
box-sizing: border-box;
padding-bottom: 20px;
}
.tab-box{
width: 100%;
background: #fff;
display: flex;
box-sizing: border-box;
padding: 0px 25px;
margin-bottom: 25px;
}
.table-boxs{
border-radius: 8px;
width: 98%;
background: #fff;
margin: 25px auto;
box-sizing: border-box;
padding: 15px;
}
</style>

13
fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJDutyServiceImpl.java
View File

@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@Service
public class LJDutyServiceImpl extends ServiceImpl<LJDutyMapper, TDuty> implements ILJDutyService {
@ -91,8 +92,18 @@ public class LJDutyServiceImpl extends ServiceImpl<LJDutyMapper, TDuty> implemen
}
@Override
public List<TDuty> selectyDutyIds(String id) {
// String[] array = id.split("[\\[\\], ]");
// List<TDuty> tDuties = baseMapper.selectBatchIds(new ArrayList<>(Arrays.asList(array)));
String[] array = id.split("[\\[\\], ]");
List<TDuty> tDuties = baseMapper.selectBatchIds(new ArrayList<>(Arrays.asList(array)));
// 过滤掉数组中的空字符串
List<String> idList = Arrays.stream(array)
.filter(str -> str != null && !str.isEmpty())
.collect(Collectors.toList());
// 仅在 idList 不为空时继续查询
List<TDuty> tDuties = idList.isEmpty() ? new ArrayList<>() : baseMapper.selectBatchIds(idList);
return tDuties;
}

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HandoverRecordController.java
View File

@ -120,6 +120,11 @@ public class HandoverRecordController extends BaseController {
return getSuccessResult(handoverRecordService.handover(staffId));
}
@GetMapping("handover2")
public ResponseObject handover2(Integer staffId) {
return getSuccessResult(handoverRecordService.handover2(staffId));
}
@GetMapping("handoverByPos")
public ResponseObject handoverByPos() {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();

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

@ -254,7 +254,9 @@ limit 1
<select id="goodsOrderStatistics" resultType="java.util.Map">
SELECT
SUM(amount) AS goodsOrder ,
SUM(IF(`status`='refund', pay_amount, 0)) AS goodsRefund,
count(status='paid') AS numberOfDeals,
SUM(IF(`status`='refund', pay_amount, 0)) AS goodsRefund,
SUM(IF(`status`='paid', pay_amount, 0)) AS goodsPaid
FROM mt_order
where store_id = #{storeId}
@ -267,8 +269,9 @@ limit 1
SELECT
'oil' AS flag,
pay_type AS payType,
SUM(IF(order_status='paid', pay_amount, 0)) AS paidAmount,
SUM(IF(order_status='refund', pay_amount, 0)) AS refundAmount
count(order_status='paid') AS numberOfDeals,
SUM(IF(order_status='paid', pay_amount, 0)) AS paidAmount,
SUM(IF(order_status='refund', pay_amount, 0)) AS refundAmount
FROM oil_order
where store_id = #{storeId}
and create_time BETWEEN #{startTime} AND #{endTime}
@ -282,7 +285,9 @@ limit 1
SELECT
'card' AS flag,
payment_type AS payType,
SUM(IF(pay_status='paid', recharge_balance, 0)) AS paidAmount,
count(pay_status='paid') AS numberOfDeals,
SUM(IF(pay_status='paid', recharge_balance, 0)) AS paidAmount,
SUM(IF(pay_status='refund', recharge_balance, 0)) AS refundAmount
FROM card_value_record
where store_id = #{storeId}
@ -297,7 +302,9 @@ limit 1
SELECT
'fuel' AS flag,
payment_type AS payType,
SUM(IF(pay_status='paid', recharge_balance, 0)) AS paidAmount,
count(pay_status='paid') AS numberOfDeals,
SUM(IF(pay_status='paid', recharge_balance, 0)) AS paidAmount,
SUM(IF(pay_status='refund', recharge_balance, 0)) AS refundAmount
FROM card_fuel_record
where store_id = #{storeId}
@ -312,7 +319,9 @@ limit 1
SELECT
'goods' AS flag,
pay_type AS payType,
SUM(IF(status='paid', pay_amount, 0)) AS paidAmount,
count(status='paid') AS numberOfDeals,
SUM(IF(status='paid', pay_amount, 0)) AS paidAmount,
SUM(IF(status='refund', pay_amount, 0)) AS refundAmount
FROM mt_order
where store_id = #{storeId}
@ -327,8 +336,9 @@ limit 1
SELECT
'point' AS flag,
payment_type AS payType,
SUM(IF(status='status', amount, 0)) AS paidAmount,
SUM(IF(status='refund', amount, 0)) AS refundAmount
COUNT(IFNULL(status='paid', 0)) AS numberOfDeals,
IFNULL(SUM(IF(status='paid', amount, 0)), 0) AS paidAmount,
IFNULL(SUM(IF(status='refund', amount, 0)), 0) AS refundAmount
FROM integral_orders
where store_id = #{storeId}
and create_time BETWEEN #{startTime} AND #{endTime}
@ -352,15 +362,15 @@ limit 1
oil_number on1
left join oil_name onn on on1.oil_name = onn.id
left join oil_order oo on oo.oils = onn.id
where on1.store_id = #{storeId}
and oo.store_id = 60
and oo.create_time BETWEEN #{startTime} AND #{endTime}
<if test="staffId != null">
and staff_id = #{staffId}
</if>
GROUP BY oo.oils
</select>
<!-- where on1.store_id = #{storeId}-->
<!-- and oo.store_id = 60-->
<!-- and oo.create_time BETWEEN #{startTime} AND #{endTime}-->
<!-- <if test="staffId != null">-->
<!-- and staff_id = #{staffId}-->
<!-- </if>-->
<select id="greaseGunStatistics" resultType="java.util.Map">
SELECT

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/HandoverRecordService.java
View File

@ -60,6 +60,7 @@ public interface HandoverRecordService {
boolean deleteById(Integer id);
public Map<String, Object> handover(Integer staffId);
public Map<String, Object> handover2(Integer staffId);
public Map<String, Object> handoverByPos(Integer staffId);
public Map<String, Object> handoverByAllOrder();

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

@ -15,6 +15,7 @@ import com.fuint.business.order.vo.AllOrderInfoVo;
import com.fuint.business.store.entity.MtStore;
import com.fuint.business.store.service.StoreService;
import com.fuint.business.userManager.mapper.LJUserMapper;
import com.fuint.business.userManager.mapper.UserBalanceMapper;
import com.fuint.common.util.TscLibDll;
import com.fuint.framework.exception.BusinessCheckException;
import com.fuint.system.dict.service.ISysDictDataService;
@ -183,9 +184,8 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
return baseInfo;
}
@Override
public Map<String, Object> handover(Integer staffId) {
@Override
public Map<String, Object> handover2(Integer staffId) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
MtStore mtStore = new MtStore();
@ -257,6 +257,80 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
}
@Override
public Map<String, Object> handover(Integer staffId) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
MtStore mtStore = new MtStore();
try {
mtStore = storeService.queryStoreById2(nowAccountInfo.getStoreId());
} catch (BusinessCheckException e) {
e.printStackTrace();
}
// 获取当前日期
LocalDate today = LocalDate.now();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
// 格式化当前时间
String formattedEndTime = LocalDateTime.now().format(formatter);
Map<String, Object> handoverMap = new HashMap<>();
String startTime = "2023-01-01 12:12:12";
HandoverRecord handoverRecord = selectByTime(staffId);
if (!ObjectUtil.isEmpty(handoverRecord) && !ObjectUtil.isEmpty(handoverRecord.getEndTime())) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
startTime = sdf.format(handoverRecord.getEndTime());
}
String handoverType = "统一交班";
Integer staff = nowAccountInfo.getStaffId();
if (ObjectUtil.isNotEmpty(staffId)){
staff = staffId;
handoverType = "个人交班";
}
LJStaff ljStaff = iljStaffService.selectStaffById(staff);
// String handover = iSysDictDataService.selectDictLabel("handover", ljStaff.getHandoverMode());
// if (!ObjectUtil.isEmpty(handover)) {
// handoverType = handover;
// }
// 填充 baseInfo
Map<String, Object> baseInfo = new HashMap<>();
baseInfo.put("storeName", mtStore.getName());
baseInfo.put("realName", ljStaff.getRealName());
baseInfo.put("handoverType", handoverType);
baseInfo.put("startTime", startTime);
baseInfo.put("endTime", formattedEndTime);
// baseInfo.put("handoverPrem", ljStaff.getHandoverPrem()); // 交班权限
// baseInfo.put("handoverOut", ljStaff.getHandoverOut()); // 交班是否退出
handoverMap.put("baseInfo",baseInfo);
// 获取订单汇总
Map<String, Object> orderSummaryMap = orderSummary(startTime, formattedEndTime, staffId);
handoverMap.put("orderSummary",orderSummaryMap);
// 支付方式汇总
List<Map<String, Object>> paymentAggregationMap = paymentAggregation(startTime, formattedEndTime, staffId);
handoverMap.put("paymentAggregation",paymentAggregationMap);
// 油号统计
List<Map<String, Object>> oilNumberStatisticsMap = oilNumberStatistics(startTime, formattedEndTime, staffId);
handoverMap.put("oilNumberStatistics",oilNumberStatisticsMap);
// 油枪统计
List<Map<String, Object>> greaseGunStatisticsMap = greaseGunStatistics(startTime, formattedEndTime, staffId);
handoverMap.put("greaseGunStatistics",greaseGunStatisticsMap);
// 员工统计
List<Map<String, Object>> employeeStatisticsMap = employeeStatistics(startTime, formattedEndTime, staffId);
handoverMap.put("employeeStatistics",employeeStatisticsMap);
// 挂账详情
List<Map<String, Object>> billingDetailsMap = billingDetails(startTime, formattedEndTime, staffId);
handoverMap.put("billingDetails",billingDetailsMap);
// 挂账归还
List<Map<String, Object>> returnedToTheAccountMap = returnedToTheAccount(startTime, formattedEndTime, staffId) ;
handoverMap.put("returnedToTheAccount",returnedToTheAccountMap);
// 合计
return handoverMap;
}
@Resource
UserBalanceMapper userBalanceMapper;
public Map<String, Object> orderSummary(String startTime, String endTime, Integer staffId) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
Map<String, Object> allStatistics = new HashMap<>();
@ -267,6 +341,17 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
Map<String, Object> fuelOrderStatistics = handoverRecordMapper.fuelOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId(), staffId);
// 普通收款(订单) 普通收款(退款) 普通收款(实收)
Map<String, Object> goodsOrderStatistics = handoverRecordMapper.goodsOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId(), staffId);
// 会员总余额
// 会员总积分
Map<String, Object> stringObjectMap = userBalanceMapper.selectHoverBalance();
// 新增会员统计
Map<String, Object> stringObjectMap1 = userBalanceMapper.addNumberSum();
if (!ObjectUtil.isEmpty(oilOrderStatistics)) {
allStatistics.putAll(oilOrderStatistics);
}else{
@ -300,6 +385,17 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
allStatistics.put("goodsRefund",0.00);
allStatistics.put("goodsPaid",0.00);
}
if(!ObjectUtil.isEmpty(stringObjectMap)) {
allStatistics.putAll(stringObjectMap);
}else {
allStatistics.put("balanceSum",0.00);
allStatistics.put("points",0.00);
}
if(!ObjectUtil.isEmpty(stringObjectMap1)) {
allStatistics.putAll(stringObjectMap1);
}else {
allStatistics.put("sumnum",0.00);
}
// }
return allStatistics;

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/UserBalanceMapper.java
View File

@ -20,4 +20,8 @@ public interface UserBalanceMapper extends BaseMapper<UserBalance> {
IPage<UserBalanceVo> listByZt(Page page,@Param("user") UserBalanceVo user);
Map<String,Object> getDataByZt(UserBalanceVo user);
Map<String,Object> selectHoverBalance();
Map<String,Object> addNumberSum();
}

12
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/UserBalanceMapper.xml
View File

@ -61,5 +61,17 @@
left join mt_user mu on mub.mt_user_id = mu.id
</select>
<select id="selectHoverBalance" resultType="java.util.Map">
select
count(*) sumnum,
sum(mub.card_balance) balanceSum,
sum(mub.points) points
from mt_user_balance mub
</select>
<select id="addNumberSum" resultType="java.util.Map">
select
count(*) sumnum
from mt_user_balance mub
</select>
</mapper>