From 8a088b4e1a411e5da44fba598797911f66652044 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 28 六月 2024 10:31:26 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java |   84 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 76 insertions(+), 8 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
index 081c671..d9f02e0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
@@ -6,6 +6,7 @@
 import com.dy.common.webUtil.BaseResponse;
 import com.dy.common.webUtil.BaseResponseUtils;
 import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper;
 import com.dy.pipIrrGlobal.daoSe.SeCardOperateMapper;
 import com.dy.pipIrrGlobal.daoSe.SeClientCardMapper;
 import com.dy.pipIrrGlobal.daoSe.SeClientMapper;
@@ -52,6 +53,9 @@
     @Autowired
     private SeGeneralMapper seGeneralMapper;
 
+    @Autowired
+    private BaSettingsMapper baSettingsMapper;
+
 
     /**
      * 娣诲姞寮�鍗¤褰�
@@ -68,8 +72,12 @@
      * @param clientNum 鍐滄埛缂栧彿
      * @return 5绾ц鏀垮尯鍒掍唬鐮�
      */
-    public Long getAreaCodeByNum(String clientNum) {
-        return seClientMapper.getAreaCodeByNum(clientNum);
+    public String getAreaCodeByNum(String clientNum) {
+        Long areaCode = seClientMapper.getAreaCodeByNum(clientNum);
+        if (areaCode == null) {
+            return "";
+        }
+        return String.valueOf(areaCode);
     }
 
     /**
@@ -131,7 +139,7 @@
          */
         Long cardId = 0L;
         Long clientId = 0L;
-        String cardNum = po.getCardNum();
+        Long cardNum = po.getCardNum();
         Float money = po.getMoney();
         Float amount = po.getAmount();
         Float gift = po.getGift();
@@ -144,7 +152,7 @@
 
 
         // 楠岃瘉姘村崱鐘舵�佹槸鍚︽敮鎸佸綋鍓嶆搷浣�
-        String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(Long.parseLong(cardNum))).orElse("");
+        String stateName = Optional.ofNullable(clientCardSv.getCardStateByCardNum(cardNum)).orElse("");
         if(stateName.length() == 0 || !stateName.equals("姝ｅ父")) {
             return BaseResponseUtils.buildFail(stateName + ", " + SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage());
         }
@@ -199,7 +207,6 @@
         return BaseResponseUtils.buildSuccess(true) ;
     }
 
-
     /**
      * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鍏呭�艰褰�
      * @param queryVo
@@ -230,7 +237,6 @@
         rsVo.obj = seCardOperateMapper.getRecharges(params);
         return rsVo ;
     }
-
 
     /**
      * 鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗璁板綍
@@ -291,7 +297,7 @@
      * @param queryVo
      * @return
      */
-    public QueryResultVo<List<VoActiveCardNew>> getActiveCards(QoActiveCard queryVo) {
+    public QueryResultVo<List<VoActiveCard>> getActiveCards(QoActiveCard queryVo) {
         //瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿
         String activeTimeStart = queryVo.activeTimeStart;
         String activeTimeStop = queryVo.activeTimeStop;
@@ -308,7 +314,7 @@
 
         Long itemTotal = seCardOperateMapper.getActiveCardRecordCount(params);
 
-        QueryResultVo<List<VoActiveCardNew>> rsVo = new QueryResultVo<>() ;
+        QueryResultVo<List<VoActiveCard>> rsVo = new QueryResultVo<>() ;
 
         rsVo.pageSize = queryVo.pageSize ;
         rsVo.pageCurr = queryVo.pageCurr ;
@@ -351,6 +357,38 @@
     }
 
     /**
+     * 鏍规嵁鎸囧畾鏉′欢鑾峰彇IC鍗℃敞閿�璁板綍
+     * @param queryVo
+     * @return
+     */
+    public QueryResultVo<List<VoOperate>> getCommonOperations(QoCommonOperate queryVo) {
+        //瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿
+        String timeStart = queryVo.getTimeStart();
+        String timeStop = queryVo.getTimeStop();
+        if(timeStart != null) {
+            timeStart = timeStart + " 00:00:00";
+            queryVo.setTimeStart(timeStart);
+        }
+        if(timeStop != null) {
+            timeStop = timeStop + " 23:59:59";
+            queryVo.setTimeStop(timeStop);
+        }
+
+        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+
+        Long itemTotal = Optional.ofNullable(seCardOperateMapper.getCommonOperationRecordCount(params)).orElse(0L);
+
+        QueryResultVo<List<VoOperate>> rsVo = new QueryResultVo<>() ;
+
+        rsVo.pageSize = queryVo.pageSize ;
+        rsVo.pageCurr = queryVo.pageCurr ;
+
+        rsVo.calculateAndSet(itemTotal, params);
+        rsVo.obj = seCardOperateMapper.getCommonOperations(params);
+        return rsVo ;
+    }
+
+    /**
      * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鏀舵嵁鍒楄〃
      * @param queryVo
      * @return
@@ -385,4 +423,34 @@
 
         return map_result;
     }
+
+    /**
+     * 鍒ゆ柇鎸囧畾姘村崱鏄惁涓烘寕澶辩姸鎬佷笖鏃犺ˉ鍗¤褰�
+     * @param cardNum 姘村崱缂栧彿
+     * @return 鏄惁宸叉寕澶辨湭琛ュ崱
+     */
+    public Boolean isLostAndUnreplaced(Long cardNum) {
+        Integer rec = seClientCardMapper.isLostAndUnreplaced(cardNum);
+        if(rec != null && rec > 0) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * 淇敼鍐滄埛姘村崱
+     * @param po
+     * @return
+     */
+    public Integer updateClientCard(SeClientCard po) {
+        return seClientCardMapper.updateByPrimaryKeySelective(po);
+    }
+
+    /**
+     * 鑾峰彇椤圭洰缂栧彿
+     * @return
+     */
+    public String getProjectNo() {
+        return baSettingsMapper.getItemValue("projectNo");
+    }
 }

--
Gitblit v1.8.0