## 注册列表188显示金额业绩(349);

This commit is contained in:
cabbage 2025-08-11 09:18:08 +08:00
parent dd9a31b0ef
commit 2703b1e5e6
2 changed files with 46 additions and 46 deletions

View File

@ -74,10 +74,7 @@ public class MarketNewsController extends BaseController {
startPage(); startPage();
List<UserInvestmentVo> list = iCuMemberService.selectBiddingList(marketNewsParam); List<UserInvestmentVo> list = iCuMemberService.selectBiddingList(marketNewsParam);
for (UserInvestmentVo userInvestmentVo : list) { for (UserInvestmentVo userInvestmentVo : list) {
if (userInvestmentVo.getOrderType() != null) { userInvestmentVo.setOrderTypeStr(EOrderType.getLabelByValue(userInvestmentVo.getOrderType()));
String label = EOrderType.getEnumByValue(userInvestmentVo.getOrderType()).getLabel();
userInvestmentVo.setOrderTypeStr(label);
}
if (userInvestmentVo.getRound() == null) { if (userInvestmentVo.getRound() == null) {
userInvestmentVo.setRound(0); userInvestmentVo.setRound(0);
} }
@ -108,18 +105,19 @@ public class MarketNewsController extends BaseController {
Integer pkCountry = SecurityUtils.getPkCountry(); Integer pkCountry = SecurityUtils.getPkCountry();
marketNewsParam.setPkCountry(pkCountry); marketNewsParam.setPkCountry(pkCountry);
marketNewsParam.setPkCreator(SecurityUtils.getUserId()); marketNewsParam.setPkCreator(SecurityUtils.getUserId());
R<List<GradeDTO>> gradeDate = iGradeServiceApi.queryGradeList(pkCountry);
List<GradeDTO> gradeList = gradeDate.getData();
R<CurrencyDTO> currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
CurrencyDTO currency = currencyDto.getData();
if (marketNewsParam.getEndCreationTime() != null) { if (marketNewsParam.getEndCreationTime() != null) {
marketNewsParam.setEndCreationTime(DateUtils.getEndTime(marketNewsParam.getEndCreationTime())); marketNewsParam.setEndCreationTime(DateUtils.getEndTime(marketNewsParam.getEndCreationTime()));
} }
startPage();
// 2025年6月26日 强制3个月之前的数据不可见 // 2025年6月26日 强制3个月之前的数据不可见
Date endDate = DateUtils.addDate(new Date(), -90); Date endDate = DateUtils.addDate(new Date(), -90);
marketNewsParam.setStartCreationTime(endDate); marketNewsParam.setStartCreationTime(endDate);
startPage();
List<UserInvestmentVo> list = iCuMemberService.selectRegList(marketNewsParam); List<UserInvestmentVo> list = iCuMemberService.selectRegList(marketNewsParam);
if (CollectionUtil.isNotEmpty(list)) {
R<List<GradeDTO>> gradeDate = iGradeServiceApi.queryGradeList(pkCountry);
List<GradeDTO> gradeList = gradeDate.getData();
for (UserInvestmentVo userInvestmentVo : list) { for (UserInvestmentVo userInvestmentVo : list) {
if (userInvestmentVo.getPkPlaceParent() != null && userInvestmentVo.getPkParent() != null) { if (userInvestmentVo.getPkPlaceParent() != null && userInvestmentVo.getPkParent() != null) {
if (userInvestmentVo.getPkPlaceParent() == 0 || userInvestmentVo.getPkParent() == 0) { if (userInvestmentVo.getPkPlaceParent() == 0 || userInvestmentVo.getPkParent() == 0) {
@ -141,11 +139,7 @@ public class MarketNewsController extends BaseController {
if (userInvestmentVo.getPlaceDept() != null) { if (userInvestmentVo.getPlaceDept() != null) {
userInvestmentVo.setPlaceDeptVal(EPlaceDept.getEPlaceDept(userInvestmentVo.getPlaceDept())); userInvestmentVo.setPlaceDeptVal(EPlaceDept.getEPlaceDept(userInvestmentVo.getPlaceDept()));
} }
// 所属国是中国 userInvestmentVo.setRegPv(userInvestmentVo.getRegPv());
if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) {
userInvestmentVo.setRegPv(userInvestmentVo.getRegPv().multiply(currency.getInExchangeRate()));
}
userInvestmentVo.setMemberCode(CommonUtil.getMemberCode(userInvestmentVo.getMemberCode(), userInvestmentVo.getServiceCode())); userInvestmentVo.setMemberCode(CommonUtil.getMemberCode(userInvestmentVo.getMemberCode(), userInvestmentVo.getServiceCode()));
userInvestmentVo.setMemberName(CommonUtil.getMemberName(userInvestmentVo.getPkVertex(), userInvestmentVo.getMemberName(), userInvestmentVo.getNickName())); userInvestmentVo.setMemberName(CommonUtil.getMemberName(userInvestmentVo.getPkVertex(), userInvestmentVo.getMemberName(), userInvestmentVo.getNickName()));
userInvestmentVo.setParentCode(CommonUtil.getMemberCode(userInvestmentVo.getParentCode(), userInvestmentVo.getParentServiceCode())); userInvestmentVo.setParentCode(CommonUtil.getMemberCode(userInvestmentVo.getParentCode(), userInvestmentVo.getParentServiceCode()));
@ -160,8 +154,9 @@ public class MarketNewsController extends BaseController {
userInvestmentVo.setParentCode(desensitizationCode(userInvestmentVo.getParentCode())); userInvestmentVo.setParentCode(desensitizationCode(userInvestmentVo.getParentCode()));
userInvestmentVo.setPlaceParentName(desensitizationName(userInvestmentVo.getPlaceParentName())); userInvestmentVo.setPlaceParentName(desensitizationName(userInvestmentVo.getPlaceParentName()));
userInvestmentVo.setPlaceParentCode(desensitizationCode(userInvestmentVo.getPlaceParentCode())); userInvestmentVo.setPlaceParentCode(desensitizationCode(userInvestmentVo.getPlaceParentCode()));
} }
}
return getDataTable(list); return getDataTable(list);
} }

View File

@ -1743,9 +1743,14 @@
cm.nick_name cm.nick_name
from cu_member cm from cu_member cm
left join ( 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 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.ORDER_STATUS = 1
and so.DEL_FLAG = 0 and so.DEL_FLAG = 0
group by so.PK_MEMBER group by so.PK_MEMBER