From bff91fc41a95f92766ea869768b1cdc894202920 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 21 八月 2024 13:45:54 +0800
Subject: [PATCH] 优化开卡、补卡返回值代码

---
 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 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 c0d55cf..32a7693 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
@@ -59,6 +59,9 @@
 
     @Value("${project.divisionCode}")
     private String divisionCode;
+
+    @Value("${project.projectNo}")
+    private Integer projectNo;
     /**
      * 寮�鍗�
      * @param po 寮�鍗′紶鍏ュ璞�
@@ -180,7 +183,8 @@
         }
 
         Map map = new HashMap();
-        map.put("projectNo", String.format("%02x", Integer.parseInt(cardOperateSv.getProjectNo())));
+//        map.put("projectNo", String.format("%02x", Integer.parseInt(cardOperateSv.getProjectNo())));
+        map.put("projectNo", String.format("%02x", projectNo));
         map.put("orderNumber", rec);
         map.put("cardNum", cardNum);
         return BaseResponseUtils.buildSuccess(map) ;
@@ -393,7 +397,7 @@
         }
 
         Map map_response = new HashMap();
-        map_response.put("projectNo", String.format("%02x", Integer.parseInt(cardOperateSv.getProjectNo())));
+        map_response.put("projectNo", String.format("%02x", projectNo));
         map_response.put("orderNumber", rec);
         map_response.put("cardNum", cardNum);
         return BaseResponseUtils.buildSuccess(map_response) ;
@@ -486,7 +490,7 @@
         }
 
         Map map_response = new HashMap();
-        map_response.put("projectNo", String.format("%02x", Integer.parseInt(cardOperateSv.getProjectNo())));
+        map_response.put("projectNo", String.format("%02x", projectNo));
         map_response.put("orderNumber", rec);
         map_response.put("cardNum", cardNum);
         return BaseResponseUtils.buildSuccess(map_response) ;
@@ -574,7 +578,7 @@
         }
 
         Map map_response = new HashMap();
-        map_response.put("projectNo", String.format("%02x", Integer.parseInt(cardOperateSv.getProjectNo())));
+        map_response.put("projectNo", String.format("%02x", projectNo));
         map_response.put("orderNumber", rec);
         map_response.put("cardNum", cardNum);
         return BaseResponseUtils.buildSuccess(map_response) ;
@@ -744,7 +748,7 @@
         }
 
         Map map_response = new HashMap();
-        map_response.put("projectNo", String.format("%02x", Integer.parseInt(cardOperateSv.getProjectNo())));
+        map_response.put("projectNo", String.format("%02x", projectNo));
         map_response.put("orderNumber", rec);
         map_response.put("cardNum", cardNum);
         return BaseResponseUtils.buildSuccess(map_response) ;
@@ -873,9 +877,9 @@
     public BaseResponse<QueryResultVo<List<VoActiveCard>>> getActiveCards(QoActiveCard vo){
         try {
             QueryResultVo<List<VoActiveCard>> res = cardOperateSv.getActiveCards(vo);
-            if(res.itemTotal == 0) {
-                return BaseResponseUtils.buildErrorMsg(SellResultCode.No_ActiveCards.getMessage());
-            }
+//            if(res.itemTotal == 0) {
+//                return BaseResponseUtils.buildErrorMsg(SellResultCode.No_ActiveCards.getMessage());
+//            }
             return BaseResponseUtils.buildSuccess(res);
         } catch (Exception e) {
             log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
@@ -902,9 +906,9 @@
     public BaseResponse<QueryResultVo<List<VoReissueCard>>> getReissueCards(QoReissueCard vo){
         try {
             QueryResultVo<List<VoReissueCard>> res = cardOperateSv.getReissueCards(vo);
-            if(res.itemTotal == 0) {
-                return BaseResponseUtils.buildErrorMsg(SellResultCode.No_ReissueCards.getMessage());
-            }
+//            if(res.itemTotal == 0) {
+//                return BaseResponseUtils.buildErrorMsg(SellResultCode.No_ReissueCards.getMessage());
+//            }
             return BaseResponseUtils.buildSuccess(res);
         } catch (Exception e) {
             log.error("鑾峰彇琛ュ崱璁板綍寮傚父", e);

--
Gitblit v1.8.0