From 189f6dff68a30e3f43cdeee3700969c7ee903798 Mon Sep 17 00:00:00 2001 From: wangh <9483> Date: Tue, 30 Jan 2024 09:56:03 +0800 Subject: [PATCH] no message --- .../mapper/xml/CardValueRecordMapper.xml | 23 +++++++++++-------- .../member/mapper/xml/LJStaffMapper.xml | 6 +++-- .../order/mapper/xml/AllOrderInfoMapper.xml | 3 ++- .../service/impl/OilOrderServiceImpl.java | 3 +-- .../mapper/OilTankMapper.java | 2 ++ .../mapper/xml/OilTankMapper.xml | 4 ++++ .../service/impl/OilTankServiceImpl.java | 7 ++++++ .../views/cashier/NewComponents/homeindex.vue | 22 +++++++++--------- 8 files changed, 45 insertions(+), 25 deletions(-) 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 2c969f7f3..cd12a9c38 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 @@ -161,34 +161,36 @@ SELECT -- 当天的数据和条数 CAST((SELECT COUNT(*) FROM card_value_record WHERE DATE(create_time) = CURDATE() and store_id = #{storeId}) AS CHAR) AS today_count, - CAST((SELECT SUM(recharge_balance) FROM card_value_record WHERE DATE(create_time) = CURDATE()and store_id = #{storeId}) AS CHAR) AS today_sum, + CAST((SELECT SUM(recharge_balance)+SUM( CASE WHEN card_value_record.payment_type = 'CASH' THEN card_value_record.amount ELSE 0 END ) FROM card_value_record WHERE DATE(create_time) = CURDATE()and store_id = #{storeId}) AS CHAR) AS today_sum, -- 当周的数据和条数 CAST((SELECT COUNT(*) FROM card_value_record WHERE WEEK(create_time) = WEEK(CURDATE())and store_id = #{storeId}) AS CHAR) AS this_week_count, - CAST((SELECT SUM(recharge_balance) FROM card_value_record WHERE WEEK(create_time) = WEEK(CURDATE())and store_id = #{storeId}) AS CHAR) AS this_week_sum, + CAST((SELECT SUM(recharge_balance)+SUM( CASE WHEN card_value_record.payment_type = 'CASH' THEN card_value_record.amount ELSE 0 END ) FROM card_value_record WHERE WEEK(create_time) = WEEK(CURDATE())and store_id = #{storeId}) AS CHAR) AS this_week_sum, -- 当月的数据和条数 CAST((SELECT COUNT(*) FROM card_value_record WHERE MONTH(create_time) = MONTH(CURDATE())and store_id = #{storeId}) AS CHAR) AS this_month_count, - CAST((SELECT SUM(recharge_balance) FROM card_value_record WHERE MONTH(create_time) = MONTH(CURDATE())and store_id = #{storeId}) AS CHAR) AS this_month_sum, + CAST((SELECT SUM(recharge_balance)+SUM( CASE WHEN card_value_record.payment_type = 'CASH' THEN card_value_record.amount ELSE 0 END ) FROM card_value_record WHERE MONTH(create_time) = MONTH(CURDATE())and store_id = #{storeId}) AS CHAR) AS this_month_sum, -- 昨天的数据 CAST((SELECT COUNT(*) FROM card_value_record WHERE DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)and store_id = #{storeId}) AS CHAR) AS yesterday_count, - CAST((SELECT SUM(recharge_balance) FROM card_value_record WHERE DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)and store_id = #{storeId}) AS CHAR) AS yesterday_sum, + CAST((SELECT SUM(recharge_balance)+SUM( CASE WHEN card_value_record.payment_type = 'CASH' THEN card_value_record.amount ELSE 0 END ) FROM card_value_record WHERE DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)and store_id = #{storeId}) AS CHAR) AS yesterday_sum, -- 上周的数据 CAST((SELECT COUNT(*) FROM card_value_record WHERE WEEK(create_time) = WEEK(DATE_SUB(CURDATE(), INTERVAL 1 WEEK))and store_id = #{storeId}) AS CHAR) AS last_week_count, - CAST((SELECT SUM(recharge_balance) FROM card_value_record WHERE WEEK(create_time) = WEEK(DATE_SUB(CURDATE(), INTERVAL 1 WEEK))and store_id = #{storeId}) AS CHAR) AS last_week_sum, + CAST((SELECT SUM(recharge_balance)+SUM( CASE WHEN card_value_record.payment_type = 'CASH' THEN card_value_record.amount ELSE 0 END ) FROM card_value_record WHERE WEEK(create_time) = WEEK(DATE_SUB(CURDATE(), INTERVAL 1 WEEK))and store_id = #{storeId}) AS CHAR) AS last_week_sum, -- 上个月的数据 CAST((SELECT COUNT(*) FROM card_value_record WHERE MONTH(create_time) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))and store_id = #{storeId}) AS CHAR) AS last_month_count, - CAST((SELECT SUM(recharge_balance) FROM card_value_record WHERE MONTH(create_time) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))and store_id = #{storeId}) AS CHAR) AS last_month_sum; + CAST((SELECT SUM(recharge_balance)+SUM( CASE WHEN card_value_record.payment_type = 'CASH' THEN card_value_record.amount ELSE 0 END ) FROM card_value_record WHERE MONTH(create_time) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))and store_id = #{storeId}) AS CHAR) AS last_month_sum; + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilTankServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilTankServiceImpl.java index c4a10f08c..283534512 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilTankServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilTankServiceImpl.java @@ -86,9 +86,12 @@ public class OilTankServiceImpl implements OilTankService { */ @Override public OilTank insert(OilTank oilTank) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); oilTank.setStoreId(nowAccountInfo.getStoreId()); oilTank.setCreateBy(nowAccountInfo.getStaffId().toString()); + OilTank oilTank1 = oilTankDao.selectByName(oilTank); + if (ObjectUtil.isNotEmpty(oilTank1)) throw new RuntimeException("油罐名称不得重复！"); this.oilTankDao.insert(oilTank); @@ -116,6 +119,10 @@ public class OilTankServiceImpl implements OilTankService { */ @Override public OilTank update(OilTank oilTank) { + OilTank oilTank1 = oilTankDao.selectByName(oilTank); + + if (ObjectUtil.isNotEmpty(oilTank1) && !oilTank1.getId().equals(oilTank.getId())) throw new RuntimeException("油罐名称不得重复！"); + this.oilTankDao.update(oilTank); return this.queryById(oilTank.getId()); } diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index 17c845731..ae1e408a1 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -59,18 +59,18 @@ placement="bottom-start" width="400" trigger="click"> -
-
- - -
-
{{ getName(oilNameList,item.oilName) }}_{{getName1(gunList,item.gunName)}}
-
-
-￥{{ item.discount }}
-
满减优惠
-
折扣优惠
+
+
+ + +
+
{{ getName(oilNameList,item.oilName) }}_{{getName1(gunList,item.gunName)}}
+
+
-￥{{ item.discount }}
+
满减优惠
+
折扣优惠
+
-