From a229dd50a553ce15a5e697e0b0c48ebdc06f4e82 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期二, 27 八月 2024 09:41:59 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml | 40 +++++++++++++++++++++++++++++----------- pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardCtrl.java | 2 +- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java | 2 +- pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml | 2 +- pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java | 2 +- 5 files changed, 33 insertions(+), 15 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java index 84522a1..12fbdc8 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java @@ -81,7 +81,7 @@ List<VoCardInfo1> getCardsByAddrAndNum(@Param("cardAddr") String cardAddr, @Param("cardNum") Long cardNum); /** - * 鏍规嵁鍐滄埛涓婚敭鑾峰彇姘村崱鍒楄〃 + * 鏍规嵁鍐滄埛涓婚敭鑾峰彇姘村崱鍒楄〃锛堢墿鐞嗗崱+铏氭嫙鍗★級 * @param clientId * @return */ diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml index 1bdeb43..bd1b81a 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml @@ -321,19 +321,37 @@ set money = #{money,jdbcType=FLOAT} where id = #{id,jdbcType=BIGINT} </update> - <!--鏍规嵁鍐滄埛涓婚敭鑾峰彇姘村崱鍒楄〃--> + <!--鏍规嵁鍐滄埛涓婚敭鑾峰彇姘村崱鍒楄〃锛堢墿鐞嗗崱+铏氭嫙鍗★級--> <select id="getCardInfoByClientId" resultType="com.dy.pipIrrGlobal.voSe.VoCardInfo"> SELECT - cardNum, - '鐢ㄦ埛鍗�' AS cardType, - money, - (CASE - WHEN state = 1 THEN '姝e父' - WHEN state = 2 THEN '宸叉敞閿�' - ELSE '宸叉寕澶�' - END) AS state - FROM se_client_card - WHERE clientId = #{clientId,jdbcType=BIGINT} + * + FROM + (SELECT + '鐗╃悊鍗�' AS cardType, + clientCard.cardNum AS CardNum, + clientCard.money AS Money, + (CASE + WHEN clientCard.state = 1 THEN '姝e父' + WHEN clientCard.state = 2 THEN '宸叉敞閿�' + ELSE '宸叉寕澶�' + END) AS State + FROM se_client client + LEFT JOIN se_client_card clientCard ON clientCard.clientId = client.id + WHERE client.id = #{clientId,jdbcType=BIGINT} + UNION ALL + SELECT + '铏氭嫙鍗�' AS cardType, + virtualCard.vc_num AS CardNum, + virtualCard.money AS vcMoney, + (CASE + WHEN virtualCard.in_use = 0 THEN '鏈娇鐢�' + WHEN virtualCard.in_use = 1 THEN '浣跨敤涓�' + END) AS State + FROM se_client client + LEFT JOIN se_virtual_card virtualCard ON client.id = virtualCard.client_id + WHERE client.id = #{clientId,jdbcType=BIGINT} + ) card + ORDER BY card.Money DESC , card.State DESC </select> <!--鏍规嵁姘村崱缂栧彿鑾峰彇鎿嶄綔璁板綍鍒楄〃--> diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml index 6569c2b..30c4b20 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml @@ -351,7 +351,7 @@ cli.phone, cli.idCard, cli.area, - (SELECT COUNT(*) FROM se_client_card WHERE clientId = cli.id) AS cardCount, + (SELECT COUNT(*) FROM se_client_card WHERE clientId = cli.id)+(SELECT COUNT(*) FROM se_virtual_card WHERE client_id = cli.id) AS cardCount, cli.address, cli.remarks, cli.operateDt diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardCtrl.java index a025279..8d6b05c 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardCtrl.java @@ -42,7 +42,7 @@ private final ClientCardSv clientCardSv; /** - * 鑾峰彇鎸囧畾鐢ㄦ埛鍚嶄笅鍏ㄩ儴姘村崱 + * 鑾峰彇鎸囧畾鐢ㄦ埛鍚嶄笅鍏ㄩ儴姘村崱锛堢墿鐞嗗崱+铏氭嫙鍗★級 * @param clientId * @return */ diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java index dfaef27..c2f14e6 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java @@ -74,7 +74,7 @@ } /** - * 鏍规嵁鍐滄埛涓婚敭鑾峰彇姘村崱鍒楄〃 + * 鏍规嵁鍐滄埛涓婚敭鑾峰彇姘村崱鍒楄〃锛堢墿鐞嗗崱+铏氭嫙鍗★級 * @param clientId * @return */ -- Gitblit v1.8.0