From b65723ac8b1ee5f6e1ae9a1744c9080b26302eff Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期六, 14 九月 2024 09:00:58 +0800 Subject: [PATCH] 2024-09-14 朱宝民 水卡使用情况(充值、消费、余额) --- pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateCtrl.java | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 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..c3638e5 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) { @@ -149,7 +156,7 @@ } /** - * 娣诲姞寮�鍗¤褰曪紝閫�杩橀噾棰濅綔涓哄厖鍊奸噾棰� + * 娣诲姞寮�鍗℃搷浣滆褰曪紝閫�杩橀噾棰濅綔涓哄厖鍊奸噾棰� */ SeCardOperate seCardOperate = new SeCardOperate(); seCardOperate.setCardId(cardId); @@ -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); @@ -388,7 +400,7 @@ } /** - * 娣诲姞娉ㄩ攢璁板綍 + * 娣诲姞娉ㄩ攢鎿嶄綔璁板綍 * 鏀粯鏂瑰紡涓虹幇閲� */ SeCardOperate seCardOperate = new SeCardOperate(); @@ -660,7 +672,7 @@ } /** - * 娣诲姞琛ユ墸璁板綍 + * 娣诲姞琛ユ墸鎿嶄綔璁板綍 */ SeCardOperate seCardOperate = new SeCardOperate(); seCardOperate.setCardId(cardId); -- Gitblit v1.8.0