From 3dc2929d22a5f437fbee133df66aaff26a10d243 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 13 九月 2024 09:47:10 +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 | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 3367773..0b577e7 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
@@ -142,6 +142,13 @@
seClientCard.setOriginalCardId(originalCardId);
}
seClientCard.setCreatedt(activeTime);
+ //if(cardCost == 0) {
+ // // 鎹㈠崱
+ // seClientCard.setLastoper(LastOperateENUM.CHANGE_CARD.getCode());
+ //}else {
+ // // 寮�鍗�
+ // seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
+ //}
seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
Long cardId = Optional.ofNullable(clientCardSv.add(seClientCard)).orElse(0L) ;
if(cardId == 0) {
@@ -161,7 +168,12 @@
// 琛ュ崱
seCardOperate.setOperateType(OperateTypeENUM.REISSUE.getCode());
}else {
- // 寮�鏂板崱
+ // 寮�鏂板崱鎴栨崲鍗�
+ //if(cardCost > 0) {
+ // seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
+ //}else {
+ // seCardOperate.setOperateType(OperateTypeENUM.CHANGE_CARD.getCode());
+ //}
seCardOperate.setOperateType(OperateTypeENUM.ACTIVE.getCode());
}
seCardOperate.setRemarks(remarks);
--
Gitblit v1.8.0