From b7bfa70f47cee38929977f2eee1e35530ae83b6b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 21 六月 2025 11:47:16 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java   |    9 ++++
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml                        |   26 +++++++++++++
 pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardCtrl.java |   28 ++++++++++++++
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientCardMapper.java         |    7 +++
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoCardByClientNum.java           |   46 +++++++++++++++++++++++
 5 files changed, 116 insertions(+), 0 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 fdf3276..7c39357 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
@@ -282,4 +282,11 @@
      * @return
      */
     List<VoCards> getLostCards(Map<?, ?> params);
+
+    /**
+     * 鏍规嵁鍐滄埛缂栧彿鑾峰彇鍗′俊鎭�
+     * @param clientNum
+     * @return
+     */
+    VoCardByClientNum getCardByClientNum(@Param("clientNum") String clientNum);
 }
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoCardByClientNum.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoCardByClientNum.java
new file mode 100644
index 0000000..381edff
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoCardByClientNum.java
@@ -0,0 +1,46 @@
+package com.dy.pipIrrGlobal.voSe;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2025-01-15 
+ * @LastEditTime 2025-01-15
+ * @Description 鏍规嵁鍐滄埛缂栧彿鑾峰彇鍗′俊鎭繑鍥炲璞�
+ */
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Schema(name = "鏍规嵁鍐滄埛缂栧彿鑾峰彇鍗′俊鎭繑鍥炲璞�")
+public class VoCardByClientNum {
+
+    @Schema(description = "姘村崱缂栧彿")
+    private String cardNum;
+
+    @Schema(description = "鍗$姸鎬佺爜")
+    private Integer cardState;
+
+    @Schema(description = "鍗$被鍨�")
+    private String cardType;
+
+    @Schema(description = "鍐滄埛濮撳悕")
+    private String clientName;
+
+    @Schema(description = "鍐滄埛缂栧彿")
+    private String clientNum;
+
+    @Schema(description = "韬唤璇佸彿")
+    private Long idCard;
+
+    @Schema(description = "浣欓")
+    private String money;
+
+    @Schema(description = "鎵嬫満鍙�")
+    private Long phone;
+
+    @Schema(description = "鐘舵�佸悕绉�")
+    private String stateName;
+} 
\ No newline at end of file
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 cd47ae0..a3901d4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
@@ -838,4 +838,30 @@
       </if>
     </trim>
   </select>
+
+  <!--鏍规嵁鍐滄埛缂栧彿鑾峰彇鍗′俊鎭�-->
+  <select id="getCardByClientNum" resultType="com.dy.pipIrrGlobal.voSe.VoCardByClientNum">
+    SELECT 
+        card.cardNum,
+        card.state AS cardState,
+        '鍐滄埛鍗�' AS cardType,
+        cli.name AS clientName,
+        cli.clientNum,
+        cli.idCard,
+        FORMAT(card.money, 1) AS money,
+        cli.phone,
+        (CASE
+            WHEN card.state = 1 THEN '姝e父'
+            WHEN card.state = 2 THEN '宸叉敞閿�'
+            WHEN card.state = 3 THEN '宸叉寕澶�'
+            WHEN card.state = 4 THEN '鏃犳晥'
+            ELSE '鏈煡'
+        END) AS stateName
+    FROM se_client_card card
+    INNER JOIN se_client cli ON card.clientId = cli.id
+    WHERE cli.clientNum = #{clientNum} 
+      AND card.state != 4
+    ORDER BY card.createDt DESC
+    LIMIT 1
+  </select>
 </mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardCtrl.java
index 07925c5..f376653 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardCtrl.java
@@ -316,4 +316,32 @@
         }
     }
 
+    /**
+     * 鏍规嵁鍐滄埛缂栧彿鑾峰彇鍗′俊鎭�
+     * @param clientNum 鍐滄埛缂栧彿
+     * @return
+     */
+    @Operation(summary = "鏍规嵁鍐滄埛缂栧彿鑾峰彇鍗′俊鎭�", description = "鏍规嵁鍐滄埛缂栧彿鑾峰彇瀵瑰簲鐨勫崱淇℃伅")
+    @ApiResponses(value = {
+            @ApiResponse(
+                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+                    description = "杩斿洖鍗′俊鎭紙BaseResponse.content:VoCardByClientNum锛�",
+                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+                            schema = @Schema(implementation = VoCardByClientNum.class))}
+            )
+    })
+    @GetMapping(path = "getcardbyclientnum")
+    @SsoAop()
+    public BaseResponse<VoCardByClientNum> getCardByClientNum(@RequestParam String clientNum){
+        try {
+            VoCardByClientNum res = cardSv.getCardByClientNum(clientNum);
+            if (res == null) {
+                return BaseResponseUtils.buildFail("鏈壘鍒板搴旂殑鍗′俊鎭�");
+            }
+            return BaseResponseUtils.buildSuccess(res);
+        } catch (Exception e) {
+            log.error("鏍规嵁鍐滄埛缂栧彿鏌ヨ鍗′俊鎭紓甯�", e);
+            return BaseResponseUtils.buildException(e.getMessage()) ;
+        }
+    }
 }
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java
index 1c33313..47a1f73 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java
@@ -1240,4 +1240,13 @@
 
         return rsVo;
     }
+
+    /**
+     * 鏍规嵁鍐滄埛缂栧彿鑾峰彇鍗′俊鎭�
+     * @param clientNum 鍐滄埛缂栧彿
+     * @return 鍗′俊鎭�
+     */
+    public VoCardByClientNum getCardByClientNum(String clientNum) {
+        return seClientCardMapper.getCardByClientNum(clientNum);
+    }
 }

--
Gitblit v1.8.0