From 3720d6b608b00c789c85c8e487fe1aeb9061ca59 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 7 Aug 2025 14:59:07 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=AE=9E=E5=90=8D=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0=E7=94=9F=E6=97=A5=EF=BC=9B?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=9C=9F=E5=AE=9E=E4=BF=A1=E6=81=AF=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiCuMemberAuthenticationController.java | 4 + .../mapper/CuMemberTransferMapper.java | 6 - .../service/ICuMemberTransferService.java | 8 +- .../CuMemberAuthenticationServiceImpl.java | 2 +- .../impl/CuMemberTransferServiceImpl.java | 82 ++-- .../account/vo/CuMemberAuthenticationVO.java | 6 + .../achieve/mapper/CuMemberTreeMapper.java | 9 - .../achieve/service/ICuMemberTreeService.java | 9 - .../service/impl/CuMemberTreeServiceImpl.java | 92 ----- .../controller/manage/CuMemberController.java | 364 +++--------------- .../manage/CuMemberTeamController.java | 102 ++--- .../base/mapper/CuMemberTeamMapper.java | 41 +- .../base/param/MemberRealInfoParam.java | 56 +-- .../base/param/MemberTeamInfoParam.java | 16 +- .../base/service/ICuMemberTeamService.java | 25 +- .../service/impl/CuMemberTeamServiceImpl.java | 12 - .../hzs/member/base/vo/MemberRealInfoVO.java | 65 +--- .../com/hzs/member/base/vo/MemberTeamVo.java | 67 ++-- .../manage/MemberStructureController.java | 23 +- .../member/achieve/CuMemberTreeMapper.xml | 13 +- .../mapper/member/base/CuMemberMapper.xml | 99 ++--- .../mapper/member/base/CuMemberTeamMapper.xml | 198 +++------- .../com/hzs/common/core/enums/ECardType.java | 30 -- .../com/hzs/common/core/enums/EIdType.java | 10 +- .../java/com/hzs/common/core/enums/ESex.java | 18 +- .../member/account/CuMemberTransfer.java | 5 - .../member/account/CuMemberTransferExt.java | 5 - .../domain/member/base/CuMemberTeam.java | 9 - 28 files changed, 288 insertions(+), 1088 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberAuthenticationController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberAuthenticationController.java index ecf14b53..a25c6c01 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberAuthenticationController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberAuthenticationController.java @@ -1,9 +1,11 @@ package com.hzs.member.account.controller.api; +import cn.hutool.core.util.IdcardUtil; import com.hzs.common.core.annotation.RepeatSubmitSimple; import com.hzs.common.core.constant.msg.FinanceMsgConstants; import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.*; +import com.hzs.common.core.utils.DateUtils; import com.hzs.common.core.utils.OssUtil; import com.hzs.common.core.utils.StringUtils; import com.hzs.common.core.utils.ThreadUtils; @@ -173,6 +175,8 @@ public class ApiCuMemberAuthenticationController extends BaseController { if (null != message) { return AjaxResult.error(message); } + // 从身份证获取出生日期 + authenticationVO.setBirthDate(DateUtils.parseDateOne(IdcardUtil.getBirthByIdCard(authenticationVO.getIdCard()), DateUtils.YAMMER)); authenticationVO.setPkCountry(pkCountry); authenticationVO.setPkMember(pkMember); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTransferMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTransferMapper.java index 1ab26faf..66fefc71 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTransferMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberTransferMapper.java @@ -1,6 +1,5 @@ package com.hzs.member.account.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.account.CuMemberTransfer; import com.hzs.common.domain.member.account.CuMemberTransferExt; @@ -9,12 +8,7 @@ import com.hzs.member.account.vo.CuMemberTransferVO; import java.util.List; /** - *

* 会员转账表 Mapper 接口 - *

- * - * @author hzs - * @since 2022-09-06 */ public interface CuMemberTransferMapper extends BaseMapper { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTransferService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTransferService.java index d04f1282..e9173498 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTransferService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTransferService.java @@ -1,24 +1,19 @@ package com.hzs.member.account.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.account.CuMemberAccount; import com.hzs.common.domain.member.account.CuMemberTransfer; -import com.hzs.common.domain.member.account.CuMemberTransferExt; import com.hzs.common.domain.system.config.BdTransfer; import com.hzs.member.account.vo.CuMemberTransferVO; - - /** - *

* 会员转账表 服务类 - *

* * @author hzs * @since 2022-09-06 */ public interface ICuMemberTransferService extends IService { + /** * 是否在血缘线上 * @@ -81,7 +76,6 @@ public interface ICuMemberTransferService extends IService { */ BdTransfer getBdTransfer(Integer pkCountry); - /** * 保存转账 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAuthenticationServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAuthenticationServiceImpl.java index c5a41010..f87e0182 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAuthenticationServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAuthenticationServiceImpl.java @@ -60,7 +60,7 @@ public class CuMemberAuthenticationServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.set(CuMember::getIsRealName, EYesNo.YES.getIntValue()); updateWrapper.set(CuMember::getIdCard, authenticationVO.getIdCard()); - updateWrapper.set(CuMember::getServiceAgreement, EServiceStatus.UNSIGNED.getValue()); + updateWrapper.set(CuMember::getBirthDate, authenticationVO.getBirthDate()); updateWrapper.set(CuMember::getModifiedTime, new Date()); updateWrapper.set(CuMember::getPkModified, pkMember); updateWrapper.eq(CuMember::getPkId, pkMember); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTransferServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTransferServiceImpl.java index 59706847..a1354273 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTransferServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTransferServiceImpl.java @@ -34,32 +34,22 @@ import java.math.RoundingMode; import java.util.*; /** - *

* 会员转账表 服务实现类 - *

- * - * @author hzs - * @since 2022-09-06 */ @Service public class CuMemberTransferServiceImpl extends ServiceImpl implements ICuMemberTransferService { @Autowired - private ICuMemberService cuMemberService; - + private ICuMemberService iCuMemberService; @Autowired - private ICuMemberAccountService cuMemberAccountService; - + private ICuMemberAccountService iCuMemberAccountService; @Autowired - private ICuMemberTradeService cuMemberTradeService; + private ICuMemberTradeService iCuMemberTradeService; + @Autowired + private ICuMemberBaseService iCuMemberBaseService; @DubboReference - private ITransferServiceApi transferServiceApi; - - - @Autowired - private ICuMemberBaseService cuMemberBaseService; - + ITransferServiceApi iTransferServiceApi; @Override public Boolean isBloodLine(Long pkMember, Long toPkMember) { @@ -71,14 +61,13 @@ public class CuMemberTransferServiceImpl extends ServiceImpl cuMemberUp = cuMemberService.queryBloodKinshipOnUmbrella(pkMember); + List cuMemberUp = iCuMemberService.queryBloodKinshipOnUmbrella(pkMember); Optional upOptional = cuMemberUp.stream().filter(up -> toPkMember.equals(up.getPkId())).findFirst(); return upOptional.isPresent(); } @@ -86,7 +75,7 @@ public class CuMemberTransferServiceImpl extends ServiceImpl cuMemberDown = cuMemberService.queryBloodKinshipUnderUmbrella(pkMember); + List cuMemberDown = iCuMemberService.queryBloodKinshipUnderUmbrella(pkMember); Optional downOptional = cuMemberDown.stream().filter(down -> toPkMember.equals(down.getPkId())).findFirst(); return downOptional.isPresent(); } @@ -102,14 +91,14 @@ public class CuMemberTransferServiceImpl extends ServiceImpl memberPlaceOn = cuMemberService.queryPlaceSponsorOnUmbrella(pkMember); + List memberPlaceOn = iCuMemberService.queryPlaceSponsorOnUmbrella(pkMember); Optional onPlaceOptional = memberPlaceOn.stream().filter(placeOn -> toPkMember.equals(placeOn.getPkId())).findFirst(); return onPlaceOptional.isPresent(); } @Override public Boolean isPlaceSponsorUnderUmbrella(Long pkMember, Long toPkMember) { - List memberPlaceUnder = cuMemberService.queryPlaceSponsorUnderUmbrella(pkMember); + List memberPlaceUnder = iCuMemberService.queryPlaceSponsorUnderUmbrella(pkMember); Optional underPlaceOptional = memberPlaceUnder.stream().filter(placeUnder -> toPkMember.equals(placeUnder.getPkId())).findFirst(); return underPlaceOptional.isPresent(); } @@ -136,7 +125,7 @@ public class CuMemberTransferServiceImpl extends ServiceImpl(); memberAccountList.add(cuMemberAccount); idsMap = new HashMap<>(); @@ -144,7 +133,7 @@ public class CuMemberTransferServiceImpl extends ServiceImpl(); memberAccountList.add(toMemberAccount); idsMap = new HashMap<>(); @@ -163,9 +152,9 @@ public class CuMemberTransferServiceImpl extends ServiceImpl memberAccountList, Integer type, String businessCode, Map idsMap) { //转出方 if (type.equals(ETransferType.TRANSFER_OUT.getValue())) { - cuMemberBaseService.handleMemberTradeDetailAndBonus(memberAccountList, businessCode, idsMap, EConsumeType.TRANSFER.getValue()); + iCuMemberBaseService.handleMemberTradeDetailAndBonus(memberAccountList, businessCode, idsMap, EConsumeType.TRANSFER.getValue()); } else { - cuMemberBaseService.saveMemberTradeDetail(businessCode); + iCuMemberBaseService.saveMemberTradeDetail(businessCode); } } @@ -178,7 +167,7 @@ public class CuMemberTransferServiceImpl extends ServiceImpl { */ List queryCuMemberTreeParentTable(@Param("tableName") String settleTableName, @Param("pkMember") Long pkMember, @Param("level") Integer level, @Param("vertexIdList") List vertexIdList); - /** - * 查询直推人数 - * - * @param settleTableName - * @param pkMember - * @return - */ - Long queryCuMemberTreeParentTableCount(@Param("tableName") String settleTableName, @Param("pkMember") Long pkMember); - /** * 查询历史安置上下级 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java index 823740e2..b292220a 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java @@ -57,15 +57,6 @@ public interface ICuMemberTreeService extends IService { */ List queryCuMemberTreeParentTable(String settleTableName, Long pkMember, Integer level, List vertexIdList); - /** - * 查询直推人数 - * - * @param settleTableName - * @param pkMember - * @return - */ - Long queryCuMemberTreeParentTableCount(String settleTableName, Long pkMember); - /** * 查询历史安置上下级 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberTreeServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberTreeServiceImpl.java index 06619f4c..a17ce30c 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberTreeServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberTreeServiceImpl.java @@ -39,25 +39,11 @@ public class CuMemberTreeServiceImpl extends ServiceImpl 0; } - /** - * 根据pkmember查询 - * - * @param settleTableName - * @param pkMember - * @return - */ @Override public CuMemberSettleExt queryCuMemberTreeByPkMemberTable(String settleTableName, Long pkMember) { return baseMapper.queryCuMemberTreeByPkMemberTable(settleTableName, pkMember); } - /** - * 查询推荐关系 - * - * @param settleTableName - * @param pkMember - * @return - */ @Override public List queryCuMemberTreeParentTable(String settleTableName, Long pkMember, Integer level, List vertexIdList) { List memberSettleExtList = baseMapper.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); @@ -91,85 +77,31 @@ public class CuMemberTreeServiceImpl extends ServiceImpl queryCuMemberTreePlaceParentHistoryTable(String settleTableName, Long pkMember, List memberIdList, Integer level) { return baseMapper.queryCuMemberTreePlaceParentHistoryTable(settleTableName, pkMember, memberIdList, level); } - /** - * 查询秒结表会员信息 - * - * @param pkMember - * @param settleTableName - * @param level - * @return - */ @Override public List selectByTreeMemberList(Long pkMember, String settleTableName, Integer level, List vertexIdList) { return baseMapper.selectByTreeMemberList(pkMember, settleTableName, level, vertexIdList); } - /** - * 查询秒结表会员信息 - * - * @param pkMember - * @param level - * @return - */ @Override public List selectByTreeMemberListFive(Long pkMember, Integer level, List vertexIdList) { return baseMapper.selectByTreeMemberListFive(pkMember, level, vertexIdList); } - /** - * 查询秒结表是否有值 - * - * @param settleTableName - * @return - */ @Override public Long selectByselectByTreeMemberCount(String settleTableName, Long pkMember) { return baseMapper.selectByselectByTreeMemberCount(settleTableName, pkMember); } - /** - * 查询伞下安置新增业绩 - * - * @param settleTableName - * @param pkMember - * @return - */ @Override public List brollyBelowResettle(String settleTableName, Long pkMember) { return baseMapper.brollyBelowResettle(settleTableName, pkMember); } - /** - * 根据pkmember查询 关联parent - * - * @param settleTableName - * @param pkMember - * @return - */ @Override public CuMemberSettleExt queryCuMemberTreeByPlacePkMemberTable(String settleTableName, Long pkMember) { CuMemberSettleExt cuMemberSettleExt = baseMapper.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember); @@ -189,40 +121,16 @@ public class CuMemberTreeServiceImpl extends ServiceImpl queryByMemberParentSumPv(String settleTableName, List memberIds) { return baseMapper.queryByMemberParentSumPv(settleTableName, memberIds); } - - /** - * 查询历史安置架构 - * - * @param settleTableName - * @param pkMember - * @param memberIdList - * @param level - * @return - */ @Override public List queryCuMemberTreePlaceParentHistoryFramework(String settleTableName, Long pkMember, List memberIdList, Integer level) { return baseMapper.queryCuMemberTreePlaceParentHistoryFramework(settleTableName, pkMember, memberIdList, level); } - /** - * 查询会员历史直推业绩 - * - * @param settleTableName - * @param memberIds - * @return - */ @Override public List queryByMemberParentSettleSumPv(String settleTableName, List memberIds) { List memberParentCountParamList = new ArrayList<>(); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java index c0d0d3e5..bfdb6a74 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java @@ -2,9 +2,6 @@ package com.hzs.member.base.controller.manage; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdcardUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.hzs.common.core.annotation.AccessPermissions; import com.hzs.common.core.annotation.ColumnAuthority; import com.hzs.common.core.annotation.Log; @@ -18,9 +15,6 @@ import com.hzs.common.core.utils.poi.ExcelUtil; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.member.account.CuMemberTransfer; -import com.hzs.common.domain.member.account.CuMemberWithdraw; -import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.domain.system.config.BdAwards; @@ -28,20 +22,14 @@ import com.hzs.common.security.service.MemberTokenService; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.service.ITransactionCommonService; import com.hzs.common.util.TransactionUtils; -import com.hzs.member.account.service.ICuMemberTransferService; -import com.hzs.member.account.service.ICuMemberWithdrawService; -import com.hzs.member.achieve.service.ICuMemberSettlePeriodService; -import com.hzs.member.achieve.service.ICuMemberTreeService; import com.hzs.member.base.dto.LoginMember; import com.hzs.member.base.dto.MemberBusinessTemplate; import com.hzs.member.base.param.*; import com.hzs.member.base.service.ICuMemberService; -import com.hzs.member.base.service.ICuMemberTeamService; import com.hzs.member.base.vo.*; import com.hzs.member.login.service.IMemberLoginService; import com.hzs.member.swing.param.CuMemberSwingNetParam; import com.hzs.member.swing.vo.CuMemberRetVO; -import com.hzs.system.base.IAreaServiceApi; import com.hzs.system.base.ICurrencyServiceApi; import com.hzs.system.base.dto.CurrencyDTO; import com.hzs.system.config.IAwardsServiceApi; @@ -58,26 +46,15 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.*; -import java.util.regex.Pattern; import java.util.stream.Collectors; @RequestMapping("/manager/member") @RestController public class CuMemberController extends BaseController { - @Autowired - private ICuMemberWithdrawService iCuMemberWithdrawService; - @Autowired - private ICuMemberSettlePeriodService iCuMemberSettlePeriodService; - @Autowired - private ICuMemberTransferService iCuMemberTransferService; @Autowired private ICuMemberService iCuMemberService; @Autowired - private ICuMemberTeamService iCuMemberTeamService; - @Autowired - private ICuMemberTreeService iCuMemberTreeService; - @Autowired private IMemberLoginService iMemberLoginService; @Autowired private ITransactionCommonService iTransactionCommonService; @@ -91,8 +68,6 @@ public class CuMemberController extends BaseController { @DubboReference IGradeServiceApi iGradeServiceApi; @DubboReference - IAreaServiceApi iAreaServiceApi; - @DubboReference ICurrencyServiceApi iCurrencyServiceApi; @DubboReference IMenuColumnServiceApi iMenuColumnServiceApi; @@ -407,18 +382,6 @@ public class CuMemberController extends BaseController { if (cvo.getCardType() == ECardType.CARD.getValue()) { cvo.setCardTypeVal(ECardType.CARD.getLabel()); } - if (cvo.getCardType() == ECardType.OFFICER.getValue()) { - cvo.setCardTypeVal(ECardType.OFFICER.getLabel()); - } - if (cvo.getCardType() == ECardType.STUDENT.getValue()) { - cvo.setCardTypeVal(ECardType.STUDENT.getLabel()); - } - if (cvo.getCardType() == ECardType.DRIVE.getValue()) { - cvo.setCardTypeVal(ECardType.DRIVE.getLabel()); - } - if (cvo.getCardType() == ECardType.PASSPORT.getValue()) { - cvo.setCardTypeVal(ECardType.PASSPORT.getLabel()); - } } } @@ -524,35 +487,18 @@ public class CuMemberController extends BaseController { UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData(); memberRealInfoParam.setVertexList(userAuthorityDTO.getUserVertexList()); memberRealInfoParam.setTeamList(userAuthorityDTO.getUserTeamList()); - if (StringUtils.isNotEmpty(memberRealInfoParam.getBirthDate())) { - memberRealInfoParam.setBirthDate(memberRealInfoParam.getBirthDate().replace("-", "")); - } + startPage(); List resultList = iCuMemberService.selectByMemberRealInfo(memberRealInfoParam); - if (CollectionUtil.isNotEmpty(resultList)) { // 奖衔 R> awardsListDate = iAwardsServiceApi.queryAwards(SecurityUtils.getPkCountry()); List awardsList = awardsListDate.getData(); - // 等级 R> gradeListDate = iGradeServiceApi.queryGradeList(SecurityUtils.getPkCountry()); List gradeList = gradeListDate.getData(); - Map areaDate = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); for (MemberRealInfoVO cuMemberExt : resultList) { - if (cuMemberExt.getPkProvince() != null) { - // 省 - cuMemberExt.setProvinceName(areaDate.get(cuMemberExt.getPkProvince())); - } - if (cuMemberExt.getPkCity() != null) { - // 市 - cuMemberExt.setCityName(areaDate.get(cuMemberExt.getPkCity())); - } - if (cuMemberExt.getPkCounty() != null) { - // 区县 - cuMemberExt.setCountyName(areaDate.get(cuMemberExt.getPkCounty())); - } // 注册等级 if (cuMemberExt.getPkRegisterGrade() != null) { for (GradeDTO grade : gradeList) { @@ -577,210 +523,67 @@ public class CuMemberController extends BaseController { } } } - // 生日 - if (StringUtils.isNotBlank(cuMemberExt.getIdCard()) && (checkIdCard(cuMemberExt.getIdCard()))) { - cuMemberExt.setBirthDate(IdcardUtil.getBirthDate(cuMemberExt.getIdCard())); - } - if (cuMemberExt.getIdType() != null) { - cuMemberExt.setCardTypeVal(EIdType.getLabel(cuMemberExt.getIdType())); - } + cuMemberExt.setCardTypeVal(EIdType.getLabelByValue(cuMemberExt.getIdType())); + cuMemberExt.setSexVal(ESex.getLabelByValue(cuMemberExt.getSex())); } } - return getDataTable(resultList); } /** - * 会员团队信息 - * - * @return - */ - @AccessPermissions("TeamInfo") - @GetMapping("/member-team-info") - public TableDataInfo memberTeamInfo(MemberTeamInfoParam memberTeamInfoParam) { - String time; - String settleTableName; - CuMemberSettlePeriod csPeriod; - List memberTeamList = new ArrayList<>(); - R> awardsDto = iAwardsServiceApi.queryAwards(SecurityUtils.getPkCountry()); - if (memberTeamInfoParam.getQueryDate() == null) { + * 导出真实信息 + **/ + @Log(module = EOperationModule.MEMBER_INFORMATION, business = EOperationBusiness.MEMBER_INFORMATION, method = EOperationMethod.EXPORT) + @PostMapping("/real-info-export") + public void realInfoExport(HttpServletResponse response, MemberRealInfoParam memberRealInfoParam) { + memberRealInfoParam.setPkCountry(SecurityUtils.getPkCountry()); - // 昨日 - time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtil.offsetDay(new Date(), -1)); - csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); - settleTableName = TableNameConstants.CU_MEMBER_SETTLE + csPeriod.getPkId(); - } else { - String queryDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, memberTeamInfoParam.getQueryDate()); - String currentDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.currentDate()); - time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, memberTeamInfoParam.getQueryDate()); - csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); - if (queryDate.equals(currentDate)) { - settleTableName = TableNameConstants.CU_MEMBER_SETTLE + csPeriod.getPkId(); - } else { - // 历史 - settleTableName = TableNameConstants.CU_MEMBER_SETTLE + csPeriod.getPkId(); - } - } - // 如果表格不存在则返回空数据 - Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName); - if (tableNumber == null || tableNumber == 0) { - return getDataTable(new ArrayList<>()); - } - memberTeamInfoParam.setSettleTableName(settleTableName); - memberTeamInfoParam.setPeriod(csPeriod.getPkId()); - startPage(); - if (StringUtils.isNotBlank(memberTeamInfoParam.getMemberCode())) { - if (memberTeamInfoParam.getRelaType() != null && memberTeamInfoParam.getRelaType().equals(ERealType.XY.getIntValue())) { - // 血缘 - memberTeamList = iCuMemberTeamService.queryMemberTeamInfoList(memberTeamInfoParam); - } else { - // 安置 - memberTeamList = iCuMemberTeamService.queryMemberTeamInfoPlaceParentList(memberTeamInfoParam); - } - } - for (MemberTeamVo memberTeamVo : memberTeamList) { - // 查询安置层级 - if (memberTeamVo.getPlaceDept() != null) { - memberTeamVo.setPlaceDept(memberTeamVo.getPlaceDept()); - memberTeamVo.setPlaceDeptStr(EPlaceDept.getEPlaceDept(memberTeamVo.getPlaceDept())); - } - if (memberTeamVo.getPkAwards() != null) { - for (BdAwards date : awardsDto.getData()) { - if (memberTeamVo.getPkAwards().equals(date.getPkId())) { - memberTeamVo.setPkAwardsStr(date.getAwardsName()); + // 获取管理员权限（角色地区范围、体系列表、团队列表） + UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData(); + memberRealInfoParam.setVertexList(userAuthorityDTO.getUserVertexList()); + memberRealInfoParam.setTeamList(userAuthorityDTO.getUserTeamList()); + + List resultList = iCuMemberService.selectByMemberRealInfo(memberRealInfoParam); + if (CollectionUtil.isNotEmpty(resultList)) { + // 奖衔 + R> awardsListDate = iAwardsServiceApi.queryAwards(SecurityUtils.getPkCountry()); + List awardsList = awardsListDate.getData(); + // 等级 + R> gradeListDate = iGradeServiceApi.queryGradeList(SecurityUtils.getPkCountry()); + List gradeList = gradeListDate.getData(); + + for (MemberRealInfoVO cuMemberExt : resultList) { + // 注册等级 + if (cuMemberExt.getPkRegisterGrade() != null) { + for (GradeDTO grade : gradeList) { + if (grade.getPkId().equals(cuMemberExt.getPkRegisterGrade())) { + cuMemberExt.setRegisterGradeVal(grade.getGradeName()); + } } } - } - if (memberTeamVo.getPkPlaceParent() != null) { - CuMember member = iCuMemberService.getMember(memberTeamVo.getPkPlaceParent()); - if (member != null) { - memberTeamVo.setPlaceParentCode(member.getMemberCode()); - } - } - memberTeamVo.setResettleLevel(memberTeamVo.getLevel()); - //TODO 血缘代数 - memberTeamVo.setConsanguinityAlgebra("第" + memberTeamVo.getLevel() + "代"); - //TODO 奖金大盘占比 - memberTeamVo.setBonusLargeMarketProportion(BigDecimal.ZERO); - // 直推人数 - Long directPushPeopleNumber = iCuMemberTreeService.queryCuMemberTreeParentTableCount(settleTableName, memberTeamVo.getMemberId()); - memberTeamVo.setDirectPushPeopleNumber(directPushPeopleNumber); - // 转账次数 - QueryWrapper qew = new QueryWrapper<>(); - qew.eq("PK_MEMBER", memberTeamVo.getMemberId()); - int memberTransferCount = iCuMemberTransferService.count(qew); - memberTeamVo.setMemberTransferCount(memberTransferCount); - - // 提现次数 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_MEMBER", memberTeamVo.getMemberId()); - int memberWithdrawCount = iCuMemberWithdrawService.count(queryWrapper); - memberTeamVo.setWithdrawalNumber(memberWithdrawCount); - // 最后一次登录时间 - if (memberTeamVo.getLastLoginTime() != null) { - // 计算当前时间和 最后一次登陆时间间隔 - memberTeamVo.setLastLoginTimeIntervalDays(DateUtil.betweenDay(DateUtils.currentDate(), memberTeamVo.getLastLoginTime(), true)); - } - } - return getDataTable(memberTeamList); - } - - /** - * 会员团队信息导出 - */ - @PostMapping("/member-team-info-export") - public void memberTeamInfoExport(MemberTeamInfoParam memberTeamInfoParam, HttpServletResponse response) { - String time; - String settleTableName; - CuMemberSettlePeriod csPeriod; - List memberTeamList = new ArrayList<>(); - R> awardsDto = iAwardsServiceApi.queryAwards(SecurityUtils.getPkCountry()); - if (memberTeamInfoParam.getQueryDate() == null) { - - // 昨日 - time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtil.offsetDay(new Date(), -1)); - csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); - settleTableName = TableNameConstants.CU_MEMBER_SETTLE + csPeriod.getPkId(); - } else { - String queryDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, memberTeamInfoParam.getQueryDate()); - String currentDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.currentDate()); - time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, memberTeamInfoParam.getQueryDate()); - csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); - if (queryDate.equals(currentDate)) { - settleTableName = TableNameConstants.CU_MEMBER_SETTLE + csPeriod.getPkId(); - } else { - // 历史 - settleTableName = TableNameConstants.CU_MEMBER_SETTLE + csPeriod.getPkId(); - } - } - // 如果表格不存在则返回空数据 - Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName); - if (tableNumber == null || tableNumber == 0) { - ExcelUtil util = new ExcelUtil<>(MemberTeamVo.class); - util.exportExcel(response, memberTeamList, "会员团队信息"); - } - memberTeamInfoParam.setSettleTableName(settleTableName); - memberTeamInfoParam.setPeriod(csPeriod.getPkId()); - startPage(); - if (StringUtils.isNotBlank(memberTeamInfoParam.getMemberCode())) { - if (memberTeamInfoParam.getRelaType() != null && memberTeamInfoParam.getRelaType().equals(ERealType.XY.getIntValue())) { - // 血缘 - memberTeamList = iCuMemberTeamService.queryMemberTeamInfoList(memberTeamInfoParam); - } else { - // 安置 - memberTeamList = iCuMemberTeamService.queryMemberTeamInfoPlaceParentList(memberTeamInfoParam); - } - } - for (MemberTeamVo memberTeamVo : memberTeamList) { - // 查询安置层级 - - if (memberTeamVo.getPlaceDept() != null) { - memberTeamVo.setPlaceDept(memberTeamVo.getPlaceDept()); - memberTeamVo.setPlaceDeptStr(EPlaceDept.getEPlaceDept(memberTeamVo.getPlaceDept())); - } - if (memberTeamVo.getPkAwards() != null) { - for (BdAwards date : awardsDto.getData()) { - if (memberTeamVo.getPkAwards().equals(date.getPkId())) { - memberTeamVo.setPkAwardsStr(date.getAwardsName()); + // 结算等级 + if (cuMemberExt.getPkSettleGrade() != null) { + for (GradeDTO grade : gradeList) { + if (grade.getPkId().equals(cuMemberExt.getPkSettleGrade())) { + cuMemberExt.setSettleGradeVal(grade.getGradeName()); + } } } - } - if (memberTeamVo.getPkPlaceParent() != null) { - CuMember member = iCuMemberService.getMember(memberTeamVo.getPkPlaceParent()); - if (member != null) { - memberTeamVo.setPlaceParentCode(member.getMemberCode()); + // 真实奖衔 + if (cuMemberExt.getPkAwards() != null) { + for (BdAwards awards : awardsList) { + if (awards.getPkId().equals(cuMemberExt.getPkAwards())) { + cuMemberExt.setAwardsVal(awards.getAwardsName()); + } + } } - } - - memberTeamVo.setResettleLevel(memberTeamVo.getLevel()); - - //血缘代数 - memberTeamVo.setConsanguinityAlgebra("第" + memberTeamVo.getLevel() + "代"); - //奖金大盘占比 - memberTeamVo.setBonusLargeMarketProportion(BigDecimal.ZERO); - // 直推人数 - Long directPushPeopleNumber = iCuMemberTreeService.queryCuMemberTreeParentTableCount(settleTableName, memberTeamVo.getMemberId()); - memberTeamVo.setDirectPushPeopleNumber(directPushPeopleNumber); - // 转账次数 - QueryWrapper qew = new QueryWrapper<>(); - qew.eq("PK_MEMBER", memberTeamVo.getMemberId()); - int memberTransferCount = iCuMemberTransferService.count(qew); - memberTeamVo.setMemberTransferCount(memberTransferCount); - - // 提现次数 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_MEMBER", memberTeamVo.getMemberId()); - int memberWithdrawCount = iCuMemberWithdrawService.count(queryWrapper); - memberTeamVo.setWithdrawalNumber(memberWithdrawCount); - // 最后一次登录时间 - if (memberTeamVo.getLastLoginTime() != null) { - // 计算当前时间和 最后一次登陆时间间隔 - memberTeamVo.setLastLoginTimeIntervalDays(DateUtil.betweenDay(DateUtils.currentDate(), memberTeamVo.getLastLoginTime(), true)); + cuMemberExt.setCardTypeVal(EIdType.getLabelByValue(cuMemberExt.getIdType())); + cuMemberExt.setSexVal(ESex.getLabelByValue(cuMemberExt.getSex())); } } - ExcelUtil util = new ExcelUtil<>(MemberTeamVo.class, iMenuColumnServiceApi.queryMenuColumn("TeamInfo", SecurityUtils.getUserId()).getData()); - util.exportExcel(response, memberTeamList, "会员团队信息"); + ExcelUtil util = new ExcelUtil<>(MemberRealInfoVO.class, iMenuColumnServiceApi.queryMenuColumn("RealInfo", SecurityUtils.getUserId()).getData()); + util.exportExcel(response, resultList, "真实信息"); } /** @@ -794,69 +597,6 @@ public class CuMemberController extends BaseController { return AjaxResult.success(memberTokenService.createToken(loginMember)); } - - /** - * 导出真实信息 - **/ - @Log(module = EOperationModule.MEMBER_INFORMATION, business = EOperationBusiness.MEMBER_INFORMATION, method = EOperationMethod.EXPORT) - @PostMapping("/real-info-export") - public void realInfoExport(HttpServletResponse response, MemberRealInfoParam memberRealInfoParam) { - memberRealInfoParam.setPkCountry(SecurityUtils.getPkCountry()); - // 获取管理员权限（角色地区范围、体系列表、团队列表） - UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData(); - memberRealInfoParam.setVertexList(userAuthorityDTO.getUserVertexList()); - memberRealInfoParam.setTeamList(userAuthorityDTO.getUserTeamList()); - List resultList = iCuMemberService.selectByMemberRealInfo(memberRealInfoParam); - - if (CollectionUtil.isNotEmpty(resultList)) { - // 获取需要翻译的枚举翻译 - Map transactionMap = iTransactionCommonService.exportEnumTransaction(ECardType.values(), - ESex.values() - ); - //数据库内容翻译 - Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, - EnumsPrefixConstants.KEY_AWARD); - - Map areaDate = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); - for (MemberRealInfoVO cuMemberExt : resultList) { - cuMemberExt.setRegisterGradeVal(transactionMap1.get(cuMemberExt.getPkRegisterGrade())); - cuMemberExt.setSettleGradeVal(transactionMap1.get(cuMemberExt.getPkSettleGrade())); - cuMemberExt.setAwardsVal(transactionMap1.get(cuMemberExt.getPkAwards())); - cuMemberExt.setPkMaxAwardsVal(transactionMap1.get(cuMemberExt.getPkMaxAwards())); - if (cuMemberExt.getPkProvince() != null) { - // 省 - cuMemberExt.setProvinceName(areaDate.get(cuMemberExt.getPkProvince())); - } - if (cuMemberExt.getPkCity() != null) { - // 市 - cuMemberExt.setCityName(areaDate.get(cuMemberExt.getPkCity())); - } - if (cuMemberExt.getPkCounty() != null) { - // 区县 - cuMemberExt.setCountyName(areaDate.get(cuMemberExt.getPkCounty())); - } - // 证件类型 - if (cuMemberExt.getCardType() != null) { - cuMemberExt.setCardTypeVal(transactionMap.get(EnumsPrefixConstants.CARD_TYPE + cuMemberExt.getCardType())); - } - // 性别 - if (cuMemberExt.getSex() != null) { - cuMemberExt.setSexVal(transactionMap.get(EnumsPrefixConstants.SEX + cuMemberExt.getSex())); - } - // 生日 - if (StringUtils.isNotBlank(cuMemberExt.getIdCard()) && (checkIdCard(cuMemberExt.getIdCard()))) { - cuMemberExt.setBirthDate(IdcardUtil.getBirthDate(cuMemberExt.getIdCard())); - } - if (cuMemberExt.getIdType() != null) { - cuMemberExt.setCardTypeVal(EIdType.getLabel(cuMemberExt.getIdType())); - } - } - } - ExcelUtil util = new ExcelUtil<>(MemberRealInfoVO.class, iMenuColumnServiceApi.queryMenuColumn("RealInfo", SecurityUtils.getUserId()).getData()); - util.exportExcel(response, resultList, "真实信息"); - } - - /** * 下载模板 * @@ -871,16 +611,6 @@ public class CuMemberController extends BaseController { util.exportExcel(response, list, "会员编号"); } - - /** - * 校验身份证格式 - **/ - public boolean checkIdCard(String idCard) { - // 正则表达式校验身份证号码格式 - String reg = "\\d{17}[\\d|x|X]"; - return Pattern.matches(reg, idCard); - } - /** * 查询顶点会员 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberTeamController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberTeamController.java index e2a58a42..3bd04c3c 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberTeamController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberTeamController.java @@ -2,8 +2,8 @@ package com.hzs.member.base.controller.manage; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.hzs.common.core.annotation.Log; import com.hzs.common.core.constant.msg.ConfigMsgConstants; import com.hzs.common.core.domain.R; @@ -20,7 +20,6 @@ import com.hzs.common.util.TransactionUtils; import com.hzs.member.base.IMemberServiceApi; import com.hzs.member.base.service.ICuMemberTeamService; import com.hzs.member.base.vo.CuMemberTeamVO; -import com.hzs.system.base.ITransactionServiceApi; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -31,24 +30,20 @@ import java.util.List; /** * 会员所属团队（隶属团队）（隶属团队） 前端控制器 - * - * @author zhangjing - * @since 2022-09-16 */ @RestController @RequestMapping("/manage/member-team") public class CuMemberTeamController extends BaseController { @Autowired - private ICuMemberTeamService cuMemberTeamService; + private ICuMemberTeamService iCuMemberTeamService; @DubboReference IMemberServiceApi iMemberServiceApi; - @DubboReference - ITransactionServiceApi iTransactionServiceApi; /** - * @description: 查询会员所属团队（隶属团队）列表 + * 查询会员所属团队（隶属团队）列表 + * * @param: [cuMemberTeam] * @return: com.hzs.common.core.web.page.TableDataInfo **/ @@ -57,12 +52,13 @@ public class CuMemberTeamController extends BaseController { public TableDataInfo list(CuMemberTeamExt cuMemberTeam) { startPage(); cuMemberTeam.setPkCountry(SecurityUtils.getPkCountry()); - List list = cuMemberTeamService.queryCuMemberTeam(cuMemberTeam); + List list = iCuMemberTeamService.queryCuMemberTeam(cuMemberTeam); return getDataTable(list); } /** - * @description: 隶属团队下拉选 + * 隶属团队下拉选 + * * @param: [cuMemberTeam] * @return: com.hzs.common.core.web.page.TableDataInfo **/ @@ -70,7 +66,7 @@ public class CuMemberTeamController extends BaseController { @GetMapping("/listNoPage") public TableDataInfo listNoPage(CuMemberTeamExt cuMemberTeam) { cuMemberTeam.setPkCountry(SecurityUtils.getPkCountry()); - List list = cuMemberTeamService.queryCuMemberTeam(cuMemberTeam); + List list = iCuMemberTeamService.queryCuMemberTeam(cuMemberTeam); List listVo = new ArrayList<>(); list.forEach(item -> listVo.add(BeanUtil.copyProperties(item, CuMemberTeamVO.class))); return getDataTable(listVo); @@ -83,7 +79,7 @@ public class CuMemberTeamController extends BaseController { */ @GetMapping("find-all") public AjaxResult findAll() { - return AjaxResult.success(cuMemberTeamService.list(new QueryWrapper<>())); + return AjaxResult.success(iCuMemberTeamService.list()); } /** @@ -94,23 +90,22 @@ public class CuMemberTeamController extends BaseController { */ @GetMapping("/find-vertex") public AjaxResult findByVertex(@RequestParam List pkVertexList) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("PK_BD_VERTEX", pkVertexList); - queryWrapper.orderByAsc("TEAM_NAME"); - return AjaxResult.success(cuMemberTeamService.list(queryWrapper)); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(CuMemberTeam::getPkBdVertex, pkVertexList); + queryWrapper.orderByAsc(CuMemberTeam::getTeamName); + return AjaxResult.success(iCuMemberTeamService.list(queryWrapper)); } /** - * @description: 新增会员所属团队（隶属团队） + * 新增会员所属团队（隶属团队） + * * @param: [cuMemberTeam] * @return: com.hzs.common.core.web.domain.AjaxResult **/ @Log(module = EOperationModule.CU_MEMBER_TEAM, method = EOperationMethod.INSERT) @PostMapping("/save") public AjaxResult save(@RequestBody CuMemberTeamExt cuMemberTeam) { - - Integer pkCountry = SecurityUtils.getPkCountry(); if (StringUtils.isEmpty(cuMemberTeam.getTeamName())) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.TEAM_NAME_NOT_NULL)); } @@ -125,33 +120,29 @@ public class CuMemberTeamController extends BaseController { if (StringUtils.isNull(member.getData())) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID)); } - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_MEMBER", member.getData().getPkId()); - List list = cuMemberTeamService.list(queryWrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CuMemberTeam::getPkMember, member.getData().getPkId()); + List list = iCuMemberTeamService.list(queryWrapper); if (CollectionUtil.isNotEmpty(list)) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_CODE_REPEAT)); } cuMemberTeam.setPkMember(member.getData().getPkId()); - //字段翻译保存到数据库 - R pkTransaction = iTransactionServiceApi.createTransaction(pkCountry, ETransactionKey.MEMBER, - cuMemberTeam.getTeamName(), EYesNo.NO, EYesNo.NO); - cuMemberTeam.setPkTransaction(pkTransaction.getData()); cuMemberTeam.setPkCountry(SecurityUtils.getPkCountry()); cuMemberTeam.setPkCreator(SecurityUtils.getUserId()); cuMemberTeam.setCreationTime(new Date()); - return toAjax(cuMemberTeamService.save(cuMemberTeam)); + return toAjax(iCuMemberTeamService.save(cuMemberTeam)); } /** - * @description: 修改会员所属团队（隶属团队） + * 修改会员所属团队（隶属团队） + * * @param: [cuMemberTeam] * @return: com.hzs.common.core.web.domain.AjaxResult **/ @Log(module = EOperationModule.CU_MEMBER_TEAM, method = EOperationMethod.UPDATE) @PostMapping("/update") public AjaxResult update(@RequestBody CuMemberTeamExt cuMemberTeam) { - Integer pkCountry = SecurityUtils.getPkCountry(); if (StringUtils.isEmpty(cuMemberTeam.getTeamName())) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.TEAM_NAME_NOT_NULL)); } @@ -168,31 +159,23 @@ public class CuMemberTeamController extends BaseController { if (StringUtils.isNull(member.getData())) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID)); } - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_MEMBER", member.getData().getPkId()); - queryWrapper.ne("PK_ID", cuMemberTeam.getPkId()); - List list = cuMemberTeamService.list(queryWrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CuMemberTeam::getPkMember, member.getData().getPkId()); + queryWrapper.ne(CuMemberTeam::getPkId, cuMemberTeam.getPkId()); + List list = iCuMemberTeamService.list(queryWrapper); if (CollectionUtil.isNotEmpty(list)) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_CODE_REPEAT)); } cuMemberTeam.setPkMember(member.getData().getPkId()); - if (null != cuMemberTeam.getPkTransaction()) { - iTransactionServiceApi.updateTransaction(pkCountry, - cuMemberTeam.getTeamName(), cuMemberTeam.getPkTransaction(), true); - } else { - //字段翻译保存到数据库 - R pkTransaction = iTransactionServiceApi.createTransaction(pkCountry, ETransactionKey.MEMBER, - cuMemberTeam.getTeamName(), EYesNo.NO, EYesNo.NO); - cuMemberTeam.setPkTransaction(pkTransaction.getData()); - } cuMemberTeam.setPkModified(SecurityUtils.getUserId()); cuMemberTeam.setModifiedTime(new Date()); - return toAjax(cuMemberTeamService.updateById(cuMemberTeam)); + return toAjax(iCuMemberTeamService.updateById(cuMemberTeam)); } /** - * @description: 查询单条会员所属团队（隶属团队） + * 查询单条会员所属团队（隶属团队） + * * @param: [pkId] * @return: com.hzs.common.core.web.domain.AjaxResult **/ @@ -201,42 +184,39 @@ public class CuMemberTeamController extends BaseController { public AjaxResult getOne(@PathVariable Long pkId) { CuMemberTeamExt memberTeam = new CuMemberTeamExt(); memberTeam.setPkId(pkId); - List cuMemberTeam = cuMemberTeamService.queryCuMemberTeam(memberTeam); + List cuMemberTeam = iCuMemberTeamService.queryCuMemberTeam(memberTeam); CuMemberTeamExt cuMemberTeamExt = cuMemberTeam.get(0); return AjaxResult.success(cuMemberTeamExt); } /** - * @description: 删除会员所属团队（隶属团队） + * 删除会员所属团队（隶属团队） + * * @param: [pkId] * @return: com.hzs.common.core.web.domain.AjaxResult **/ @Log(module = EOperationModule.CU_MEMBER_TEAM, method = EOperationMethod.DELETE) @DeleteMapping("/{pkId}") public AjaxResult delete(@PathVariable Long pkId) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_ID", pkId); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId()); - updateWrapper.set("MODIFIED_TIME", new Date()); - //删除翻译 - CuMemberTeam memberTeam = cuMemberTeamService.getById(pkId); - List pkIdList = new ArrayList<>(); - pkIdList.add(memberTeam.getPkTransaction().longValue()); - iTransactionServiceApi.removeTransactionByPkId(pkIdList); - return toAjax(cuMemberTeamService.update(updateWrapper)); + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(CuMemberTeam::getPkId, pkId); + updateWrapper.set(CuMemberTeam::getDelFlag, EDelFlag.DELETE.getValue()); + updateWrapper.set(CuMemberTeam::getPkModified, SecurityUtils.getUserId()); + updateWrapper.set(CuMemberTeam::getModifiedTime, new Date()); + return toAjax(iCuMemberTeamService.update(updateWrapper)); } /** - * @description: 更新所属团队（隶属团队） + * 更新所属团队（隶属团队） + * * @param: [pkId] * @return: com.hzs.common.core.web.domain.AjaxResult **/ @Log(module = EOperationModule.CU_MEMBER_TEAM, method = EOperationMethod.RENEW) @GetMapping("/update-team/{pkTeamCode}") public AjaxResult updateTeamByVertex(@PathVariable Long pkTeamCode) { - cuMemberTeamService.updateCuMemberTeamByVertex(pkTeamCode); + iCuMemberTeamService.updateCuMemberTeamByVertex(pkTeamCode); return AjaxResult.success(); } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberTeamMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberTeamMapper.java index 742cd623..1d67fbe5 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberTeamMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberTeamMapper.java @@ -3,65 +3,34 @@ package com.hzs.member.base.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.base.CuMemberTeam; import com.hzs.common.domain.member.ext.CuMemberTeamExt; -import com.hzs.member.base.param.MemberTeamInfoParam; -import com.hzs.member.base.vo.MemberTeamVo; -import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 会员交易明细 Mapper 接口 - *

- * - * @author hzs - * @since 2022-09-01 */ public interface CuMemberTeamMapper extends BaseMapper { List queryCuMemberTeam(CuMemberTeamExt cuMemberTeamExt); /* - * @description: 查询会员伞下团队 - * @author: sui q - * @date: 2023/4/24 20:04 - * @param: null null + * 查询会员伞下团队 **/ List queryCuMemberUmbrella(Long pkMember); /* - * @description: 更新体系下所有的团队为空 - * @author: sui q - * @date: 2023/4/24 19:26 - * @param: null null + * 更新体系下所有的团队为空 **/ void updateSelfCuMemberTeam(Long pkMember); /* - * @description: 更新伞下会员 - * @author: sui q - * @date: 2023/4/24 19:34 - * @param: null null + * 更新伞下会员 **/ void updateCuMemberUnderUmbrella(CuMemberTeam cuMemberTeam); /* - * @description: 更新伞下会员 - * @author: sui q - * @date: 2023/4/24 19:34 - * @param: null null + * 更新伞下会员 **/ void updateCuMemberUnderUmbrellaNull(Long pkMember); - /** - * 查询会员团队信息 - * @param memberTeamInfoParam - * @return - */ - List queryMemberTeamInfoList(MemberTeamInfoParam memberTeamInfoParam); - /** - * 查询会员安置团队信息 - * @param memberTeamInfoParam - * @return - */ - List queryMemberTeamInfoPlaceParentList(MemberTeamInfoParam memberTeamInfoParam); + } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberRealInfoParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberRealInfoParam.java index 566f5221..706ea7a6 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberRealInfoParam.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberRealInfoParam.java @@ -1,26 +1,10 @@ -package com.hzs.member.base.param;/** - * @Description: - * @Author: yuhui - * @Time: 2023/4/26 10:08 - * @Classname: MemberRealInfo - * @PackageName: com.hzs.member.base.param - */ +package com.hzs.member.base.param; -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; import java.util.List; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.param - *@Author: yh - *@CreateTime: 2023-04-26 10:08 - *@Description: TODO - *@Version: 1.0 - */ @Data public class MemberRealInfoParam { @@ -57,7 +41,6 @@ public class MemberRealInfoParam { /** * 证件类型 */ - private Integer idType; /** @@ -68,48 +51,15 @@ public class MemberRealInfoParam { * 出生日期（年月日） */ private String birthDate; - /** - * 省id + * 出生日期查询 */ - private Integer pkProvince; - /** - * 市id - */ - private Integer pkCity; - /** - * 区县id - */ - private Integer pkCounty; - /** - * 详细地址 - */ - private String address; + private Date birthDateQuery; /** * 性别（0=未知,1=男,2=女） */ - private Integer sex; - /** - * 银行名称 - */ - private String bankName; - - /** - * 支行名称 - */ - private String subBankName; - - /** - * 银行卡号 - */ - private String cardNumber; - - /** - * 邮箱 - */ - private String email; /** * 开始认证时间 diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberTeamInfoParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberTeamInfoParam.java index 58de2209..68d3370b 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberTeamInfoParam.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberTeamInfoParam.java @@ -1,24 +1,10 @@ -package com.hzs.member.base.param;/** - * @Description: - * @Author: yuhui - * @Time: 2023/5/29 14:53 - * @Classname: MemberTeamInfoParam - * @PackageName: com.hzs.member.base.param - */ +package com.hzs.member.base.param; import lombok.Data; import java.math.BigDecimal; import java.util.Date; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.param - *@Author: yh - *@CreateTime: 2023-05-29 14:53 - *@Description: TODO - *@Version: 1.0 - */ @Data public class MemberTeamInfoParam { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberTeamService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberTeamService.java index c6903730..187a6f52 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberTeamService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberTeamService.java @@ -3,8 +3,6 @@ package com.hzs.member.base.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.base.CuMemberTeam; import com.hzs.common.domain.member.ext.CuMemberTeamExt; -import com.hzs.member.base.param.MemberTeamInfoParam; -import com.hzs.member.base.vo.MemberTeamVo; import java.util.List; @@ -14,17 +12,17 @@ import java.util.List; public interface ICuMemberTeamService extends IService { /** - * @description: 隶属团队列表 + * 隶属团队列表 **/ List queryCuMemberTeam(CuMemberTeamExt cuMemberTeamExt); /* - * @description: 根据会员主键获得所属团队 + * 根据会员主键获得所属团队 **/ CuMemberTeamExt getCuMemberTeamById(Long pkMember); /** - * @description: 根据国家查询隶属团队 + * 根据国家查询隶属团队 **/ List queryCuMemberTeam(Integer pkCountry); @@ -37,23 +35,8 @@ public interface ICuMemberTeamService extends IService { Boolean checkVertex(Integer pkVertex); /* - * @description: 更新体系下的团队 + * 更新体系下的团队 **/ Boolean updateCuMemberTeamByVertex(Long pkTeamCode); - /** - * 查询会员团队信息 - * - * @param memberTeamInfoParam - * @return - */ - List queryMemberTeamInfoList(MemberTeamInfoParam memberTeamInfoParam); - - /** - * 查询会员安置信息团队 - * - * @param memberTeamInfoParam - * @return - */ - List queryMemberTeamInfoPlaceParentList(MemberTeamInfoParam memberTeamInfoParam); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberTeamServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberTeamServiceImpl.java index 0fe9535a..4e0aca5e 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberTeamServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberTeamServiceImpl.java @@ -6,9 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.domain.member.base.CuMemberTeam; import com.hzs.common.domain.member.ext.CuMemberTeamExt; import com.hzs.member.base.mapper.CuMemberTeamMapper; -import com.hzs.member.base.param.MemberTeamInfoParam; import com.hzs.member.base.service.ICuMemberTeamService; -import com.hzs.member.base.vo.MemberTeamVo; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -74,14 +72,4 @@ public class CuMemberTeamServiceImpl extends ServiceImpl queryMemberTeamInfoList(MemberTeamInfoParam memberTeamInfoParam) { - return baseMapper.queryMemberTeamInfoList(memberTeamInfoParam); - } - - @Override - public List queryMemberTeamInfoPlaceParentList(MemberTeamInfoParam memberTeamInfoParam) { - return baseMapper.queryMemberTeamInfoPlaceParentList(memberTeamInfoParam); - } - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberRealInfoVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberRealInfoVO.java index b5a36391..185940fa 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberRealInfoVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberRealInfoVO.java @@ -48,12 +48,6 @@ public class MemberRealInfoVO { @Excel(name = "联系方式", sort = 3) private String phone; - /** - * 邮箱 - */ - @Excel(name = "邮箱地址", sort = 20) - private String email; - /** * 证件号码 */ @@ -62,20 +56,18 @@ public class MemberRealInfoVO { /** * 证件类型 ECardType */ - @Transaction(transactionKey = EnumsPrefixConstants.CARD_TYPE) private Integer cardType; /** * 性别（0=未知,1=男,2=女）Esex */ - @Transaction(transactionKey = EnumsPrefixConstants.SEX) private Integer sex; /** * 出生日期（年月日） */ @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "出生日期", sort = 8) + @Excel(name = "出生日期", sort = 8, dateFormat = "yyyy-MM-dd") private Date birthDate; /** @@ -158,7 +150,7 @@ public class MemberRealInfoVO { * 支付时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "支付时间", dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 22) + @Excel(name = "支付日期", dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 22) private Date payTime; /** @@ -329,53 +321,11 @@ public class MemberRealInfoVO { */ private String idBack; - /** - * 省id - */ - private Integer pkProvince; - /** - * 省名称 - */ - @Excel(name = "省", sort = 11) - private String provinceName; - /** - * 市id - */ - private Integer pkCity; - /** - * 市名称 - */ - @Excel(name = "市", sort = 12) - private String cityName; - /** - * 区县id - */ - private Integer pkCounty; - /** - * 区县名 - */ - @Excel(name = "区/县", sort = 13) - private String countyName; /** * 详细地址 */ @Excel(name = "详细地址", sort = 14) private String address; - /** - * 银行名称 - */ - @Excel(name = "银行名称", sort = 15) - private String bankName; - /** - * 支行名称 - */ - @Excel(name = "支行名称", sort = 16) - private String subBankName; - /** - * 真实姓名（开户姓名） - */ - @Excel(name = "开户姓名", sort = 17) - private String accountName; /** * 证件类型 字符 */ @@ -385,12 +335,10 @@ public class MemberRealInfoVO { /** * 预留电话 */ - @Excel(name = "预留电话", sort = 18) private String reservedPhone; /** * 银行卡号 */ - @Excel(name = "银行卡号", sort = 19) private String cardNumber; @@ -419,15 +367,14 @@ public class MemberRealInfoVO { @Excel(name = "结算等级", sort = 5) private String settleGradeVal; - /** - * 真实奖衔 字符 - */ - @Excel(name = "真实奖衔", sort = 6) - private String awardsVal; /** * 荣誉奖衔 字符 */ @Excel(name = "荣誉奖衔", sort = 6) + private String awardsVal; + /** + * + */ private String pkMaxAwardsVal; /** diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberTeamVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberTeamVo.java index ff19d32f..0813d1fe 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberTeamVo.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberTeamVo.java @@ -1,10 +1,4 @@ -package com.hzs.member.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/5/29 16:02 - * @Classname: MemberTeamVo - * @PackageName: com.hzs.member.base.vo - */ +package com.hzs.member.base.vo; import com.fasterxml.jackson.annotation.JsonFormat; import com.hzs.common.core.annotation.Excel; @@ -13,14 +7,6 @@ import lombok.Data; import java.math.BigDecimal; import java.util.Date; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-05-29 16:02 - *@Description: TODO - *@Version: 1.0 - */ @Data public class MemberTeamVo { @@ -93,13 +79,13 @@ public class MemberTeamVo { /** * 左区首购业绩 */ - @Excel(name = "左区首购业绩($)") + @Excel(name = "左区首购业绩") private BigDecimal afirstPv; /** * 右区首购业绩 */ - @Excel(name = "右区首购业绩($)") + @Excel(name = "右区首购业绩") private BigDecimal bfirstPv; /** @@ -108,68 +94,61 @@ public class MemberTeamVo { private Integer placeDept; - - - - - - - /** * 血缘首购业绩 */ // TODO 血缘首购业绩 - @Excel(name = "血缘首购业绩($)") + @Excel(name = "血缘首购业绩") private BigDecimal consanguinityFirstPv; /** * 左区复购业绩 */ - @Excel(name = "左区复购业绩($)") + @Excel(name = "左区复购业绩") private BigDecimal repASumPv; /** * 右区复购业绩 */ - @Excel(name = "右区复购业绩($)") + @Excel(name = "右区复购业绩") private BigDecimal repBSumPv; /** * 血缘复购业绩 */ // TODO 血缘复购业绩 - @Excel(name = "血缘复购业绩($)") + @Excel(name = "血缘复购业绩") private BigDecimal consanguinityRepBSumPv; /** - *左区真实业绩(PV) + * 左区真实业绩(PV) */ - @Excel(name = "左区真实业绩($)") + @Excel(name = "左区真实业绩") private BigDecimal aSumRealPv; /** * B区真实业绩(PV) */ - @Excel(name = "右区真实业绩($)") + @Excel(name = "右区真实业绩") private BigDecimal bSumRealPv; /** * 血缘真实业绩（pv） */ - @Excel(name = "血缘真实业绩($)") + @Excel(name = "血缘真实业绩") private BigDecimal consanguinityRealPv; /** * 奖金收益 */ - // @Excel(name = "奖金收益($)") + // @Excel(name = "奖金收益") private BigDecimal realIncomeTotal; /** * 奖金团队占比 */ // todo 奖金团队占比 - @Excel(name = "奖金团队占比(%)",suffix = "%") + @Excel(name = "奖金团队占比(%)", suffix = "%") private BigDecimal bonusTeamProportion; /** @@ -212,14 +191,14 @@ public class MemberTeamVo { * 福利金额（$） */ // todo 福利金额 - @Excel(name = "福利金额($)") + @Excel(name = "福利金额") private BigDecimal benefitAmount; /** * 福利业绩(pv) */ // todo 福利业绩 - @Excel(name = "福利业绩($)") + @Excel(name = "福利业绩") private BigDecimal benefitPv; /** @@ -239,14 +218,14 @@ public class MemberTeamVo { * 转账金额（$） */ // todo 转账金额分多个账户 - @Excel(name = "转账金额($)") + @Excel(name = "转账金额") private BigDecimal transferAmount; /** * 充值金额（$） */ // todo 充值金额分多个账户 - @Excel(name = "充值金额($)") + @Excel(name = "充值金额") private BigDecimal rechargeAmount; /** @@ -259,38 +238,38 @@ public class MemberTeamVo { * 提现金额（$） */ // todo 提现金额分多个账户 - @Excel(name = "提现金额($)") + @Excel(name = "提现金额") private Integer withdrawalAmount; /** * 登录次数 */ - // @Excel(name = "登录次数") + // @Excel(name = "登录次数") private Integer loginNumber; /** * 最后一次登录时间 */ - @Excel(name = "最近登录",dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "最近登录", dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date lastLoginTime; /** * 最后一次登录时间间隔天数 */ - // @Excel(name = "最后一次登录时间间隔天数") + // @Excel(name = "最后一次登录时间间隔天数") private Long lastLoginTimeIntervalDays; /** * 创建时间 */ - @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date creationTime; /** * 支付时间 */ - @Excel(name = "支付时间",dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "支付时间", dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date payTime; diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java index 2fa67d85..7297fb21 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java @@ -45,7 +45,7 @@ import org.springframework.web.bind.annotation.*; import java.util.*; /** - * @Description: 架构管理 + * 架构管理 */ @RestController @RequestMapping("/manage/member-structure") @@ -82,28 +82,19 @@ public class MemberStructureController extends BaseController { // 体系 UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData(); List vertexIdList = userAuthorityDTO.getVertexIdList(); - Date date = new Date(); - String time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date); + String time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, new Date()); - Long pkMember; + Long pkMember = null; if (StringUtils.isNotBlank(memberCode)) { CuMember member = iCuMemberService.getMemberByCode(memberCode); - if (null == member) { - return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_NOT_EXITS)); + if (null != member) { + pkMember = member.getPkId(); } - pkMember = member.getPkId(); - } else { + } + if (null == pkMember) { return AjaxResult.error("请输入会员编号"); } -// if (vertexIdList != null && StringUtils.isNotBlank(memberCode)) { -// // 体系不为空 并且会员编号不为空 只能查询自己伞下以及自己的 -// List memberExtList = iCuMemberService.checkMemberVertex(vertexIdList, memberCode); -// if (memberExtList.size() == 0) { -// return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.QUERY_VERTEX_CODE)); -// } -// } - Integer period = null; Date settleDate = null; if (memberSettlePeriodId != null) { diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml index 5145d393..c42168de 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml @@ -299,10 +299,8 @@ cm.PK_AWARDS,cm.PK_PLACE_PARENT,cm.PK_PARENT ,cm.PLACE_DEPT ,cm.MEMBER_NAME, cm.MEMBER_CODE,cm.PK_ID PK_MEMBER,cm.PK_COUNTRY,cm.PK_SETTLE_COUNTRY,cme.MEMBER_CODE parentMemberCode, grade.GRADE_NAME, awards.AWARDS_NAME, - (select count(cr.pk_id) from CU_MEMBER cr where cr.pk_parent = cm.pk_id and cr.del_flag = 0) - directPushNumber,cm.PK_VERTEX ,cm.NICK_NAME - from - CU_MEMBER cm + cm.PK_VERTEX ,cm.NICK_NAME + from CU_MEMBER cm left join CU_MEMBER cme on cme.PK_ID = cm.PK_PLACE_PARENT left join BD_GRADE grade on grade.PK_ID = cm.PK_SETTLE_GRADE left join BD_AWARDS awards on awards.PK_ID = cm.PK_AWARDS @@ -395,13 +393,6 @@ - - select - cm.MEMBER_CODE as memberCode, - cm.MEMBER_NAME memberName, - cm.PHONE phone, - cm.PK_REGISTER_GRADE as pkRegisterGrade, - cm.PK_SETTLE_GRADE as pkSettleGrade, - cm.PK_AWARDS as pkAwards, - cm.PK_MAX_AWARDS as pkMaxAwards, - ma.SEX as sex, + cm.member_code as memberCode, + cm.member_name memberName, + cm.phone phone, + cm.pk_register_grade as pkRegisterGrade, + cm.pk_settle_grade as pkSettleGrade, + cm.pk_awards as pkAwards, + ma.sex as sex, cm.birth_date birthDate, - ma.ID_TYPE idType, - ma.ID_CARD idCard, - ma.ID_FRONT idFront, - ma.ID_BACK idBack, - ma.PK_PROVINCE pkProvince, - ma.PK_CITY pkCity, - ma.PK_COUNTY pkCounty, - ma.ADDRESS address, - bb.BANK_NAME bankName, - ma.SUB_BANK_NAME subBankName, - ma.ACCOUNT_NAME accountName, - ma.PHONE reservedPhone, - ma.CARD_NUMBER cardNumber, - cm.EMAIL email, - ma.CREATION_TIME certificationTime, - cm.CREATION_TIME creationTime, - cm.PAY_TIME payTime, - cm.DIRECT_PUSH_NUMBER directPushNumber - from CU_MEMBER cm - left join CU_MEMBER_AUTHENTICATION ma on ma.PK_MEMBER = cm.PK_ID and ma.del_flag = 0 - left join BD_BANK bb on bb.PK_ID = ma.pk_bank + ma.id_type idType, + ma.id_card idCard, + ma.id_front idFront, + ma.id_back idBack, + ma.address address, + ma.phone reservedPhone, + ma.card_number cardNumber, + ma.creation_time certificationTime, + cm.creation_time creationTime, + cm.pay_time payTime, + cm.direct_push_number directPushNumber + from cu_member_authentication ma + left join cu_member cm on ma.pk_member = cm.PK_ID left join bd_vertex ver on cm.pk_vertex = ver.pk_id LEFT JOIN cu_member_team ct ON ct.pk_id = cm.pk_team_code where cm.del_flag = 0 - and PK_SETTLE_COUNTRY = #{pkCountry} + and ma.del_flag = 0 + and cm.PK_SETTLE_COUNTRY = #{pkCountry} - and cm.MEMBER_CODE like #{memberCode} ||'%' + and cm.member_code like #{memberCode} ||'%' - and cm.MEMBER_NAME like #{memberName} ||'%' + and cm.member_name like #{memberName} ||'%' - - and ma.ID_CARD like '%' || #{birthDate} ||'%' + + and cm.birth_date = to_date(#{birthDate}, 'yyyy-mm-dd') - and cm.PHONE = #{phone} + and cm.phone = #{phone} - and cm.PK_REGISTER_GRADE = #{pkRegisterGrade} + and cm.pk_register_grade = #{pkRegisterGrade} - and cm.PK_AWARDS = #{pkAwards} + and cm.pk_awards = #{pkAwards} - and cm.PK_SETTLE_GRADE = #{pkSettleGrade} + and cm.pk_settle_grade = #{pkSettleGrade} - and ma.ID_TYPE = #{idType} + and ma.id_type = #{idType} - and ma.ID_CARD = #{idCard} - - - - and ma.PK_PROVINCE = #{pkProvince} - - - and ma.PK_CITY = #{pkCity} - - - and ma.PK_COUNTY = #{pkCounty} - - - and ma.ADDRESS like #{address} ||'%' + and ma.id_card = #{idCard} - and ma.SEX = #{sex} - - - and bb.BANK_NAME like #{bankName}||'%' - - - and ma.SUB_BANK_NAME like #{subBankName}||'%' - - - and ma.CARD_NUMBER like #{cardNumber}||'%' - - - and cm.EMAIL like #{email}||'%' + and ma.sex = #{sex} and ma.CREATION_TIME >= to_date(#{startCertificationTime}, 'yyyy-mm-dd') diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberTeamMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberTeamMapper.xml index 697537e7..f4d7824b 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberTeamMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberTeamMapper.xml @@ -4,66 +4,64 @@ - - - - - - - - - - + + + + + + + + + + - - - DEL_FLAG, - PK_COUNTRY, - PK_CREATOR, - CREATION_TIME, - PK_MODIFIED, - MODIFIED_TIME, - PK_ID, MEMBER_CODE, TEAM_NAME, PK_TRANSACTION - - update cu_member set pk_team_code=null where pk_id in( - select t.pk_member from cu_member_team t - inner join ( - SELECT t.pk_id - FROM cu_member t - WHERE t.del_flag = 0 - START WITH t.pk_id = #{pkMember} - CONNECT BY PRIOR t.pk_id = t.pk_parent + update cu_member + set pk_team_code=null + where pk_id in ( + select t.pk_member + from cu_member_team t + inner join ( + SELECT t.pk_id + FROM cu_member t + WHERE t.del_flag = 0 + START + WITH t.pk_id = #{pkMember} + CONNECT BY PRIOR t.pk_id = t.pk_parent ) s on t.pk_member = s.pk_id - where t.del_flag=0) + where t.del_flag = 0) + merge into cu_member a - using ( + using ( + SELECT t.pk_id + FROM cu_member t + WHERE t.del_flag = 0 + START + WITH t.pk_parent = #{pkMember} + CONNECT BY PRIOR + t.pk_id = t.pk_parent) b + on (a.pk_id = b.pk_id) + when matched then + update set a.pk_team_code = #{pkId} + + + + update cu_member + set pk_team_code = null + where pk_id in ( SELECT t.pk_id FROM cu_member t WHERE t.del_flag = 0 - START WITH t.pk_parent = 2725 - CONNECT BY PRIOR - t.pk_id = t.pk_parent) b - on (a.pk_id = b.pk_id) - when matched then - update set a.pk_team_code= #{pkId} - - - update cu_member set pk_team_code = null - where pk_id in( - SELECT t.pk_id - FROM cu_member t - WHERE t.del_flag = 0 - START WITH t.pk_id = #{pkMember} - CONNECT BY PRIOR t.pk_id = t.pk_parent) + START WITH t.pk_id = #{pkMember} + CONNECT BY PRIOR t.pk_id = t.pk_parent) - + + - - - - - diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECardType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECardType.java index 2da0b542..855d41e9 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECardType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECardType.java @@ -1,6 +1,5 @@ package com.hzs.common.core.enums; -import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Getter; @@ -16,26 +15,6 @@ public enum ECardType { */ CARD(1, "身份证", 0), - /** - * 军官证 - */ - OFFICER(2, "军官证", 0), - - /** - * 学生证 - */ - STUDENT(3, "学生证", 0), - - /** - * 驾驶证 - */ - DRIVE(4, "驾驶证", 0), - - /** - * 护照 - */ - PASSPORT(5, "护照", 0), - ; /** @@ -51,13 +30,4 @@ public enum ECardType { */ private final int enable; - public static String getCardType(int value) { - for (ECardType eCardType : ECardType.values()) { - if (eCardType.getValue() == value) { - return eCardType.getLabel(); - } - } - return null; - } - } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EIdType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EIdType.java index 18933097..904d4d98 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EIdType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EIdType.java @@ -40,13 +40,15 @@ public enum EIdType { */ private final String key; - public static String getLabel(int value){ + public static String getLabelByValue(Integer value) { + if (null == value) { + return ""; + } for (EIdType eIdType : EIdType.values()) { - if (eIdType.getValue() == value){ + if (eIdType.getValue() == value) { return eIdType.getLabel(); } - } - return null; + return ""; } } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESex.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESex.java index b3daef2d..61ecb79c 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESex.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESex.java @@ -1,6 +1,5 @@ package com.hzs.common.core.enums; -import com.hzs.common.core.constant.EnumsPrefixConstants; import com.hzs.common.core.utils.StringUtils; import lombok.AllArgsConstructor; import lombok.Getter; @@ -15,17 +14,17 @@ public enum ESex { /** * 未知 */ - UNKNOWN(0, "未知", 0, EnumsPrefixConstants.SEX + "0"), + UNKNOWN(0, "未知", 0), /** * 男 */ - MAN(1, "男", 0, EnumsPrefixConstants.SEX + "1"), + MAN(1, "男", 0), /** * 女 */ - WOMAN(2, "女", 0, EnumsPrefixConstants.SEX + "2"), + WOMAN(2, "女", 0), ; @@ -41,18 +40,17 @@ public enum ESex { * 是否启用（0=是,1=否） -- 来源EYesNo */ private final int enable; - /** - * 国际化翻译key值 - */ - private final String key; - public static String getSex(int value) { + public static String getLabelByValue(Integer value) { + if (null == value) { + return ""; + } for (ESex sex : ESex.values()) { if (sex.getValue() == value) { return sex.getLabel(); } } - return null; + return ""; } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/account/CuMemberTransfer.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/account/CuMemberTransfer.java index f16d9361..ae2e8220 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/account/CuMemberTransfer.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/account/CuMemberTransfer.java @@ -11,12 +11,7 @@ import lombok.*; import lombok.experimental.Accessors; /** - *

* 会员转账表 - *

- * - * @author hzs - * @since 2022-09-06 */ @Data @Builder diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/account/CuMemberTransferExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/account/CuMemberTransferExt.java index ae9642cb..04e46ff3 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/account/CuMemberTransferExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/account/CuMemberTransferExt.java @@ -12,12 +12,7 @@ import java.math.BigDecimal; import java.util.List; /** - *

* 会员转账表 - *

- * - * @author hzs - * @since 2022-09-06 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/CuMemberTeam.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/CuMemberTeam.java index 9b2cfbed..260b0f98 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/CuMemberTeam.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/CuMemberTeam.java @@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 会员团队配置 - *

- * - * @author hzs - * @since 2022-09-01 */ @Data @EqualsAndHashCode(callSuper = true) @@ -63,8 +58,4 @@ public class CuMemberTeam extends BaseEntity { private Integer pkTransaction; - - - - }