From 06c1e69816f028c3108ce4e1e01db4251e481b06 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 05 七月 2024 08:41:21 +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/CardOperateCtrl.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

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 7ff5012..cb6bb55 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
@@ -798,11 +798,17 @@
     @GetMapping(path = "/getRecharges")
     @SsoAop()
     public BaseResponse<QueryResultVo<List<VoRecharge>>> get(QoRecharge vo){
+        // 濡傛灉浼犲叆鐨勬槸10浣嶇殑姘村崱缂栧彿锛屽崌涓�17浣嶆按鍗$紪鍙�
+        if(vo != null && vo.getCardNum() != null) {
+            String cardNumS = String.valueOf(vo.getCardNum()).trim();
+            if(cardNumS.length() == 10) {
+                cardNumS = "100000" + cardNumS.substring(0,6) + "0" + cardNumS.substring(6);
+                vo.setCardNum(Long.parseLong(cardNumS));
+            }
+        }
+
         try {
             QueryResultVo<List<VoRecharge>> res = cardOperateSv.getRecharges(vo);
-            //if(res.itemTotal == 0) {
-            //    return BaseResponseUtils.buildFail(SellResultCode.No_RECHARGES.getMessage());
-            //}
             return BaseResponseUtils.buildSuccess(res);
         } catch (Exception e) {
             log.error("鑾峰彇鍏呭�艰褰曞紓甯�", e);

--
Gitblit v1.8.0