管理后台-办理业务-基础业务办理，修改奖衔，修改等级修改，去掉办理业务手续费配置校验
This commit is contained in:
jinwei
parent
a084080a6c
commit
62c16faff5
|
|
@ -180,28 +180,37 @@ public class CuMemberTradeServiceImpl extends ServiceImpl<CuMemberTradeMapper, C
|
|||
public Boolean businessCommissionSubmit(BusinessCommissionDTO businessCommissionDTO, EApproveStatus eApproveStatus) {
|
||||
Integer isWithdraw = null;
|
||||
eApproveStatus = null == eApproveStatus ? EApproveStatus.FINISH : eApproveStatus;
|
||||
//过滤扣费金额等于、小于零的业务
|
||||
|
||||
// 过滤扣费金额等于、小于零的业务
|
||||
List<MemberAmountDTO> memberAmountDTOList = businessCommissionDTO.getMemberAmountDTOList();
|
||||
if (CollUtil.isNotEmpty(memberAmountDTOList)) {
|
||||
List<MemberAmountDTO> memberAmountList = memberAmountDTOList.stream().filter(memberAmountDTO -> memberAmountDTO.getTradeAmount().compareTo(BigDecimal.ZERO) > 0).collect(Collectors.toList());
|
||||
List<MemberAmountDTO> memberAmountList = memberAmountDTOList.stream()
|
||||
.filter(Objects::nonNull) // 确保DTO对象非空
|
||||
.filter(memberAmountDTO -> {
|
||||
BigDecimal tradeAmount = memberAmountDTO.getTradeAmount();
|
||||
return tradeAmount != null && tradeAmount.compareTo(BigDecimal.ZERO) > 0;
|
||||
})
|
||||
.collect(Collectors.toList());
|
||||
|
||||
if (CollUtil.isNotEmpty(memberAmountList)) {
|
||||
businessCommissionDTO.setMemberAmountDTOList(memberAmountList);
|
||||
Object[] objects = composeCuMemberTrade(businessCommissionDTO, eApproveStatus);
|
||||
List<CuMemberTrade> cuMemberTrades = (List<CuMemberTrade>) objects[0];
|
||||
this.saveBatch(cuMemberTrades);
|
||||
//更新余额
|
||||
|
||||
// 更新余额
|
||||
Integer pkCountry = businessCommissionDTO.getPkCountry();
|
||||
if (null != pkCountry) {
|
||||
Integer accountValue = cuMemberBaseService.getAccountValueById(businessCommissionDTO.getPkAccount());
|
||||
if(accountValue.equals(EAccount.BONUS.getValue())){
|
||||
isWithdraw = 0;
|
||||
}
|
||||
return cuMemberAccountService.batchUpdateMemberAccountByPkmember((List<MemberAmountDTO>) objects[1],accountValue, isWithdraw);
|
||||
return cuMemberAccountService.batchUpdateMemberAccountByPkmember(
|
||||
(List<MemberAmountDTO>) objects[1], accountValue, isWithdraw);
|
||||
} else {
|
||||
return cuMemberAccountService.batchUpdateMemberAccountByPkMemberCountry((List<MemberAmountDTO>) objects[1], null);
|
||||
return cuMemberAccountService.batchUpdateMemberAccountByPkMemberCountry(
|
||||
(List<MemberAmountDTO>) objects[1], null);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -395,12 +395,13 @@ public class CuHandleBusinessController extends BaseController {
|
|||
nbtvo.setCost(serviceChargeDtoR.getData().getCost());
|
||||
nbtvo.setTradeAmount(serviceChargeDtoR.getData().getCost());
|
||||
singleAmountTotal = singleAmountTotal.add(serviceChargeDtoR.getData().getCost());
|
||||
} else {
|
||||
BusinessErrorVO bev = new BusinessErrorVO();
|
||||
bev.setErrorMsg(transactionMap.get(EnumsPrefixConstants.APPROVAL_BUSINESS + etv.getBusinessType()) + " " + ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL);
|
||||
bev.setMemberCode(uc.getMemberCode());
|
||||
errorMemberList.add(bev);
|
||||
}
|
||||
// else {
|
||||
// BusinessErrorVO bev = new BusinessErrorVO();
|
||||
// bev.setErrorMsg(transactionMap.get(EnumsPrefixConstants.APPROVAL_BUSINESS + etv.getBusinessType()) + " " + ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL);
|
||||
// bev.setMemberCode(uc.getMemberCode());
|
||||
// errorMemberList.add(bev);
|
||||
// }
|
||||
|
||||
//修改会员姓名校验姓名不能为空
|
||||
if (StringUtils.isNotNull(etv.getBusinessType()) && etv.getBusinessType() == EApprovalBusiness.CHANGE_NAME.getValue()) {
|
||||
|
|
@ -846,7 +847,7 @@ public class CuHandleBusinessController extends BaseController {
|
|||
} else {
|
||||
bt.setPkAccount(null);
|
||||
bt.setPkAccountKey(null);
|
||||
bt.setPkAccountKeyVal(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_BALANCE_INSUFFICIENT));
|
||||
bt.setPkAccountKeyVal(null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -884,15 +885,15 @@ public class CuHandleBusinessController extends BaseController {
|
|||
if (CollectionUtil.isNotEmpty(businessSingleVO.getBusinessCostVOList())) {
|
||||
List<MemberBusinessBalanceDTO> mbbList = new ArrayList<>();
|
||||
businessSingleVO.getBusinessCostVOList().forEach(item -> mbbList.add(BeanUtil.copyProperties(item, MemberBusinessBalanceDTO.class)));
|
||||
List<MemberBusinessBalanceDTO> memberBalanceList = cuMemberTradeService.selectBusinessBalanceNotEnoughMember(mbbList, pkCountry);
|
||||
for (MemberBusinessBalanceDTO mbb : memberBalanceList) {
|
||||
if (mbb.getPkAccount() == null) {
|
||||
BusinessErrorVO bev = new BusinessErrorVO();
|
||||
bev.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_BALANCE_INSUFFICIENT));
|
||||
bev.setMemberCode(mbb.getMemberCode());
|
||||
errorMemberList.add(bev);
|
||||
}
|
||||
}
|
||||
// List<MemberBusinessBalanceDTO> memberBalanceList = cuMemberTradeService.selectBusinessBalanceNotEnoughMember(mbbList, pkCountry);
|
||||
// for (MemberBusinessBalanceDTO mbb : memberBalanceList) {
|
||||
// if (mbb.getPkAccount() == null) {
|
||||
// BusinessErrorVO bev = new BusinessErrorVO();
|
||||
// bev.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_BALANCE_INSUFFICIENT));
|
||||
// bev.setMemberCode(mbb.getMemberCode());
|
||||
// errorMemberList.add(bev);
|
||||
// }
|
||||
// }
|
||||
}
|
||||
if (CollectionUtil.isNotEmpty(errorMemberList)) {
|
||||
return AjaxResult.error(504, TransactionUtils.getContent(ConfigMsgConstants.MEMBER_DATA_ERROR), errorMemberList);
|
||||
|
|
|
|||
|
|
@ -799,7 +799,7 @@ public class CuHandleBusinessServiceImpl extends ServiceImpl<CuHandleBusinessMap
|
|||
List<BusinessTypeValueVO> handleBusinessList = handleBusinessVO.getHandleBusinessList();
|
||||
for (BusinessTypeValueVO businessTypeValueVO : handleBusinessList) {
|
||||
Integer businessType = businessTypeValueVO.getBusinessType();
|
||||
if (businessType.equals(EApprovalBusiness.CHANGE_MAX_AWARDS.getValue())) {
|
||||
if (businessType.equals(EApprovalBusiness.CHANGE_AWARDS.getValue())) {
|
||||
List<BusinessMemberVO> businessMemberList = handleBusinessVO.getBusinessMemberList();
|
||||
List<BusinessMemberVO> businessMemberListUpdate = getBusinessMemberByBusinessType(businessMemberList, businessType);
|
||||
CuMemberAwards cuMemberAwards;
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ public enum EApprovalBusiness {
|
|||
/**
|
||||
* 修改奖衔
|
||||
*/
|
||||
CHANGE_AWARDS(107, "修改真实奖衔", EnumsPrefixConstants.APPROVAL_BUSINESS + "107"),
|
||||
CHANGE_AWARDS(107, "修改荣誉奖衔", EnumsPrefixConstants.APPROVAL_BUSINESS + "107"),
|
||||
/**
|
||||
* 修改会员礼包收货地址
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue