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/CardOperateCtrl.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 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 29a0cd6..98c5e85 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
@@ -76,6 +76,11 @@
return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
+ // 渚濇嵁姘村崱鍦板潃鍒ゆ柇璇ュ崱鏄惁鍙互寮�鍗★紝鏈紑杩囧崱鎴栦笉鏄甯哥姸鎬併�佹寕澶辩姸鎬佺殑鍙紑鍗�
+ if(!cardOperateSv.canActiveCard(po.getCardAddr())) {
+ return BaseResponseUtils.buildErrorMsg(SellResultCode.ACTIVE_FAIL_CARD_ESIST.getMessage());
+ }
+
Long clientId = po.getClientId();
// 鑾峰彇5绾ц鏀垮尯鍒掍覆areaCode
@@ -877,9 +882,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);
@@ -906,9 +911,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);
@@ -943,9 +948,9 @@
try {
QueryResultVo<List<VoOperate>> res = cardOperateSv.getCommonOperations(vo);
- if(res.itemTotal == 0) {
- return BaseResponseUtils.buildErrorMsg(SellResultCode.No_CANCELS.getMessage());
- }
+// if(res.itemTotal == 0) {
+// return BaseResponseUtils.buildErrorMsg(SellResultCode.No_CANCELS.getMessage());
+// }
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
@@ -971,11 +976,11 @@
@SsoAop()
public BaseResponse<Map> getReceipts(QoReceipt vo){
try {
- Map res = Optional.ofNullable(cardOperateSv.getReceipts(vo)).orElse(new HashMap());
- if(res.size() == 0) {
- return BaseResponseUtils.buildErrorMsg(SellResultCode.No_RECEIPTS.getMessage());
- }
- return BaseResponseUtils.buildSuccess(res);
+ // Map res = Optional.ofNullable(cardOperateSv.getReceipts(vo)).orElse(new HashMap());
+ // if(res.size() == 0) {
+ // return BaseResponseUtils.buildErrorMsg(SellResultCode.No_RECEIPTS.getMessage());
+ // }
+ return BaseResponseUtils.buildSuccess(cardOperateSv.getReceipts(vo));
} catch (Exception e) {
log.error("鑾峰彇鐢靛瓙閽卞寘璐︽埛璁板綍", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
--
Gitblit v1.8.0