From a5b7ba070f03327f8848593a31c44cc79e7bb24a Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期四, 11 七月 2024 21:53:14 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) 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 f7da91d..2e55f5e 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml @@ -214,6 +214,16 @@ SELECT id FROM se_virtual_card WHERE vc_num = #{vcNum} </select> + <!--鏍规嵁铏氭嫙鍗$紪鍙疯幏鍙栬櫄鎷熷崱ID--> + <select id="getClientIdAndNameByVsCardNo" resultType="java.util.Map"> + SELECT + cli.id AS clientId, + cli.name AS clientName + FROM se_virtual_card card + INNER JOIN se_client cli ON card.client_id = cli.id + WHERE card.vc_num = #{vcNum} + </select> + <!--鏍规嵁琛屾斂鍖哄垝涓叉ā绯婃煡璇㈣櫄鎷熷崱缂栧彿--> <select id="getVcCardNumOfMax" resultType="java.lang.String"> SELECT vc_num @@ -241,11 +251,7 @@ WHEN order_state = 2 THEN "宸叉敮浠�" END) AS orderStateName FROM se_vc_recharge - <where> - <if test = "orderState != null"> - order_state = #{orderState,jdbcType=TINYINT} - </if> - </where> + where order_state = 2 order by recharge_time DESC <if test="pageCurr != null and pageSize != null"> LIMIT ${(pageCurr-1)*pageSize}, ${pageSize} @@ -256,10 +262,6 @@ SELECT COUNT(*) FROM se_vc_recharge - <where> - <if test = "orderState != null"> - order_state = #{orderState,jdbcType=TINYINT} - </if> - </where> + where order_state = 2 </select> </mapper> \ No newline at end of file -- Gitblit v1.8.0