From 46627228f6f42826c0eef299115872d43268f9a9 Mon Sep 17 00:00:00 2001 From: ds Date: Tue, 19 Nov 2024 08:30:08 +0800 Subject: [PATCH] 11.19 --- .../dai_yunyingfenxi/tab/paytype.vue | 8 +++--- .../jiaoyiduizhang/tab/int.vue | 7 +++++- .../jiaoyiduizhang/tab/oil.vue | 7 +++++- .../jiaoyiduizhang/tab/store.vue | 7 +++++- .../jiaoyiduizhang/tab/vip.vue | 7 +++++- .../mapper/xml/CardValueRecordMapper.xml | 2 +- .../order/mapper/xml/AllOrderInfoMapper.xml | 25 +++---------------- .../service/impl/AllOrderInfoServiceImpl.java | 7 +++++- .../business/store/mapper/MtStoreMapper.java | 5 ++++ .../store/mapper/xml/MtStoreMapper.xml | 15 +++++++++++ 10 files changed, 58 insertions(+), 32 deletions(-) diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue index cc1892bce..fd232a586 100644 --- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue +++ b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue @@ -46,19 +46,19 @@
活跃油站汇总数/合作油站汇总数
-
{{ orderStatistics.allOrderStoreId?orderStatistics.allOrderStoreId:0 }}/{{orderStatistics.totalCount}}
+
{{ orderStatistics.allOrderStoreId?orderStatistics.allOrderStoreId:0 }}/{{orderStatistics.totalCount ? orderStatistics.totalCount : 0}}
交易金额汇总数（元）/交易笔数
-
{{ orderStatistics.totalPayMoney?orderStatistics.totalPayMoney:0 }}/{{orderStatistics.totalTransactionCount}}
+
{{ orderStatistics.totalPayMoney?orderStatistics.totalPayMoney:0 }}/{{orderStatistics.totalTransactionCount ? orderStatistics.totalTransactionCount : 0}}
退款金额（元）/退款笔数
-
{{ orderStatistics.refMoney?orderStatistics.refMoney:0 }}/{{orderStatistics.refCount}}
+
{{ orderStatistics.refMoney?orderStatistics.refMoney:0 }}/{{orderStatistics.refCount ? orderStatistics.refCount : 0 }}
新增油站数
-
{{ orderStatistics.totalCount?orderStatistics.totalCount:0 }}
+
{{ orderStatistics.newStoreTotal?orderStatistics.newStoreTotal:0 }}
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue index 6aae3dfab..14d92022a 100644 --- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue +++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue @@ -99,7 +99,12 @@ 现金 微信 支付宝 - 余额 + 银联二维码 + 小程序码 + 储值卡 + 囤油卡 + 车队卡 + 挂账 diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue index ea9f4f89c..f83c1f386 100644 --- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue +++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue @@ -100,7 +100,12 @@ 现金 微信 支付宝 - 余额 + 银联二维码 + 小程序码 + 储值卡 + 囤油卡 + 车队卡 + 挂账 diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue index b83d3d325..3c0aaec65 100644 --- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue +++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue @@ -98,7 +98,12 @@ 现金 微信 支付宝 - 余额 + 银联二维码 + 小程序码 + 储值卡 + 囤油卡 + 车队卡 + 挂账 diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue index 8c09f733b..ce6949592 100644 --- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue +++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue @@ -101,7 +101,12 @@ 现金 微信 支付宝 - 余额 + 银联二维码 + 小程序码 + 储值卡 + 囤油卡 + 车队卡 + 挂账 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml index f01aa23f2..b2670ab3d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml @@ -327,7 +327,7 @@ real_name, update_time as updateTime, create_time as createTime, - status as payStatus, + pay_status as payStatus, mt_staff_id, card_value_id, store_id from card_value_record) a diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml index 2a8cfcf28..693de6b6c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml @@ -771,7 +771,7 @@ d.dept_name AS deptName, s.name AS storeName, SUM(COALESCE(a.pay_money, 0)) AS payMoney, - count(*) count, + count(a.id) count, sum( CASE WHEN a.pay_type = 'WECHAT' THEN a.pay_money ELSE 0 END ) wechatMoney, sum( CASE WHEN a.pay_type = 'CASH' THEN a.pay_money ELSE 0 END ) cashMoney, sum( CASE WHEN a.pay_type = 'balance' THEN a.pay_money ELSE 0 END ) balanceMoney, @@ -780,8 +780,8 @@ count( CASE WHEN a.STATUS = 'refund' THEN 1 ELSE NULL END ) refCount from mt_store s - LEFT JOIN all_order_info a on s.id=a.store_id - LEFT JOIN sys_dept d on d.dept_id = s.contract_dept_id + inner JOIN all_order_info a on s.id=a.store_id + inner JOIN sys_dept d on d.dept_id = s.contract_dept_id where s.id in @@ -798,14 +798,6 @@ and ( a.create_time IS NULL OR date_format(a.create_time,'%y%m%d') <= date_format(#{order.params.endTime},'%y%m%d') ) - - and (s.create_time IS NULL OR date_format(s.create_time,'%y%m%d') >= - date_format(#{order.params.beginTime},'%y%m%d')) - - - and ( s.create_time IS NULL OR date_format(s.create_time,'%y%m%d') <= - date_format(#{order.params.endTime},'%y%m%d') ) - GROUP BY s.id ORDER BY payMoney DESC @@ -877,8 +869,6 @@ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java index b76b282b6..31e5843fb 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java @@ -321,7 +321,12 @@ public class AllOrderInfoServiceImpl extends ServiceImpl { * @return */ List selectStoreNumByMonth(@Param("storeVo") MtStore store,@Param("storeIds") List storeIds); + + int getNewStoreTotal(@Param("order") AllOrderInfo allOrderInfo); + + int getStoreTotal(); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/xml/MtStoreMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/xml/MtStoreMapper.xml index 3a88fd08f..7651e712d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/xml/MtStoreMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/xml/MtStoreMapper.xml @@ -144,4 +144,19 @@ tradeTime) t GROUP BY t.tradeTime + + + \ No newline at end of file