diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/mapper/CuMemberBonusPushMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/mapper/CuMemberBonusPushMapper.java index 67dea457..88c131a1 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/mapper/CuMemberBonusPushMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/mapper/CuMemberBonusPushMapper.java @@ -9,9 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 会员奖金-直推收益明细表 Mapper 接口 - *

* * @author hzs * @since 2022-11-10 @@ -20,12 +18,15 @@ public interface CuMemberBonusPushMapper extends BaseMapper { /** * 查询三单循环列表 + * * @param tripleCycleListParam * @return */ List tripleCycleList(TripleCycleListParam tripleCycleListParam); + /** * 获取下一轮次 + * * @param pkMember * @return */ diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/service/ICuMemberBonusPushService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/service/ICuMemberBonusPushService.java index b915c039..d7bfe700 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/service/ICuMemberBonusPushService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/service/ICuMemberBonusPushService.java @@ -1,19 +1,14 @@ package com.hzs.member.bonus.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.bonus.CuMemberBonus; import com.hzs.common.domain.member.bonus.CuMemberBonusPush; import com.hzs.common.domain.member.ext.CuMemberBonusPushExt; import com.hzs.member.marketnews.param.TripleCycleListParam; -import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Set; /** - *

* 会员奖金-直推收益明细表 服务类 - *

* * @author hzs * @since 2022-11-10 @@ -22,6 +17,7 @@ public interface ICuMemberBonusPushService extends IService { /** * 查询三单循环列表 + * * @param tripleCycleListParam * @return */ @@ -29,8 +25,10 @@ public interface ICuMemberBonusPushService extends IService { /** * 获取下一轮次 + * * @param pkMember * @return */ CuMemberBonusPush nextRound(Long pkMember); + } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/service/impl/CuMemberBonusPushHisServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/service/impl/CuMemberBonusPushHisServiceImpl.java index 66e55b27..ae6e3062 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/service/impl/CuMemberBonusPushHisServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/bonus/service/impl/CuMemberBonusPushHisServiceImpl.java @@ -11,9 +11,7 @@ import org.springframework.stereotype.Service; import java.util.List; /** - *

* 会员奖金-直推历史轮次记录 服务实现类 - *

* * @author hzs * @since 2023-09-10 @@ -29,4 +27,5 @@ public class CuMemberBonusPushHisServiceImpl extends ServiceImpl * 会员奖金-直推收益明细表 服务实现类 - *

* * @author hzs * @since 2022-11-10 @@ -25,22 +19,14 @@ import java.util.Set; @Service public class CuMemberBonusPushServiceImpl extends ServiceImpl implements ICuMemberBonusPushService { - /** - * 查询三单循环列表 - * @param tripleCycleListParam - * @return - */ @Override public List tripleCycleList(TripleCycleListParam tripleCycleListParam) { - return baseMapper.tripleCycleList(tripleCycleListParam); + return baseMapper.tripleCycleList(tripleCycleListParam); } - /** - * 获取下一轮次 - * @param pkMember - * @return - */ + @Override public CuMemberBonusPush nextRound(Long pkMember) { return baseMapper.nextRound(pkMember); } + } 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 a8a296ea..848d9ff6 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 @@ -13,7 +13,6 @@ import com.hzs.common.core.utils.DateUtils; 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.base.CuMember; import com.hzs.common.domain.member.bonus.CuMemberBonusPush; import com.hzs.common.domain.member.bonus.CuMemberBonusPushHis; import com.hzs.common.domain.member.ext.CuMemberBonusPushExt; @@ -42,15 +41,9 @@ import java.math.BigDecimal; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.function.Function; -import java.util.stream.Collectors; /** * @Description: 市场动态部分接口 - * @Author: yuhui - * @Time: 2023/1/13 16:38 - * @Classname: MarketNewsController - * @PackageName: com.hzs.member.marketNews.controller.api */ @RestController @RequestMapping("/api/market-news") @@ -59,19 +52,18 @@ public class MarketNewsController extends BaseController { @Autowired private ITransactionCommonService iTransactionCommonService; @Autowired - private ICuMemberShareService memberShareService; + private ICuMemberShareService iCuMemberShareService; @Autowired - private ICuMemberService memberService; + private ICuMemberService iCuMemberService; @Autowired - private ICuMemberBonusPushService memberBonusPushService; + private ICuMemberBonusPushService iCuMemberBonusPushService; @Autowired - private ICuMemberBonusPushHisService cuMemberBonusPushHisService; + private ICuMemberBonusPushHisService iCuMemberBonusPushHisService; @DubboReference - IGradeServiceApi gradeServiceApi; + IGradeServiceApi iGradeServiceApi; @DubboReference - ICurrencyServiceApi currencyServiceApi; - + ICurrencyServiceApi iCurrencyServiceApi; /** * 招商列表 @@ -81,12 +73,12 @@ public class MarketNewsController extends BaseController { @GetMapping("/bidding-list") public TableDataInfo biddingList(MarketNewsParam marketNewsParam) { Integer pkCountry = SecurityUtils.getPkCountry(); - R> gradeDate = gradeServiceApi.queryGradeList(pkCountry); + R> gradeDate = iGradeServiceApi.queryGradeList(pkCountry); List gradeList = gradeDate.getData(); marketNewsParam.setPkCountry(pkCountry); startPage(); - List list = memberService.selectBiddingList(marketNewsParam); + List list = iCuMemberService.selectBiddingList(marketNewsParam); for (UserInvestmentVo userInvestmentVo : list) { if (userInvestmentVo.getOrderType() != null) { String label = EOrderType.getEnumByValue(userInvestmentVo.getOrderType()).getLabel(); @@ -122,15 +114,15 @@ public class MarketNewsController extends BaseController { Integer pkCountry = SecurityUtils.getPkCountry(); marketNewsParam.setPkCountry(pkCountry); marketNewsParam.setPkCreator(SecurityUtils.getUserId()); - R> gradeDate = gradeServiceApi.queryGradeList(pkCountry); + R> gradeDate = iGradeServiceApi.queryGradeList(pkCountry); List gradeList = gradeDate.getData(); - R currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); CurrencyDTO currency = currencyDto.getData(); if (marketNewsParam.getEndCreationTime() != null) { marketNewsParam.setEndCreationTime(DateUtils.getEndTime(marketNewsParam.getEndCreationTime())); } startPage(); - List list = memberService.selectRegList(marketNewsParam); + List list = iCuMemberService.selectRegList(marketNewsParam); for (UserInvestmentVo userInvestmentVo : list) { if (userInvestmentVo.getPkPlaceParent() != null && userInvestmentVo.getPkParent() != null) { if (userInvestmentVo.getPkPlaceParent() == 0 || userInvestmentVo.getPkParent() == 0) { @@ -180,7 +172,7 @@ public class MarketNewsController extends BaseController { seaFlourParam.setEndCreationTime(DateUtil.endOfDay(seaFlourParam.getEndCreationTime())); } startPage(); - List memberList = memberShareService.seaFlourList(seaFlourParam); + List memberList = iCuMemberShareService.seaFlourList(seaFlourParam); if (CollectionUtil.isNotEmpty(memberList)) { for (SeaFlourVo seaFlourVo : memberList) { seaFlourVo.setMemberCode(CommonUtil.getMemberCode(seaFlourVo.getMemberCode(), seaFlourVo.getServiceCode())); @@ -195,9 +187,9 @@ public class MarketNewsController extends BaseController { */ @GetMapping("/round-his") public TableDataInfo seaFlourList() { - List cuMemberBonusPushHis = cuMemberBonusPushHisService.queryCuMemberBonusPushHis(SecurityUtils.getUserId()); + List cuMemberBonusPushHis = iCuMemberBonusPushHisService.queryCuMemberBonusPushHis(SecurityUtils.getUserId()); if (Objects.equals(CountryConstants.CHINA_COUNTRY, SecurityUtils.getPkCountry())) { - CurrencyDTO currencyDTO = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()).getData(); + CurrencyDTO currencyDTO = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()).getData(); cuMemberBonusPushHis.forEach(bonusPushHis -> bonusPushHis.setCalAchieve(ComputeUtil.computeMultiply(bonusPushHis.getCalAchieve(), currencyDTO.getInExchangeRate()))); } @@ -209,63 +201,55 @@ public class MarketNewsController extends BaseController { */ @GetMapping("/triple_cycle_list") public TableDataInfo tripleCycleList(TripleCycleListParam tripleCycleListParam) { - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - // 汇率比例 - BigDecimal inExchangeRate = currency.getData().getInExchangeRate(); - R> gradeDto = gradeServiceApi.findAll(); - List gradeDate = gradeDto.getData(); tripleCycleListParam.setPkMember(SecurityUtils.getUserId()); - startPage(); if (tripleCycleListParam.getStartCreationTime() != null) { tripleCycleListParam.setStartCreationTime(DateUtil.beginOfDay(tripleCycleListParam.getStartCreationTime())); } if (tripleCycleListParam.getEndCreationTime() != null) { tripleCycleListParam.setEndCreationTime(DateUtil.endOfDay(tripleCycleListParam.getEndCreationTime())); } - Map transactionMap = iTransactionCommonService.exportEnumTransaction(EOrderType.values()); - Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE); - //查询所有汇率 - R> currencyDTOList = currencyServiceApi.findAll(); - Map currencyMap = currencyDTOList.getData().stream().collect(Collectors.toMap(CurrencyDTO::getPkCountry, Function.identity())); + // 禅道bug 8461 会员端，招商列表下的【三单循环】历史轮次需要显示已退单的会员数据 需要展示已删除的会员信息 - List list = memberBonusPushService.tripleCycleList(tripleCycleListParam); - for (CuMemberBonusPushExt cuMemberBonusPush : list) { + startPage(); + List list = iCuMemberBonusPushService.tripleCycleList(tripleCycleListParam); - cuMemberBonusPush.setMemberCode(CommonUtil.getMemberCode(cuMemberBonusPush.getMemberCode(), cuMemberBonusPush.getServiceCode())); - cuMemberBonusPush.setMemberName(CommonUtil.getMemberName(cuMemberBonusPush.getPkVertex(), cuMemberBonusPush.getMemberName(), cuMemberBonusPush.getNickName())); + if (CollectionUtil.isNotEmpty(list)) { + R> gradeDto = iGradeServiceApi.findAll(); + List gradeDate = gradeDto.getData(); - for (GradeDTO gradeDTO : gradeDate) { - // 注册等级 - if (cuMemberBonusPush.getPkRegisterGrade() != null) { - if (cuMemberBonusPush.getPkRegisterGrade().equals(gradeDTO.getPkId())) { - cuMemberBonusPush.setPkRegisterGradeStr(transactionMap1.get(gradeDTO.getPkTransaction())); + // 汇率比例 + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + BigDecimal inExchangeRate = currency.getData().getInExchangeRate(); + + Map transactionMap = iTransactionCommonService.exportEnumTransaction(EOrderType.values()); + Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE); + + for (CuMemberBonusPushExt cuMemberBonusPush : list) { + cuMemberBonusPush.setMemberCode(CommonUtil.getMemberCode(cuMemberBonusPush.getMemberCode(), cuMemberBonusPush.getServiceCode())); + cuMemberBonusPush.setMemberName(CommonUtil.getMemberName(cuMemberBonusPush.getPkVertex(), cuMemberBonusPush.getMemberName(), cuMemberBonusPush.getNickName())); + + for (GradeDTO gradeDTO : gradeDate) { + // 注册等级 + if (cuMemberBonusPush.getPkRegisterGrade() != null) { + if (cuMemberBonusPush.getPkRegisterGrade().equals(gradeDTO.getPkId())) { + cuMemberBonusPush.setPkRegisterGradeStr(transactionMap1.get(gradeDTO.getPkTransaction())); + } } } - } - if (cuMemberBonusPush.getOrderType() != null) { - cuMemberBonusPush.setOrderTypeStr(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + cuMemberBonusPush.getOrderType())); - } - // 注册业绩 国内 * 汇率 - if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { - if (cuMemberBonusPush.getOrderAchieve() == null) { - cuMemberBonusPush.setOrderAchieve(BigDecimal.ZERO); + if (cuMemberBonusPush.getOrderType() != null) { + cuMemberBonusPush.setOrderTypeStr(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + cuMemberBonusPush.getOrderType())); } - cuMemberBonusPush.setOrderAchieve(cuMemberBonusPush.getOrderAchieve().multiply(inExchangeRate)); - } else { - cuMemberBonusPush.setOrderAchieve(cuMemberBonusPush.getOrderAchieve()); + // 注册业绩 国内 * 汇率 + if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { + if (cuMemberBonusPush.getOrderAchieve() == null) { + cuMemberBonusPush.setOrderAchieve(BigDecimal.ZERO); + } + cuMemberBonusPush.setOrderAchieve(cuMemberBonusPush.getOrderAchieve().multiply(inExchangeRate)); + } else { + cuMemberBonusPush.setOrderAchieve(cuMemberBonusPush.getOrderAchieve()); + } + cuMemberBonusPush.setCreationTime(cuMemberBonusPush.getMemberPayTime()); } - cuMemberBonusPush.setCreationTime(cuMemberBonusPush.getMemberPayTime()); - - // 跨国报单 汇率转换 - Long pkCreator = cuMemberBonusPush.getPkCreator(); - CuMember member = memberService.getMember(pkCreator); - if (!member.getPkSettleCountry().equals(cuMemberBonusPush.getPkCountry())) { - // 会员结算国是中国 并且会员结算国和订单下单国家不一致 - CurrencyDTO thisCurrency = currencyMap.get(member.getPkSettleCountry()); - CurrencyDTO settleCurrency = currencyMap.get(cuMemberBonusPush.getPkCountry()); - cuMemberBonusPush.setOrderAmount(cuMemberBonusPush.getOrderAmount().divide(settleCurrency.getInExchangeRate(), 2, BigDecimal.ROUND_HALF_UP).multiply(thisCurrency.getInExchangeRate())); - } - } return getDataTable(list); } @@ -276,7 +260,7 @@ public class MarketNewsController extends BaseController { @GetMapping("/next-round") public AjaxResult nextRound() { Long pkMember = SecurityUtils.getUserId(); - CuMemberBonusPush memberBonusPush = memberBonusPushService.nextRound(pkMember); + CuMemberBonusPush memberBonusPush = iCuMemberBonusPushService.nextRound(pkMember); if (memberBonusPush == null || memberBonusPush.getRound() == null || memberBonusPush.getSecond() == null) { memberBonusPush.setSecond(1); memberBonusPush.setRound(1); diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/bonus/CuMemberBonusPushMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/bonus/CuMemberBonusPushMapper.xml index 58bf949a..dea76541 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/bonus/CuMemberBonusPushMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/bonus/CuMemberBonusPushMapper.xml @@ -4,70 +4,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + select ce.member_name ,ce.member_code, so.ORDER_AMOUNT ,so.order_achieve, + ce.pk_register_grade, so.order_type, cp.ROUND + 1 ROUND, cp.SECOND SECOND, + so.PAY_TIME memberPayTime, so.PK_CREATOR, so.PK_COUNTRY, ce.pk_vertex, + ce.service_code, ce.nick_name from cu_member_bonus_push cp - left join sa_order so on so.pk_id = cp.PK_ORDER - left join CU_MEMBER ce on ce.PK_ID = so.PK_MEMBER + left join sa_order so on so.pk_id = cp.PK_ORDER + left join cu_member ce on ce.PK_ID = so.PK_MEMBER where - so.order_type in (1, 2,24,25) - and so.order_status = 1 and cp.pk_bonus_items=3 and cal_type=1 + so.order_type in (1, 2, 24, 25) + and so.order_status = 1 and cp.pk_bonus_items = 3 and cal_type = 1 and so.pk_reference = #{pkMember} - and (ce.member_code=#{memberInfo} or ce.member_name=#{memberInfo}) @@ -84,45 +84,20 @@ and so.PAY_TIME <#{endCreationTime} - and ce.PK_REGISTER_GRADE = #{pkRegisterGrade} + and ce.PK_REGISTER_GRADE = #{pkRegisterGrade} - order by round,second - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + order by round desc, second desc - - + select bb.ROUND, bb.SECOND + from ( + select bp.* + from CU_MEMBER_BONUS_PUSH bp + left join CU_MEMBER_BONUS mb on mb.PK_ID = bp.PK_BONUS + where PK_MEMBER = #{pkMember} + order by bp.ROUND desc, bp.SECOND desc) bb + where rownum = 1 +