From 43fd4cb92bcaae10c6d6167a570b7012275cc068 Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Thu, 10 Jul 2025 16:31:10 +0800 Subject: [PATCH] =?UTF-8?q?##=20Feat=20-=20=E8=AE=BE=E7=BD=AE=E6=94=B6?= =?UTF-8?q?=E7=9B=8A=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CuHandleBusinessServiceImpl.java | 41 +++++++++++++------ .../CuMemberRetailRegionController.java | 4 ++ .../member/param/RetailMemberRegionParam.java | 2 +- .../mapper/member/base/CuMemberMapper.xml | 2 +- 4 files changed, 34 insertions(+), 15 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java index 3692cef8..db949508 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java @@ -22,6 +22,7 @@ import com.hzs.common.domain.member.detail.CuMemberLevel; import com.hzs.common.domain.member.detail.CuMemberServiceLog; import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.domain.member.handleBusiness.CuHandleBusiness; +import com.hzs.common.domain.retail.member.CuMemberRetailRegion; import com.hzs.common.domain.system.base.BdCountry; import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.security.utils.SecurityUtils; @@ -40,6 +41,7 @@ import com.hzs.member.handlebusiness.vo.BusinessMemberVO; import com.hzs.member.handlebusiness.vo.BusinessTypeValueVO; import com.hzs.member.handlebusiness.vo.HandleBusinessShowVO; import com.hzs.member.handlebusiness.vo.HandleBusinessVO; +import com.hzs.retail.member.service.ICuMemberRetailRegionService; import com.hzs.system.base.ICountryServiceApi; import com.hzs.system.config.IAwardsServiceApi; import com.hzs.system.config.IGradeServiceApi; @@ -93,6 +95,8 @@ public class CuHandleBusinessServiceImpl extends ServiceImpl 0) { - throw new ServiceException("已存在结算等级为公司的用户,不允许重复添加!"); - } - } else if (EGrade.S_VIP.getValue() == gradesMap.get(updateGradeId).getGradeValue()) { - // 2025年6月20日 新等级 分公司验省唯一 - int count = cuMemberService.validateBranchOfficeCount(businessMemberVO.getAreaId(), businessMemberVO.getPkMember()); - if (count > 0) { - throw new ServiceException("已存在结算绑定省的分公司用户,不允许重复添加!"); - } - } +// if (EGrade.COMPANY.getValue() == gradesMap.get(updateGradeId).getGradeValue()) { +// // 2025年6月20日 新等级 公司验全唯一 +// int count = cuMemberService.validateCompanyCount(); +// if (count > 0) { +// throw new ServiceException("已存在结算等级为公司的用户,不允许重复添加!"); +// } +// } else if (EGrade.S_VIP.getValue() == gradesMap.get(updateGradeId).getGradeValue()) { +// // 2025年6月20日 新等级 分公司验省唯一 +// int count = cuMemberService.validateBranchOfficeCount(businessMemberVO.getAreaId(), businessMemberVO.getPkMember()); +// if (count > 0) { +// throw new ServiceException("已存在结算绑定省的分公司用户,不允许重复添加!"); +// } +// } // 记录升级历史 cuMemberLevel = CuMemberLevel.builder() .pkMember(businessMemberVO.getPkMember()) @@ -773,6 +777,17 @@ public class CuHandleBusinessServiceImpl extends ServiceImpl delWrapper = new LambdaQueryWrapper<>(); + delWrapper.eq(CuMemberRetailRegion::getPkMember, businessMemberVO.getPkMember()); + cuMemberRetailRegionService.remove(delWrapper); + } cuMemberLevel.setPkCountry(handleBusinessVO.getPkCountry()); cuMemberLevel.setPkCreator(loginUser.getUserId()); cuMemberLevelList.add(cuMemberLevel); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/manage/CuMemberRetailRegionController.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/manage/CuMemberRetailRegionController.java index 385b91f0..5cbe2cc2 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/manage/CuMemberRetailRegionController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/manage/CuMemberRetailRegionController.java @@ -1,6 +1,7 @@ package com.hzs.retail.member.controller.manage; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hzs.common.core.annotation.Log; @@ -152,6 +153,9 @@ public class CuMemberRetailRegionController extends BaseController { return AjaxResult.error(ConfigMsgConstants.MEMBER_RETAIL_REGION_REPEAT); } // 校验区域是否被占用 + if(ObjectUtil.isEmpty(mrrExt.getCounty())){ + mrrExt.setCounty(-1); + } int cuMemberRetailRegion = cuMemberRetailRegionService.count(Wrappers.lambdaQuery() .eq(CuMemberRetailRegion::getProvince, mrrExt.getProvince()) .eq(CuMemberRetailRegion::getCity, mrrExt.getCity()) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/param/RetailMemberRegionParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/param/RetailMemberRegionParam.java index a4b04788..3af37f76 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/param/RetailMemberRegionParam.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/param/RetailMemberRegionParam.java @@ -30,7 +30,7 @@ public class RetailMemberRegionParam implements Serializable { /** * 县 */ - @NotNull(message = "请选择收益区域") +// @NotNull(message = "请选择收益区域") private Integer county; /** diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml index c8257b3a..b9d2940f 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml @@ -856,7 +856,7 @@ - pk_settle_grade = #{value}, pk_area_id = #{businessMemberList[${index}].areaId} + pk_settle_grade = #{value}