From 7a76aa4311c86413ff964ed882f592edec5dc470 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 20 五月 2024 21:37:54 +0800 Subject: [PATCH] 1、完善协议实现代码; 2、实体协议数据处理自动任务(报警及状态+定时上报数据); 3、数据库实体id自动付值插件优化。 --- pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml | 72 +++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml index ce7af1c..3114482 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml @@ -387,7 +387,7 @@ </select> <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍗¤褰�--> - <select id="getActiveCards" resultType="com.dy.pipIrrGlobal.voSe.VoActiveCardNew"> + <select id="getActiveCards" resultType="com.dy.pipIrrGlobal.voSe.VoActiveCard"> SELECT CAST(ope.id AS char) AS id , cli.name AS clientName, @@ -491,6 +491,76 @@ </trim> </select> + <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇閫氱敤鎿嶄綔璁板綍鏁伴噺--> + <select id="getCommonOperationRecordCount" parameterType="java.util.Map" resultType="java.lang.Long"> + select + COUNT(*) AS recordCount + FROM se_card_operate ope + INNER JOIN se_client cli ON ope.client_id = cli.id + INNER JOIN se_client_card card ON ope.card_id = card.id + INNER JOIN ba_user us ON ope.operator = us.id + <where> + <if test = "operateType != null and operateType > 0"> + AND ope.operate_type = ${operateType} + </if> + + <if test = "clientName != null and clientName !=''"> + AND cli.name like CONCAT('%',#{clientName},'%') + </if> + + <if test = "cardNum != null and cardNum !=''"> + AND card.cardNum like CONCAT('%',#{cardNum},'%') + </if> + + <if test = "timeStart != null and timeStop != null"> + AND ope.operate_dt BETWEEN #{timeStart} AND #{timeStop} + </if> + </where> + </select> + + <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇閫氱敤鎿嶄綔璁板綍--> + <select id="getCommonOperations" resultType="com.dy.pipIrrGlobal.voSe.VoOperate"> + SELECT + cli.name AS clientName, + cli.clientNum, + CAST(card.cardNum AS char) AS cardNum, + us.name AS operator, + ope.operate_dt AS operateDt, + IFNULL(ope.trade_amount,0) AS refund, + (CASE + WHEN ope.payment_id = 1 THEN "鐜伴噾" + END) AS refundTypeName, + card.money, + IFNULL(ope.system_balance,0) AS systemBalance + FROM se_card_operate ope + INNER JOIN se_client cli ON ope.client_id = cli.id + INNER JOIN se_client_card card ON ope.card_id = card.id + INNER JOIN ba_user us ON ope.operator = us.id + <where> + <if test = "operateType != null and operateType > 0"> + AND ope.operate_type = ${operateType} + </if> + + <if test = "clientName != null and clientName !=''"> + AND cli.name like CONCAT('%',#{clientName},'%') + </if> + + <if test = "cardNum != null and cardNum !=''"> + AND card.cardNum like CONCAT('%',#{cardNum},'%') + </if> + + <if test = "timeStart != null and timeStop != null"> + AND ope.operate_dt BETWEEN #{timeStart} AND #{timeStop} + </if> + </where> + ORDER BY ope.operate_dt DESC + <trim prefix="limit " > + <if test="start != null and count != null"> + #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER} + </if> + </trim> + </select> + <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鏀舵嵁鍒楄〃鏁�--> <select id="getReceiptsRecordCount" parameterType="java.util.Map" resultType="java.lang.Long"> SELECT -- Gitblit v1.8.0