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-27 09:40:46 +08:00
parent a3ccc2ba87
commit 261bbd510d
31 changed files with 310 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fuintAdmin_zt/src/views/Site/components/afterff.vue
View File

@ -14,15 +14,7 @@ export default {
return {
dialogVisible:false,
dialogVisible2:false,
tableData: [{
price:2000,
yprice:2500,
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
status:'进行中',
upadate: '2016-05-02',
}, ],
tableData: [ ],
form: {
deductionRate: '', // 扣点费率
likelyTransactionVolume: '0', // 已发生交易流量

3
fuintAdmin_zt/src/views/Site/components/before.vue
View File

@ -129,7 +129,7 @@ export default {
<el-table
:data="tableData"
border
style="width: 90%;margin-left: 55px ">
style="width: 95%;margin-left: 55px ">
<el-table-column
prop="prepaidAmount"
align="center"
@ -175,6 +175,7 @@ export default {
<template slot="header" slot-scope="scope">
<el-button
size="mini"
type="success" plain
@click="handleUpdate1(scope.row)"
>新增</el-button>
</template>

3
fuintAdmin_zt/src/views/Site/components/yearff.vue
View File

@ -92,7 +92,7 @@ export default {
<el-table
:data="tableData"
border
style="width: 80%;margin-left: 55px ">
style="width: 95%;margin-left: 55px ">
<el-table-column
prop="price"
align="center"
@ -137,6 +137,7 @@ export default {
<el-button
size="mini"
@click="dialogVisible=true"
type="success" plain
>新增</el-button>
</template>
<template slot-scope="scope">

67
fuintAdmin_zt/src/views/Site/index.vue
View File

@ -151,7 +151,7 @@
<el-table-column
label="操作"
align="center"
width="160"
width="200px"
class-name="small-padding fixed-width"
>
<!-- v-hasPermi="['system:account:edit']" -->
@ -172,15 +172,22 @@
@click="handleDelete(scope.row)"
v-hasPermi="['user:delete']"
>删除</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" >
<span class="el-dropdown-link" v-hasPermi="['user:password']">
<i class="el-icon-d-arrow-right el-icon--right"></i>更多
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['user:password']"
>重置密码</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button
size="mini"
type="text"
icon="el-icon-refresh"
@click="handleResetPwd(scope.row)"
v-hasPermi="['user:delete']"
>重置密码</el-button>
<!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" >-->
<!-- <span class="el-dropdown-link" v-hasPermi="['user:password']">-->
<!-- <i class="el-icon-d-arrow-right el-icon&#45;&#45;right"></i>更多-->
<!-- </span>-->
<!-- <el-dropdown-menu slot="dropdown">-->
<!-- <el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['user:password']"-->
<!-- >重置密码</el-dropdown-item>-->
<!-- </el-dropdown-menu>-->
<!-- </el-dropdown>-->
</template>
</el-table-column>
</el-table>
@ -292,7 +299,8 @@
</span>
</span>
</el-form-item>
<template v-if="ruleForm.deptType !== '3'">
<!-- <template v-if="ruleForm.deptType !== '3'">-->
<template v-if="is2Store">
<el-row >
<el-col :span="20">
<el-form-item label="计费方式" prop="turnoverType">
@ -541,6 +549,7 @@
</el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery1">查询</el-button>
<el-button icon="el-icon-refresh" @click="reset2">重置</el-button>
</el-form-item>
</el-form>
@ -842,6 +851,9 @@ export default {
}
};
return {
// 判断是否是二级门店
is2Store:false,
maxNumber:1,
storeNum: false,
isEditDept:true,
@ -1295,6 +1307,18 @@ export default {
this.queryParams1.page = 1;
this.getDutyList();
},
//重置校色信息
reset2(){
this.queryParams1 = {
page:1,
pageSize:10,
// 当做机构id使用
storeId:"",
deptId:''
}
this.getDutyList();
},
getDutyList(){
this.loading = true;
dutyList(this.queryParams1).then(res => {
@ -1370,7 +1394,7 @@ export default {
let evenNumbers = typeList
// isClick
if (this.deptType == 3 || (this.deptType == 2 && !this.isClick)) {
evenNumbers = typeList.filter(number => number.label === "基本门店");
evenNumbers = typeList.filter(number => number.label === "单油站");
this.ruleForm.deptType = "3"
}
return evenNumbers
@ -1556,6 +1580,11 @@ export default {
event.stopPropagation();
this.isAdd = true
// 新增树
if (data.id == 100) {
this.is2Store = true
}else {
this.is2Store = true
}
},
cleanRuleForm() {
this.ruleForm= {
@ -1621,9 +1650,15 @@ export default {
Userlist(id).then(res=>{
let ancestors = res.data.ancestors.slice(2).toString();
this.parentName = res.data.parentName
this.ruleForm = res.data
if (this.ruleForm.parentId == 100) {
this.is2Store = true
}else {
this.is2Store = false
}
// this.ruleForm.parentId = res.data.parentId
// this.ruleForm.status = res.data.status
@ -1954,6 +1989,14 @@ export default {
password:'',
accountStatus:1
}
this.queryParams= {
pageNum: 1,
pageSize: 10,
userName: '',
phonenumber: '',
status: '',
deptId: ''
}
},
/** 修改按钮操作 */

2
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/list.vue
View File

@ -21,7 +21,7 @@
</div>
<div class="nbox" :class="pointerClass" @click="updateRedio('积分兑换订单')">
<div class="fount-box" :style="{ color: radio1 === '积分兑换订单' ? '#FF770F' : '#999999' }">积分兑换订单</div>
<div class="fount-box" :style="{ color: radio1 === '积分兑换订单' ? '#FF770F' : '#999999' }">积分商城订单</div>
<div class="heng-box" v-if="radio1 == '积分兑换订单'"></div>
<div class="heng-box" style="background-color: #FFFFFF" v-else></div>
</div>

22
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="margin-top: 0px">
<div style="margin-top: 0px;margin-right: 40px">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
@ -43,11 +43,11 @@
<el-select
v-model="queryParams.status"
clearable
placeholder="支付状态"
placeholder="订单状态"
>
<el-option label="已支付" value="paid"/>
<el-option label="未支付" value="unpaid"/>
<el-option label="已退款" value="refund"/>
<el-option label="支付成功" value="paid"/>
<el-option label="待支付" value="unpaid"/>
<el-option label="退款成功" value="refund"/>
</el-select>
</el-form-item>
<el-form-item label="">
@ -69,7 +69,7 @@
<el-form-item class="" style="float: right;">
<el-form-item class="" style="float: right;margin-right:0px">
<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>
@ -83,7 +83,7 @@
<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="orderNumber" align="center" label="订单号" > </el-table-column>
<el-table-column prop="amount" align="center" label="订单金额（万元）">
<el-table-column prop="amount" align="center" label="订单金额（元）">
<template slot-scope="scope">
<span v-if="scope.row.amount">{{scope.row.amount}}</span>
<span v-else>--</span>
@ -93,7 +93,7 @@
<template slot-scope="scope">
<span v-if="scope.row.payChannel=='cashier'">收银台</span>
<span v-else-if="scope.row.payChannel=='POS'">POS机</span>
<span v-else-if="scope.row.payChannel=='PC'">平台</span>
<span v-else-if="scope.row.payChannel=='PC'">收银台</span>
<span v-else-if="scope.row.payChannel=='applet'">小程序</span>
<span v-else>其他</span>
</template>
@ -108,9 +108,9 @@
</el-table-column>
<el-table-column prop="status" align="center" label="支付状态">
<template slot-scope="scope">
<el-tag v-if="scope.row.status == 'unpaid'">未支付</el-tag>
<el-tag type="success" v-else-if="scope.row.status == 'paid'">已支付</el-tag>
<el-tag type="danger" v-else-if="scope.row.status == 'refund'">已退款</el-tag>
<el-tag v-if="scope.row.status == 'unpaid'">待支付</el-tag>
<el-tag type="success" v-else-if="scope.row.status == 'paid'">支付成功</el-tag>
<el-tag type="danger" v-else-if="scope.row.status == 'refund'">退款成功</el-tag>
<el-tag type="danger" v-else>支付失败</el-tag>
</template>
</el-table-column>

22
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="margin-top: 0px">
<div style="margin-top: 0px;margin-right: 40px">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
@ -43,11 +43,11 @@
<el-select
v-model="queryParams.orderStatus"
clearable
placeholder="支付状态"
placeholder="订单状态"
>
<el-option label="已支付" value="paid"/>
<el-option label="未支付" value="unpaid"/>
<el-option label="已退款" value="refund"/>
<el-option label="支付成功" value="paid"/>
<el-option label="待支付" value="unpaid"/>
<el-option label="退款成功" value="refund"/>
</el-select>
</el-form-item>
<el-form-item label="">
@ -69,7 +69,7 @@
<el-form-item class="" style="float: right;">
<el-form-item class="" style="float: right;margin-right:0px">
<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>
@ -85,12 +85,12 @@
<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="orderNo" align="center" label="订单号" > </el-table-column>
<el-table-column prop="payAmount" align="center" label="订单金额（万元）"></el-table-column>
<el-table-column prop="payAmount" align="center" label="订单金额（元）"></el-table-column>
<el-table-column prop="terminal" align="center" label="订单类型">
<template slot-scope="scope">
<span v-if="scope.row.terminal=='cashier'">收银台</span>
<span v-else-if="scope.row.terminal=='POS'">POS机</span>
<span v-else-if="scope.row.terminal=='PC'">平台</span>
<span v-else-if="scope.row.terminal=='PC'">收银台</span>
<span v-else-if="scope.row.terminal=='applet'">小程序</span>
<span v-else>其他</span>
</template>
@ -105,9 +105,9 @@
</el-table-column>
<el-table-column prop="orderStatus" align="center" label="支付状态">
<template slot-scope="scope">
<el-tag v-if="scope.row.orderStatus == 'unpaid'">未支付</el-tag>
<el-tag type="success" v-else-if="scope.row.orderStatus == 'paid'">已支付</el-tag>
<el-tag type="danger" v-else-if="scope.row.orderStatus == 'refund'">已退款</el-tag>
<el-tag v-if="scope.row.orderStatus == 'unpaid'">待支付</el-tag>
<el-tag type="success" v-else-if="scope.row.orderStatus == 'paid'">支付成功</el-tag>
<el-tag type="danger" v-else-if="scope.row.orderStatus == 'refund'">退款成功</el-tag>
<el-tag type="danger" v-else>支付失败</el-tag>
</template>
</el-table-column>

22
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="margin-top: 0px">
<div style="margin-top: 0px;margin-right: 40px">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
@ -43,11 +43,11 @@
<el-select
v-model="queryParams.status"
clearable
placeholder="支付状态"
placeholder="订单状态"
>
<el-option label="已支付" value="paid"/>
<el-option label="未支付" value="unpaid"/>
<el-option label="已退款" value="refund"/>
<el-option label="支付成功" value="paid"/>
<el-option label="待支付" value="unpaid"/>
<el-option label="退款成功" value="refund"/>
</el-select>
</el-form-item>
<el-form-item label="">
@ -69,7 +69,7 @@
<el-form-item class="" style="float: right;">
<el-form-item class="" style="float: right;;margin-right:0px">
<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>
@ -83,12 +83,12 @@
<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="orderNo" align="center" label="订单号" > </el-table-column>
<el-table-column prop="payAmount" align="center" label="订单金额（万元）"></el-table-column>
<el-table-column prop="payAmount" align="center" label="订单金额（元）"></el-table-column>
<el-table-column prop="payChannel" align="center" label="订单类型">
<template slot-scope="scope">
<span v-if="scope.row.payChannel=='cashier'">收银台</span>
<span v-else-if="scope.row.payChannel=='POS'">POS机</span>
<span v-else-if="scope.row.payChannel=='PC'">平台</span>
<span v-else-if="scope.row.payChannel=='PC'">收银台</span>
<span v-else-if="scope.row.payChannel=='applet'">小程序</span>
<span v-else>其他</span>
</template>
@ -103,9 +103,9 @@
</el-table-column>
<el-table-column prop="status" align="center" label="支付状态">
<template slot-scope="scope">
<el-tag v-if="scope.row.status == 'unpaid'">未支付</el-tag>
<el-tag type="success" v-else-if="scope.row.status == 'paid'">已支付</el-tag>
<el-tag type="danger" v-else-if="scope.row.status == 'refund'">已退款</el-tag>
<el-tag v-if="scope.row.status == 'unpaid'">待支付</el-tag>
<el-tag type="success" v-else-if="scope.row.status == 'paid'">支付成功</el-tag>
<el-tag type="danger" v-else-if="scope.row.status == 'refund'">退款成功</el-tag>
<el-tag type="danger" v-else>支付失败</el-tag>
</template>
</el-table-column>

45
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="margin-top: 0px">
<div style="margin-top: 0px;margin-right: 40px">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
@ -45,11 +45,11 @@
<el-select
v-model="queryParams.status"
clearable
placeholder="支付状态"
placeholder="订单状态"
>
<el-option label="已支付" value="paid"/>
<el-option label="未支付" value="unpaid"/>
<el-option label="已退款" value="refund"/>
<el-option label="支付成功" value="paid"/>
<el-option label="待支付" value="unpaid"/>
<el-option label="退款失败" value="refund"/>
<el-option label="支付失败" value="payFail"/>
</el-select>
</el-form-item>
@ -72,7 +72,7 @@
<el-form-item class="" style="float: right;">
<el-form-item class="" style="float: right;margin-right:0px">
<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>
@ -83,28 +83,15 @@
<el-table
:data="orderList"
style="width: 100%">
"storeId": "",
"orderNo": "",
"payChannel": "",
"payAmount": "",
"payType": "",
"status": "",
"name": "",
"mobile": "",
"rechargeType": "",
"mchntCd": "",
"paymentChannel": "",
"createTime": "",
"payTime": ""
<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="orderNo" align="center" label="订单号" > </el-table-column>
<el-table-column prop="payAmount" align="center" label="订单金额（万元）"></el-table-column>
<el-table-column prop="payAmount" align="center" label="订单金额（元）"></el-table-column>
<el-table-column prop="payChannel" align="center" label="订单类型">
<template slot-scope="scope">
<span v-if="scope.row.payChannel=='cashier'">收银台</span>
<span v-else-if="scope.row.payChannel=='POS'">POS机</span>
<span v-else-if="scope.row.payChannel=='PC'">平台</span>
<span v-else-if="scope.row.payChannel=='PC'">收银台</span>
<span v-else-if="scope.row.payChannel=='applet'">小程序</span>
<span v-else>其他</span>
</template>
@ -119,9 +106,9 @@
</el-table-column>
<el-table-column prop="status" align="center" label="支付状态">
<template slot-scope="scope">
<el-tag v-if="scope.row.status == 'unpaid'">未支付</el-tag>
<el-tag type="success" v-else-if="scope.row.status == 'paid'">已支付</el-tag>
<el-tag type="danger" v-else-if="scope.row.status == 'refund'">已退款</el-tag>
<el-tag v-if="scope.row.status == 'unpaid'">待支付</el-tag>
<el-tag type="success" v-else-if="scope.row.status == 'paid'">支付成功</el-tag>
<el-tag type="danger" v-else-if="scope.row.status == 'refund'">退款成功</el-tag>
<el-tag type="danger" v-else>支付失败</el-tag>
</template>
</el-table-column>
@ -136,8 +123,16 @@
</el-table-column>
</el-table-column>
<el-table-column prop="mchntCd" align="center" label="支付通道">
<template slot-scope="scope">
{{scope.row.mchntCd?scope.row.mchntCd:'--'}}
</template>
</el-table-column>
<el-table-column prop="paymentChannel" align="center" label="商户号编码" width="150"> </el-table-column>
<el-table-column prop="paymentChannel" align="center" label="商户号编码" width="150">
<template slot-scope="scope">
{{scope.row.mchntCd?scope.row.paymentChannel:'--'}}
</template></el-table-column>
<el-table-column prop="createTime" align="center" label="订单创建时间" > </el-table-column>
<el-table-column prop="payTime" align="center" label="订单完成时间" >
<template slot-scope="scope">

12
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
View File

@ -61,7 +61,11 @@
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="storeName" label="机构名称" width="150" align="center"></el-table-column>
<el-table-column prop="paidInfo" label="累计交易金额 (万元)" width="150" align="center"></el-table-column>
<el-table-column prop="paidInfo" label="累计交易金额 (万元)" width="150" align="center">
<template slot-scope="scope">
{{(scope.row.paidInfo/10000).toFixed(6)}}
</template>
</el-table-column>
<el-table-column prop="count" label="累计交易笔数" width="150" align="center"></el-table-column>
<el-table-column prop="exchangeQuantity" label="兑换商品数量" width="150" align="center"></el-table-column>
<el-table-column prop="integral" label="累计消费积分" width="150" align="center"></el-table-column>
@ -72,7 +76,11 @@
<el-table-column prop="paidInfo" label="销售金额 (元)" width="150" align="center"></el-table-column>
<el-table-column prop="integralBy" label="消费积分" width="150" align="center"></el-table-column>
</el-table-column>
<el-table-column prop="statDate" label="统计日期" width="200" align="center"></el-table-column>
<el-table-column prop="statDate" label="统计日期" align="center">
<template>
{{this.value2[0]}} 至{{this.value2[1]}}
</template>
</el-table-column>
</el-table>
</div>

35
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
View File

@ -73,32 +73,53 @@
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="payAmount" label="累计交易金额(万元)">
<template slot-scope="scope">
{{(scope.row.payAmount/10000).toFixed(6)}}
</template>
</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" label="92#汽油">
<el-table-column align="center" prop="amount92" label="交易金额(万元)"></el-table-column>
<el-table-column align="center" prop="amount92" label="交易金额(万元)">
<template slot-scope="scope">
{{(scope.row.amount92/10000).toFixed(6)}}
</template>
</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>
</el-table-column>
<el-table-column align="center" label="95#汽油">
<el-table-column align="center" prop="amount95" label="交易金额(万元)"></el-table-column>
<el-table-column align="center" prop="amount95" label="交易金额(万元)">
<template slot-scope="scope">
{{(scope.row.amount95/10000).toFixed(6)}}
</template>
</el-table-column>
<el-table-column align="center" prop="count95" label="交易笔数"></el-table-column>
<el-table-column prop="num95" label="交易升数"></el-table-column>
<el-table-column align="center" prop="num95" label="交易升数"></el-table-column>
</el-table-column>
<el-table-column align="center" label="98#汽油">
<el-table-column align="center" prop="amount98" label="交易金额(万元)"></el-table-column>
<el-table-column align="center" prop="amount98" label="交易金额(万元)">
<template slot-scope="scope">
{{(scope.row.amount98/10000).toFixed(6)}}
</template>
</el-table-column>
<el-table-column align="center" prop="count98" label="交易笔数" ></el-table-column>
<el-table-column align="center" prop="num98" label="交易升数" ></el-table-column>
</el-table-column>
<el-table-column align="center" label="0#柴油">
<el-table-column align="center" prop="amount0" label="交易金额(万元)" ></el-table-column>
<el-table-column align="center" prop="amount0" label="交易金额(万元)" >
<template slot-scope="scope">
{{(scope.row.amount0/10000).toFixed(6)}}
</template>
</el-table-column>
<el-table-column align="center" prop="count0" label="交易笔数" ></el-table-column>
<el-table-column align="center" prop="num0" label="交易升数" ></el-table-column>
</el-table-column>
<el-table-column align="center" prop="date" label="统计日期" >
<template>
<!-- {{this.beginTime}} -{{this.endTime}}-->
{{this.value2[0]}} 至{{this.value2[1]}}
<!-- this.value2 = [parseTime(start1),parseTime(new Date())];-->
</template>
</el-table-column>
</el-table>

18
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
View File

@ -62,13 +62,21 @@
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="storeName" label="机构名称" width="150" align="center"></el-table-column>
<el-table-column prop="payAmounts" label="累计交易金额 (万元)" align="center"></el-table-column>
<el-table-column prop="payAmounts" label="累计交易金额 (万元)" align="center">
<template slot-scope="scope">
{{(scope.row.payAmounts/10000).toFixed(6)}}
</template>
</el-table-column>
<el-table-column prop="counts" label="累计交易笔数" align="center"></el-table-column>
<el-table-column prop="goodsNums" label="累计销售商品数量" align="center"></el-table-column>
<el-table-column label="商品信息" align="center">
<el-table-column prop="cvgNum" label="品类数量" width="100" align="center"></el-table-column>
<el-table-column prop="goodsNum" label="商品数量" width="100" align="center"></el-table-column>
<el-table-column prop="payAmounts" label="累计交易金额 (万元)" width="150" align="center"></el-table-column>
<el-table-column prop="payAmounts" label="累计交易金额 (万元)" width="150" align="center">
<template slot-scope="scope">
{{(scope.row.payAmounts/10000).toFixed(6)}}
</template>
</el-table-column>
</el-table-column>
<el-table-column label="热销品类信息" align="center">
@ -84,7 +92,11 @@
<el-table-column prop="goodsAmount" label="销售金额 (元)" width="150" align="center"></el-table-column>
<!-- <el-table-column prop="supplierName" label="供应商名称" width="100" align="center"></el-table-column>-->
</el-table-column>
<el-table-column prop="statDate" label="统计日期" width="200" align="center"></el-table-column>
<el-table-column prop="statDate" label="统计日期" width="200" align="center">
<template>
{{this.value2[0]}} 至{{this.value2[1]}}
</template>
</el-table-column>
</el-table>
</div>

31
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="margin-top: 0px;margin-right: 20px">
<div style="margin-top: 0px;margin-right: 40px">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
@ -57,6 +57,7 @@
<div class="table-box">
<el-table
:data="orderList"
border
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="userName" align="center" label="会员名称"> </el-table-column>
@ -64,8 +65,8 @@
<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="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="amount" align="center" label="累计充值金额（元）" > </el-table-column>
<el-table-column prop="countNum" align="center" label="累计充值次数" > </el-table-column>
<el-table-column prop="leijiMoney" align="center" label="累计消费金额（元）" > </el-table-column>
<el-table-column prop="leijiNum" align="center" label="累计消费笔数" > </el-table-column>
<!-- <el-table-column prop="createTime" align="center" label="囤油卡余额" > </el-table-column>-->
@ -164,10 +165,10 @@ import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/fina
},
exportExcelCashier() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
// if (this.beginTime && this.endTime) {
// dateRange.push(this.beginTime.toLocaleDateString())
// dateRange.push(this.endTime.toLocaleDateString())
// }
exportExcelTradingApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
this.$download.saveAs(blob,'交易明细统计.xLsx')
@ -177,10 +178,10 @@ import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/fina
getOrderStatistics() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
// if (this.beginTime && this.endTime) {
// dateRange.push(this.beginTime.toLocaleDateString())
// dateRange.push(this.endTime.toLocaleDateString())
// }
getFenXiUserbalanceDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
this.orderStatistics = res.data
console.log("res.data1111",res.data)
@ -190,10 +191,10 @@ import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/fina
// 获取列表信息
getList(val){
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
// if (this.beginTime && this.endTime) {
// dateRange.push(this.beginTime.toLocaleDateString())
// dateRange.push(this.endTime.toLocaleDateString())
// }
getFenXiUserbalanceListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
this.orderList = response.data.records;
this.total = response.data.total;

101
fuintAdmin_zt/src/views/setting/app/index.vue
View File

@ -2,15 +2,19 @@
<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-input
v-model="queryParams.orgName"
placeholder="请输入机构名称"
clearable
style="width: 240px;"
@keyup.enter.native="handleQuery"
/>
<el-form-item label="" prop="legalRepresentativeContact">
<el-select
v-model="queryParams.orgId"
clearable
placeholder="所属机构"
>
<el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="legalRepresentativeContact">
<el-input
v-model="queryParams.legalRepresentativeContact"
@ -20,11 +24,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="legalRepresentativeContact">
<el-select v-model="queryParams.appStatus" placeholder="请选择小程序状态">
<el-option label="停用" value="0" ></el-option>
<el-option label="启用" value="1" ></el-option>
</el-select>
<el-form-item style="float: right">
</el-form-item>
<el-form-item style="float: right;margin-right: 0px">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button
@ -34,11 +41,11 @@
>新增小程序配置</el-button>
</el-form-item>
</el-form>
</el-card>
<!-- </el-card>-->
<!-- 列表信息-->
<el-card style="margin-top: 20px" >
<el-table :data="tableData" style="width: 100%">
<!-- &lt;!&ndash; 列表信息&ndash;&gt;-->
<!-- <el-card style="margin-top: 20px" >-->
<el-table :data="tableData" style="width: 100%" border>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="orgName" label="机构名称"></el-table-column>
<el-table-column prop="unifiedSocialCreditCode" label="统一社会信用代码"></el-table-column>
@ -88,36 +95,46 @@
</el-card>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
<el-form ref="form" :model="deviceInfo" label-width="80px">
<el-form :model="deviceInfo" ref="deviceForm" label-width="120px">
<el-form-item label="机构名称" prop="orgName">
<el-input v-model="deviceInfo.orgName" style="width: 300px"></el-input>
</el-form-item>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
<!-- <el-form ref="form" :model="deviceInfo" label-width="80px">-->
<el-form :model="deviceInfo" ref="deviceForm" label-width="140px" :rules="rule">
<!-- <el-form-item label="机构名称" prop="orgName">-->
<!-- <el-input v-model="deviceInfo.orgName" style="width: 300px"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="机构名称" prop="orgName">-->
<!-- <el-input v-model="deviceInfo.orgName" style="width: 300px"></el-input>-->
<!-- </el-form-item>-->
<!-- -->
<el-form-item label="机构名称" prop="orgId">
<el-select
v-model="deviceInfo.orgId"
clearable
placeholder="机构名称"
style="width: 300px;"
>
<el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode">
<el-input v-model="deviceInfo.unifiedSocialCreditCode"></el-input>
<el-input v-model="deviceInfo.unifiedSocialCreditCode" style="width: 300px;"></el-input>
</el-form-item>
<el-form-item label="小程序appID" prop="appId">
<el-input v-model="deviceInfo.appId"></el-input>
<el-input v-model="deviceInfo.appId" style="width: 300px;"></el-input>
</el-form-item>
<el-form-item label="密钥" prop="appKey">
<el-input v-model="deviceInfo.appKey"></el-input>
<el-input v-model="deviceInfo.appKey" style="width: 300px;"></el-input>
</el-form-item>
<el-form-item label="法人姓名" prop="legalRepresentativeName">
<el-input v-model="deviceInfo.legalRepresentativeName"></el-input>
<el-input v-model="deviceInfo.legalRepresentativeName" style="width: 300px;"></el-input>
</el-form-item>
<el-form-item label="法人微信号" prop="legalRepresentativeWechat">
<el-input v-model="deviceInfo.legalRepresentativeWechat"></el-input>
<el-input v-model="deviceInfo.legalRepresentativeWechat" style="width: 300px;"></el-input>
</el-form-item>
<el-form-item label="法人联系方式" prop="legalRepresentativeContact">
<el-input v-model="deviceInfo.legalRepresentativeContact"></el-input>
<el-input v-model="deviceInfo.legalRepresentativeContact" style="width: 300px;"></el-input>
</el-form-item>
<el-form-item label="小程序状态" prop="appStatus">
<el-switch
@ -130,7 +147,7 @@
<el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
</el-form-item>
</el-form>
</el-form>
<!-- </el-form>-->
</el-dialog>
</div>
@ -141,6 +158,7 @@
import {deleteAppApi, getAppListApi, saveAppApi, updateAppApi} from "@/api/sys/app";
import {updateBannerApi} from "@/api/sys/banner";
import {getRunningWaterByTissueApi} from "@/api/allOrder";
export default {
name: "printIndex",
@ -148,9 +166,12 @@ export default {
data() {
return {
tableData: [],
deptList: [],
deviceInfo: {
id: null, // 自增id
orgName: '', // 机构名称
orgId: '', // 机构名称
unifiedSocialCreditCode: '', // 统一社会信用代码
appId: '', // 小程序appID
appKey: '', // 密钥
@ -160,6 +181,15 @@ export default {
appStatus: false, // 小程序状态
createByName: '',
},
rule: {
orgId: [{required: true, message: '请选择机构名称', trigger: 'blur'},],
unifiedSocialCreditCode: [{required: true, message: '请填写统一社会信用代码', trigger: 'blur'},],
appId: [{required: true, message: '请填写小程序appID', trigger: 'blur'},],
appKey: [{required: true, message: '请填写密钥', trigger: 'blur'},],
legalRepresentativeName: [{required: true, message: '请填写法人姓名', trigger: 'blur'},],
legalRepresentativeWechat: [{required: true, message: '请填写法人微信号', trigger: 'blur'},],
legalRepresentativeContact: [{required: true, message: '请填写法人联系方式', trigger: 'blur'},],
},
// 是否显示弹出层
open: false,
title:"",
@ -169,6 +199,7 @@ export default {
page: 1,
pageSize: 10,
orgName:'',
orgId:'',
legalRepresentativeContact:'',
appStatus:'',
},
@ -176,8 +207,14 @@ export default {
},
created() {
this.getList()
this.getDeptList()
},
methods: {
getDeptList() {
getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then(response => {
this.deptList = response.data.records;
})
},
getList(){
getAppListApi(this.queryParams).then(res=>{
this.tableData = res.data.records;
@ -200,7 +237,11 @@ export default {
},
submitDeviceInfo() {
// 在这里调用接口提交设备信息数据
console.log('提交设备信息数据:', this.deviceInfo);
let filter = this.deptList.filter(item => item.deptId == this.deviceInfo.orgId);
this.deviceInfo.orgName = filter[0].deptName
if (this.deviceInfo.id) {
updateAppApi(this.deviceInfo).then(res=>{
if(res.code === 200) {
@ -245,12 +286,12 @@ export default {
handleAdd(e) {
this.clean()
this.open = true;
this.title = "增加设备"
this.title = "新增小程序配置"
},
edit(e) {
this.clean()
this.open = true;
this.title = "编辑设备"
this.title = "编辑小程序配置"
this.deviceInfo = e
console.log('提交设备信息数据:', this.deviceInfo);

4
fuintAdmin_zt/src/views/setting/banner/index.vue
View File

@ -37,7 +37,7 @@
</el-select>
</el-form-item>
<el-form-item style="float: right">
<el-form-item style="float: right ;margin-right: 0px">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button
@ -54,7 +54,7 @@
<!-- <el-card style="margin-top: 20px" >-->
<el-table :data="tableData" style="width: 100%">
<el-table :data="tableData" style="width: 100%" border>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="bannerName" label="banner名称"></el-table-column>
<el-table-column prop="productImage" label="图片">

4
fuintAdmin_zt/src/views/setting/hardware.vue
View File

@ -34,7 +34,7 @@
</el-select>
</el-form-item>
<el-form-item style="float: right">
<el-form-item style="float: right;margin-right: 0px">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button
@ -46,7 +46,7 @@
</el-form-item>
</el-form>
<el-table :data="tableData" style="width: 100%">
<el-table :data="tableData" style="width: 100%" border>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="name" label="商品名称"></el-table-column>
<el-table-column prop="categoryName" label="商品分类"></el-table-column>

11
fuintAdmin_zt/src/views/setting/sysLog.vue
View File

@ -6,6 +6,13 @@
<el-tab-pane label="中台系统" name="first"></el-tab-pane>
<el-tab-pane label="油站系统" name="second"></el-tab-pane>
</el-tabs>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="90px">
<el-form-item label="" prop="createName">
<el-input
@ -70,7 +77,7 @@
</el-form-item>
</el-form>
<el-table :data="tableData" style="width: 100%">
<el-table :data="tableData" style="width: 100%" border>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="createAccount" label="登录账号"></el-table-column>
<el-table-column prop="createName" label="操作用户"></el-table-column>
@ -86,7 +93,7 @@
</template>
</el-table-column>
<el-table-column prop="moudle" label="操作模块"></el-table-column>
<el-table-column prop="content" label="操作内容"></el-table-column>
<el-table-column prop="content" label="操作内容" width="500"></el-table-column>
<el-table-column prop="ipAddr" label="IP地址"></el-table-column>
<el-table-column prop="createTime" label="操作时间"></el-table-column>
</el-table>

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/controller/DeptPriceInfoController.java
View File

@ -41,7 +41,7 @@ public class DeptPriceInfoController extends BaseController {
*/
@GetMapping("queryByPage")
public ResponseObject queryByPage(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
@RequestParam(value = "pageSize",defaultValue = "10000") Integer pageSize,
@Param("deptPriceInfo") DeptPriceInfo deptPriceInfo) {
Page page = new Page(pageNo, pageSize);
IPage< DeptPriceInfo> iPageList = this.deptPriceInfoService.queryByPage(page, deptPriceInfo);

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/controller/DeptServiceFeeInfoController.java
View File

@ -41,7 +41,7 @@ public class DeptServiceFeeInfoController extends BaseController {
*/
@GetMapping("queryByPage")
public ResponseObject queryByPage(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
@RequestParam(value = "pageSize",defaultValue = "1000") Integer pageSize,
@Param("deptServiceFeeInfo") DeptServiceFeeInfo deptServiceFeeInfo) {
Page page = new Page(pageNo, pageSize);
IPage< DeptServiceFeeInfo> iPageList = this.deptServiceFeeInfoService.queryByPage(page, deptServiceFeeInfo);

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/xml/DeptServiceFeeInfoMapper.xml
View File

@ -86,7 +86,7 @@ service_fee_statistics,service_fee_limit,status,create_name
select
id,deduction_rate,payment_amount,likely_transaction_volume,service_fee_statistics,service_fee_limit,status
from dept_service_fee_info
where deptId = #{deptId}
where dept_id = #{deptId}
and status = 1
</select>
<select id="getAllYue" resultType="java.util.HashMap">
@ -94,7 +94,7 @@ service_fee_statistics,service_fee_limit,status,create_name
sum(likely_transaction_volume) as lto
from dept_service_fee_info
where
dept_id = #{deptId}
dept_id = #{dept_id}
and status = 2
</select>

9
fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/service/impl/DeptPriceInfoServiceImpl.java
View File

@ -52,10 +52,10 @@ public class DeptPriceInfoServiceImpl implements DeptPriceInfoService {
*/
@Override
public IPage<DeptPriceInfo> queryByPage(@Param("page") Page page, DeptPriceInfo deptPriceInfo) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
deptPriceInfo.setDeptId(nowAccountInfo.getDeptId());
// AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
// deptPriceInfo.setDeptId(nowAccountInfo.getDeptId());
// 判断以进行中的数据进行判断并修改状态
DeptPriceInfo deptPriceInfo1 = deptPriceInfoMapper.queryByDeptId(nowAccountInfo.getDeptId());
DeptPriceInfo deptPriceInfo1 = deptPriceInfoMapper.queryByDeptId(deptPriceInfo.getDeptId());
if (ObjectUtil.isNotEmpty(deptPriceInfo1)) {
boolean isValid = isDateInRange(deptPriceInfo1.getSystemValidityPeriodStart(),deptPriceInfo1.getSystemValidityPeriodEnd());
if (!isValid) {
@ -144,6 +144,9 @@ public class DeptPriceInfoServiceImpl implements DeptPriceInfoService {
public Map<String,Object> getALlInfoBydeptId(Long deptId) {
List<Long> strings = sysDeptMapper.selectChildByDeptIdR(deptId);
List<Long> longs = mtStoreMapper.queryStoresByDeptIdsR(strings);
if (longs.size()==0) {
return null;
}
return deptPriceInfoMapper.getALlInfoBydeptId(longs);
}

10
fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/service/impl/DeptServiceFeeInfoServiceImpl.java
View File

@ -52,14 +52,14 @@ public class DeptServiceFeeInfoServiceImpl implements DeptServiceFeeInfoService
*/
@Override
public IPage<DeptServiceFeeInfo> queryByPage(@Param("page") Page page, DeptServiceFeeInfo deptServiceFeeInfo) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
// AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
// deptServiceFeeInfo.setStoreId(nowAccountInfo.getStoreId());
// 首先查询进行中的是否已缴费 查询当前进行中的
DeptServiceFeeInfo deptServiceFeeInfo1 = deptServiceFeeInfoMapper.queryByDeptId(nowAccountInfo.getDeptId());
DeptServiceFeeInfo deptServiceFeeInfo1 = deptServiceFeeInfoMapper.queryByDeptId(deptServiceFeeInfo.getDeptId());
// 查询总的交易数据
Map<String, Object> aLlInfoBydeptId = deptPriceInfoService.getALlInfoBydeptId(nowAccountInfo.getDeptId());
Map<String, Object> aLlInfoBydeptId = deptPriceInfoService.getALlInfoBydeptId(deptServiceFeeInfo.getDeptId());
// 查询已发生的交易
Map<String, Object> allyue = deptServiceFeeInfoMapper.getAllYue(nowAccountInfo.getDeptId());
Map<String, Object> allyue = deptServiceFeeInfoMapper.getAllYue(deptServiceFeeInfo.getDeptId());
String payMoney = ObjectUtil.isNotEmpty(aLlInfoBydeptId.get("payMoney"))?aLlInfoBydeptId.get("payMoney").toString():"0";
String lto = ObjectUtil.isNotEmpty(allyue.get("lto"))?allyue.get("lto").toString():"0";
@ -79,7 +79,7 @@ public class DeptServiceFeeInfoServiceImpl implements DeptServiceFeeInfoService
//剩余交易减去 v
deptServiceFeeInfo.setDeptId(nowAccountInfo.getDeptId());
deptServiceFeeInfo.setDeptId(deptServiceFeeInfo.getDeptId());
return this.deptServiceFeeInfoMapper.queryAllByLimit(page, deptServiceFeeInfo);
}

14
fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/service/impl/DeptTransactionInfoServiceImpl.java
View File

@ -53,26 +53,26 @@ public class DeptTransactionInfoServiceImpl implements DeptTransactionInfoServic
*/
@Override
public IPage<DeptTransactionInfo> queryByPage(@Param("page") Page page, DeptTransactionInfo deptTransactionInfo) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
// AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
// deptTransactionInfo.setStoreId(nowAccountInfo.getStoreId());
deptTransactionInfo.setDeptId(nowAccountInfo.getDeptId());
deptTransactionInfo.setDeptId(deptTransactionInfo.getDeptId());
// 修改进行中的数据 remainingTransactionVolume
// 查询正在进行中的数据
DeptTransactionInfo deptTransactionInfo1 = deptTransactionInfoMapper.queryByDeptId(nowAccountInfo.getDeptId());
DeptTransactionInfo deptTransactionInfo1 = deptTransactionInfoMapper.queryByDeptId(deptTransactionInfo.getDeptId());
// 查询已跑流量
Map<String, Object> aLlInfoBydeptId = deptPriceInfoService.getALlInfoBydeptId(nowAccountInfo.getDeptId());
Map<String, Object> aLlInfoBydeptId = deptPriceInfoService.getALlInfoBydeptId(deptTransactionInfo.getDeptId());
String payMoney = aLlInfoBydeptId.get("payMoney").toString();
// 根据deptId查询所有流量
// 流量折合
Map<String, Object> etv = deptTransactionInfoMapper.getSumETV(nowAccountInfo.getDeptId());
Map<String, Object> etv = deptTransactionInfoMapper.getSumETV(deptTransactionInfo.getDeptId());
BigDecimal etv1 = new BigDecimal(etv.get("etv").toString()).subtract(new BigDecimal(payMoney));
if (ObjectUtil.isEmpty(deptTransactionInfo1) || deptTransactionInfo1.getRemainingTransactionVolume()<=0 ) {
// 将所有进行中的设置为已完成
deptTransactionInfoMapper.editStatus(nowAccountInfo.getDeptId());
deptTransactionInfoMapper.editStatus(deptTransactionInfo.getDeptId());
// 查询未开始的最旧一个
DeptTransactionInfo deptTransactionInfo2 = deptTransactionInfoMapper.queryByDeptIdLimit(nowAccountInfo.getDeptId());
DeptTransactionInfo deptTransactionInfo2 = deptTransactionInfoMapper.queryByDeptIdLimit(deptTransactionInfo.getDeptId());
deptTransactionInfo2.setStatus(1);
deptTransactionInfo2.setRemainingTransactionVolume(deptTransactionInfo2.getRemainingTransactionVolume() -Double.parseDouble(etv1.toString()) );

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
View File

@ -311,7 +311,9 @@
count(*) as consumeNum,
sum(amount) as amount
from card_value_record
<where>
mt_user_id = #{mtUserId}
</where>
</select>
<!-- where store_id = #{storeId} and mt_user_id = #{userId}-->
<!-- group by chain_store_id

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

@ -79,6 +79,6 @@ public interface AllOrderInfoMapper extends BaseMapper<AllOrderInfo> {
Double selectAllAmount(@Param("allOrderInfo") AllOrderInfo allOrderInfo);
Map<String, Object> getLeiJiInfo(UserBalanceVo record);
Map<String, Object> getLeiJiInfo(@Param("order") UserBalanceVo record);
Map<String, Object> getShuJuVipInfo(@Param("order") UserBalanceVo record);
}

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

@ -476,6 +476,7 @@
COUNT(CASE WHEN type = 3 and status = 'refund' THEN 0 END) AS leijiNum
from all_order_info
where user_id = #{order.mtUserId}
</select>
<!-- group by user_id-->

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/entity/SysApp.java
View File

@ -20,6 +20,8 @@ public class SysApp extends BaseEntity {
/**
* 机构名称，字符长度最多50，不能为空，且唯一
*/
private Integer orgId;
private String orgName;
private String deptId; // 机构id
private String appKey; // 密钥

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

@ -101,6 +101,7 @@ legal_representative_id,legal_representative_contact,app_status,create_time,crea
legal_representative_contact,
legal_representative_wechat,
app_key,
org_id,
app_status)
values (#{sysApp.orgName},
#{sysApp.unifiedSocialCreditCode},
@ -110,6 +111,7 @@ legal_representative_id,legal_representative_contact,app_status,create_time,crea
#{sysApp.legalRepresentativeContact},
#{sysApp.legalRepresentativeWechat},
#{sysApp.appKey},
#{sysApp.orgId},
#{sysApp.appStatus})
</insert>
@ -164,6 +166,9 @@ org_name = values(org_name)unified_social_credit_code = values(unified_social_cr
<if test="appStatus != null">
app_status = #{appStatus},
</if>
<if test="orgId != null">
org_id = #{orgId},
</if>
</set>
where id = #{id}
</update>

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

@ -17,7 +17,7 @@ public interface UserBalanceMapper extends BaseMapper<UserBalance> {
int addUserBalance(@Param("id") Integer id, @Param("changeCardBalance") Double changeCardBalance);
IPage<UserBalanceVo> listByZt(Page page, UserBalanceVo user);
IPage<UserBalanceVo> listByZt(Page page,@Param("user") UserBalanceVo user);
Map<String,Object> getDataByZt(UserBalanceVo user);
}

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

@ -44,6 +44,13 @@
mu.id mtUserId
from mt_user_balance mub
left join mt_user mu on mub.mt_user_id = mu.id
<where>
mub.store_id in
<foreach collection="user.storeIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</where>
order by mub.create_time desc
</select>
<select id="getDataByZt" resultType="java.util.Map">

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
View File

@ -89,7 +89,7 @@ public class UserBalanceServiceImpl extends ServiceImpl<UserBalanceMapper, UserB
Map<String, Object> amountAndConsume = cardValueRecordMapper.getAmountAndConsume(record);
if (ObjectUtil.isNotEmpty(amountAndConsume)) {
record.setCountNum(amountAndConsume.get("consumeNum").toString()); // 累计重置次数
record.setAmount(amountAndConsume.get("amount").toString());
record.setAmount(ObjectUtil.isNotEmpty(amountAndConsume.get("amount"))?amountAndConsume.get("amount").toString():"0");
}