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-07-23 21:13:58 +08:00
parent 2179365671
commit 31e8866262
18 changed files with 427 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,6 +100,7 @@ export function getTissueByDataApi(query) {
}
export function exportExcelTradingApi(data) {
return request({
url: 'business/allOrderInfo/tradingExportExcel',
@ -136,3 +137,37 @@ export function exportExcelDayApi(data) {
data: data // 通过 data 参数传递需要的数据
});
}
export function getFenxiByDailiApi(query) {
return request({
url: 'business/allOrderInfo/getFenxiByDaili',
method: 'get',
params: query
})
}
export function getFenxiByDailiByDataApi(query) {
return request({
url: 'business/allOrderInfo/getFenxiByDailiBydata',
method: 'get',
params: query
})
}
export function getFenxiByDailiTypeApi(query) {
return request({
url: 'business/allOrderInfo/getFenxiByDailiType',
method: 'get',
params: query
})
}
export function getFenxiByDailgetFenxiByDailiTypeiByDataApi(query) {
return request({
url: 'business/allOrderInfo/getFenxiByDailiBydata',
method: 'get',
params: query
})
}

24
fuintAdmin_zt/src/api/sys/sysNotificationlog.js
View File

@ -18,3 +18,27 @@ export function getSysNotifyList(query) {
})
}
export function deleteSysNotifyApi(PayId) {
return request({
url: 'sysNotificationlog/' + PayId,
method: 'delete'
})
}
//
export function saveSysNotificationApi(data) {
return request({
url: 'sysNotificationlog',
method: 'post',
data: data
})
}
// 保存修改信息
export function updateSysNotificationApi(data) {
return request({
url: 'sysNotificationlog',
method: 'put',
data: data
})
}

37
fuintAdmin_zt/src/api/sys/sysNotify.js Normal file
View File

@ -0,0 +1,37 @@
import request from '@/utils/request'
// 分页查询所有的订单信息
export function getSysNotifyList(query) {
return request({
url: 'sysNotify/queryByPage',
method: 'get',
params: query
})
}
//
export function deleteSysNotifyApi(PayId) {
return request({
url: 'sysNotify/' + PayId,
method: 'delete'
})
}
//
export function saveSysNotifyApi(data) {
return request({
url: 'sysNotify',
method: 'post',
data: data
})
}
// 保存修改信息
export function updateSysNotifyApi(data) {
return request({
url: 'sysNotify',
method: 'put',
data: data
})
}

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

@ -72,29 +72,14 @@
</el-form>
<div class="wrap-box">
<div class="k_" id="k_1">
<div class="size_">累计交易金额（万元）</div>
<div class="title_">{{orderStatistics.amount}}</div>
<div class="size_">交易金额汇总数（万元）/交易笔数</div>
<div class="title_">{{orderStatistics.payMoney}}/{{orderStatistics.count}}</div>
</div>
<div class="k_" id="k_2">
<div class="size_">累计交易升数</div>
<div class="title_">{{orderStatistics.num}}</div>
</div>
<div class="k_" id="k_3">
<div class="size_">92#汽油交易金额（万元）</div>
<div class="title_">{{orderStatistics.amount92}}</div>
</div>
<div class="k_" id="k_4">
<div class="size_">95#汽油交易金额（万元）</div>
<div class="title_">{{orderStatistics.amount95}}</div>
</div>
<div class="k_" id="k_5">
<div class="size_">98#汽油交易金额（万元）</div>
<div class="title_">{{orderStatistics.amount98}}</div>
</div>
<div class="k_" id="k_5">
<div class="size_">0#柴油交易金额（万元）</div>
<div class="title_">{{orderStatistics.amount0}}</div>
<div class="k_" id="k_2" v-for="item in orderStatistics.fenxiByDaili2ByData" >
<div class="size_">{{item.paymentChannel}}交易金额（万元）</div>
<div class="title_">{{item.payMoneyChannel}}</div>
</div>
</div>
</el-card>
<el-card class="box-card">
@ -106,13 +91,16 @@
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column align="center" prop="storeName" label="机构名称"></el-table-column>
<el-table-column align="center" prop="payAmount" label="所属机构"></el-table-column>
<el-table-column align="center" prop="sum" label="累计交易金额"></el-table-column>
<el-table-column align="center" prop="oilNum" label="累计交易笔数"></el-table-column>
<el-table-column align="center" prop="deptName" label="所属机构"></el-table-column>
<el-table-column align="center" prop="payMoney" label="累计交易金额"></el-table-column>
<el-table-column align="center" prop="count" label="累计交易笔数"></el-table-column>
<el-table-column align="center" label="支付通道交易信息：金额（万元），笔数（万笔），占比（%）">
<el-table-column align="center" prop="amount92" label="富友交易金额"></el-table-column>
<el-table-column align="center" prop="count92" label="富友交易笔数"></el-table-column>
<el-table-column align="center" prop="num92" label="富友交易占比"></el-table-column>
<template>
<el-table-column align="center" prop="amount92" label="富友交易金额"></el-table-column>
<el-table-column align="center" prop="count92" label="拉卡拉交易笔数"></el-table-column>
<el-table-column align="center" prop="count92" label="拉卡拉交易占比"></el-table-column>
</template>
</el-table-column>
<el-table-column align="center" prop="date" label="统计日期" >
@ -138,7 +126,7 @@
<script>
import {
exportExcelTradingApi,
exportExcelTradingApi, getFenxiByDailiApi, getFenxiByDailiByDataApi,
getRunningWaterByTissueApi,
getTissueByDataApi,
getTradingPageApi
@ -180,12 +168,10 @@ import {getFenXiOilOrderDataApi, getFenXiOilOrderListApi} from "@/api/financialS
deptId:"",
},
orderStatistics:{
amount:'0',
num:'0',
amount92:'0',
amount95:'0',
amount98:'0',
amount0:'0',
count:'0',
payMoney:'0',
fenxiByDaili2ByData: []
},
total:0,
}
@ -229,12 +215,13 @@ import {getFenXiOilOrderDataApi, getFenXiOilOrderListApi} from "@/api/financialS
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFenXiOilOrderDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
getFenxiByDailiByDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
this.orderStatistics = res.data
console.log("res.data1111",res.data)
})
},
// 获取列表信息
getList(val){
let dateRange = []
@ -242,7 +229,7 @@ import {getFenXiOilOrderDataApi, getFenXiOilOrderListApi} from "@/api/financialS
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFenXiOilOrderListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
getFenxiByDailiApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false

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

@ -24,32 +24,20 @@
<!-- <el-card class="box-card">-->
<div class="wrap-box">
<div class="k_" id="k_1">
<div class="size_">会员总数</div>
<div class="title_">{{orderStatistics.sumnum}}</div>
<div class="size_">活跃油站汇总总数/合作油站汇总总数</div>
<div class="title_">{{orderStatistics.sumnum}}/0</div>
</div>
<div class="k_" id="k_2">
<div class="size_">累计充值金额（万元）</div>
<div class="size_">交易金额汇总数（万元）/交易笔数</div>
<div class="title_">{{orderStatistics.tongjMoney}}</div>
</div>
<div class="k_" id="k_3">
<div class="size_">会员总消费（万元）</div>
<div class="size_">退款金额（元）/退款笔数</div>
<div class="title_">{{orderStatistics.tongjXfMoney}}</div>
</div>
<div class="k_" id="k_4">
<div class="size_">会员总余额（万元）</div>
<div class="title_">--</div>
</div>
<div class="k_" id="k_5">
<div class="size_">累计囤油卡余额（万元）</div>
<div class="title_">--</div>
</div>
<div class="k_" id="k_6">
<div class="size_">累计礼品卡余额（元）</div>
<div class="title_">--</div>
</div>
<div class="k_" id="k_7">
<div class="size_">累计储值卡余额（元 ）</div>
<div class="title_">{{orderStatistics.balanceSum}}</div>
<div class="size_">新增油站数（万元）</div>
<div class="title_">0</div>
</div>
</div>
</el-card>
@ -59,19 +47,19 @@
: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="deptName" align="center" label="会员手机号码" > </el-table-column>
<el-table-column prop="physicalCard" align="center" label="累计交易金额（万元）"></el-table-column>
<el-table-column prop="storeName" align="center" label="机构名称"> </el-table-column>
<el-table-column prop="parentName" align="center" label="所属机构" > </el-table-column>
<el-table-column prop="payMoney" align="center" label="累计交易金额（万元）"></el-table-column>
<el-table-column prop="count" align="center" label="累计交易笔数"></el-table-column>
<el-table-column prop="storeName" align="center" label="交易金额">
<el-table-column prop="gradeName" align="center" label="微信" > </el-table-column>
<el-table-column prop="gradeName" align="center" label="支付宝" > </el-table-column>
<el-table-column prop="gradeName" align="center" label="云闪付" > </el-table-column>
<el-table-column prop="gradeName" align="center" label="现金" > </el-table-column>
<el-table-column prop="gradeName" align="center" label="其他" > </el-table-column>
<el-table-column prop="wechatMoney" align="center" label="微信" > </el-table-column>
<el-table-column prop="alipayMoney" align="center" label="支付宝" > </el-table-column>
<!-- <el-table-column prop="gradeName" align="center" label="云闪付" > </el-table-column>-->
<el-table-column prop="cashMoney" align="center" label="现金" > </el-table-column>
<el-table-column prop="balanceMoney" align="center" label="其他" > </el-table-column>
</el-table-column>
<el-table-column prop="gradeName" align="center" label="会员等级" > </el-table-column>
<el-table-column prop="consumeNum" align="center" label="累计退款金额（元）" > </el-table-column>
<el-table-column prop="amount" align="center" label="累计退款笔数" > </el-table-column>
<el-table-column prop="refMoney" align="center" label="累计退款金额（元）" > </el-table-column>
<el-table-column prop="refCount" align="center" label="累计退款笔数" > </el-table-column>
</el-table>
</div>
<pagination
@ -89,7 +77,7 @@
<script>
import {
exportExcelTradingApi,
exportExcelTradingApi, getFenxiByDailiTypeApi,
getRunningWaterByTissueApi,
getTissueByDataApi,
getTradingPageApi
@ -191,7 +179,7 @@ import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/fina
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFenXiUserbalanceListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
getFenxiByDailiTypeApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false

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

@ -2,36 +2,36 @@
<div class="app-container">
<el-card >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="" prop="orgName">
<el-form-item label="" prop="notificationName">
<el-input
v-model="queryParams.orgName"
v-model="queryParams.notificationName"
placeholder="请选择通知名称"
clearable
style="width: 240px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="orgName">
<el-form-item label="" prop="notificationType">
<el-input
v-model="queryParams.orgName"
v-model="queryParams.notificationType"
placeholder="请选择通知类型"
clearable
style="width: 240px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="orgName">
<el-form-item label="" prop="recipientRoles">
<el-input
v-model="queryParams.orgName"
v-model="queryParams.recipientRoles"
placeholder="请选择接收角色"
clearable
style="width: 240px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="orgName">
<el-form-item label="" prop="templateStatus">
<el-input
v-model="queryParams.orgName"
v-model="queryParams.templateStatus"
placeholder="请选择通知状态"
clearable
style="width: 240px;"
@ -55,9 +55,9 @@
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="notificationName" label="通知名称"></el-table-column>
<el-table-column prop="notificationType" label="通知类型"></el-table-column>
<el-table-column prop="templateContent" label="小程序appID"></el-table-column>
<el-table-column prop="recipientRoles" label="密钥"></el-table-column>
<el-table-column prop="templateStatus" label="法人姓名"></el-table-column>
<el-table-column prop="templateContent" label="模板内容"></el-table-column>
<el-table-column prop="recipientRoles" label="接收角色"></el-table-column>
<el-table-column prop="templateStatus" label="模板状态"></el-table-column>
<el-table-column prop="createTime" label="创建人"></el-table-column>
<el-table-column prop="createTime" label="创建时间"></el-table-column>
<el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
@ -158,6 +158,7 @@
import {deleteAppApi, getAppListApi, saveAppApi, updateAppApi} from "@/api/sys/app";
import {dutyList} from "@/api/duty/duty";
import {getSysNotifyList, saveSysNotifyApi, updateSysNotifyApi} from "@/api/sys/sysNotify";
export default {
name: "notify-mode",
@ -166,6 +167,7 @@ export default {
return {
tableData: [],
form: {
id: null,
notificationName: '',
notificationType: '',
templateContent: '',
@ -203,31 +205,33 @@ export default {
},
methods: {
getList(){
getAppListApi(this.queryParams).then(res=>{
getSysNotifyList(this.queryParams).then(res=>{
this.tableData = res.data.records;
this.total = res.data.total
})
},
getsSubmitDeviceInfo(){},
submitForm(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
// 表单验证通过，可以提交数据
// 示例：调用 API 提交数据
this.submitDeviceInfo();
} else {
// 表单验证失败，不执行任何操作
return false;
}
});
},
submitDeviceInfo() {
// submitForm(formName) {
// this.$refs[formName].validate(valid => {
// if (valid) {
// // 表单验证通过，可以提交数据
// // 示例：调用 API 提交数据
// this.submitDeviceInfo();
// } else {
// // 表单验证失败，不执行任何操作
// return false;
// }
// });
// },
handleSubmit() {
// 在这里调用接口提交设备信息数据
console.log('提交设备信息数据:', this.deviceInfo);
this.deviceInfo.conditions = JSON.stringify(this.deviceInfo.conditions)
if (this.deviceInfo.id) {
updateAppApi(this.deviceInfo).then(res=>{
console.log('提交设备信息数据:', this.form);
this.form.conditions = JSON.stringify(this.form.conditions)
this.form.recipientRoles = JSON.stringify(this.form.recipientRoles)
if (this.form.id) {
updateSysNotifyApi(this.form).then(res=>{
if(res.code === 200) {
this.getList()
this.open = false
@ -235,7 +239,7 @@ export default {
})
}else {
saveAppApi(this.deviceInfo).then(res=>{
saveSysNotifyApi(this.form).then(res=>{
if(res.code === 200) {
this.getList()
this.open = false
@ -243,6 +247,10 @@ export default {
})
}
},
handleReset() {
this.open = false
},
handleQuery(){
this.getList()
},
@ -265,7 +273,11 @@ export default {
this.clean()
this.open = true;
this.title = "编辑设备"
this.deviceInfo = e
this.getDutyList()
this.form = e
this.form.conditions = JSON.parse(this.form.conditions)
this.form.recipientRoles = JSON.parse(this.form.recipientRoles)
console.log('提交设备信息数据:', this.deviceInfo);
},
@ -314,15 +326,15 @@ export default {
clean() {
this.deviceInfo= {
id: null, // 自增id
orgName: '', // 机构名称
unifiedSocialCreditCode: '', // 统一社会信用代码
appId: '', // 小程序appID
appKey: '', // 密钥
legalRepresentativeName: '', // 法人姓名
legalRepresentativeWeChat: '', // 法人微信
legalRepresentativeContact: '', // 法人联系方式
appStatus: false, // 小程序状态
createByName: '',
notificationName: '',
notificationType: '',
templateContent: '',
recipientRoles: [],
dutyList: [],
templateStatus: true,
conditions: [
{ field: '', operator: '', value: '' }
]
}
},
}

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

@ -5,7 +5,7 @@
<el-form-item label="" prop="deptName">
<el-input
v-model="queryParams.deptName"
placeholder="请输入机构名称"
placeholder="请输入选择通知名称"
clearable
style="width: 240px;"
@keyup.enter.native="handleQuery"
@ -14,7 +14,7 @@
<el-form-item label="" prop="legalRepresentativeContact">
<el-input
v-model="queryParams.legalRepresentativeContact"
placeholder="请输入法人联系方式"
placeholder="请选择通知类型"
clearable
style="width: 240px;"
@keyup.enter.native="handleQuery"
@ -29,13 +29,31 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="appStatus">
<el-input
v-model="queryParams.appStatus"
placeholder="请选择接受角色"
clearable
style="width: 240px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="appStatus">
<el-input
v-model="queryParams.appStatus"
placeholder="请选择通知状态"
clearable
style="width: 240px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item 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-button
type="primary"
@click="handleAdd"
>新增小程序配置</el-button>
>新增通知</el-button>
</el-form-item>
</el-form>
</el-card>
@ -48,10 +66,7 @@
<el-table-column prop="notificationType" label="通知类型"></el-table-column>
<el-table-column prop="templateContent" label="通知内容"></el-table-column>
<el-table-column prop="recipientRoles" label="接收角色"></el-table-column>
<el-table-column prop="recipientRoles" label="接收用户"></el-table-column>
<el-table-column prop="recipientRoles" label="通知状态"></el-table-column>
<el-table-column prop="recipientRoles" label="通知状态"></el-table-column>
<el-table-column prop="createByName" label="创建人"></el-table-column>
<el-table-column prop="createTime" label="创建时间"></el-table-column>
@ -133,6 +148,9 @@
</el-form-item>
</el-form>
<el-button type="primary" @click="userEnter1">确定</el-button>
<el-button @click="userCe2">取消</el-button>
</el-dialog>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open1" width="50%" append-to-body>
<el-table v-loading="" :data="userList" @selection-change="handleSelectionChange">
@ -162,6 +180,7 @@
import {deleteAppApi, getAppListApi, saveAppApi, updateAppApi} from "@/api/sys/app";
import {listUser} from "@/api/system/Site/site";
import {dutyList} from "@/api/duty/duty";
import {getNotificationlogList, saveSysNotificationApi, updateSysNotificationApi} from "@/api/sys/sysNotificationlog";
export default {
name: "notify-record",
@ -176,37 +195,18 @@ export default {
recipientRoles: [],
templateStatus: true,
conditions: [
{ field: '', operator: '', value: '' }
],
// conditions: [
// { field: '', operator: '', value: '' }
// ],
recipientUser:[
{
id: 1,
userName: '张三',
},
{
id: 2,
userName: '李四',
},
{
id: 3,
userName: '王五',
}
]
},
dutyList:[],
// 用户表格数据
userList: null,
deviceInfo: {
id: null, // 自增id
notificationName: '',//通知名称，字符长度最多100，不能为空
notificationType: '',//通知类型
templateContent: '',//模板内容
recipientRoles: '', // 接收角色，字符长度最多255，不能为空
templateStatus: true //模板状态
},
// 是否显示弹出层
open: false,
open1: false,
@ -234,12 +234,11 @@ export default {
},
methods: {
getList(){
getAppListApi(this.queryParams).then(res=>{
getNotificationlogList(this.queryParams).then(res=>{
this.tableData = res.data.records;
this.total = res.data.total
})
},
getsSubmitDeviceInfo(){},
submitForm(formName) {
this.$refs[formName].validate(valid => {
@ -253,26 +252,7 @@ export default {
}
});
},
submitDeviceInfo() {
// 在这里调用接口提交设备信息数据
console.log('提交设备信息数据:', this.deviceInfo);
if (this.deviceInfo.id) {
updateAppApi(this.deviceInfo).then(res=>{
if(res.code === 200) {
this.getList()
this.open = false
}
})
}else {
saveAppApi(this.deviceInfo).then(res=>{
if(res.code === 200) {
this.getList()
this.open = false
}
})
}
},
handleQuery(){
this.getList()
},
@ -290,12 +270,38 @@ export default {
this.getDutyList()
this.title = "增加设备"
},
userEnter1(){
// 在这里调用接口提交设备信息数据
console.log('提交设备信息数据:', this.form);
JSON.stringify(this.form.recipientUser)
if (this.form.id) {
updateSysNotificationApi(this.form).then(res=>{
if(res.code === 200) {
this.getList()
this.open = false
}
})
}else {
saveSysNotificationApi(this.form).then(res=>{
if(res.code === 200) {
this.getList()
this.open = false
}
})
}
},
userCe2(){
},
edit(e) {
this.clean()
this.open = true;
this.title = "编辑设备"
this.deviceInfo = e
this.form = e
this.form.recipientUser = JSON.parse(this.form.recipientUser)
console.log('提交设备信息数据:', this.deviceInfo);
},
@ -329,7 +335,7 @@ export default {
this.linshicunshu.push(
{
staffId:val.staffId,
realName:val.realName
userName:val.realName
}
)
})

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

@ -240,4 +240,29 @@ public class AllOrderInfoController extends BaseController {
public ResponseObject getAmount1(AllOrderInfoVo allOrderInfo){
return getSuccessResult(allOrderInfoService.getAmount1(allOrderInfo));
}
@GetMapping("getFenxiByDaili")
public ResponseObject getFenxiByDaili(AllOrderInfo allOrderInfo,
@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
Page page =new Page(pageNo,pageSize);
IPage<AllOrderInfoVo> list = allOrderInfoService.getFenxiByDaili(page, allOrderInfo);
return getSuccessResult(list);
}
@GetMapping("getFenxiByDailiType")
public ResponseObject getFenxiByDailiType(AllOrderInfo allOrderInfo,
@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
Page page =new Page(pageNo,pageSize);
IPage<AllOrderInfoVo> list = allOrderInfoService.getFenxiByDailiType(page, allOrderInfo);
return getSuccessResult(list);
}
@GetMapping("/getFenxiByDailiBydata")
public ResponseObject getFenxiByDailiBydata(AllOrderInfoVo allOrderInfo){
return getSuccessResult(allOrderInfoService.getFenxiByDailiBydata(allOrderInfo));
}
}

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

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuint.business.order.vo.Excel.allorderVOo;
import com.fuint.framework.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -11,6 +12,8 @@ import lombok.Data;
import java.util.Date;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* 所有订单详情表(AllOrderInfo)实体类
@ -90,5 +93,6 @@ public class AllOrderInfo extends BaseEntity implements Serializable {
private String refOrderNo;
private String refBy;
List<allorderVOo> fenxiByDaili2;
}

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

@ -10,6 +10,7 @@ import com.fuint.business.order.entity.CardBalanceChange;
import com.fuint.business.order.entity.HandoverRecord;
import com.fuint.business.order.vo.AllOrderInfoVo;
import com.fuint.business.order.vo.CardBalanceChangeVo;
import com.fuint.business.order.vo.Excel.allorderVOo;
import com.fuint.business.store.entity.MtStore;
import com.fuint.business.userManager.vo.UserBalanceVo;
import org.apache.ibatis.annotations.Param;
@ -21,7 +22,11 @@ import java.util.Map;
public interface AllOrderInfoMapper extends BaseMapper<AllOrderInfo> {
IPage<AllOrderInfoVo> getPageList(@Param("page") Page page, @Param("allOrderInfo") AllOrderInfo allOrderInfo);
IPage<AllOrderInfoVo> getFenxiByDaili(@Param("page") Page page, @Param("allOrderInfo") AllOrderInfo allOrderInfo);
IPage<AllOrderInfoVo> getFenxiByDailiType(@Param("page") Page page, @Param("allOrderInfo") AllOrderInfo allOrderInfo);
List<allorderVOo> getFenxiByDaili2(@Param("allOrderInfo") AllOrderInfo allOrderInfo);
Map<String, Object> getFenxiByDailiBydata(@Param("allOrderInfo") AllOrderInfo allOrderInfo);
List<AllOrderInfoVo> getFenxiByDaili2ByData(@Param("allOrderInfo") AllOrderInfo allOrderInfo);
String sumPayMoney(@Param("allOrderInfo") AllOrderInfo allOrderInfo);
// 根据storeId List查询总流水

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

@ -486,7 +486,69 @@
from all_order_info
</select>
<!-- SUM(CASE WHEN transaction_type = 'sale' THEN amount ELSE 0 END) AS total_sales-->
<select id="getFenxiByDaili" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
SELECT
store_id storeId,
SUM(pay_money) payMoney,
count(*) count
from all_order_info
group by store_id
</select>
<select id="getFenxiByDailiType" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
SELECT
store_id storeId,
SUM(pay_money) payMoney,
count(*) count,
sum(CASE WHEN pay_type = 'WECHAT' THEN pay_money ELSE 0 END) wechatMoney,
sum(CASE WHEN pay_type = 'CASH' THEN pay_money ELSE 0 END) cashMoney,
sum(CASE WHEN pay_type = 'balance' THEN pay_money ELSE 0 END) balanceMoney,
sum(CASE WHEN pay_type = 'ALIPAY' THEN pay_money ELSE 0 END) alipayMoney,
sum(CASE WHEN status = 'refund' THEN pay_money ELSE 0 END) refMoney,
count(CASE WHEN status = 'refund' THEN pay_money ELSE 0 END) refCount
from all_order_info
group by store_id
</select>
<select id="getFenxiByDaili2" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
SELECT
payment_channel paymentChannel,
SUM(pay_money) payMoneyChannel,
count(*) countChannel
from all_order_info
group by payment_channel
</select>
<!-- <select id="getFenxiByDailiBydata" resultType="com.fuint.business.order.vo.AllOrderInfoVo">-->
<!-- SELECT-->
<!-- SUM(pay_amount) payAmount,-->
<!-- count(*)-->
<!-- from all_order_info-->
<!-- </select>-->
<select id="getFenxiByDaili2ByData" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
SELECT
payment_channel paymentChannel,
SUM(pay_money) payMoneyChannel,
count(*) countChannel
from all_order_info
group by payment_channel
</select>
<select id="getFenxiByDailiBydata" resultType="java.util.Map">
SELECT
SUM(pay_money) payMoney,
count(*) count
from all_order_info
</select>
<select id="getFenxiByDailiTypeDaty" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
SELECT
SUM(pay_money) payMoney,
count(*) count,
sum(CASE WHEN status = 'refund' THEN pay_money ELSE 0 END) refMoney,
count(CASE WHEN status = 'refund' THEN pay_money ELSE 0 END) refCount
from all_order_info
group by store_id
</select>
<!-- SUM(CASE WHEN transaction_type = 'sale' THEN amount ELSE 0 END) AS total_sales-->
<!-- COUNT(CASE WHEN pay_type = 'WECHAT' THEN 0 END) AS wechat, &#45;&#45; 微信-->

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

@ -718,9 +718,9 @@
from oil_order
<where>
<if test="storeIds != null">
oo.store_id in
<foreach collection="storeIds" item="item" index="index" open="(" separator="," close=")">
<if test="order.storeIds != null">
store_id in
<foreach collection="order.storeIds" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
@ -738,9 +738,9 @@
from oil_order
<where>
<if test="storeIds != null">
oo.store_id in
<foreach collection="storeIds" item="item" index="index" open="(" separator="," close=")">
<if test="order.storeIds != null">
store_id in
<foreach collection="order.storeIds" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>

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

@ -28,6 +28,9 @@ public interface AllOrderInfoService {
IPage<AllOrderInfoVo> getPageList(Page page, AllOrderInfo allOrderInfo);
IPage<AllOrderInfoVo> getPageListByPos(Page page, AllOrderInfo allOrderInfo);
IPage<AllOrderInfoVo> getFenxiByDaili(Page page, AllOrderInfo allOrderInfo);
IPage<AllOrderInfoVo> getFenxiByDailiType(Page page, AllOrderInfo allOrderInfo);
Map<String, Object> getFenxiByDailiBydata(AllOrderInfo allOrderInfo);
/**
* 统计总的金额
* @param allOrderInfo

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

@ -20,10 +20,7 @@ import com.fuint.business.order.entity.*;
import com.fuint.business.order.mapper.AllOrderInfoMapper;
import com.fuint.business.order.service.*;
import com.fuint.business.order.vo.AllOrderInfoVo;
import com.fuint.business.order.vo.Excel.DayExcel;
import com.fuint.business.order.vo.Excel.InstituionExcel;
import com.fuint.business.order.vo.Excel.OilDepotExcel;
import com.fuint.business.order.vo.Excel.TradingExcel;
import com.fuint.business.order.vo.Excel.*;
import com.fuint.business.order.vo.OilOrderVo;
import com.fuint.business.order.vo.OrderGoodsVo;
import com.fuint.business.petrolStationManagement.entity.OilGun;
@ -116,6 +113,9 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
return pageList;
}
public String sumPayMoney(AllOrderInfo allOrderInfo){
String sumPayMoney = allOrderInfoMapper.sumPayMoney(allOrderInfo);
@ -143,7 +143,44 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
return row;
}
public IPage<AllOrderInfoVo> getFenxiByDaili(Page page, AllOrderInfo allOrderInfo) {
IPage<AllOrderInfoVo> fenxiByDaili = allOrderInfoMapper.getFenxiByDaili(page, allOrderInfo);
for (AllOrderInfoVo record : fenxiByDaili.getRecords()) {
MtStore mtStore = mtStoreMapper.selectById(record.getStoreId());
if (ObjectUtil.isNotEmpty(mtStore)) {
SysDept byId = deptService.getById(mtStore.getContractDeptId());
SysDept byId2 = deptService.getById(byId.getParentId());
record.setStoreName(byId.getDeptName());
record.setParentName(byId2.getDeptName());
}
List<allorderVOo> fenxiByDaili2 = allOrderInfoMapper.getFenxiByDaili2(allOrderInfo);
record.setFenxiByDaili2(fenxiByDaili2);
}
return fenxiByDaili;
}
// getFenxiByDailiBydata
@Override
public Map<String, Object> getFenxiByDailiBydata(AllOrderInfo allOrderInfo) {
Map<String, Object> fenxiByDailiBydata = allOrderInfoMapper.getFenxiByDailiBydata(allOrderInfo);
List<AllOrderInfoVo> fenxiByDaili2ByData = allOrderInfoMapper.getFenxiByDaili2ByData(allOrderInfo);
fenxiByDailiBydata.put("fenxiByDaili2ByData",fenxiByDaili2ByData);
return fenxiByDailiBydata;
}
public IPage<AllOrderInfoVo> getFenxiByDailiType(Page page, AllOrderInfo allOrderInfo) {
IPage<AllOrderInfoVo> fenxiByDaili = allOrderInfoMapper.getFenxiByDailiType(page, allOrderInfo);
for (AllOrderInfoVo record : fenxiByDaili.getRecords()) {
MtStore mtStore = mtStoreMapper.selectById(record.getStoreId());
if (ObjectUtil.isNotEmpty(mtStore)) {
SysDept byId = deptService.getById(mtStore.getContractDeptId());
SysDept byId2 = deptService.getById(byId.getParentId());
record.setStoreName(byId.getDeptName());
record.setParentName(byId2.getDeptName());
}
}
return fenxiByDaili;
}
@Override
public int updateAllOrderInfo(AllOrderInfo allOrderInfo) {
merchantConfigService.updateMeChAmountByStoreId(allOrderInfo.getStoreId(),allOrderInfo.getPayMoney());

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

@ -9,12 +9,18 @@ public class AllOrderInfoVo extends AllOrderInfo {
private String userName;
private String userMobile;
private String storeName;
private String parentName;
private String mchntCd;
private String orderStatus;
private Double sumPayMoney;
//交易金额
private String amount;
private String wechatMoney;
private String cashMoney;
private String balanceMoney;
private String alipayMoney;
private String refMoney;
// 交易笔数
private String strokeCount;
// 笔单价
@ -64,6 +70,11 @@ public class AllOrderInfoVo extends AllOrderInfo {
@TableField(exist = false)
private String ancestors;
private String paymentChannel;
private String payMoneyChannel;
private String countChannel;
private String count;
private String refCount;
}

10
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/Excel/allorderVOo.java Normal file
View File

@ -0,0 +1,10 @@
package com.fuint.business.order.vo.Excel;
import lombok.Data;
@Data
public class allorderVOo {
private String paymentChannel;
private String payMoneyChannel;
private String countChannel;
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/entity/SysNotify.java
View File

@ -1,5 +1,6 @@
package com.fuint.business.sys.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fuint.repository.model.base.BaseEntity;
import lombok.Data;
@ -32,6 +33,9 @@ public class SysNotify extends BaseEntity {
* 接收角色，字符长度最多255，不能为空
*/
private String recipientRoles;
@TableField(exist = false)
private String recipientRolesName;
private String conditions;
/**
* 模板状态，布尔类型，不能为空
*/

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/mapper/xml/SysNotifyMapper.xml
View File

@ -75,8 +75,8 @@ id,notification_name,notification_type,template_content,recipient_roles,template
<!--新增所有列-->
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
insert into sys_notify(notification_name,notification_type,template_content,recipient_roles,template_status)
values (#{notificationName}#{notificationType}#{templateContent}#{recipientRoles}#{templateStatus})
insert into sys_notify(notification_name,notification_type,template_content,recipient_roles,template_status,conditions)
values (#{notificationName},#{notificationType},#{templateContent},#{recipientRoles},#{templateStatus},#{conditions})
</insert>
<insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
@ -116,6 +116,9 @@ notification_name = values(notification_name)notification_type = values(notifica
<if test="templateStatus != null">
template_status = #{templateStatus},
</if>
<if test="conditions != null">
conditions = #{conditions},
</if>
</set>
where id = #{id}
</update>