angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(办理业务)：隐藏分红免考

This commit is contained in:
woody 2025-04-28 15:55:41 +08:00 committed by cabbage
parent b98891bb94
commit ed7cf86412
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/controller/manage/CuHandleBusinessController.java
View File

@ -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));

4
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EFreeAssessmentState.java
View File

@ -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"),