From d1f12fd867d800b9375a3c635bd3db2265601a8b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 29 十二月 2023 11:45:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'git-pipIrr/master'

---
 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/clientCard/ClientCardSv.java |   63 +++++++++++++++++++++++++++++++
 1 files changed, 62 insertions(+), 1 deletions(-)

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 645534b..8517231 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
@@ -2,9 +2,12 @@
 
 import com.dy.pipIrrGlobal.daoSe.SeClientCardMapper;
 import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
+import com.dy.pipIrrGlobal.voSe.VoCardInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.*;
 
 /**
  * @author ZhuBaoMin
@@ -30,7 +33,7 @@
     }
 
     /**
-     * 渚濇嵁姘村崱鍦板潃鑾峰彇姘村崱缂栧彿锛堜富閿級
+     * 渚濇嵁姘村崱鍦板潃鑾峰彇姘村崱缂栧彿锛�12鏈�19鏃ュ簾寮冿級
      * @param cardAddr
      * @return
      */
@@ -39,6 +42,23 @@
     }
 
     /**
+     * 鏍规嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿紙12鏈�19鏃ユ坊鍔犲悗搴熷純锛�
+     * @param cardNum 16浣嶆按鍗$紪鍙�
+     * @return 姘村崱琛ㄤ富閿�
+     */
+    public Long getCardIdByNum(String cardNum) {
+        return seClientCardMapper.getCardIdByNum(cardNum);
+    }
+
+    /**
+     * 鏍规嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿強鍐滄埛缂栧彿
+     * @param cardNum
+     * @return
+     */
+    public Map getCardIdAndClientNum(String cardNum) {
+        return seClientCardMapper.getCardIdAndClientNum(cardNum);
+    }
+    /**
      * 鏍规嵁姘村崱缂栧彿锛堜富閿級淇敼鍐滄埛鍗′俊鎭�
      * @param po
      * @return
@@ -46,4 +66,45 @@
     public Integer UpdateClientCard(SeClientCard po) {
         return seClientCardMapper.updateByPrimaryKeySelective(po);
     }
+
+    /**
+     * 鏍规嵁鍐滄埛涓婚敭鑾峰彇姘村崱鍒楄〃
+     * @param clientId
+     * @return
+     */
+    public List<VoCardInfo> getCardInfoByClientId(Long clientId){
+        List<VoCardInfo> list = Optional.ofNullable(seClientCardMapper.getCardInfoByClientId(clientId)).orElse(new ArrayList<>());
+        if(list.size() > 0) {
+            return list;
+        }else {
+            return new ArrayList<>();
+        }
+    }
+
+    /**
+     * 鏍规嵁姘村崱缂栧彿鑾峰彇鎿嶄綔璁板綍鍙婁綑棰�
+     * @param cardNum
+     * @return
+     */
+    public Map getOperateRecordsAndMoney(Long cardNum) {
+        List<Map<String, Object>> list = Optional.ofNullable(seClientCardMapper.getOperateRecordsByCardNum(cardNum)).orElse(new ArrayList<>());
+        Float mondy = Optional.ofNullable(seClientCardMapper.getMoneyByCardNum(cardNum)).orElse(0f);
+        Float amount = Optional.ofNullable(seClientCardMapper.sumRechargeByCardNum(cardNum)).orElse(0f);
+
+        Map map = new HashMap();
+        map.put("mondy", mondy);
+        map.put("amount", amount);
+        map.put("list", list);
+        return map;
+    }
+
+    /**
+     * 鏍规嵁姘村崱缂栧彿鑾峰彇鍗$墖鐘舵��
+     * @param cardNum
+     * @return
+     */
+    public String getCardStateByCardNum(Long cardNum) {
+        String stateName = Optional.ofNullable(seClientCardMapper.getCardStateByCardNum(cardNum)).orElse("");
+        return stateName;
+    }
 }

--
Gitblit v1.8.0