From 86b6d265f71768e44e528a8aa5215ab494fbc3ca Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期二, 05 十一月 2024 16:10:42 +0800 Subject: [PATCH] 修改常用充值金额配置信息,修改部分接口 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml | 3 ++- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRechargeProfile.java | 2 +- pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml | 36 ++++++++++++++++++------------------ 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRechargeProfile.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRechargeProfile.java index 81f1e79..1686a2f 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRechargeProfile.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRechargeProfile.java @@ -27,5 +27,5 @@ /** * 鍏呭�奸噾棰� */ - private Integer rechargeAmount; + private Double rechargeAmount; } diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml index e2efef1..ddcc7a0 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml @@ -50,12 +50,12 @@ <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/> </irrigateProfile> <rechargeProfile> - <item1 rechargeAmount = "5000" sort = "1"/> - <item2 rechargeAmount = "10000" sort = "2" /> - <item3 rechargeAmount = "20000" sort = "3"/> - <item4 rechargeAmount = "30000" sort = "4"/> - <item5 rechargeAmount = "50000" sort = "5"/> - <item6 rechargeAmount = "100000" sort = "6"/> + <item1 rechargeAmount = "50" sort = "1"/> + <item2 rechargeAmount = "100" sort = "2" /> + <item3 rechargeAmount = "200" sort = "3"/> + <item4 rechargeAmount = "300" sort = "4"/> + <item5 rechargeAmount = "500" sort = "5"/> + <item6 rechargeAmount = "1000" sort = "6"/> </rechargeProfile> </org1> <org2 tag="sp" name="娌欑洏" enable="true"> @@ -106,12 +106,12 @@ <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/> </irrigateProfile> <rechargeProfile> - <item1 rechargeAmount = "5000" sort = "1"/> - <item2 rechargeAmount = "10000" sort = "2" /> - <item3 rechargeAmount = "20000" sort = "3"/> - <item4 rechargeAmount = "30000" sort = "4"/> - <item5 rechargeAmount = "50000" sort = "5"/> - <item6 rechargeAmount = "100000" sort = "6"/> + <item1 rechargeAmount = "50" sort = "1"/> + <item2 rechargeAmount = "100" sort = "2" /> + <item3 rechargeAmount = "200" sort = "3"/> + <item4 rechargeAmount = "300" sort = "4"/> + <item5 rechargeAmount = "500" sort = "5"/> + <item6 rechargeAmount = "1000" sort = "6"/> </rechargeProfile> </org2> <org3 tag="test" name="娴嬭瘯" enable="true"> @@ -162,12 +162,12 @@ <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/> </irrigateProfile> <rechargeProfile> - <item1 rechargeAmount = "5000" sort = "1"/> - <item2 rechargeAmount = "10000" sort = "2" /> - <item3 rechargeAmount = "20000" sort = "3"/> - <item4 rechargeAmount = "30000" sort = "4"/> - <item5 rechargeAmount = "50000" sort = "5"/> - <item6 rechargeAmount = "100000" sort = "6"/> + <item1 rechargeAmount = "50" sort = "1"/> + <item2 rechargeAmount = "100" sort = "2" /> + <item3 rechargeAmount = "200" sort = "3"/> + <item4 rechargeAmount = "300" sort = "4"/> + <item5 rechargeAmount = "500" sort = "5"/> + <item6 rechargeAmount = "1000" sort = "6"/> </rechargeProfile> </org3> </orgs> diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml index d38ce76..0331a56 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml @@ -189,7 +189,8 @@ SELECT id, vc_num AS vcNum, - ROUND(money / 100, 2) AS money, +<!-- ROUND(money / 100, 2) AS money,--> + money, in_use AS inUse, (CASE WHEN money <= #{alarmValue} THEN true -- Gitblit v1.8.0