diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/controller/api/MarketNewsController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/controller/api/MarketNewsController.java index d3fab0d0..991c57d9 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/controller/api/MarketNewsController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/marketnews/controller/api/MarketNewsController.java @@ -74,10 +74,7 @@ public class MarketNewsController extends BaseController { startPage(); List list = iCuMemberService.selectBiddingList(marketNewsParam); for (UserInvestmentVo userInvestmentVo : list) { - if (userInvestmentVo.getOrderType() != null) { - String label = EOrderType.getEnumByValue(userInvestmentVo.getOrderType()).getLabel(); - userInvestmentVo.setOrderTypeStr(label); - } + userInvestmentVo.setOrderTypeStr(EOrderType.getLabelByValue(userInvestmentVo.getOrderType())); if (userInvestmentVo.getRound() == null) { userInvestmentVo.setRound(0); } @@ -108,60 +105,58 @@ public class MarketNewsController extends BaseController { Integer pkCountry = SecurityUtils.getPkCountry(); marketNewsParam.setPkCountry(pkCountry); marketNewsParam.setPkCreator(SecurityUtils.getUserId()); - R> gradeDate = iGradeServiceApi.queryGradeList(pkCountry); - List gradeList = gradeDate.getData(); - R currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - CurrencyDTO currency = currencyDto.getData(); if (marketNewsParam.getEndCreationTime() != null) { marketNewsParam.setEndCreationTime(DateUtils.getEndTime(marketNewsParam.getEndCreationTime())); } - startPage(); // 2025年6月26日 强制3个月之前的数据不可见 Date endDate = DateUtils.addDate(new Date(), -90); marketNewsParam.setStartCreationTime(endDate); - List list = iCuMemberService.selectRegList(marketNewsParam); - for (UserInvestmentVo userInvestmentVo : list) { - if (userInvestmentVo.getPkPlaceParent() != null && userInvestmentVo.getPkParent() != null) { - if (userInvestmentVo.getPkPlaceParent() == 0 || userInvestmentVo.getPkParent() == 0) { - userInvestmentVo.setParentName("-"); - userInvestmentVo.setParentCode("-"); - userInvestmentVo.setPlaceParentCode("-"); - userInvestmentVo.setPlaceParentName("-"); - } - } - //注册等级key - if (userInvestmentVo.getPkRegisterGrade() != null) { - for (GradeDTO gradeDTO : gradeList) { - if (gradeDTO.getPkId().equals(userInvestmentVo.getPkRegisterGrade())) { - userInvestmentVo.setRegisterGradeVal(gradeDTO.getGradeName()); + startPage(); + List list = iCuMemberService.selectRegList(marketNewsParam); + if (CollectionUtil.isNotEmpty(list)) { + R> gradeDate = iGradeServiceApi.queryGradeList(pkCountry); + List gradeList = gradeDate.getData(); + + for (UserInvestmentVo userInvestmentVo : list) { + if (userInvestmentVo.getPkPlaceParent() != null && userInvestmentVo.getPkParent() != null) { + if (userInvestmentVo.getPkPlaceParent() == 0 || userInvestmentVo.getPkParent() == 0) { + userInvestmentVo.setParentName("-"); + userInvestmentVo.setParentCode("-"); + userInvestmentVo.setPlaceParentCode("-"); + userInvestmentVo.setPlaceParentName("-"); } } - } - if (userInvestmentVo.getPlaceDept() != null) { - userInvestmentVo.setPlaceDeptVal(EPlaceDept.getEPlaceDept(userInvestmentVo.getPlaceDept())); - } - // 所属国是中国 - if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { - userInvestmentVo.setRegPv(userInvestmentVo.getRegPv().multiply(currency.getInExchangeRate())); - } - userInvestmentVo.setMemberCode(CommonUtil.getMemberCode(userInvestmentVo.getMemberCode(), userInvestmentVo.getServiceCode())); - userInvestmentVo.setMemberName(CommonUtil.getMemberName(userInvestmentVo.getPkVertex(), userInvestmentVo.getMemberName(), userInvestmentVo.getNickName())); - userInvestmentVo.setParentCode(CommonUtil.getMemberCode(userInvestmentVo.getParentCode(), userInvestmentVo.getParentServiceCode())); - userInvestmentVo.setParentName(CommonUtil.getMemberName(userInvestmentVo.getParentPkVertex(), userInvestmentVo.getParentName(), userInvestmentVo.getParentNickName())); - userInvestmentVo.setPlaceParentCode(CommonUtil.getMemberCode(userInvestmentVo.getPlaceParentCode(), userInvestmentVo.getPlaceServiceCode())); - userInvestmentVo.setPlaceParentName(CommonUtil.getMemberName(userInvestmentVo.getPlacePkVertex(), userInvestmentVo.getPlaceParentName(), userInvestmentVo.getPlaceNickName())); + //注册等级key + if (userInvestmentVo.getPkRegisterGrade() != null) { + for (GradeDTO gradeDTO : gradeList) { + if (gradeDTO.getPkId().equals(userInvestmentVo.getPkRegisterGrade())) { + userInvestmentVo.setRegisterGradeVal(gradeDTO.getGradeName()); + } + } + } + if (userInvestmentVo.getPlaceDept() != null) { + userInvestmentVo.setPlaceDeptVal(EPlaceDept.getEPlaceDept(userInvestmentVo.getPlaceDept())); + } + userInvestmentVo.setRegPv(userInvestmentVo.getRegPv()); + userInvestmentVo.setMemberCode(CommonUtil.getMemberCode(userInvestmentVo.getMemberCode(), userInvestmentVo.getServiceCode())); + userInvestmentVo.setMemberName(CommonUtil.getMemberName(userInvestmentVo.getPkVertex(), userInvestmentVo.getMemberName(), userInvestmentVo.getNickName())); + userInvestmentVo.setParentCode(CommonUtil.getMemberCode(userInvestmentVo.getParentCode(), userInvestmentVo.getParentServiceCode())); + userInvestmentVo.setParentName(CommonUtil.getMemberName(userInvestmentVo.getParentPkVertex(), userInvestmentVo.getParentName(), userInvestmentVo.getParentNickName())); + userInvestmentVo.setPlaceParentCode(CommonUtil.getMemberCode(userInvestmentVo.getPlaceParentCode(), userInvestmentVo.getPlaceServiceCode())); + userInvestmentVo.setPlaceParentName(CommonUtil.getMemberName(userInvestmentVo.getPlacePkVertex(), userInvestmentVo.getPlaceParentName(), userInvestmentVo.getPlaceNickName())); - // 2025年6月26日 脱敏 + // 2025年6月26日 脱敏 // userInvestmentVo.setMemberName(desensitizationName(userInvestmentVo.getMemberName())); // userInvestmentVo.setMemberCode(desensitizationCode(userInvestmentVo.getMemberCode())); - userInvestmentVo.setParentName(desensitizationName(userInvestmentVo.getParentName())); - userInvestmentVo.setParentCode(desensitizationCode(userInvestmentVo.getParentCode())); - userInvestmentVo.setPlaceParentName(desensitizationName(userInvestmentVo.getPlaceParentName())); - userInvestmentVo.setPlaceParentCode(desensitizationCode(userInvestmentVo.getPlaceParentCode())); - + userInvestmentVo.setParentName(desensitizationName(userInvestmentVo.getParentName())); + userInvestmentVo.setParentCode(desensitizationCode(userInvestmentVo.getParentCode())); + userInvestmentVo.setPlaceParentName(desensitizationName(userInvestmentVo.getPlaceParentName())); + userInvestmentVo.setPlaceParentCode(desensitizationCode(userInvestmentVo.getPlaceParentCode())); + } } + return getDataTable(list); } 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 ff7bf1b0..b7c1dbb6 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 @@ -1743,9 +1743,14 @@ cm.nick_name from cu_member cm left join ( - select nvl(sum(so.ORDER_AMOUNT),0) regMoney ,nvl(sum(so.ORDER_ACHIEVE),0) regPv,so.PK_MEMBER from SA_ORDER so + select + nvl(sum(so.ORDER_AMOUNT),0) regMoney, + nvl(sum(so.ORDER_ACHIEVE),0) regPv, + so.PK_MEMBER + from SA_ORDER so where - so.ORDER_TYPE in (1, 24) + ((so.ORDER_TYPE in (1, 24)) or + (so.order_type = 3 and so.ORDER_TYPE_EXTEND = 1)) and so.ORDER_STATUS = 1 and so.DEL_FLAG = 0 group by so.PK_MEMBER