From 2a0cd555233b96cbd504a1ea1eb6a1dd0bba5b29 Mon Sep 17 00:00:00 2001 From: woody Date: Mon, 28 Apr 2025 15:55:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=8A=9E=E7=90=86=E4=B8=9A=E5=8A=A1)?= =?UTF-8?q?=EF=BC=9A=E9=9A=90=E8=97=8F=E5=88=86=E7=BA=A2=E5=85=8D=E8=80=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/CuHandleBusinessController.java | 28 +++++++++---------- .../core/enums/EFreeAssessmentState.java | 4 +-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/controller/manage/CuHandleBusinessController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/controller/manage/CuHandleBusinessController.java index d00b5d20..ea9f2219 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/controller/manage/CuHandleBusinessController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/controller/manage/CuHandleBusinessController.java @@ -671,15 +671,15 @@ public class CuHandleBusinessController extends BaseController { bev.setMemberCode(bum.getMemberCode()); errorMemberList.add(bev); } - if ((etv.getBusinessValueList().get(0) == EFreeAssessmentState.BONUS.getValue() && - etv.getBusinessValueList().get(1) == EFreeAssessmentState.CANCEL_BONUS.getValue()) || - (etv.getBusinessValueList().get(1) == EFreeAssessmentState.BONUS.getValue() && - etv.getBusinessValueList().get(0) == EFreeAssessmentState.CANCEL_BONUS.getValue())) { - BusinessErrorVO bev = new BusinessErrorVO(); - bev.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.FREE_ASSESSMENT_STATE_INVALID)); - bev.setMemberCode(bum.getMemberCode()); - errorMemberList.add(bev); - } +// if ((etv.getBusinessValueList().get(0) == EFreeAssessmentState.BONUS.getValue() && +// etv.getBusinessValueList().get(1) == EFreeAssessmentState.CANCEL_BONUS.getValue()) || +// (etv.getBusinessValueList().get(1) == EFreeAssessmentState.BONUS.getValue() && +// etv.getBusinessValueList().get(0) == EFreeAssessmentState.CANCEL_BONUS.getValue())) { +// BusinessErrorVO bev = new BusinessErrorVO(); +// bev.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.FREE_ASSESSMENT_STATE_INVALID)); +// bev.setMemberCode(bum.getMemberCode()); +// errorMemberList.add(bev); +// } } bum.setNewValue(newValue(etv.getBusinessValueList())); @@ -703,11 +703,11 @@ public class CuHandleBusinessController extends BaseController { } else { purchaseStatus = EFreeAssessmentState.CANCEL_REPURCHASE.getValue(); } - if (cov.getShareStatus() == EYesNo.YES.getIntValue()) { - shareStatus = EFreeAssessmentState.BONUS.getValue(); - } else { - shareStatus = EFreeAssessmentState.CANCEL_BONUS.getValue(); - } +// if (cov.getShareStatus() == EYesNo.YES.getIntValue()) { +// shareStatus = EFreeAssessmentState.BONUS.getValue(); +// } else { +// shareStatus = EFreeAssessmentState.CANCEL_BONUS.getValue(); +// } bum.setOldValue(purchaseStatus + "," + shareStatus); sig.setOldValue(transactionMap.get(EnumsPrefixConstants.EFREE_ASSESSMENT_STATE + purchaseStatus) + "/" + transactionMap.get(EnumsPrefixConstants.EFREE_ASSESSMENT_STATE + shareStatus)); diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFreeAssessmentState.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFreeAssessmentState.java index 0fb9af89..e32e35e1 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFreeAssessmentState.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFreeAssessmentState.java @@ -22,7 +22,7 @@ public enum EFreeAssessmentState { /** * 2=分红免考 */ - BONUS(2, "分红免考", 0, EnumsPrefixConstants.EFREE_ASSESSMENT_STATE + "2"), +// BONUS(2, "分红免考", 0, EnumsPrefixConstants.EFREE_ASSESSMENT_STATE + "2"), /** * 3=取消复购免考 */ @@ -30,7 +30,7 @@ public enum EFreeAssessmentState { /** * 4=取消分红免考 */ - CANCEL_BONUS(4, "取消分红免考", 0, EnumsPrefixConstants.EFREE_ASSESSMENT_STATE + "4"), +// CANCEL_BONUS(4, "取消分红免考", 0, EnumsPrefixConstants.EFREE_ASSESSMENT_STATE + "4"),