diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusStageMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusStageMapper.java index cffb0062..a3e1dec7 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusStageMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusStageMapper.java @@ -1,7 +1,10 @@ package com.hzs.bonus.bonus.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hzs.bonus.bonus.param.BonusParam; import com.hzs.common.domain.member.bonus.CuMemberBonusStage; +import com.hzs.common.domain.member.ext.CuMemberBonusDetailExt; +import com.hzs.common.domain.member.ext.CuMemberBonusPushExt; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -21,4 +24,13 @@ public interface CuMemberBonusStageMapper extends BaseMapper */ void batchInsertCuMemberBonusStage(@Param("cuMemberBonusStageList") List cuMemberBonusStageList); + + + + /** + * 根据查询条件查询固定的奖金明细(阶段收益) + * + * @param bonusParam 查询条件 + */ + List queryMemberBonusStageByBonusItemsFoServer(@Param("bonusParam") BonusParam bonusParam); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java index 8f3edff8..1d45ed1a 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java @@ -62,6 +62,8 @@ public class CuMemberBonusServiceImpl extends ServiceImpl cuMemberBonusDetailList = cuMemberBonusStageMapper.queryMemberBonusStageByBonusItemsFoServer(bonusParam); + dataTable = getDataTable(cuMemberBonusDetailList); + cuMemberBonusDetailList.forEach(cuMemberBonusDetail -> { + MemberBonusDetailSerVO memberBonusDetailVO = BeanUtil.copyProperties(cuMemberBonusDetail, MemberBonusDetailSerVO.class); + memberBonusDetailSerVoS.add(memberBonusDetailVO); + }); } else { // 其他收益 区域分红、月度分红平均、月度分红加权 List cuMemberBonusDetailList = cuMemberBonusDetailMapper.queryMemberBonusDetailByBonusItemsForServer(bonusParam); diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusDetailMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusDetailMapper.xml index 7dc5b3e3..a7f89558 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusDetailMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusDetailMapper.xml @@ -326,6 +326,26 @@ and cd.pk_bonus_items = #{bonusParam.pkBonusItems} + union all + select + cb.pk_member,cs.pk_order,cb.period,cb.pk_country,cs.pk_bonus_items,cs.income_status,cs.CAL_ACHIEVE,cs.pretax_income,cs.income_tax,cs.real_income, + cs.remark,cs.income_ratio,cs.income_dial_ratio,cs.order_dial_ratio + from cu_member_bonus cb + inner join CU_MEMBER_BONUS_STAGE cs + on cb.pk_id = cs.pk_bonus + where 1=1 + + and cs.pk_bonus = #{bonusParam.pkBonus} + + + and cs.pk_range = #{bonusParam.pkGrade} + + + and cb.period = #{bonusParam.period} + + + and cd.pk_bonus_items = #{bonusParam.pkBonusItems} + ) x where 1=1 diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusStageMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusStageMapper.xml index 42f3c685..34f3bbdd 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusStageMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusStageMapper.xml @@ -33,4 +33,130 @@ SELECT 1 FROM dual +