From 854e951894deaa54b26590f8575474ed7a5f5b88 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 02 七月 2024 10:32:30 +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 | 32 ++++++++++++++++++++++++--------
1 files changed, 24 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 d9f02e0..180bfe9 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
@@ -150,11 +150,17 @@
Long operator = po.getOperator();
Date rechargeTime = new Date();
+ // 濡傛灉浼犲叆鐨勬槸10浣嶇殑姘村崱缂栧彿锛屽崌涓�17浣嶆按鍗＄紪鍙�
+ String cardNumS = String.valueOf(cardNum).trim();
+ if(cardNumS.length() == 10) {
+ cardNumS = "100000" + cardNumS.substring(0,6) + "0" + cardNumS.substring(6);
+ }
+ cardNum = Long.valueOf(cardNumS);
// 楠岃瘉姘村崱鐘舵�佹槸鍚︽敮鎸佸綋鍓嶆搷浣�
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());
+ return BaseResponseUtils.buildErrorMsg(stateName + ", " + SellResultCode.THE_CARD_NOT_SUPPORT_THIS_OPERATION.getMessage());
}
/**
@@ -162,7 +168,7 @@
*/
Map map = Optional.ofNullable(clientCardSv.getCardIdAndClientNum(cardNum)).orElse(new HashMap());
if(map == null || map.size() <= 0) {
- return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
+ return BaseResponseUtils.buildErrorMsg(SellResultCode.CARD_NUMBER_MISTAKE.getMessage());
}
cardId = Long.parseLong(map.get("cardId").toString());
clientId = Long.parseLong(map.get("clientId").toString());
@@ -179,7 +185,7 @@
seClientCard.setLastoper(LastOperateENUM.RECHARGE.getCode ());
Integer rec_updateClientCard = Optional.ofNullable(clientCardSv.UpdateClientCard(seClientCard)).orElse(0);
if(rec_updateClientCard == 0) {
- return BaseResponseUtils.buildFail(SellResultCode.RECHARGE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
+ return BaseResponseUtils.buildErrorMsg(SellResultCode.RECHARGE_FAIL_WRITE_CLIENT_CARD_ERROR.getMessage());
}
/**
@@ -201,7 +207,7 @@
seCardOperateMapper.insert(seCardOperate);
Long rec = Optional.ofNullable(seCardOperate.getId()).orElse(0L);
if(rec == 0) {
- return BaseResponseUtils.buildFail(SellResultCode.REPLACE_FAIL_WRITE_RECHARGE_ERROR.getMessage());
+ return BaseResponseUtils.buildErrorMsg(SellResultCode.REPLACE_FAIL_WRITE_RECHARGE_ERROR.getMessage());
}
return BaseResponseUtils.buildSuccess(true) ;
@@ -430,11 +436,12 @@
* @return 鏄惁宸叉寕澶辨湭琛ュ崱
*/
public Boolean isLostAndUnreplaced(Long cardNum) {
- Integer rec = seClientCardMapper.isLostAndUnreplaced(cardNum);
- if(rec != null && rec > 0) {
- return false;
+ Integer lostCount = seClientCardMapper.getLostCount(cardNum);
+ Integer replacedCount = seClientCardMapper.getReplacedCount(cardNum);
+ if(lostCount > 0 && replacedCount == 0) {
+ return true;
}
- return true;
+ return false;
}
/**
@@ -453,4 +460,13 @@
public String getProjectNo() {
return baSettingsMapper.getItemValue("projectNo");
}
+
+ /**
+ * 鏍规嵁姘村崱缂栧彿鑾峰彇鍏舵寕澶辨椂閫�娆鹃噾棰濓紙琛ュ崱鏃跺垽鏂娇鐢級
+ * @param cardNum
+ * @return
+ */
+ public Double getTradeAmountByCardNo(Long cardNum) {
+ return seCardOperateMapper.getTradeAmountByCardNo(cardNum);
+ }
}
--
Gitblit v1.8.0