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

bug

Browse Source
This commit is contained in:
cun-nan 2024-08-08 09:19:56 +08:00
parent d075c6bcfd
commit 694dbdbac7
21 changed files with 585 additions and 504 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fuintAdmin/src/api/fleet/fleetmember.js
View File

@ -1,6 +1,6 @@
import request from '@/utils/request'
// 分页查询所有的订单信息
// 分页查询所有的车队成员信息
export function getFleetMemberList(query) {
return request({
url: 'fleetMember',
@ -10,7 +10,7 @@ export function getFleetMemberList(query) {
})
}
// 分页查询所有的订单信息
// 根据id查询车队成员信息
export function getFleetMember(id) {
return request({
url: 'fleetMember/'+id,
@ -18,7 +18,7 @@ export function getFleetMember(id) {
})
}
// 分页查询所有的订单信息
// 添加车队成员信息
export function addFleetMember(data) {
return request({
url: 'fleetMember',
@ -27,7 +27,7 @@ export function addFleetMember(data) {
})
}
// 分页查询所有的订单信息
// 修改车队成员信息
export function editFleetMember(data) {
return request({
url: 'fleetMember',
@ -36,10 +36,19 @@ export function editFleetMember(data) {
})
}
// 分页查询所有的订单信息
// 删除车队成员信息
export function deleteFleetMember(id) {
return request({
url: 'fleetMember/'+id,
method: 'delete',
})
}
// 注销车队成员信息
export function logOffFleetMember(id) {
return request({
url: 'fleetMember/logOff/'+id,
method: 'get',
})
}

BIN
fuintAdmin/src/assets/menu_icon/chedui.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
fuintAdmin/src/assets/menu_icon/chedui_b.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

8
fuintAdmin/src/layout/components/Sidebar/SidebarItem.vue
View File

@ -43,6 +43,10 @@
<img src="@/assets/menu_icon/user.png" v-if="!activeMenu.includes(item.path) && !activeMenu.includes('/userGrade')" style="width: 21px;height: 21px;"/>
<img src="@/assets/menu_icon/user_b.png" v-else style="width: 21px;height: 21px;"/>
</span>
<span style="margin-right: 10px;" v-if="item.meta.title=='车队管理'">
<img src="@/assets/menu_icon/chedui.png" v-if="!activeMenu.includes('/fleet')" style="width: 21px;height: 21px;"/>
<img src="@/assets/menu_icon/chedui_b.png" v-else style="width: 21px;height: 21px;"/>
</span>
<span style="margin-right: 10px;" v-if="item.meta.title=='油站管理'">
<img src="@/assets/menu_icon/youqiang.png" v-if="!activeMenu.includes(item.path)" style="width: 21px;height: 21px;"/>
<img src="@/assets/menu_icon/youqiang_b.png" v-else style="width: 21px;height: 21px;"/>
@ -92,6 +96,10 @@
<img src="@/assets/menu_icon/youqiang.png" v-if="!activeMenu.includes(item.path)" style="width: 25px;height: 25px;"/>
<img src="@/assets/menu_icon/youqiang_b.png" v-else style="width: 25px;height: 25px;"/>
</span>
<span style="margin-right: 10px;" v-if="item.meta.title=='车队管理'">
<img src="@/assets/menu_icon/chedui.png" v-if="!activeMenu.includes('/fleet')" style="width: 21px;height: 21px;"/>
<img src="@/assets/menu_icon/chedui_b.png" v-else style="width: 21px;height: 21px;"/>
</span>
<span style="margin-right: 10px;" v-if="item.meta.title=='便利店'">
<img src="@/assets/menu_icon/car.png" v-if="!activeMenu.includes('/convenience')" style="width: 25px;height: 25px;"/>
<img src="@/assets/menu_icon/car_b.png" v-else style="width: 25px;height: 25px;"/>

156
fuintAdmin/src/views/fleet/tab/fleetInfo.vue
View File

@ -4,21 +4,21 @@
<el-card class="box-card" shadow="never">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
<el-form-item label="" prop="fleetName" style="width: 180px">
<el-input
v-model="queryParams.realName"
v-model="queryParams.fleetName"
placeholder="请输入车队名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="deptId" style="width: 180px">
<el-form-item label="" prop="gradeId" style="width: 180px">
<el-select
v-model="queryParams.deptId"
v-model="queryParams.gradeId"
clearable
placeholder="请选择车队等级"
placeholder="请选择会员等级"
>
<el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
<el-option v-for="item in userGradeList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
@ -70,13 +70,25 @@
<el-table-column prop="fleetName" align="center" label="车队名称"></el-table-column>
<el-table-column prop="cardType" align="center" label="卡类型"></el-table-column>
<el-table-column prop="fleetLeader" align="center" label="车队负责人"></el-table-column>
<el-table-column prop="mobile" align="center" label="手机号"></el-table-column>
<el-table-column prop="gradeId" align="center" label="会员等级"></el-table-column>
<el-table-column prop="staffId" align="center" label="油站负责人"></el-table-column>
<el-table-column prop="mobile" align="center" label="手机号" width="120"></el-table-column>
<el-table-column prop="gradeName" align="center" label="会员等级"></el-table-column>
<el-table-column prop="oilHead" align="center" label="油站负责人"></el-table-column>
<el-table-column align="center" prop="totalBalance" label="总余额"></el-table-column>
<el-table-column align="center" prop="rechargeAmount" label="充值本金"></el-table-column>
<el-table-column align="center" prop="giveAmount" label="赠送金额"></el-table-column>
<el-table-column align="center" prop="corporateName" label="公司名称"></el-table-column>
<el-table-column align="center" prop="rechargeAmount" label="充值本金">
<template slot-scope="scope">
<span>{{ scope.row.rechargeAmount || "--" }}</span>
</template>
</el-table-column>
<el-table-column align="center" prop="giveAmount" label="赠送金额">
<template slot-scope="scope">
<span>{{ scope.row.giveAmount || "--" }}</span>
</template>
</el-table-column>
<el-table-column align="center" prop="corporateName" label="公司名称">
<template slot-scope="scope">
<span>{{ scope.row.corporateName || "--" }}</span>
</template>
</el-table-column>
<el-table-column align="center" prop="status" label="状态">
<template slot-scope="scope">
<el-switch
@ -88,10 +100,14 @@
</el-switch>
</template>
</el-table-column>
<el-table-column align="center" prop="remark" label="备注"></el-table-column>
<el-table-column align="center" prop="createBy" label="创建人"></el-table-column>
<el-table-column align="center" prop="createTime" label="创建时间"></el-table-column>
<el-table-column align="center" label="操作">
<el-table-column align="center" prop="remark" label="备注">
<template slot-scope="scope">
<span>{{ scope.row.remark || "--" }}</span>
</template>
</el-table-column>
<el-table-column align="center" prop="accountName" label="创建人"></el-table-column>
<el-table-column align="center" prop="createTime" label="创建时间" width="150"></el-table-column>
<el-table-column align="center" label="操作" width="120">
<template slot-scope="scope">
<el-button
size="mini"
@ -126,7 +142,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="车队名称" prop="fleetName">
<el-input v-model="form.fleetName" placeholder="请输入车队名称" maxlength="30" style="width: 270px"/>
<el-input v-model="form.fleetName" placeholder="请输入车队名称" maxlength="30" />
</el-form-item>
<el-form-item label="卡类型" prop="cardType">
@ -136,14 +152,14 @@
</el-checkbox-group>
</el-form-item>
<el-form-item label="车队负责人" prop="fleetLeader">
<el-input v-model="form.fleetLeader" placeholder="请输入车队负责人姓名" maxlength="30" style="width: 270px"/>
<el-input v-model="form.fleetLeader" placeholder="请输入车队负责人姓名" maxlength="30" />
</el-form-item>
<el-form-item label="手机号" prop="mobile">
<el-input v-model="form.mobile" placeholder="请输入手机号" />
</el-form-item>
<el-form-item label="会员等级" prop="gradeId">
<el-select v-model="form1.gradeId" placeholder="请选择会员等级">
<el-select v-model="form.gradeId" placeholder="请选择会员等级" style="width: 100%">
<el-option
v-for="item in userGradeList"
:key="item.id"
@ -153,24 +169,17 @@
</el-select>
</el-form-item>
<el-form-item label="油站负责人" prop="staffId">
<el-select v-model="form1.staffId" placeholder="请选择油站负责人">
<el-select v-model="form.staffId" placeholder="请选择油站负责人" multiple style="width: 100%">
<el-option
v-for="item in staffList"
:key="item.id"
:key="item.id+''"
:label="item.realName"
:value="item.id">
:value="item.id+''">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="会员标签" prop="userLabelId">
<el-select v-model="form1.userLabelId" placeholder="请选择会员标签">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-form-item label="公司名称" prop="corporateName">
<el-input v-model="form.corporateName" placeholder="请输入公司名称" />
</el-form-item>
@ -200,28 +209,23 @@
<el-form ref="form1" :model="form1" :rules="rules" label-width="120px">
<el-form-item label="车队名称" prop="fleetName">
<el-input v-model="form1.fleetName" placeholder="请输入车队名称" maxlength="30" style="width: 270px"/>
<el-input v-model="form1.fleetName" placeholder="请输入车队名称" maxlength="50"/>
</el-form-item>
<el-form-item label="充值金额" prop="rechargeAmount">
<el-input v-model="form1.rechargeAmount" placeholder="请输入充值金额" maxlength="30" style="width: 270px">
<el-input v-model="form1.rechargeAmount1" placeholder="请输入充值金额" >
<template slot="append">元</template>
</el-input>
</el-form-item>
<el-form-item label="赠送金额" prop="giveAmount">
<el-input v-model="form1.giveAmount" placeholder="请输入赠送金额" >
<el-input v-model="form1.giveAmount1" placeholder="请输入赠送金额，若不赠送请输入0" >
<template slot="append">元</template>
</el-input>
</el-form-item>
<el-form-item label="支付方式" prop="paymentType">
<el-select v-model="form1.paymentType" placeholder="请选择支付方式">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
<el-select v-model="form1.paymentType" placeholder="请选择支付方式" style="width: 100%">
<el-option label="现金" value="CASH"></el-option>
</el-select>
</el-form-item>
@ -244,7 +248,7 @@
<script>
import {delStaff, queryStaffs} from "@/api/staff/staff";
import {getFleetInfoList} from "@/api/fleet/fleetinfo";
import {addFleetInfo, deleteFleetInfo, editFleetInfo, getFleetInfo, getFleetInfoList} from "@/api/fleet/fleetinfo";
import {listUserGrade} from "@/api/staff/user/usergrade";
export default {
@ -265,7 +269,8 @@ export default {
userGradeList:[],
staffList:[],
form:{
cardType:[]
cardType:[],
status:'qy',
},
form1:{},
options: [{
@ -321,9 +326,6 @@ export default {
],
paymentType: [
{required: true, message: "支付方式不能为空", trigger: "blur"}
],
password: [
{required: true, message: "操作密码不能为空", trigger: "blur"}
]
}
}
@ -359,7 +361,7 @@ export default {
}
getFleetInfoList(this.addDateRange(this.queryParams, dateRange)).then(res => {
this.orderList = res.data.records
this.total = res .data.total
this.total = res.data.total
})
},
// 取消按钮
@ -371,10 +373,22 @@ export default {
submitForm: function () {
this.$refs["form"].validate(valid => {
if (valid) {
this.form.cardType = this.form.cardType.toString()
this.form.staffId = this.form.staffId.toString()
if (!this.form.id) {
addFleetInfo(this.form).then(res => {
this.$message.success("添加成功")
this.open = false
this.queryParams.page = 1
this.getList()
})
} else {
editFleetInfo(this.form).then(res => {
this.$message.success("修改成功")
this.open = false
this.queryParams.page = 1
this.getList()
})
}
}
});
@ -388,11 +402,14 @@ export default {
submitForm1: function () {
this.$refs["form1"].validate(valid => {
if (valid) {
if (!this.form1.id) {
} else {
}
// if (!this.form1.id) {
editFleetInfo(this.form1).then(res => {
this.$message.success("修改成功")
this.open1 = false
this.queryParams.page = 1
this.getList()
})
// }
}
});
},
@ -400,7 +417,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "新增员工";
this.title = "新增车队信息";
},
// 搜索按钮操作
handleQuery() {
@ -414,27 +431,42 @@ export default {
page: 1,
pageSize: 10,
}
this.beginTime = ''
this.endTime = ''
this.handleQuery();
},
// 修改按钮操作
handleUpdate(row) {
this.reset();
this.open = true;
getFleetInfo(row.id).then(res => {
this.form = res.data
this.form.cardType = res.data.cardType.split(",")
this.form.staffId = res.data.staffId.split(",")
this.open = true;
this.title = "修改车队信息";
})
},
// 修改按钮操作
handleRecharge(row) {
this.reset();
this.open = true;
getFleetInfo(row.id).then(res => {
this.form1 = res.data
this.open1 = true;
this.title = "车队充值";
})
},
// 表单重置
reset() {
this.form = {
cardType:[],
status:'qy',
}
this.resetForm("form");
},
// 删除按钮操作
handleDelete(row) {
const name = row.realName || this.id;
this.$modal.confirm('是否确认删除"' + name + '"的员工信息？').then(function() {
return delStaff(row.id);
const name = row.fleetName || this.id;
this.$modal.confirm('是否确认删除"' + name + '"的车队信息？').then(function() {
return deleteFleetInfo(row.id);
}).then(() => {
this.queryParams.page = 1
this.getList();
@ -459,7 +491,7 @@ export default {
.table-box {
width: 100%;
height: 73vh;
height: 67.5vh;
overflow: auto;
}

494
fuintAdmin/src/views/fleet/tab/fleetMember.vue
View File

@ -4,21 +4,25 @@
<el-card class="box-card" shadow="never">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
<el-form-item label="" prop="fleetName" style="width: 180px">
<el-input
v-model="queryParams.realName"
v-model="queryParams.fleetName"
placeholder="请输入车队名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="deptId" style="width: 180px">
<el-form-item label="" prop="secondaryCardType" style="width: 180px">
<el-select
v-model="queryParams.deptId"
v-model="queryParams.secondaryCardType"
clearable
placeholder="请选择副卡类型"
>
<el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
@ -68,15 +72,34 @@
:data="orderList"
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="storeName" align="center" label="车队名称"></el-table-column>
<el-table-column prop="parentName" align="center" label="姓名"></el-table-column>
<el-table-column prop="payMoney" align="center" label="手机号"></el-table-column>
<el-table-column prop="count" align="center" label="会员卡号"></el-table-column>
<el-table-column prop="refMoney" align="center" label="副卡类型"></el-table-column>
<el-table-column prop="refCount" align="center" label="车牌号"></el-table-column>
<el-table-column align="center" prop="date" label="可用余额"></el-table-column>
<el-table-column align="center" prop="date" label="备注"></el-table-column>
<el-table-column align="center" prop="date" label="状态">
<el-table-column prop="fleetName" align="center" label="车队名称"></el-table-column>
<el-table-column prop="name" align="center" label="姓名"></el-table-column>
<el-table-column prop="mobile" align="center" label="手机号"></el-table-column>
<el-table-column prop="userCardNum" align="center" label="会员卡号"></el-table-column>
<el-table-column prop="secondaryCardType" align="center" label="副卡类型" width="130">
<template slot-scope="scope">
<span v-if="scope.row.secondaryCardType=='1'">共享副卡-不限额</span>
<span v-else-if="scope.row.secondaryCardType=='2'">共享副卡-限额</span>
<span v-else-if="scope.row.secondaryCardType=='3'">独立副卡</span>
<span v-else>--</span>
</template>
</el-table-column>
<el-table-column prop="carNum" align="center" label="车牌号">
<template slot-scope="scope">
<span>{{ scope.row.carNum || "--" }}</span>
</template>
</el-table-column>
<el-table-column align="center" prop="remainingCreditLimit" label="可用余额">
<template slot-scope="scope">
<span>{{ scope.row.remainingCreditLimit || 0 }}</span>
</template>
</el-table-column>
<el-table-column align="center" prop="remark" label="备注">
<template slot-scope="scope">
<span>{{ scope.row.remark || "--" }}</span>
</template>
</el-table-column>
<el-table-column align="center" prop="status" label="状态">
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
@ -87,35 +110,39 @@
</el-switch>
</template>
</el-table-column>
<el-table-column align="center" prop="date" label="创建人"></el-table-column>
<el-table-column align="center" prop="date" label="创建时间"></el-table-column>
<el-table-column align="center" label="操作">
<el-table-column align="center" prop="accountName" label="创建人"></el-table-column>
<el-table-column align="center" prop="createTime" label="创建时间" width="150"></el-table-column>
<el-table-column align="center" label="操作" width="230">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="handleUpdate(scope.row)"
>修改</el-button>
>修改
</el-button>
<el-button
size="mini"
type="text"
@click="handleRecharge(scope.row)"
>额度管理</el-button>
>额度管理
</el-button>
<el-button
size="mini"
type="text"
@click="handleRecharge(scope.row)"
>注销副卡</el-button>
@click="handleLogOff(scope.row)"
>注销副卡
</el-button>
<el-button
size="mini"
type="text"
@click="handleRecharge(scope.row)"
>消费记录</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- >删除</el-button>-->
@click="handleRecord(scope.row)"
>消费记录
</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- >删除</el-button>-->
</template>
</el-table-column>
</el-table>
@ -133,29 +160,29 @@
<el-dialog :title="title" :visible.sync="open" width="30%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="车队名称" prop="realName">
<el-select v-model="form1.zhongduan" placeholder="请选择车队名称">
<el-form-item label="车队名称" prop="fleetId">
<el-select v-model="form.fleetId" placeholder="请选择车队名称" style="width: 100%;">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
v-for="item in fleetList"
:key="item.id"
:label="item.fleetName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="姓名" prop="pinpai">
<el-input v-model="form.pinpai" placeholder="请输入成员姓名" maxlength="30" style="width: 270px"/>
<el-form-item label="姓名" prop="name">
<el-input v-model="form.name" placeholder="请输入成员姓名" maxlength="30" />
</el-form-item>
<el-form-item label="手机号码" prop="zhongduan">
<el-input v-model="form.zhongduan" placeholder="请输入手机号码" />
<el-form-item label="手机号码" prop="mobile">
<el-input v-model="form.mobile" @input="queryUser" placeholder="请输入手机号码"/>
</el-form-item>
<el-form-item label="会员卡号" prop="zhongduan">
<el-input v-model="form.zhongduan" placeholder="请输入会员卡号" />
<el-form-item label="会员卡号" prop="userCardNum">
<el-input v-model="form.userCardNum" disabled placeholder="请输入会员卡号"/>
</el-form-item>
<el-form-item label="副卡类型" prop="miyao">
<el-select v-model="form1.zhongduan" placeholder="请选择副卡类型">
<el-form-item label="副卡类型" prop="secondaryCardType">
<el-select v-model="form.secondaryCardType" placeholder="请选择副卡类型" style="width: 100%;">
<el-option
v-for="item in options"
:key="item.value"
@ -164,18 +191,8 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="油站负责人" prop="miyao">
<el-select v-model="form1.zhongduan" placeholder="请选择油站负责人">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="车牌号" prop="staffId">
<el-input v-model="form.staffId" placeholder="请输入车牌号码" />
<el-form-item label="车牌号" prop="carNum">
<el-input v-model="form.carNum" placeholder="请输入车牌号码"/>
</el-form-item>
@ -189,8 +206,8 @@
</el-switch>
</el-form-item>
<el-form-item label="备注" >
<el-input v-model="form.desc" placeholder="请输入备注" type="textarea"/>
<el-form-item label="备注">
<el-input v-model="form.remark" placeholder="请输入备注" type="textarea"/>
</el-form-item>
</el-form>
@ -204,71 +221,71 @@
<el-dialog :title="title" :visible.sync="open1" width="30%" append-to-body>
<el-form ref="form1" :model="form1" :rules="rules" label-width="120px">
<el-form-item label="副卡额度" prop="realName">
<el-input v-model="form1.realName" placeholder="0.0" maxlength="30" style="width: 270px">
<el-form-item label="副卡额度" prop="secondaryCardLimit">
<el-input v-model="form1.secondaryCardLimit" disabled placeholder="0.0" maxlength="30" >
<template slot="append">元</template>
</el-input>
</el-form-item>
<el-form-item label="已用额度" prop="pinpai">
<el-input v-model="form1.pinpai" placeholder="0.0" maxlength="30" style="width: 270px">
<el-form-item label="已用额度" prop="usedCreditLimit">
<el-input v-model="form1.usedCreditLimit" disabled placeholder="0.0" maxlength="30" >
<template slot="append">元</template>
</el-input>
</el-form-item>
<el-form-item label="剩余额度" prop="zhongduan">
<el-input v-model="form1.zhongduan" placeholder="0.0" >
<el-form-item label="剩余额度" prop="remainingCreditLimit">
<el-input v-model="form1.remainingCreditLimit" disabled placeholder="0.0">
<template slot="append">元</template>
</el-input>
</el-form-item>
<el-form-item label="调整类型" prop="gongneng">
<!-- <el-checkbox-group v-model="form.gongneng">-->
<el-checkbox v-model="form.gongneng" label="增加" value="0"></el-checkbox>
<el-checkbox v-model="form.gongneng" label="扣除" value="1"></el-checkbox>
<!-- </el-checkbox-group>-->
<el-form-item label="调整类型" prop="adjustType">
<el-radio-group v-model="form1.adjustType" @change="adjustLimit">
<el-radio type="name" label="0" value="0">增加</el-radio>
<el-radio type="name" label="1" value="1">扣除</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="调整额度" prop="zhongduan">
<el-input v-model="form1.zhongduan" placeholder="0.0" >
<el-form-item label="调整额度" prop="adjustLimit">
<el-input v-model="form1.adjustLimit" @input="adjustLimit" placeholder="0.0">
<template slot="append">元</template>
</el-input>
</el-form-item>
<el-form-item label="备注" >
<el-input v-model="form1.desc" placeholder="请输入备注" type="textarea"/>
<el-form-item label="备注">
<el-input v-model="form1.remark" placeholder="请输入备注" type="textarea"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm1">确 定</el-button>
<el-button @click="open1 = false">取 消</el-button>
</div>
</el-dialog>
<!-- 添加或修改对话框 -->
<el-dialog :title="title" :visible.sync="open1" width="30%" append-to-body>
<el-form ref="form1" :model="form1" :rules="rules" label-width="120px">
<el-dialog :title="title" :visible.sync="open2" width="30%" append-to-body>
<el-form ref="form2" :model="form2" :rules="rules" label-width="120px">
<el-form-item label="副卡额度" prop="realName">
<el-input v-model="form1.realName" placeholder="0.0" maxlength="30" style="width: 270px">
<el-form-item label="副卡额度" prop="secondaryCardLimit">
<el-input v-model="form2.secondaryCardLimit" placeholder="0.0" maxlength="30" style="width: 270px">
<template slot="append">元</template>
</el-input>
</el-form-item>
<el-form-item label="已用额度" prop="pinpai">
<el-input v-model="form1.pinpai" placeholder="0.0" maxlength="30" style="width: 270px">
<el-form-item label="已用额度" prop="usedCreditLimit">
<el-input v-model="form2.usedCreditLimit" placeholder="0.0" maxlength="30" style="width: 270px">
<template slot="append">元</template>
</el-input>
</el-form-item>
<el-form-item label="剩余额度" prop="zhongduan">
<el-input v-model="form1.zhongduan" placeholder="0.0" >
<el-form-item label="剩余额度" prop="remainingCreditLimit">
<el-input v-model="form2.remainingCreditLimit" placeholder="0.0">
<template slot="append">元</template>
</el-input>
</el-form-item>
<el-form-item label="操作密码" prop="miyao">
<el-input v-model="form1.miyao" placeholder="请输入操作密码" type="password" />
<el-form-item label="操作密码" prop="password">
<el-input v-model="form2.password" placeholder="请输入操作密码" type="password"/>
</el-form-item>
</el-form>
@ -284,13 +301,18 @@
<el-form ref="form2" :model="form2" :rules="rules">
<el-row>
<el-col :span="24">
<el-form-item label="车队名称" prop="fixingLevelId">
<el-form-item label="车队名称" prop="fleetId">
<el-select
v-model="form2.fixingLevelId"
v-model="form2.fleetId"
placeholder="请选择车队名称"
clearable
>
<el-option v-for="item in options" :key="item.id+''" :label="item.name" :value="item.id"/>
<el-option
v-for="item in fleetList"
:key="item.id"
:label="item.fleetName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
@ -306,9 +328,11 @@
style="margin-left: 50px"
:file-list="fileList">
<div style="display: flex;margin-left: 20px">
<div style="position: relative" >
<div style="position: relative">
<img src="@/assets/images/scimg.png" style="width: 167px;height: 144px;">
<div style=" width: 100%; position: absolute;left: 50%;transform: translate(-50%,50%);bottom: 36px"> <span style="color: #FF9655">点击导入</span> 文件</div>
<div style=" width: 100%; position: absolute;left: 50%;transform: translate(-50%,50%);bottom: 36px">
<span style="color: #FF9655">点击导入</span> 文件
</div>
</div>
<div style="margin-top: 120px">
<a style="margin-left: 50px;color: #FF9655;"
@ -330,7 +354,7 @@
</el-dialog>
<el-drawer
title="提成记录"
title="消费记录"
:visible.sync="drawer"
direction="rtl"
size="60%"
@ -338,11 +362,11 @@
<div style="display: grid; place-items: center;">
<el-card class="box-card">
<el-form :model="queryParams2" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="订单类型">
<el-form-item label="">
<el-select
v-model="queryParams2.type"
clearable
placeholder="全部"
placeholder="请选择订单类型"
>
<el-option label="油品订单提成" :value="1"></el-option>
<el-option label="商品订单提成" :value="2"></el-option>
@ -350,7 +374,7 @@
<el-option label="囤油卡充值提成" :value="4"></el-option>
</el-select>
</el-form-item>
<el-form-item label="订单号">
<el-form-item label="">
<el-input v-model="queryParams2.orderNo" placeholder="请输入订单号"></el-input>
</el-form-item>
<el-form-item>
@ -360,25 +384,16 @@
</el-form>
</el-card>
<el-card class="box-card" style="margin-top: 15px">
<div style="margin-top: 20px" v-if="activeName=='staffCommission'">
<el-table ref="tables" v-loading="loading" :data="commissionList">
<el-table ref="tables" v-loading="loading" :data="consumeList">
<el-table-column type="index" width="80" align="center" label="序号"/>
<el-table-column label="类型" prop="type" align="center" >
<template slot-scope="scope">
<span v-if="scope.row.type==1">油品订单提成</span>
<span v-if="scope.row.type==2">商品订单提成</span>
<span v-if="scope.row.type==3">储值卡充值提成</span>
<span v-if="scope.row.type==4">囤油卡充值提成</span>
</template>
</el-table-column>
<el-table-column label="提成金额（元）" prop="amount" align="center">
<template slot-scope="scope">
<span>{{ scope.row.amount || 0 }}</span>
</template>
</el-table-column>
<el-table-column label="关联订单号" prop="orderNo" align="center" width="260"/>
<el-table-column label="描述" prop="description" align="center"/>
<el-table-column label="创建时间" prop="createTime" align="center" width="160">
<el-table-column label="订单号" prop="type" align="center"></el-table-column>
<el-table-column label="机构信息" prop="amount" align="center"></el-table-column>
<el-table-column label="储值卡付款金额" prop="orderNo" align="center" width="260"/>
<el-table-column label="订单金额" prop="description" align="center"/>
<el-table-column label="优惠金额" prop="description" align="center"/>
<el-table-column label="实收金额" prop="description" align="center"/>
<el-table-column label="订单状态" prop="description" align="center"/>
<el-table-column label="订单完成时间" prop="createTime" align="center" width="160">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
@ -392,7 +407,6 @@
:limit.sync="queryParams2.pageSize"
@pagination="getList"
/>
</div>
</el-card>
</div>
</el-drawer>
@ -404,6 +418,9 @@
import {delStaff} from "@/api/staff/staff";
import {getToken} from "@/utils/auth";
import {addCertifiedMembers} from "@/api/staff/user/certifiedmember";
import {addFleetMember, editFleetMember, getFleetMember, getFleetMemberList} from "@/api/fleet/fleetmember";
import {getFleetInfoList} from "@/api/fleet/fleetinfo";
import {getUserMobile} from "@/api/staff/user/user";
export default {
dicts: ['zhzt'],
@ -416,10 +433,10 @@ export default {
// 文件上传信息
fileList: [],
loading: false,
open:false,
open1:false,
open2:false,
title:'',
open: false,
open1: false,
open2: false,
title: '',
// 日期范围
dateRange: [],
beginTime: "",
@ -427,24 +444,24 @@ export default {
// 收银台订单列表
orderList: [],
deptList: [],
form:{},
form1:{},
form2:{},
fleetList: [],
consumeList:[],
form: {},
form1: {
adjustType:[]
},
form2: {},
secondaryCardLimit:0,
usedCreditLimit:0,
options: [{
value: '选项1',
label: '黄金糕'
value: '1',
label: '共享副卡-不限额'
}, {
value: '选项2',
label: '双皮奶'
value: '2',
label: '共享副卡-限额'
}, {
value: '选项3',
label: '蚵仔煎'
}, {
value: '选项4',
label: '龙须面'
}, {
value: '选项5',
label: '北京烤鸭'
value: '3',
label: '独立副卡'
}],
// 查询参数
queryParams: {
@ -461,35 +478,63 @@ export default {
total2: 0,
// 表单校验
rules: {
realName: [
{required: true, message: "设备名称不能为空", trigger: "blur"},
fleetId: [
{required: true, message: "车队名称不能为空", trigger: "blur"},
],
pinpai: [
{required: true, message: "品牌不能为空", trigger: "blur"},
name: [
{required: true, message: "成员姓名不能为空", trigger: "blur"},
],
gongneng: [
{required: true, message: "设备功能不能为空", trigger: "blur"}
mobile: [
{required: true, message: "手机号码不能为空", trigger: "blur"}
],
zhongduan: [
{required: true, message: "设备终端号不能为空", trigger: "blur"}
],
miyao: [
{required: true, message: "密钥不能为空", trigger: "blur"}
],
staffId: [
{required: true, message: "关联员工不能为空", trigger: "blur"}
secondaryCardType: [
{required: true, message: "副卡类型不能为空", trigger: "blur"}
],
status: [
{required: true, message: "状态不能为空", trigger: "blur"}
],
adjustType: [
{required: true, message: "调整类型不能为空", trigger: "blur"}
],
adjustLimit: [
{required: true, message: "调整额度不能为空", trigger: "blur"}
],
password: [
{required: true, message: "密码不能为空", trigger: "blur"}
]
}
}
},
created() {
this.getList();
this.getFleetList();
},
methods: {
// 调整额度
adjustLimit(){
if (!this.form1.secondaryCardLimit) this.form1.secondaryCardLimit = 0
if (!this.form1.usedCreditLimit) this.form1.usedCreditLimit = 0
if (!this.form1.remainingCreditLimit) this.form1.remainingCreditLimit = 0
if (this.form1.adjustType==0){
this.form1.secondaryCardLimit = Number(this.secondaryCardLimit) + Number(this.form1.adjustLimit)
this.form1.remainingCreditLimit = this.secondaryCardLimit - this.usedCreditLimit
}else if (this.form1.adjustType==1) {
this.form1.secondaryCardLimit = this.secondaryCardLimit - this.form1.adjustLimit
this.form1.remainingCreditLimit = this.secondaryCardLimit - this.usedCreditLimit
}
this.$forceUpdate()
},
// 查询用户信息
queryUser(){
getUserMobile({mobile:this.form.mobile}).then(res => {
if (res.data){
this.form.userCardNum = res.data.userNo
}else {
this.form.userCardNum = ''
}
this.$forceUpdate()
})
},
// 重置按钮操作
resetQuery1() {
this.dateRange = [];
@ -511,9 +556,9 @@ export default {
// 批量导入
handleChange(file, fileList) {
this.uploading = true;
if(file.status === 'success'){
if (file.status === 'success') {
this.uploading = false;
this.fileList.splice(0,1)
this.fileList.splice(0, 1)
this.openMembers = false;
this.openResult = true;
this.title = "会员认证结果";
@ -523,7 +568,7 @@ export default {
}
},
// 提交按钮 批量认证会员信息
submitFormMembers: function() {
submitFormMembers: function () {
this.$refs["form2"].validate(valid => {
if (valid) {
addCertifiedMembers(this.form2).then(response => {
@ -542,10 +587,10 @@ export default {
this.openMembers = false;
this.reset2();
},
getDeptList() {
// getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then(response => {
// this.deptList = response.data.records;
// })
getFleetList() {
getFleetInfoList({pageNo: 1, pageSize: 10000, status: 'qy'}).then(res => {
this.fleetList = res.data.records
})
},
// 获取列表信息
getList() {
@ -554,6 +599,10 @@ export default {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFleetMemberList(this.addDateRange(this.queryParams, dateRange)).then(res => {
this.orderList = res.data.records
this.total = res.data.total
})
},
// 取消按钮
cancel() {
@ -565,18 +614,56 @@ export default {
this.$refs["form"].validate(valid => {
if (valid) {
if (!this.form.id) {
addFleetMember(this.form).then(res => {
if (res.data==1){
this.$message.success("添加成功")
this.open = false
this.queryParams.page = 1
this.getList()
}else {
this.$message.error("添加失败，手机号不能重复")
}
})
} else {
editFleetMember(this.form).then(res => {
if (res.data==1){
this.$message.success("修改成功")
this.open = false
this.queryParams.page = 1
this.getList()
}else {
this.$message.error("修改失败，手机号已存在")
}
})
}
}
});
},
// 提交按钮
submitForm1: function () {
this.$refs["form1"].validate(valid => {
if (valid) {
editFleetMember(this.form1).then(res => {
if (res.data==1){
this.$message.success("修改成功")
this.open1 = false
this.queryParams.page = 1
this.getList()
}else {
this.$message.error("修改失败，手机号已存在")
}
})
}
});
},
// 新增按钮操作
handleAdd() {
this.reset();
this.form = {
status:'qy'
}
this.open = true;
this.title = "新增员工";
this.title = "新增成员";
},
// 新增按钮操作
batchAdd() {
@ -596,17 +683,44 @@ export default {
page: 1,
pageSize: 10,
}
this.beginTime = ''
this.endTime = ''
this.handleQuery();
},
// 修改按钮操作
handleUpdate(row) {
this.reset();
this.open = true;
getFleetMember(row.id).then(res => {
this.form = res.data
this.open = true;
this.title = '修改车队成员'
})
},
// 修改按钮操作
// 额度管理
handleRecharge(row) {
this.reset();
this.open = true;
this.form1 = {}
this.secondaryCardLimit = 0
this.usedCreditLimit = 0
getFleetMember(row.id).then(res => {
this.form1 = res.data
this.secondaryCardLimit = res.data.secondaryCardLimit
this.usedCreditLimit = res.data.usedCreditLimit
this.open1 = true;
this.title = '额度管理'
})
},
// 注销
handleLogOff(row) {
this.form1 = {}
getFleetMember(row.id).then(res => {
this.form1 = res.data
this.open1 = true;
this.title = '注销副卡'
})
},
// 消费记录
handleRecord(row) {
this.drawer = true
},
// 表单重置
reset() {
@ -615,13 +729,14 @@ export default {
// 删除按钮操作
handleDelete(row) {
const name = row.realName || this.id;
this.$modal.confirm('是否确认删除"' + name + '"的员工信息？').then(function() {
this.$modal.confirm('是否确认删除"' + name + '"的员工信息？').then(function () {
return delStaff(row.id);
}).then(() => {
this.queryParams.page = 1
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
}).catch(() => {
});
}
}
}
@ -641,63 +756,8 @@ export default {
.table-box {
width: 100%;
height: 73vh;
height: 68vh;
overflow: auto;
}
.wrap-boxs {
width: 100%;
display: flex;
align-items: center;
margin-bottom: 15px;
}
.k_ {
width: 250px;
height: 75px;
margin-right: 20px;
box-sizing: border-box;
padding: 15px 10px;
padding-top: 5px;
color: #333333;
}
.size_ {
font-weight: 400;
font-size: 14px;
color: #333333;
margin-bottom: 20px;
}
.title_ {
font-weight: 600;
font-size: 24px;
color: #333333;
}
.d-s {
display: flex;
align-items: center;
}
.anniu-h {
width: 80px;
height: 26px;
background: #FAFAFA;
border-radius: 4px 4px 4px 4px;
border: 1px solid #DDDDDD;
display: flex;
align-items: center;
justify-content: center;
color: #777777;
margin-right: 20px;
}
.anniu-act {
background: #FF9655 !important;
border: 1px solid #FF9655 !important;
color: #fff;
}
</style>

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/controller/FleetInfoController.java
View File

@ -3,6 +3,7 @@ package com.fuint.business.fleet.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.fleet.entity.FleetInfo;
import com.fuint.business.fleet.service.FleetInfoService;
import com.fuint.business.fleet.vo.FleetInfoVo;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.web.bind.annotation.*;
@ -32,8 +33,8 @@ public class FleetInfoController extends BaseController {
* @return
*/
@GetMapping
public ResponseObject lists(FleetInfo fleetInfo,
@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
public ResponseObject lists(FleetInfoVo fleetInfo,
@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
Page page =new Page(pageNo,pageSize);
return getSuccessResult(fleetInfoService.queryPage(page,fleetInfo));

9
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/controller/FleetMemberController.java
View File

@ -3,6 +3,7 @@ package com.fuint.business.fleet.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.fleet.entity.FleetMember;
import com.fuint.business.fleet.service.FleetMemberService;
import com.fuint.business.fleet.vo.FleetMemberVo;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.web.bind.annotation.*;
@ -32,8 +33,8 @@ public class FleetMemberController extends BaseController {
* @return
*/
@GetMapping
public ResponseObject lists(FleetMember fleetMember,
@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
public ResponseObject lists(FleetMemberVo fleetMember,
@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
Page page =new Page(pageNo,pageSize);
return getSuccessResult(fleetMemberService.queryPage(page,fleetMember));
@ -83,5 +84,9 @@ public class FleetMemberController extends BaseController {
return getSuccessResult(fleetMemberService.deleteById(id));
}
@GetMapping("/logOff/{id}")
public ResponseObject logOffFleetMember(@PathVariable Integer id){
return getSuccessResult(fleetMemberService.logOffFleetMember(id));
}
}

17
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/entity/FleetInfo.java
View File

@ -1,6 +1,7 @@
package com.fuint.business.fleet.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fuint.framework.entity.BaseEntity;
@ -75,15 +76,15 @@ public class FleetInfo extends BaseEntity implements Serializable {
/**
* 总余额
*/
private String totalBalance;
private Double totalBalance;
/**
* 充值金额
*/
private String rechargeAmount;
private Double rechargeAmount;
/**
* 赠送金额
*/
private String giveAmount;
private Double giveAmount;
/**
* 公司名称
*/
@ -113,5 +114,15 @@ public class FleetInfo extends BaseEntity implements Serializable {
*/
private Date updateTime;
/**
* 单次充值金额
*/
@TableField(exist = false)
private Double rechargeAmount1;
/**
* 单次赠送金额
*/
@TableField(exist = false)
private Double giveAmount1;
}

196
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/entity/FleetMember.java
View File

@ -1,5 +1,13 @@
package com.fuint.business.fleet.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fuint.framework.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.io.Serializable;
@ -9,11 +17,16 @@ import java.io.Serializable;
* @author makejava
* @since 2024-08-02 10:33:13
*/
public class FleetMember implements Serializable {
private static final long serialVersionUID = 988159363763061454L;
@Data
@TableName("fleet_member")
@ApiModel(value = "FleetMember", description = "车队成员")
public class FleetMember extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@ApiModelProperty("自增ID")
@TableId(value = "ID", type = IdType.AUTO)
private Integer id;
/**
* 所属连锁店id
@ -40,7 +53,7 @@ public class FleetMember implements Serializable {
*/
private String userCardNum;
/**
* 副卡类型：选项为共享副卡-不限额、共享副卡限额、独立副卡
* 副卡类型：选项为1、共享副卡-不限额；2、共享副卡限额；3、独立副卡
*/
private String secondaryCardType;
/**
@ -100,182 +113,5 @@ public class FleetMember implements Serializable {
*/
private Date updateTime;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Integer getChainStoreId() {
return chainStoreId;
}
public void setChainStoreId(Integer chainStoreId) {
this.chainStoreId = chainStoreId;
}
public Integer getStoreId() {
return storeId;
}
public void setStoreId(Integer storeId) {
this.storeId = storeId;
}
public Integer getFleetId() {
return fleetId;
}
public void setFleetId(Integer fleetId) {
this.fleetId = fleetId;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getMobile() {
return mobile;
}
public void setMobile(String mobile) {
this.mobile = mobile;
}
public String getUserCardNum() {
return userCardNum;
}
public void setUserCardNum(String userCardNum) {
this.userCardNum = userCardNum;
}
public String getSecondaryCardType() {
return secondaryCardType;
}
public void setSecondaryCardType(String secondaryCardType) {
this.secondaryCardType = secondaryCardType;
}
public String getCarNum() {
return carNum;
}
public void setCarNum(String carNum) {
this.carNum = carNum;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public Double getSecondaryCardLimit() {
return secondaryCardLimit;
}
public void setSecondaryCardLimit(Double secondaryCardLimit) {
this.secondaryCardLimit = secondaryCardLimit;
}
public Double getUsedCreditLimit() {
return usedCreditLimit;
}
public void setUsedCreditLimit(Double usedCreditLimit) {
this.usedCreditLimit = usedCreditLimit;
}
public Double getRemainingCreditLimit() {
return remainingCreditLimit;
}
public void setRemainingCreditLimit(Double remainingCreditLimit) {
this.remainingCreditLimit = remainingCreditLimit;
}
public String getAdjustType() {
return adjustType;
}
public void setAdjustType(String adjustType) {
this.adjustType = adjustType;
}
public Double getAdjustLimit() {
return adjustLimit;
}
public void setAdjustLimit(Double adjustLimit) {
this.adjustLimit = adjustLimit;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public String getIfLogOff() {
return ifLogOff;
}
public void setIfLogOff(String ifLogOff) {
this.ifLogOff = ifLogOff;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getUpdateBy() {
return updateBy;
}
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
}

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/FleetInfoMapper.java
View File

@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.fleet.entity.FleetInfo;
import com.fuint.business.fleet.vo.FleetInfoVo;
import org.apache.ibatis.annotations.Param;
public interface FleetInfoMapper extends BaseMapper<FleetInfo> {
IPage<FleetInfo> queryPage(Page page,@Param("entity") FleetInfo fleetInfo);
IPage<FleetInfoVo> queryPage(Page page,@Param("entity") FleetInfoVo fleetInfo);
}

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/FleetMemberMapper.java
View File

@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.fleet.entity.FleetMember;
import com.fuint.business.fleet.vo.FleetMemberVo;
import org.apache.ibatis.annotations.Param;
public interface FleetMemberMapper extends BaseMapper<FleetMember> {
IPage<FleetMember> queryPage(Page page, @Param("entity") FleetMember fleetMember);
IPage<FleetMemberVo> queryPage(Page page, @Param("entity") FleetMemberVo fleetMember);
}

18
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/FleetInfoMapper.xml
View File

@ -2,26 +2,28 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fuint.business.fleet.mapper.FleetInfoMapper">
<select id="queryPage" resultType="com.fuint.business.fleet.entity.FleetInfo">
SELECT * FROM fleet_info
<select id="queryPage" resultType="com.fuint.business.fleet.vo.FleetInfoVo">
SELECT fi.*,mug.`name` gradeName,ta.real_name accountName FROM fleet_info fi
LEFT JOIN mt_user_grade mug on fi.grade_id = mug.id
LEFT JOIN t_account ta on fi.create_by = ta.acct_id
<where>
<if test="entity.storeId != null and entity.storeId != ''">
and store_id = #{entity.storeId}
and fi.store_id = #{entity.storeId}
</if>
<if test="entity.status != null and entity.status != ''">
and status = #{entity.status}
and fi.status = #{entity.status}
</if>
<if test="entity.gradeId != null and entity.gradeId != ''">
and grade_id = #{entity.gradeId}
and fi.grade_id = #{entity.gradeId}
</if>
<if test="entity.fleetName != null and entity.fleetName != ''">
and fleet_name like concat('%', #{entity.fleetName}, '%')
and fi.fleet_name like concat('%', #{entity.fleetName}, '%')
</if>
<if test="entity.params.beginTime != null and entity.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{entity.params.beginTime},'%y%m%d')
and date_format(fi.create_time,'%y%m%d') &gt;= date_format(#{entity.params.beginTime},'%y%m%d')
</if>
<if test="entity.params.endTime != null and entity.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{entity.params.endTime},'%y%m%d')
and date_format(fi.create_time,'%y%m%d') &lt;= date_format(#{entity.params.endTime},'%y%m%d')
</if>
</where>
ORDER BY create_time DESC

18
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/FleetMemberMapper.xml
View File

@ -2,26 +2,28 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fuint.business.fleet.mapper.FleetMemberMapper">
<select id="queryPage" resultType="com.fuint.business.fleet.entity.FleetMember">
SELECT * FROM fleet_member
<select id="queryPage" resultType="com.fuint.business.fleet.vo.FleetMemberVo">
SELECT fm.*,fi.fleet_name fleetName,ta.real_name accountName FROM fleet_member fm
LEFT JOIN fleet_info fi ON fm.fleet_id = fi.id
LEFT JOIN t_account ta ON fm.create_by = ta.acct_id
<where>
<if test="entity.storeId != null and entity.storeId != ''">
and store_id = #{entity.storeId}
and fm.store_id = #{entity.storeId}
</if>
<if test="entity.status != null and entity.status != ''">
and status = #{entity.status}
and fm.status = #{entity.status}
</if>
<if test="entity.secondaryCardType != null and entity.secondaryCardType != ''">
and secondary_card_type = #{entity.secondaryCardType}
and fm.secondary_card_type = #{entity.secondaryCardType}
</if>
<if test="entity.fleetName != null and entity.fleetName != ''">
and fleet_name like concat('%', #{entity.fleetName}, '%')
and fi.fleet_name like concat('%', #{entity.fleetName}, '%')
</if>
<if test="entity.params.beginTime != null and entity.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{entity.params.beginTime},'%y%m%d')
and date_format(fm.create_time,'%y%m%d') &gt;= date_format(#{entity.params.beginTime},'%y%m%d')
</if>
<if test="entity.params.endTime != null and entity.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{entity.params.endTime},'%y%m%d')
and date_format(fm.create_time,'%y%m%d') &lt;= date_format(#{entity.params.endTime},'%y%m%d')
</if>
</where>
ORDER BY create_time DESC

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/FleetInfoService.java
View File

@ -3,6 +3,7 @@ package com.fuint.business.fleet.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.fleet.entity.FleetInfo;
import com.fuint.business.fleet.vo.FleetInfoVo;
/**
* 车队信息(FleetInfo)表服务接口
@ -17,7 +18,7 @@ public interface FleetInfoService {
* @param fleetInfo
* @return
*/
IPage<FleetInfo> queryPage(Page page, FleetInfo fleetInfo);
IPage<FleetInfoVo> queryPage(Page page, FleetInfoVo fleetInfo);
/**
* 通过ID查询单条数据

16
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/FleetMemberService.java
View File

@ -3,6 +3,7 @@ package com.fuint.business.fleet.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.fleet.entity.FleetMember;
import com.fuint.business.fleet.vo.FleetMemberVo;
/**
* 车队成员(FleetMember)表服务接口
@ -17,7 +18,7 @@ public interface FleetMemberService {
* @param fleetMember
* @return
*/
IPage<FleetMember> queryPage(Page page, FleetMember fleetMember);
IPage<FleetMemberVo> queryPage(Page page, FleetMemberVo fleetMember);
/**
* 通过ID查询单条数据
@ -27,6 +28,13 @@ public interface FleetMemberService {
*/
FleetMember queryById(Integer id);
/**
* 根据手机号查询车队成员信息
* @param mobile
* @return
*/
FleetMember queryByMobile(String mobile);
/**
* 新增数据
*
@ -51,4 +59,10 @@ public interface FleetMemberService {
*/
int deleteById(Integer id);
/**
* 注销车队成员信息
* @param id
* @return
*/
int logOffFleetMember(Integer id);
}

46
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetInfoServiceImpl.java
View File

@ -1,13 +1,22 @@
package com.fuint.business.fleet.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.business.fleet.entity.FleetInfo;
import com.fuint.business.fleet.mapper.FleetInfoMapper;
import com.fuint.business.fleet.service.FleetInfoService;
import com.fuint.business.fleet.vo.FleetInfoVo;
import com.fuint.business.member.entity.LJStaff;
import com.fuint.business.member.service.ILJStaffService;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 车队信息(FleetInfo)表服务实现类
@ -18,9 +27,30 @@ import org.springframework.stereotype.Service;
@Service("fleetInfoService")
public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper,FleetInfo> implements FleetInfoService {
@Autowired
private ILJStaffService mtStaffService;
@Override
public IPage<FleetInfo> queryPage(Page page, FleetInfo fleetInfo) {
return baseMapper.queryPage(page,fleetInfo);
public IPage<FleetInfoVo> queryPage(Page page, FleetInfoVo fleetInfo) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
fleetInfo.setStoreId(nowAccountInfo.getStoreId());
IPage<FleetInfoVo> fleetInfoVoIPage = baseMapper.queryPage(page, fleetInfo);
List<LJStaff> list = mtStaffService.queryStaffList();
for (FleetInfoVo record : fleetInfoVoIPage.getRecords()) {
if (ObjectUtil.isNotEmpty(record.getStaffId())){
String oilHead = "";
String[] split = record.getStaffId().split(",");
for (String staffId : split) {
for (LJStaff ljStaff : list) {
if (staffId.equals(ljStaff.getId().toString())){
oilHead += ljStaff.getRealName() + ",";
}
}
}
record.setOilHead(oilHead);
}
}
return fleetInfoVoIPage;
}
/**
@ -42,6 +72,9 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper,FleetInfo>
*/
@Override
public int insert(FleetInfo fleetInfo) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
fleetInfo.setStoreId(nowAccountInfo.getStoreId());
fleetInfo.setChainStoreId(nowAccountInfo.getChainStoreId());
return baseMapper.insert(fleetInfo);
}
@ -53,6 +86,15 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper,FleetInfo>
*/
@Override
public int update(FleetInfo fleetInfo) {
FleetInfo fleetInfo1 = queryById(fleetInfo.getId());
if (ObjectUtil.isEmpty(fleetInfo1)){
return 0;
}
if (ObjectUtil.isNotEmpty(fleetInfo.getRechargeAmount1()) && ObjectUtil.isNotEmpty(fleetInfo.getGiveAmount1())) {
fleetInfo.setRechargeAmount(fleetInfo1.getRechargeAmount() + fleetInfo.getRechargeAmount1());
fleetInfo.setGiveAmount(fleetInfo1.getGiveAmount() + fleetInfo.getGiveAmount1());
fleetInfo.setTotalBalance(fleetInfo1.getTotalBalance() + fleetInfo.getRechargeAmount1() + fleetInfo.getGiveAmount1());
}
return baseMapper.updateById(fleetInfo);
}

39
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetMemberServiceImpl.java
View File

@ -1,11 +1,16 @@
package com.fuint.business.fleet.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.business.fleet.entity.FleetMember;
import com.fuint.business.fleet.mapper.FleetMemberMapper;
import com.fuint.business.fleet.service.FleetMemberService;
import com.fuint.business.fleet.vo.FleetMemberVo;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil;
import org.springframework.stereotype.Service;
/**
@ -18,7 +23,9 @@ import org.springframework.stereotype.Service;
public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetMember> implements FleetMemberService {
@Override
public IPage<FleetMember> queryPage(Page page, FleetMember fleetMember) {
public IPage<FleetMemberVo> queryPage(Page page, FleetMemberVo fleetMember) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
fleetMember.setStoreId(nowAccountInfo.getStoreId());
return baseMapper.queryPage(page,fleetMember);
}
@ -33,6 +40,14 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetM
return baseMapper.selectById(id);
}
@Override
public FleetMember queryByMobile(String mobile) {
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("mobile",mobile);
queryWrapper.eq("if_log_off","0");
return baseMapper.selectOne(queryWrapper);
}
/**
* 新增数据
*
@ -41,6 +56,14 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetM
*/
@Override
public int insert(FleetMember fleetMember) {
FleetMember fleetMember1 = queryByMobile(fleetMember.getMobile());
if (ObjectUtil.isNotEmpty(fleetMember1)) {
return 0;
}
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
fleetMember.setStoreId(nowAccountInfo.getStoreId());
fleetMember.setChainStoreId(nowAccountInfo.getChainStoreId());
return baseMapper.insert(fleetMember);
}
@ -52,6 +75,11 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetM
*/
@Override
public int update(FleetMember fleetMember) {
FleetMember fleetMember1 = queryByMobile(fleetMember.getMobile());
if (ObjectUtil.isNotEmpty(fleetMember1) && fleetMember1.getId() != fleetMember.getId()){
return 0;
}
return baseMapper.updateById(fleetMember);
}
@ -65,4 +93,13 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetM
public int deleteById(Integer id) {
return baseMapper.deleteById(id);
}
@Override
public int logOffFleetMember(Integer id) {
FleetMember fleetMember = queryById(id);
if (ObjectUtil.isEmpty(fleetMember)) return 0;
fleetMember.setIfLogOff("1");
return baseMapper.updateById(fleetMember);
}
}

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/vo/FleetInfoVo.java
View File

@ -1,10 +1,12 @@
package com.fuint.business.fleet.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fuint.business.fleet.entity.FleetInfo;
import lombok.Data;
@Data
public class FleetInfoVo extends FleetInfo {
/**
* 等级名称
*/
@ -16,5 +18,6 @@ public class FleetInfoVo extends FleetInfo {
/**
* 油站负责人
*/
@TableField(exist = false)
private String oilHead;
}

16
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/vo/FleetMemberVo.java Normal file
View File

@ -0,0 +1,16 @@
package com.fuint.business.fleet.vo;
import com.fuint.business.fleet.entity.FleetMember;
import lombok.Data;
@Data
public class FleetMemberVo extends FleetMember {
/**
* 车队名称
*/
private String fleetName;
/**
* 创建人
*/
private String accountName;
}

20
fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java
View File

@ -90,21 +90,21 @@ public class QrCodeUtils {
LJStaff staff1 = staffService.selectStaffByStoreId(storeId);
// 店铺名称位置文字绘制到指定位置
g.drawString(store.getName(), returnX(g,bufImg.getWidth(),store.getName()), 560);
g.drawString(store.getName(), returnX(g,bufImg.getWidth(),store.getName()), 550);
// 加油员姓名位置文字绘制到指定位置
if (ObjectUtil.isNotEmpty(staff)) {
g.drawString("加油员："+staff.getRealName(), 50, 680);
g.drawString("加油员："+staff.getRealName(), 50, 670);
}
// 站长名称位置文字绘制到指定位置
g.drawString("站长名称："+staff1.getRealName(), 50, 590);
g.drawString("站长名称："+staff1.getRealName(), 50, 580);
// 服务监督电话位置文字绘制到指定位置
g.drawString("服务监督电话："+staff1.getMobile(), 50, 620);
g.drawString("服务监督电话："+staff1.getMobile(), 50, 610);
// 店铺地址位置文字绘制到指定位置
// g.drawString(store.getAddress(), returnX(g,bufImg.getWidth(),store.getAddress()), 900);
drawStringWithMultiLine(g,store.getAddress(), bufImg.getWidth()-90,51,650,5 );
drawStringWithMultiLine(g,store.getAddress(), bufImg.getWidth()-90,51,640,5 );
}else {
drawStringWithMultiLine(g,"欢迎光临", bufImg.getWidth()-20,20,940,10 );
g.drawString("欢迎光临：", returnX(g, bufImg.getWidth(), "服务监督电话："), 870);
drawStringWithMultiLine(g,"欢迎光临", bufImg.getWidth()-20,20,930,10 );
g.drawString("欢迎光临：", returnX(g, bufImg.getWidth(), "服务监督电话："), 860);
}
@ -306,17 +306,17 @@ public class QrCodeUtils {
// Font font = Font.createFont(Font.TRUETYPE_FONT, new ClassPathResource("classpath:font/msyh.ttc").getFile());
// b = font.deriveFont(Font.BOLD, 40);
b = new Font("TimesRoman", Font.BOLD, 16);
b = new Font("TimesRoman", Font.BOLD, 14);
} else {
prefixFont = "/usr/share/fonts" + File.separator + "msyh.ttc";
try {
Font font = Font.createFont(Font.TRUETYPE_FONT, new File(prefixFont));
b = font.deriveFont(Font.BOLD, 16);
b = font.deriveFont(Font.BOLD, 14);
// b = new Font("msyh", Font.BOLD, 40);
} catch (Exception e) {
//如果发生异常执行默认的字体
b = new Font("msyh", Font.BOLD, 16);
b = new Font("msyh", Font.BOLD, 14);
log.error(e.getMessage(),"找不到字体");
}