From 8910275656c9bf398832dc14957a03684a593e96 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 30 八月 2024 15:16:58 +0800
Subject: [PATCH] 2024-08-30 朱宝民 修改配置文件bug
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 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 5ff8607..a927bb2 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
@@ -21,6 +21,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.text.DecimalFormat;
@@ -57,6 +58,8 @@
@Autowired
private SeManagerCardMapper seManagerCardMapper;
+ @Value("${project.projectNo}")
+ private Integer projectNo;
/**
* 娣诲姞寮�鍗¤褰�
@@ -225,7 +228,8 @@
}
Map map_response = new HashMap();
- map_response.put("projectNo", String.format("%02x", Integer.parseInt(getProjectNo())));
+// map_response.put("projectNo", String.format("%02x", Integer.parseInt(getProjectNo())));
+ map_response.put("projectNo", String.format("%02x", projectNo));
map_response.put("orderNumber", rec);
map_response.put("cardNum", cardNum);
return BaseResponseUtils.buildSuccess(map_response) ;
@@ -381,7 +385,7 @@
}
/**
- * 鏍规嵁鎸囧畾鏉′欢鑾峰彇IC鍗℃敞閿�璁板綍
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇閫氱敤鎿嶄綔璁板綍
* @param queryVo
* @return
*/
@@ -487,4 +491,26 @@
public Double getTradeAmountByCardNo(Long cardNum) {
return seCardOperateMapper.getTradeAmountByCardNo(cardNum);
}
+
+ /**
+ * 鏍规嵁姘村崱鍦板潃鍒ゆ柇璇ュ崱鏄惁鍙互寮�鍗�
+ * @param cardAddr
+ * @return
+ */
+ public Boolean canActiveCard(String cardAddr) {
+
+ // 鎸囧畾姘村崱鍦板潃鐨勬按鍗℃暟閲�
+ Long cardCount = Optional.ofNullable(seClientCardMapper.getCountByCardAddr(cardAddr)).orElse(0L);
+ if(cardCount == 0) {
+ return true;
+ }
+
+ // 鎸囧畾姘村崱鍦板潃涓旀甯哥姸鎬佹垨鎸傚け鐘舵�佺殑姘村崱鏁伴噺
+ cardCount = Optional.ofNullable(seClientCardMapper.getCountByCardAddrAndState(cardAddr)).orElse(0L);
+ if(cardCount == 0) {
+ return true;
+ }
+
+ return false;
+ }
}
--
Gitblit v1.8.0