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

1

Browse Source
This commit is contained in:
zhaohengkun 2024-10-25 11:48:41 +08:00
parent 6163dec554
commit 2aa71233f3
11 changed files with 451 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuintAdmin/src/views/order/order_Vip.vue
View File

@ -82,7 +82,11 @@
<el-table-column prop="mobile" label="手机号" align="center"></el-table-column>
<el-table-column prop="rechargeBalance" label="充值金额（元）" align="center"></el-table-column>
<el-table-column prop="giftBalance" label="赠送金额（元）" align="center"></el-table-column>
<el-table-column prop="giftBalance" label="会员总余额（元）" align="center"></el-table-column>
<el-table-column prop="giftBalance" label="会员总余额（元）" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rechargeBalance + scope.row.giftBalance }}</span>
</template>
</el-table-column>
<el-table-column prop="paymentType" label="支付方式" align="center">
<template slot-scope="scope">
<span>{{ getType(payList, scope.row.paymentType) }}</span>

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

@ -261,14 +261,17 @@
date_range.date
</select>
<select id="orderStatistics" resultType="java.util.Map">
select count(*) numberOfTopUps, -- 充值笔数
sum(bid_balance) theTotalAmountOfTopUp, -- 充值总金额
sum(gift_balance) theTotalAmountOfTheCredit, -- 赠送总额
sum(recharge_balance) totalAmountReceived, -- 实收总额
COUNT(CASE WHEN payment_type = 'WECHAT' THEN 0 END) AS wechat, -- 微信
COUNT(CASE WHEN payment_type = 'ALIPAY' THEN 0 END) AS alipay, -- 支付宝
COUNT(CASE WHEN payment_type = 'CASH' THEN 0 END) AS cash -- 现金
from card_value_record
SELECT
count(*) numberOfTopUps,-- 充值笔数
sum( bid_balance + gift_balance ) theTotalAmountOfTopUp,-- 到账总金额
sum( gift_balance ) theTotalAmountOfTheCredit,-- 赠送总额
sum( bid_balance ) totalAmountReceived,-- 实收总额
SUM( CASE WHEN payment_type = 'WECHAT' THEN bid_balance ELSE 0 END ) AS wechat, -- 微信
SUM( CASE WHEN payment_type = 'ALIPAY' THEN bid_balance ELSE 0 END ) AS alipay, -- 支付宝
sum( CASE WHEN payment_type = 'CASH' THEN bid_balance ELSE 0 END ) AS cash, -- 现金
sum( CASE WHEN payment_type = 'UNIONPAY' THEN bid_balance ELSE 0 END ) AS UNIONPAY -- 银联二维码
FROM
card_value_record
<where>
store_id = #{cardValueRecord.storeId}
<if test="cardValueRecord.mtStaffId != null and cardValueRecord.mtStaffId != ''">
@ -286,6 +289,9 @@
<if test="cardValueRecord.params.endTime != null and cardValueRecord.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{cardValueRecord.params.endTime},'%y%m%d')
</if>
<if test="cardValueRecord.payChannel != null and cardValueRecord.payChannel != ''">
and pay_channel = #{cardValueRecord.payChannel}
</if>
</where>
</select>
<select id="selectCardValueRecordList"

9
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java
View File

@ -150,6 +150,15 @@ public class HangBillController extends BaseController {
return getSuccessResult(hangBillService.selectNoReturnAmount(hangBill));
}
/**
* 查询挂账统计数据
*/
@GetMapping("selectStatistics")
public ResponseObject selectStatistics(HangBillVo hangBill){
return getSuccessResult(hangBillService.selectStatistics(hangBill));
}
/**
* 查询当前店铺归还账单的数量
* @return

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/HangBillMapper.java
View File

@ -9,6 +9,7 @@ import com.fuint.business.order.vo.HangBillVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* 挂账记录表 mapper层
@ -67,4 +68,6 @@ public interface HangBillMapper extends BaseMapper<HangBill> {
* @return
*/
int selectCountReturn(@Param("hangBill") HangBillVo hangBill);
Map<String, Object> selectStatistics(@Param("hangBill") HangBillVo hangBill);
}

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

@ -2,10 +2,10 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fuint.business.order.mapper.HangBillMapper">
<sql id="selectHangBill">
select hb.*,ms.real_name,ms.mobile,cu.unit_name,cu.person_credit,cu.contact_mobile,cu.credit_limit
select hb.*, ms.real_name, ms.mobile, cu.unit_name, cu.person_credit, cu.contact_mobile, cu.credit_limit
from hang_bill hb
left join mt_staff ms on hb.staff_id = ms.id
left join credit_unit cu on hb.credit_unit_id = cu.id
left join mt_staff ms on hb.staff_id = ms.id
left join credit_unit cu on hb.credit_unit_id = cu.id
</sql>
<select id="selectHangBillList" resultType="com.fuint.business.order.vo.HangBillVo">
@ -50,7 +50,7 @@
</select>
<select id="selectHangBills" resultType="com.fuint.business.order.vo.HangBillVo">
select hb.*,cu.unit_name,cu.person_credit,cu.contact_mobile,cu.credit_limit from hang_bill hb
left join credit_unit cu on hb.credit_unit_id = cu.id
left join credit_unit cu on hb.credit_unit_id = cu.id
<where>
hb.store_id = #{hangBill.storeId} and hb.status!=1
<if test="hangBill.creditUnitId != null and hangBill.creditUnitId != ''">
@ -61,10 +61,10 @@
<select id="selectAllAmount" resultType="java.lang.Double" parameterType="com.fuint.business.order.vo.HangBillVo">
select sum(t.amount) from
(select ms.real_name,ms.mobile,cu.unit_name,cu.person_credit,cu.contact_mobile,cu.credit_limit,hb.*
from hang_bill hb
left join mt_staff ms on hb.staff_id = ms.id
left join credit_unit cu on hb.credit_unit_id = cu.id) t
(select ms.real_name,ms.mobile,cu.unit_name,cu.person_credit,cu.contact_mobile,cu.credit_limit,hb.*
from hang_bill hb
left join mt_staff ms on hb.staff_id = ms.id
left join credit_unit cu on hb.credit_unit_id = cu.id) t
<where>
t.store_id = #{hangBill.storeId}
<if test="hangBill.status != null and hangBill.status != ''">
@ -95,10 +95,10 @@
</select>
<select id="selectReturnAmount" resultType="java.lang.Double">
select sum(repaid_amount) from
(select ms.real_name,ms.mobile,cu.unit_name,cu.person_credit,cu.contact_mobile,cu.credit_limit,hb.*
from hang_bill hb
left join mt_staff ms on hb.staff_id = ms.id
left join credit_unit cu on hb.credit_unit_id = cu.id) t
(select ms.real_name,ms.mobile,cu.unit_name,cu.person_credit,cu.contact_mobile,cu.credit_limit,hb.*
from hang_bill hb
left join mt_staff ms on hb.staff_id = ms.id
left join credit_unit cu on hb.credit_unit_id = cu.id) t
<where>
t.store_id = #{hangBill.storeId}
<if test="hangBill.status != null and hangBill.status != ''">
@ -129,10 +129,10 @@
</select>
<select id="selectNoReturnAmount" resultType="java.lang.Double">
select sum(outstand_amount) from
(select ms.real_name,ms.mobile,cu.unit_name,cu.person_credit,cu.contact_mobile,cu.credit_limit,hb.*
from hang_bill hb
left join mt_staff ms on hb.staff_id = ms.id
left join credit_unit cu on hb.credit_unit_id = cu.id) t
(select ms.real_name,ms.mobile,cu.unit_name,cu.person_credit,cu.contact_mobile,cu.credit_limit,hb.*
from hang_bill hb
left join mt_staff ms on hb.staff_id = ms.id
left join credit_unit cu on hb.credit_unit_id = cu.id) t
<where>
t.store_id = #{hangBill.storeId}
<if test="hangBill.status != null and hangBill.status != ''">
@ -199,10 +199,10 @@
<select id="selectHangBillListExport" resultType="com.fuint.business.order.vo.Excel.HangBillExcel"
parameterType="com.fuint.business.order.vo.HangBillVo">
select hb.order_no,hb.return_type,hb.status,hb.amount,hb.repaid_amount,hb.outstand_amount,
ms.real_name,ms.mobile,
cu.unit_name,cu.person_credit,cu.contact_mobile from hang_bill hb
left join mt_staff ms on hb.staff_id = ms.id
left join credit_unit cu on hb.credit_unit_id = cu.id
ms.real_name,ms.mobile,
cu.unit_name,cu.person_credit,cu.contact_mobile from hang_bill hb
left join mt_staff ms on hb.staff_id = ms.id
left join credit_unit cu on hb.credit_unit_id = cu.id
<where>
hb.store_id = #{hangBill.storeId}
<if test="hangBill.status != null and hangBill.status != ''">
@ -235,10 +235,10 @@
<select id="selectCountReturn" resultType="java.lang.Integer"
parameterType="com.fuint.business.order.vo.HangBillVo">
select count(t.amount) from
(select ms.real_name,ms.mobile,cu.unit_name,cu.person_credit,cu.contact_mobile,cu.credit_limit,hb.*
from hang_bill hb
left join mt_staff ms on hb.staff_id = ms.id
left join credit_unit cu on hb.credit_unit_id = cu.id) t
(select ms.real_name,ms.mobile,cu.unit_name,cu.person_credit,cu.contact_mobile,cu.credit_limit,hb.*
from hang_bill hb
left join mt_staff ms on hb.staff_id = ms.id
left join credit_unit cu on hb.credit_unit_id = cu.id) t
<where>
t.store_id = #{hangBill.storeId}
<if test="hangBill.status == null or hangBill.status == ''">
@ -270,4 +270,33 @@
</if>
</where>
</select>
<select id="selectStatistics" resultType="java.util.Map">
select
sum(ha.amount) as s1, -- 挂账总金额
count(*) as s2, -- 总条数
SUM(CASE WHEN ha.return_type = 1 THEN ha.amount ELSE 0 END) AS s3, -- 归还总金额
count(CASE WHEN ha.return_type = 1 THEN ha.amount ELSE null END) AS s4, -- 归还总条数
SUM(CASE WHEN ha.return_type = 0 THEN ha.amount ELSE 0 END) AS s5 -- 未归还总金额
from hang_bill ha inner join credit_unit cr on cr.id = ha.credit_unit_id
<where>
<if test="hangBill.returnType != null and hangBill.returnType != ''">
and ha.return_type = #{hangBill.returnType}
</if>
<if test="hangBill.params.beginTime != null and hangBill.params.beginTime != ''"><!-- 开始时间检索 -->
and ha.create_time &gt;= STR_TO_DATE(#{hangBill.params.beginTime}, '%Y/%m/%d')
</if>
<if test="hangBill.params.endTime != null and hangBill.params.endTime != ''"><!-- 结束时间检索 -->
and ha.create_time &lt;= STR_TO_DATE(concat(#{hangBill.params.endTime},'23:59:59'), '%Y/%m/%d %H:%i:%s')
</if>
<if test="hangBill.unitName != null and hangBill.unitName != ''"><!-- 结束时间检索 -->
and cr.unit_name like concat('%', #{hangBill.unitName}, '%')
</if>
<if test="hangBill.personCredit != null and hangBill.personCredit != ''"><!-- 结束时间检索 -->
and cr.person_credit like concat('%', #{hangBill.personCredit}, '%')
</if>
<if test="hangBill.contactMobile != null and hangBill.contactMobile != ''"><!-- 结束时间检索 -->
and cr.contact_mobile like concat('%', #{hangBill.contactMobile}, '%')
</if>
</where>
</select>
</mapper>

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/HangBillService.java
View File

@ -112,4 +112,6 @@ public interface HangBillService extends IService<HangBill> {
Double selectNoReturnAmount(HangBillVo hangBill);
void export(HttpServletResponse response, HangBillVo hangBill);
Map<String,Object> selectStatistics(HangBillVo hangBill);
}

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

@ -334,6 +334,11 @@ public class HangBillServiceImpl extends ServiceImpl<HangBillMapper, HangBill> i
}
}
@Override
public Map<String, Object> selectStatistics(HangBillVo hangBill) {
return baseMapper.selectStatistics(hangBill);
}
/**
* 调用支付接口
* @param map

9
fuintCashierWeb/src/api/cashier/hangbill.js
View File

@ -71,6 +71,15 @@ export function hangBillReturnTotal(query) {
})
}
// 挂账统计
export function selectStatistics(query) {
return request({
url: '/business/hangBill/selectStatistics',
method: 'get',
params: query
})
}
// 当前店铺归还账单的数量
export function hangBillAllAmount(query) {
return request({

574
fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue
View File

@ -1,7 +1,7 @@
<!--增值交易订单-->
<template>
<div class="contenr_new">
<!-- 表单查询-->
<!-- 表单查询-->
<div class="top_new">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
<el-form-item label="" prop="returnType">
@ -45,14 +45,16 @@
v-model="beginTime"
style="width: 160px"
type="date"
placeholder="开始日期">
placeholder="开始日期"
>
</el-date-picker>
至
<el-date-picker
v-model="endTime"
style="width: 160px"
type="date"
placeholder="结束日期">
placeholder="结束日期"
>
</el-date-picker>
</el-form-item>
@ -60,94 +62,96 @@
<div style="display: flex;align-items: center;height: 32px">
<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 = "exportExcelCashier()">导出</el-button>
<el-button type="primary" @click="exportExcelCashier()">导出</el-button>
</div>
</div>
<!-- 统计-->
<!-- 统计-->
<!-- 列表-->
<div class="bottom_new">
<div class="box-gang">
<div class="box">
<div style="font-size: 26px;color: #0DC291;font-weight: bold;margin-top: 5px">
{{ map.s1 || 0 }} / {{ map.s2 || 0 }}
</div>
<div class="size-hui">
<div style="width: 8px;height: 8px;border-radius: 4px;background: #0DC291"></div>
<div style="font-weight: bold;font-size: 13px;margin-left: 5px">挂账总金额（元）/笔数</div>
</div>
<!-- 列表-->
<div class="bottom_new">
<div class="box-gang">
<div class="box">
<div style="font-size: 26px;color: #0DC291;font-weight: bold;margin-top: 5px">
{{ total || 0 }}
</div>
<div class="size-hui">
<div style="width: 8px;height: 8px;border-radius: 4px;background: #0DC291"></div>
<div style="font-weight: bold;font-size: 13px;margin-left: 5px">挂账总金额（元）/笔数</div>
<div class="box">
<div style="font-size: 26px;color: #00CAFF;font-weight: bold;margin-top: 5px">
{{ map.s3 || 0}} / {{ map.s4 || 0 }}
</div>
<div class="size-hui">
<div style="width: 8px;height: 8px;border-radius: 4px;background: #00CAFF"></div>
<div style="font-weight: bold;font-size: 13px;margin-left: 5px">归还总金额（元）/笔数</div>
</div>
</div>
<div class="box">
<div style="font-size: 26px;color: #F44522;font-weight: bold;margin-top: 5px">
{{ map.s5 || 0 }}
</div>
<div class="size-hui">
<div style="width: 8px;height: 8px;border-radius: 4px;background: #F44522"></div>
<div style="font-weight: bold;font-size: 13px;margin-left: 5px">未归还金额（元））</div>
</div>
</div>
</div>
<div class="box">
<div style="font-size: 26px;color: #00CAFF;font-weight: bold;margin-top: 5px">
{{ returnTotal || 0 }}
</div>
<div class="size-hui">
<div style="width: 8px;height: 8px;border-radius: 4px;background: #00CAFF"></div>
<div style="font-weight: bold;font-size: 13px;margin-left: 5px">归还总金额（元）/笔数</div>
</div>
</div>
<div class="box">
<div style="font-size: 26px;color: #F44522;font-weight: bold;margin-top: 5px">
{{ allAmount || 0 }}
</div>
<div class="size-hui">
<div style="width: 8px;height: 8px;border-radius: 4px;background: #F44522"></div>
<div style="font-weight: bold;font-size: 13px;margin-left: 5px">未归还金额（元））</div>
</div>
</div>
</div>
<div class="table-box">
<el-table
:data="hangBillList"
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="orderNo" align="center" label="单据号" width="220"></el-table-column>
<el-table-column align="center" label="挂账单位">
<el-table-column prop="unitName" align="center" label="单位名称"> </el-table-column>
<el-table-column prop="personCredit" align="center" label="挂账人"> </el-table-column>
<el-table-column prop="contactMobile" align="center" label="联系电话"> </el-table-column>
</el-table-column>
<el-table-column label="记录明细" align="center">
<el-table-column prop="returnType" align="center" label="类型">
<div class="table-box">
<el-table
:data="hangBillList"
style="width: 100%"
>
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="orderNo" align="center" label="单据号" width="220"></el-table-column>
<el-table-column align="center" label="挂账单位">
<el-table-column prop="unitName" align="center" label="单位名称"></el-table-column>
<el-table-column prop="personCredit" align="center" label="挂账人"></el-table-column>
<el-table-column prop="contactMobile" align="center" label="联系电话"></el-table-column>
</el-table-column>
<el-table-column label="记录明细" align="center">
<el-table-column prop="returnType" align="center" label="类型">
<template slot-scope="scope">
<el-tag v-if="scope.row.returnType == 0">挂账</el-tag>
<el-tag v-else type="success">归还</el-tag>
</template>
</el-table-column>
<el-table-column prop="amount" align="center" label="金额"></el-table-column>
<el-table-column prop="status" align="center" label="状态">
<template slot-scope="scope">
<span v-if="scope.row.status == 0">未归还</span>
<span v-else-if="scope.row.status == 1" type="success">已归还</span>
<span v-else type="success">部分归还</span>
</template>
</el-table-column>
<el-table-column prop="repaidAmount" align="center" label="已归还金额"></el-table-column>
<el-table-column prop="outstandAmount" align="center" label="未归还金额"></el-table-column>
</el-table-column>
<el-table-column prop="realName" align="center" label="操作人"></el-table-column>
<el-table-column prop="createTime" align="center" label="创建时间" width="220">
<template slot-scope="scope">
<el-tag v-if="scope.row.returnType == 0">挂账</el-tag>
<el-tag v-else type="success">归还</el-tag>
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column prop="amount" align="center" label="金额"> </el-table-column>
<el-table-column prop="status" align="center" label="状态">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<span v-if="scope.row.status == 0">未归还</span>
<span v-else-if="scope.row.status == 1" type="success">已归还</span>
<span v-else type="success">部分归还</span>
<el-button
v-if="scope.row.status != 0"
size="mini"
type="text"
@click="returnRecord(scope.row.id)"
>归还详情
</el-button>
</template>
</el-table-column>
<el-table-column prop="repaidAmount" align="center" label="已归还金额"> </el-table-column>
<el-table-column prop="outstandAmount" align="center" label="未归还金额"> </el-table-column>
</el-table-column>
<el-table-column prop="realName" align="center" label="操作人"> </el-table-column>
<el-table-column prop="createTime" align="center" label="创建时间" width="220">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
v-if="scope.row.status != 0"
size="mini"
type="text"
@click="returnRecord(scope.row.id)"
>归还详情</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="pagination-box">
</el-table>
</div>
<div class="pagination-box">
<pagination
v-show="total>0"
@ -157,28 +161,29 @@
@pagination="getList"
/>
</div>
</div>
</div>
<!-- 归还记录信息-->
<el-drawer
title="归还详情"
:visible.sync="drawer"
direction="rtl"
size="55%"
:before-close="handleClose">
:before-close="handleClose"
>
<div style="display: grid; place-items: center;">
<div class="top_pop">
<div class="wrap_box">
<div class="three_box">
<div class="or_num">订单号：{{record.orderNo}}</div>
<div class="or_num">联系电话：{{record.contactMobile}}</div>
<div class="or_num">订单号：{{ record.orderNo }}</div>
<div class="or_num">联系电话：{{ record.contactMobile }}</div>
</div>
<div class="three_box">
<div class="or_num">挂账单位：{{record.unitName}}</div>
<div class="or_num">操作人：{{ record.realName }}</div>
<div class="or_num">挂账单位：{{ record.unitName }}</div>
<div class="or_num">操作人：{{ record.realName }}</div>
</div>
<div class="three_box">
<div class="or_num">挂账人：{{record.personCredit}}</div>
<div class="or_num">挂账人：{{ record.personCredit }}</div>
<div class="or_num">操作账号：xxxx-xx-xx xx:x</div>
</div>
</div>
@ -189,7 +194,8 @@
<el-table ref="tables"
border
v-loading="loading"
:data="returnRecordList">
:data="returnRecordList"
>
<el-table-column label="单据号" align="center" prop="orderNo" width="200"></el-table-column>
<el-table-column label="类型" align="center" prop="returnType">
<template slot-scope="scope">
@ -197,11 +203,11 @@
<el-tag v-else type="success">归还</el-tag>
</template>
</el-table-column>
<el-table-column label="归还金额" align="center" prop="amount" />
<el-table-column label="找零金额" align="center" prop="seekZero" />
<el-table-column label="归还金额" align="center" prop="amount"/>
<el-table-column label="找零金额" align="center" prop="seekZero"/>
<el-table-column label="归还方式" align="center" prop="status">
<template slot-scope="scope">
<span>{{ getPayMeth(payList,scope.row.status) }}</span>
<span>{{ getPayMeth(payList, scope.row.status) }}</span>
</template>
</el-table-column>
<el-table-column label="支付状态" align="center" prop="payStatus">
@ -211,7 +217,7 @@
<el-tag type="danger" v-else>支付失败</el-tag>
</template>
</el-table-column>
<el-table-column label="操作人" align="center" prop="realName" />
<el-table-column label="操作人" align="center" prop="realName"/>
<el-table-column label="支付时间" align="center" prop="payTime" width="200">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.payTime) }}</span>
@ -221,13 +227,13 @@
<div class="pagination-box">
<pagination
v-show="total2>0"
:total="total2"
:page.sync="queryParams1.page"
:limit.sync="queryParams1.pageSize"
@pagination="getRecordList"
/>
<pagination
v-show="total2>0"
:total="total2"
:page.sync="queryParams1.page"
:limit.sync="queryParams1.pageSize"
@pagination="getRecordList"
/>
</div>
@ -239,197 +245,205 @@
<script>
import {
hangBillAllAmount,
hangBillAllNoReturnAmount,
hangBillAllReturnAmount, hangBillInfo, hangBillReturnTotal,
hangBillInfo,
selectStatistics,
listHangBill
} from "@/api/cashier/hangbill";
import {getDicts} from "@/api/dict/data";
import {listReturnRecord} from "@/api/cashier/returnrecord";
import {exportExcelCashierApi, exportExcelHangBillApi} from "@/api/order/exportExcel";
} from '@/api/cashier/hangbill'
import { getDicts } from '@/api/dict/data'
import { listReturnRecord } from '@/api/cashier/returnrecord'
import { exportExcelCashierApi, exportExcelHangBillApi } from '@/api/order/exportExcel'
export default {
name: "order_Cashier",
data(){
return{
queryParams1: {
page: 1,
pageSize: 10,
hangBillId:"",
},
hangBillList:[],
total:0,
total2:0,
loading:false,
queryParams:{
page:1,
pageSize:10,
returnType:"",
status:"",
unitName:"",
personCredit:"",
contactMobile:"",
mobile:"",
},
dateRange:[],
beginTime:"",
endTime:"",
returnRecordList:[],
payList:[],
// 归还账单总数
returnTotal:0,
// 挂账总额
allAmount:0,
// 归还总额
returnAllAmount:0,
// 未归还总额
noReturnAllAmount:0,
drawer:false,
// 挂账信息
record:{},
// 是否为当天时间
isSysDate:false,
export default {
name: 'order_Cashier',
data() {
return {
map:{},
queryParams1: {
page: 1,
pageSize: 10,
hangBillId: ''
},
hangBillList: [],
total: 0,
total2: 0,
loading: false,
queryParams: {
page: 1,
pageSize: 10,
returnType: '',
status: '',
unitName: '',
personCredit: '',
contactMobile: '',
mobile: ''
},
dateRange: [],
beginTime: '',
endTime: '',
returnRecordList: [],
payList: [],
// 归还账单总数
returnTotal: 0,
// 挂账总额
allAmount: 0,
// 归还总额
returnAllAmount: 0,
// 未归还总额
noReturnAllAmount: 0,
drawer: false,
// 挂账信息
record: {},
// 是否为当天时间
isSysDate: false
}
},
created() {
let start = new Date()
start.setHours(0)
start.setMinutes(0)
start.setSeconds(0)
start.setMilliseconds(0)
this.dateRange = [start, new Date()]
this.beginTime = start
this.endTime = new Date()
this.isSysDate = true
this.getList()
this.getPayList()
},
methods: {
exportExcelCashier() {
// this.dateRange.push(this.beginTime)
// this.dateRange.push(this.endTime)
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
exportExcelHangBillApi(this.addDateRange(this.queryParams, dateRange)).then(res => {
const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })
this.$download.saveAs(blob, '挂账订单统计.xLsx')
})
},
created() {
let start = new Date();
start.setHours(0)
start.setMinutes(0)
start.setSeconds(0)
start.setMilliseconds(0)
this.dateRange = [start,new Date()];
this.beginTime = start
this.endTime = new Date()
this.isSysDate = true
// 归还记录详情弹框
returnRecord(id) {
this.record = {}
this.drawer = true
hangBillInfo(id).then(response => {
this.record = response.data
})
this.getRecordList(id, 1)
},
getRecordList(id, val) {
if (val != 1) {
this.queryParams1.page = id
this.queryParams1.hangBillId = this.record.id
} else {
this.queryParams1.hangBillId = id
}
listReturnRecord(this.queryParams1).then(response => {
this.returnRecordList = response.data.records
this.total2 = response.data.total
})
},
// 获取支付方式
getPayList() {
getDicts('payment_type').then(response => {
this.payList = response.data
})
},
getPayMeth(list, val) {
let name = ''
if (list != null && list != '') {
list.forEach(item => {
if (item.dictValue == val) {
name = item.dictLabel
}
})
}
return name
},
// 是否关闭弹框
handleClose(done) {
done()
},
getList(val) {
if (val != undefined) {
this.queryParams.page = val
}
let dateRange1 = this.dateRange
// let dateRange = []
// if (this.isSysDate){
// dateRange.push(dateRange1[0].toLocaleDateString())
// dateRange.push(dateRange1[1].toLocaleDateString())
// }else {
// dateRange = this.dateRange
// }
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
listHangBill(this.addDateRange(this.queryParams, dateRange)).then(response => {
this.hangBillList = response.data.records
this.total = response.data.total
this.queryParams.page = response.data.current
this.isSysDate = false
})
this.getStatistic()
},
// 获取挂账统计信息
getStatistic() {
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
selectStatistics(this.addDateRange(this.queryParams, dateRange)).then(
res => {
this.map = res.data
}
)
// this.mapStatistics
// hangBillReturnTotal(this.addDateRange(this.queryParams, dateRange)).then(res => {
// this.returnTotal = res.data
// })
// hangBillAllAmount(this.addDateRange(this.queryParams, dateRange)).then(res => {
// if (res.data) {
// this.allAmount = res.data
// }
// })
// hangBillAllReturnAmount(this.addDateRange(this.queryParams, dateRange)).then(res => {
// if (res.data) {
// this.returnAllAmount = res.data
// }
// })
// hangBillAllNoReturnAmount(this.addDateRange(this.queryParams, dateRange)).then(res => {
// if (res.data) {
// this.noReturnAllAmount = res.data
// }
// })
},
// 搜索按钮操作
handleQuery() {
this.queryParams.page = 1
this.getList()
this.getPayList()
},
methods: {
exportExcelCashier() {
// this.dateRange.push(this.beginTime)
// this.dateRange.push(this.endTime)
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
exportExcelHangBillApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
this.$download.saveAs(blob,'挂账订单统计.xLsx')
})
},
// 归还记录详情弹框
returnRecord(id){
this.record = {}
this.drawer = true
hangBillInfo(id).then(response => {
this.record = response.data
})
this.getRecordList(id,1);
},
getRecordList(id,val){
if (val!=1){
this.queryParams1.page = id
this.queryParams1.hangBillId = this.record.id
}else {
this.queryParams1.hangBillId = id
}
listReturnRecord(this.queryParams1).then(response => {
this.returnRecordList = response.data.records
this.total2 = response.data.total
})
},
// 获取支付方式
getPayList() {
getDicts("payment_type").then(response => {
this.payList = response.data;
})
},
getPayMeth(list,val){
let name = "";
if (list!=null && list!=""){
list.forEach(item => {
if (item.dictValue == val){
name = item.dictLabel
}
})
}
return name;
},
// 是否关闭弹框
handleClose(done) {
done();
},
getList(val){
if (val!=undefined){
this.queryParams.page = val
}
let dateRange1 = this.dateRange
// let dateRange = []
// if (this.isSysDate){
// dateRange.push(dateRange1[0].toLocaleDateString())
// dateRange.push(dateRange1[1].toLocaleDateString())
// }else {
// dateRange = this.dateRange
// }
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
listHangBill(this.addDateRange(this.queryParams, dateRange)).then( response => {
this.hangBillList = response.data.records
this.total = response.data.total;
this.queryParams.page = response.data.current;
this.isSysDate = false
})
this.getStatistic();
},
// 获取挂账统计信息
getStatistic(){
let dateRange = []
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
hangBillReturnTotal(this.addDateRange(this.queryParams, dateRange)).then(res => {
this.returnTotal = res.data
})
hangBillAllAmount(this.addDateRange(this.queryParams, dateRange)).then(res => {
if (res.data) {
this.allAmount = res.data
}
})
hangBillAllReturnAmount(this.addDateRange(this.queryParams, dateRange)).then(res => {
if (res.data) {
this.returnAllAmount = res.data
}
})
hangBillAllNoReturnAmount(this.addDateRange(this.queryParams, dateRange)).then(res => {
if (res.data) {
this.noReturnAllAmount = res.data
}
})
},
// 搜索按钮操作
handleQuery() {
this.queryParams.page = 1;
this.getList();
},
// 重置按钮操作
resetQuery() {
this.dateRange = [];
this.queryParams.page = 1;
this.beginTime = ""
this.endTime = ""
this.resetForm("queryForm");
this.handleQuery();
},
// 重置按钮操作
resetQuery() {
this.dateRange = []
this.queryParams.page = 1
this.beginTime = ''
this.endTime = ''
this.resetForm('queryForm')
this.handleQuery()
}
}
}
</script>
<style scoped>

13
fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
View File

@ -23,6 +23,19 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="terminal">
<el-select
v-model="queryParams.terminal"
clearable
placeholder="请选择订单类型"
>
<el-option v-for="item in terminalList"
:key="item.id"
:label="item.dictLabel"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="payType">
<el-select
v-model="queryParams.payType"

68
fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
View File

@ -15,17 +15,14 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="paymentType">
<el-form-item label="" prop="payChannel">
<el-select
v-model="queryParams.paymentType"
v-model="queryParams.payChannel"
clearable
placeholder="请选择订单类型"
>
<el-option v-for="item in payList"
:key="item.id"
:label="item.dictLabel"
:value="item.dictValue">
</el-option>
<el-option label="收银台" value="cashier"></el-option>
<el-option label="小程序" value="applet"></el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="paymentType">
@ -110,11 +107,11 @@
</div>
<div class="box2">
<div style="font-size: 26px;color: #2B63F4;font-weight: bold;margin-top: 5px">
{{ orderStatistics.wechat || 0 }}/{{ orderStatistics.alipay || 0 }}
{{ orderStatistics.UNIONPAY || 0 }}
</div>
<div class="size-hui">
<div style="width: 8px;height: 8px;border-radius: 4px;background: #2B63F4"></div>
<div style="font-weight: bold;font-size: 13px;margin-left: 5px">云闪付/pos刷卡（元）</div>
<div style="font-weight: bold;font-size: 13px;margin-left: 5px">银联二维码（元）</div>
</div>
</div>
<div class="box2">
@ -136,31 +133,37 @@
border
:data="list"
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="paymentNo" label="订单号" align="center"></el-table-column>
<el-table-column prop="payChannel" label="订单类型" align="center">
<template slot-scope="scope">
<span v-if="scope.row.payChannel=='cashier'">收银台</span>
<span v-else>小程序</span>
</template>
</el-table-column>
<el-table-column prop="name" label="会员名称" align="center"></el-table-column>
<el-table-column prop="mobile" label="会员手机号" align="center"></el-table-column>
<el-table-column prop="bidBalance" label="到账金额" align="center"></el-table-column>
<el-table-column prop="amount" label="自定义充值金额" align="center"></el-table-column>
<el-table-column prop="rechargeBalance" label="电子储值卡实售金额" align="center"></el-table-column>
<el-table-column prop="giftBalance" label="电子储值卡赠送金额" align="center"></el-table-column>
<el-table-column prop="mobile" label="手机号" align="center"></el-table-column>
<el-table-column prop="rechargeBalance" label="充值金额（元）" align="center"></el-table-column>
<el-table-column prop="giftBalance" label="赠送金额（元）" align="center"></el-table-column>
<el-table-column prop="giftBalance" label="会员总余额（元）" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rechargeBalance + scope.row.giftBalance }}</span>
</template>
</el-table-column>
<el-table-column prop="paymentType" label="支付方式" align="center">
<template slot-scope="scope">
<span>{{ getType(payList, scope.row.paymentType) }}</span>
</template>
</el-table-column>
<el-table-column prop="payStatus" label="支付状态" align="center">
<el-table-column prop="payStatus" label="订单状态" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.payStatus == 'unpaid'">未支付</el-tag>
<el-tag type="success" v-else-if="scope.row.payStatus == 'paid'">已支付</el-tag>
<el-tag type="danger" v-else>支付失败</el-tag>
<div v-if="scope.row.payStatus == 'unpaid'" style="color: #F44522">未支付</div>
<div v-else-if="scope.row.payStatus == 'paid'" style="color: #0DC291">支付成功</div>
<div v-else style="color: #F44522">支付失败</div>
</template>
</el-table-column>
<el-table-column prop="realName" label="交易员工" align="center">
<template slot-scope="scope">
<span>{{ scope.row.realName || getStaffName(staffList, scope.row.mtStaffId) }}</span>
</template>
</el-table-column>
<el-table-column prop="remark" label="充值备注" align="center">
<el-table-column prop="remark" label="备注" align="center">
<template slot-scope="scope">
<span>{{ scope.row.remark ? scope.row.remark : "--" }}</span>
</template>
@ -170,6 +173,18 @@
<span>充值满{{ scope.row.rechargeBalance }}元赠送{{ scope.row.giftBalance }}元</span>
</template>
</el-table-column>
<el-table-column prop="realName" label="关联员工" align="center">
<template slot-scope="scope">
<span>{{ scope.row.realName || getStaffName(staffList, scope.row.mtStaffId) }}</span>
</template>
</el-table-column>
<el-table-column label="订单完成时间" align="center" width="150" prop="payTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<!-- <el-button size="mini" type="text" icon="el-icon-edit">更多操作</el-button>-->
@ -530,6 +545,8 @@ export default {
})
},
getType(list, val) {
console.log("支付方式", list)
console.log("支付方式", val)
let name = "";
list.forEach(item => {
if (item.dictValue == val) {
@ -543,6 +560,9 @@ export default {
getDicts("payment_type").then(response => {
this.payList = response.data;
})
getDicts("terminal").then(response => {
this.terminalList = response.data;
})
queryStaffs().then(response => {
this.staffList = response.data;
})