From 3dae16069f7f6572750f028a48ca291f449bbb44 Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期五, 12 七月 2024 14:37:40 +0800 Subject: [PATCH] 2024-07-12 朱宝民 开卡传入协议,补卡返回协议 --- pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/ActiveCard.java | 6 ++++++ pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml | 7 ++++--- pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java | 6 ++++++ 3 files changed, 16 insertions(+), 3 deletions(-) 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 d828d9e..71d1989 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml @@ -56,9 +56,10 @@ <select id="getCardIdAndClientNum" resultType="java.util.Map"> <!-- SELECT id AS cardId, clientNum FROM se_client_card WHERE cardNum = #{cardNum}--> SELECT - card.id AS cardId, - cli.clientNum, - cli.id AS clientId + card.id AS cardId, + cli.clientNum, + cli.id AS clientId, + protocol FROM se_client_card card INNER JOIN se_client cli ON card.clientId = cli.id WHERE card.cardNum = #{cardNum} diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java index b607fb5..502c1e9 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java @@ -107,6 +107,7 @@ * operator 鎿嶄綔浜虹紪鍙� * activeTime 寮�鍗℃椂闂� */ + String protocol = po.getProtocol(); String cardAddr = po.getCardAddr(); Integer cardCost = po.getCardCost(); Long originalCardId = po.getOriginalCardId(); @@ -120,6 +121,7 @@ * 娣诲姞鍐滄埛鍗¤褰曪紝閫�杩橀噾棰濅綔涓哄綋鍓嶄綑棰� */ SeClientCard seClientCard = new SeClientCard(); + seClientCard.setProtocol(protocol); seClientCard.setCardaddr(cardAddr); seClientCard.setCardnum(cardNum); seClientCard.setClientid(clientId); @@ -207,6 +209,7 @@ * operator 鎿嶄綔浜虹紪鍙� */ + String protocol; String cardAddr = po.getCardAddr(); String clientNum = ""; Long clientId = 0L; @@ -241,6 +244,7 @@ clientNum = map.get("clientNum").toString(); cardId = Long.parseLong(map.get("cardId").toString()); clientId = Long.parseLong(map.get("clientId").toString()); + protocol = map.get("protocol").toString(); /** * 濡傛灉鏄ˉ鍗¤皟鐢ㄧ殑寮�鍗′笖杞Щ浜嗛��杩橀噾棰濓紝闇�淇敼鎸傚け鍗′綑棰濅负0 @@ -256,6 +260,7 @@ * 娣诲姞寮�鍗¤褰曪紝閫�杩橀噾棰濆啿鍒版柊鍗′腑 */ ActiveCard activeCard = new ActiveCard(); + activeCard.setProtocol(protocol); activeCard.setCardAddr(cardAddr); activeCard.setClientId(clientId); activeCard.setOriginalCardId(cardId); @@ -279,6 +284,7 @@ map_response.put("projectNo", projectNo); map_response.put("orderNumber", orderNumber); map_response.put("cardNum", cardNum); + map_response.put("protocol", protocol); return BaseResponseUtils.buildSuccess(map_response) ; } diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/ActiveCard.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/ActiveCard.java index 2cbc5a0..2c3ff91 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/ActiveCard.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/ActiveCard.java @@ -17,6 +17,12 @@ public static final long serialVersionUID = 202407111129001L; /** + * 鍗忚鍚嶇О + */ + @NotBlank(message = "鍗忚涓嶈兘涓虹┖") + private String protocol; + + /** * 姘村崱鍦板潃锛屼粎淇濆瓨锛屾棤涓氬姟 */ @NotBlank(message = "姘村崱鍦板潃涓嶈兘涓虹┖") -- Gitblit v1.8.0