From c4cb8370a2f5be336a49876c0740d62965454b97 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 14 Oct 2025 13:38:18 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E7=99=BB=E5=BD=95=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=8B=86=E5=88=86=E6=8B=A6=E6=88=AA=E5=A4=84?= =?UTF-8?q?=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/base/mapper/CuMemberMapper.java | 9 ++ .../member/base/service/ICuMemberService.java | 90 ++++++++++--------- .../service/impl/CuMemberServiceImpl.java | 4 + .../service/impl/MemberLoginServiceImpl.java | 16 ++++ .../mapper/member/base/CuMemberMapper.xml | 44 ++++----- .../domain/member/base/CuMemberSplit.java | 37 ++++++++ 6 files changed, 139 insertions(+), 61 deletions(-) create mode 100644 bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/CuMemberSplit.java diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java index 051eec49..dce0ba17 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java @@ -2,6 +2,7 @@ package com.hzs.member.base.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.base.CuMember; +import com.hzs.common.domain.member.base.CuMemberSplit; import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.member.base.dto.MemberCountDTO; import com.hzs.member.base.param.*; @@ -794,4 +795,12 @@ public interface CuMemberMapper extends BaseMapper { List queryDeleteDeadLockList(@Param("memberCode") String memberCode); Integer queryIsDeadMember(@Param("memberCode") String memberCode); + + /** + * 系统会员拆分列表 + * + * @return + */ + List listMemberSplit(); + } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java index b973d61c..0e82bbe5 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java @@ -3,6 +3,7 @@ package com.hzs.member.base.service; import cn.hutool.core.lang.tree.Tree; import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.base.CuMember; +import com.hzs.common.domain.member.base.CuMemberSplit; import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.domain.member.ext.CuMemberSettleExt; import com.hzs.member.base.param.UpdatePlaceParentPetitionParam; @@ -37,7 +38,7 @@ public interface ICuMemberService extends IService { Boolean saveMember(CuMember cuMember); /* - * @description: 查询网体是否存在推荐人 + * 查询网体是否存在推荐人 **/ Integer queryCuMemberByPkMember(Long pkReference); @@ -65,7 +66,7 @@ public interface ICuMemberService extends IService { List getMemberInfoByCondition(CuMember cuMember); /* - * @description: 根据条件查询会员信息,查询单表 + * 根据条件查询会员信息,查询单表 **/ List queryMemberByCondition(CuMember cuMember); @@ -86,12 +87,12 @@ public interface ICuMemberService extends IService { CuMember getMember(Long pkId); /* - * @description: 查询会员 + * 查询会员 **/ CuMember queryMember(String memberCode); /* - * @description: 查询会员 + * 查询会员 **/ CuMember queryMember(Long pkMember); @@ -194,14 +195,14 @@ public interface ICuMemberService extends IService { List queryCuMemberByCondition(CuMemberVO memberParam); /* - * @description: 查询会员信息,根据条件 + * 查询会员信息,根据条件 **/ List queryCuMemberByMemberList(List cuMemberVOList, CuMemberVO memberParam); List queryCuMemberByMemberListExcel(CuMemberVO memberParam); /** - * @description: 查询真实信息 + * 查询真实信息 **/ List realCuMemberByCondition(CuMemberVO memberParam); @@ -262,27 +263,27 @@ public interface ICuMemberService extends IService { CuMember createEmptyOrderMember(CuMemberExt member); /** - * @description: 特殊业务-修改会员编号列表 + * 特殊业务-修改会员编号列表 **/ List puCodeList(UpdateCodeVO updateCodeVO); /** - * @description: 查询会员有效期休止期 + * 查询会员有效期休止期 **/ List getMemberExpireStopList(UpdateExpireStopVO updateExpireStopVO); /** - * @description: 零元撤单列表 + * 零元撤单列表 **/ List zeroList(ZeroElementRevokeVO zeroElementRevokeVO); /** - * @description: 零元撤单签呈列表 + * 零元撤单签呈列表 **/ List zeroByBusinessList(AnalysisBusinessAppealParam analysisBusinessAppealParam); /** - * @description: 查询会员变更前信息 + * 查询会员变更前信息 **/ UpdateCodeVO specialBusinessQuery(UpdateCodeVO updateCodeVO); @@ -301,47 +302,47 @@ public interface ICuMemberService extends IService { String updateParent(ParentParam parentParam); /** - * @description: 批量修改会员编号 + * 批量修改会员编号 **/ UpdateCodeVO updateCode(UpdateCodeVO updateCodeVO); /** - * @description: 修改会员续约发起签呈 + * 修改会员续约发起签呈 **/ UpdateExpireStopVO upExpireStop(UpdateExpireStopVO upESVO); /** - * @description: 修改会员续约-审核通过驳回 + * 修改会员续约-审核通过驳回 **/ boolean upExpireStopProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** - * @description: 发起签呈-修改会员编号 + * 发起签呈-修改会员编号 **/ UpdateCodeVO petition(UpdateCodeVO updateCodeVO); /** - * @description: 审核通过根据业务单号,业务类型批量修改业务数据 + * 审核通过根据业务单号,业务类型批量修改业务数据 **/ boolean updateCodeByBusinessNo(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** - * @description: 政策币签呈审核 + * 政策币签呈审核 **/ boolean upPolicyCurrencyProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** - * @description:删除政策币业务审核 + * 删除政策币业务审核 **/ boolean delPolicyCurrencyProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** - * @description: 审核驳回 根据业务单号,业务类型批量修改业务数据 + * 审核驳回 根据业务单号,业务类型批量修改业务数据 **/ boolean updateCodeReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** - * @description: 真实奖衔控制-通过或驳回 + * 真实奖衔控制-通过或驳回 **/ boolean awardsControlPetition(ApprovalBusinessResultDTO approvalBusinessResultDTO); @@ -372,47 +373,47 @@ public interface ICuMemberService extends IService { Integer batchUpdateMemberByBusinessType(HandleBusinessVO handleBusinessVO); /** - * @description: 招商列表 + * 招商列表 **/ List selectBiddingList(MarketNewsParam marketNewsParam); /** - * @description: + * **/ List upsettleCountryList(UpdateSettleCountryVO upseCountryVO); /** - * @description:查询修改政策币列表 + * 查询修改政策币列表 **/ List upPolicyCurrencyList(UpPolicyCurrencyVO upVO); /** - * @description: 特殊业务-修改结算国 + * 特殊业务-修改结算国 **/ UpdateSettleCountryVO updateSettleCountry(UpdateSettleCountryVO upseCountryVO); /** - * @description: 特殊业务-修改政策币 + * 特殊业务-修改政策币 **/ UpPolicyCurrencyVO upPolicyCurrency(UpPolicyCurrencyVO policyCurrencyVO); /** - * @description: 特殊业务-删除政策币业务 + * 特殊业务-删除政策币业务 **/ UpPolicyCurrencyVO delPolicyCurrency(UpPolicyCurrencyVO policyCurrencyVO); /** - * @description: 发起签呈-修改结算国 + * 发起签呈-修改结算国 **/ UpdateSettleCountryVO petition(UpdateSettleCountryVO upseCountryVO); /** - * @description: 发起签呈-修改政策币发起签呈 + * 发起签呈-修改政策币发起签呈 **/ UpPolicyCurrencyVO petition(UpPolicyCurrencyVO policyCurrencyVO); /** - * @description: 零元撤单审核-审核通过、驳回 + * 零元撤单审核-审核通过、驳回 **/ boolean zeroByBusinessNo(ApprovalBusinessResultDTO approvalBusinessResultDTO); @@ -428,37 +429,37 @@ public interface ICuMemberService extends IService { List> systemTjSetListTree(List memberSettleExtList, CuMemberSettleExt memberSettleExt, String settleTableName, Boolean isMemberSecord); /** - * @description: 特殊业务-修改结算国-审核通过 + * 特殊业务-修改结算国-审核通过 **/ boolean updateSettleCountryAdopt(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** - * @description: 特殊业务-修改结算国-审核驳回 + * 特殊业务-修改结算国-审核驳回 **/ boolean updateSettleCountryReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** - * @description: 校验会员是否有充值审核 + * 校验会员是否有充值审核 **/ Integer checkCecharge(Long pkMember); /** - * @description: 校验会员是否有提现审核 + * 校验会员是否有提现审核 **/ Integer checkWithdraw(Long pkMember); /** - * @description: 校验会员所有账户是否有余额 + * 校验会员所有账户是否有余额 **/ Integer checkAccount(Long pkMember); /** - * @description: 查询会员是否存在未完成基础业务办理 + * 查询会员是否存在未完成基础业务办理 **/ Integer checkmsLogCount(Long pkMember, Integer editType); /** - * @description: 查询会员是否存在未完成注水业绩业务 + * 查询会员是否存在未完成注水业绩业务 **/ Integer checkMemberAchieveCount(Long pkMember); @@ -489,12 +490,12 @@ public interface ICuMemberService extends IService { List> systemAzSetListTreeFive(List list, CuMemberSettleExt memberSettleExt); /** - * @description: 获取等级的翻译KEY值 + * 获取等级的翻译KEY值 **/ Integer getGradeTranslateValue(Integer pkId); /** - * @description: 获取奖衔的翻译KEY值 + * 获取奖衔的翻译KEY值 **/ Integer getAwardsTranslateValue(Integer pkCountry, Integer pkId); @@ -720,7 +721,7 @@ public interface ICuMemberService extends IService { void updateParentByBusinessNoReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); /* - * @description: 查询会员左右区人数 + * 查询会员左右区人数 **/ List queryMemberLeftRightCount(Long pkMember); @@ -773,7 +774,7 @@ public interface ICuMemberService extends IService { List selectPlaceErrorCode(); /* - * @description: 查询伞下会员 + * 查询伞下会员 **/ Boolean queryCuMemberUnderUmbrella(Long pkMember); @@ -858,7 +859,7 @@ public interface ICuMemberService extends IService { List getMemberConsumptionStat(MemberConsumptionStatParam memberConsumptionStatParam); /** - * @description: 查询表是否存在 + * 查询表是否存在 **/ Integer selectExistTable(String tableName); @@ -1007,4 +1008,11 @@ public interface ICuMemberService extends IService { */ int countGradeMemberPoint(String memberName, String phone, Integer pkGrade, Integer pkCountry); + /** + * 系统会员拆分列表 + * + * @return + */ + List listMemberSplit(); + } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java index fd52f8e1..a955b3f3 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java @@ -3375,4 +3375,8 @@ public class CuMemberServiceImpl extends ServiceImpl i return baseMapper.countGradeMemberPoint(memberName, phone, pkGrade, pkCountry); } + @Override + public List listMemberSplit() { + return baseMapper.listMemberSplit(); + } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/login/service/impl/MemberLoginServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/login/service/impl/MemberLoginServiceImpl.java index 988f48a1..4f7dd4c1 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/login/service/impl/MemberLoginServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/login/service/impl/MemberLoginServiceImpl.java @@ -1,5 +1,6 @@ package com.hzs.member.login.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.hzs.common.core.constant.msg.SystemMsgConstants; import com.hzs.common.core.domain.R; @@ -10,6 +11,7 @@ import com.hzs.common.core.utils.StringUtils; import com.hzs.common.core.utils.ip.IpUtils; import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.domain.member.base.CuMemberShare; +import com.hzs.common.domain.member.base.CuMemberSplit; import com.hzs.common.domain.member.detail.CuMemberLogin; import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.security.utils.SecurityUtils; @@ -25,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletRequest; +import java.util.List; /** * 登录/登出服务 @@ -86,6 +89,19 @@ public class MemberLoginServiceImpl implements IMemberLoginService { throw new ServiceException(TransactionUtils.getContent(SystemMsgConstants.USER_NOT_EXIST, username)); } + // 判断会员拆分系统 + List memberSplitList = iCuMemberService.listMemberSplit(); + if (CollectionUtil.isNotEmpty(memberSplitList)) { + long nowTime = System.currentTimeMillis(); + for (CuMemberSplit cuMemberSplit : memberSplitList) { + if (null != member.getPkVertex() + && cuMemberSplit.getPkVertex().equals(member.getPkVertex()) + && nowTime > cuMemberSplit.getSplitTime()) { + throw new ServiceException(cuMemberSplit.getContent()); + } + } + } + try { // 是否更新会员 boolean updateFlag = false; 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 e238a184..4f2c5d13 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 @@ -3207,29 +3207,33 @@ cu.DEL_FLAG = 0 AND cu.CATEGORY = 2 - AND cu.MEMBER_CODE = #{memberCode} + AND cu.MEMBER_CODE = #{memberCode} + + + diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/CuMemberSplit.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/CuMemberSplit.java new file mode 100644 index 00000000..671cfaff --- /dev/null +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/CuMemberSplit.java @@ -0,0 +1,37 @@ +package com.hzs.common.domain.member.base; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 系统会员拆分表 + */ +@Data +@Accessors(chain = true) +@TableName("CU_MEMBER_SPLIT") +public class CuMemberSplit { + + private static final long serialVersionUID = 1L; + + /** + * 体系ID + */ + @TableField("PK_VERTEX") + private Long pkVertex; + + /** + * 时间线(时间戳毫秒级) + */ + @TableField("SPLIT_TIME") + private Long splitTime; + + /** + * 提示信息 + */ + @TableField("CONTENT") + private String content; + + +}