From 8d33408ae3e6d5f82e584eb38566f38f87d63637 Mon Sep 17 00:00:00 2001 From: jinwei <2606983012@qq.com> Date: Wed, 16 Apr 2025 19:14:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0-=E5=8A=9E?= =?UTF-8?q?=E7=90=86=E4=B8=9A=E5=8A=A1-=E5=9F=BA=E7=A1=80=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=8A=9E=E7=90=86=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=A5=96?= =?UTF-8?q?=E8=A1=94=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=AD=89=E7=BA=A7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=8A=9E=E7=90=86=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E6=89=8B=E7=BB=AD=E8=B4=B9=E9=85=8D=E7=BD=AE=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CuMemberTradeServiceImpl.java | 23 +++++++++----- .../manage/CuHandleBusinessController.java | 31 ++++++++++--------- .../impl/CuHandleBusinessServiceImpl.java | 2 +- .../common/core/enums/EApprovalBusiness.java | 2 +- 4 files changed, 34 insertions(+), 24 deletions(-) diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeServiceImpl.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeServiceImpl.java index 5bce5218..ee8952ed 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeServiceImpl.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeServiceImpl.java @@ -180,28 +180,37 @@ public class CuMemberTradeServiceImpl extends ServiceImpl memberAmountDTOList = businessCommissionDTO.getMemberAmountDTOList(); if (CollUtil.isNotEmpty(memberAmountDTOList)) { - List memberAmountList = memberAmountDTOList.stream().filter(memberAmountDTO -> memberAmountDTO.getTradeAmount().compareTo(BigDecimal.ZERO) > 0).collect(Collectors.toList()); + List 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 cuMemberTrades = (List) 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) objects[1],accountValue, isWithdraw); + return cuMemberAccountService.batchUpdateMemberAccountByPkmember( + (List) objects[1], accountValue, isWithdraw); } else { - return cuMemberAccountService.batchUpdateMemberAccountByPkMemberCountry((List) objects[1], null); + return cuMemberAccountService.batchUpdateMemberAccountByPkMemberCountry( + (List) objects[1], null); } - - } } return true; diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/controller/manage/CuHandleBusinessController.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/controller/manage/CuHandleBusinessController.java index 90549f70..d00b5d20 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/controller/manage/CuHandleBusinessController.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/controller/manage/CuHandleBusinessController.java @@ -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 mbbList = new ArrayList<>(); businessSingleVO.getBusinessCostVOList().forEach(item -> mbbList.add(BeanUtil.copyProperties(item, MemberBusinessBalanceDTO.class))); - List 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 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); diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java index 3f741a3b..f54686ed 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java @@ -799,7 +799,7 @@ public class CuHandleBusinessServiceImpl extends ServiceImpl 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 businessMemberList = handleBusinessVO.getBusinessMemberList(); List businessMemberListUpdate = getBusinessMemberByBusinessType(businessMemberList, businessType); CuMemberAwards cuMemberAwards; diff --git a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java index d5eb75c5..01937660 100644 --- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java +++ b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java @@ -46,7 +46,7 @@ public enum EApprovalBusiness { /** * 修改奖衔 */ - CHANGE_AWARDS(107, "修改真实奖衔", EnumsPrefixConstants.APPROVAL_BUSINESS + "107"), + CHANGE_AWARDS(107, "修改荣誉奖衔", EnumsPrefixConstants.APPROVAL_BUSINESS + "107"), /** * 修改会员礼包收货地址 */