angelo
/
java-zk-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 奖金来源添加领导奖、平级奖筛选；

This commit is contained in:
cabbage 2025-09-29 10:27:14 +08:00
parent f5584a64c7
commit 3e7c57c2a0
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java
View File

@ -22,6 +22,7 @@ import com.hzs.common.core.utils.ComputeUtil;
import com.hzs.common.core.utils.DateUtils; import com.hzs.common.core.utils.DateUtils;
import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.core.web.page.TableDataInfo;
import com.hzs.common.domain.member.bonus.CuMemberBonus; import com.hzs.common.domain.member.bonus.CuMemberBonus;
import com.hzs.common.domain.member.bonus.CuMemberBonusRange;
import com.hzs.common.domain.member.ext.*; import com.hzs.common.domain.member.ext.*;
import com.hzs.common.domain.system.config.BdBonusItems; import com.hzs.common.domain.system.config.BdBonusItems;
import com.hzs.common.domain.system.config.ext.BdBonusItemsExt; import com.hzs.common.domain.system.config.ext.BdBonusItemsExt;
@ -400,7 +401,16 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
// MemberBonusDetailSerVO memberBonusDetailVO = BeanUtil.copyProperties(cuMemberBonusRange, MemberBonusDetailSerVO.class); // MemberBonusDetailSerVO memberBonusDetailVO = BeanUtil.copyProperties(cuMemberBonusRange, MemberBonusDetailSerVO.class);
// memberBonusDetailSerVoS.add(memberBonusDetailVO); // memberBonusDetailSerVoS.add(memberBonusDetailVO);
// }); // });
} else if(EBonusItems.STAGE_INCOME.getValue() == bonusItemsValue) { } else if (EBonusItems.RANGE_INCOME.getValue() == bonusItemsValue
|| EBonusItems.SAME_LEVEL_INCOME.getValue() == bonusItemsValue) {
// 领导奖收益、平级奖收益
List<CuMemberBonusRangeExt> cuMemberBonusRangeList = cuMemberBonusRangeMapper.queryMemberBonusRangeByBonusItemsForServer(bonusParam);
dataTable = getDataTable(cuMemberBonusRangeList);
cuMemberBonusRangeList.forEach(cuMemberBonusRange -> {
MemberBonusDetailSerVO memberBonusDetailVO = BeanUtil.copyProperties(cuMemberBonusRange, MemberBonusDetailSerVO.class);
memberBonusDetailSerVoS.add(memberBonusDetailVO);
});
} else if (EBonusItems.STAGE_INCOME.getValue() == bonusItemsValue) {
// 阶段收益 // 阶段收益
List<CuMemberBonusDetailExt> cuMemberBonusDetailList = cuMemberBonusStageMapper.queryMemberBonusStageByBonusItemsFoServer(bonusParam); List<CuMemberBonusDetailExt> cuMemberBonusDetailList = cuMemberBonusStageMapper.queryMemberBonusStageByBonusItemsFoServer(bonusParam);
dataTable = getDataTable(cuMemberBonusDetailList); dataTable = getDataTable(cuMemberBonusDetailList);

7
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusRangeMapper.xml
View File

@ -161,9 +161,10 @@
where so.del_flag = 0 where so.del_flag = 0
) so ) so
inner join ( inner join (
select select cb.pk_member, cr.pk_order, cb.period, cb.pk_country, cr.pk_bonus_items,
cb.pk_member,cr.pk_order,cb.period,cb.pk_country,cr.pk_bonus_items,cr.income_status,cr.CAL_ACHIEVE,cr.pretax_income,cr.income_tax,cr.real_income, cr.income_status, cr.cal_achieve, cr.remark,
cr.remark,cr.income_ratio,cr.income_dial_ratio,cr.order_dial_ratio cr.pretax_income, cr.income_tax, cr.real_income,
cr.income_ratio, cr.income_dial_ratio, cr.order_dial_ratio
from cu_member_bonus cb from cu_member_bonus cb
inner join CU_MEMBER_BONUS_RANGE cr inner join CU_MEMBER_BONUS_RANGE cr
on cb.pk_id = cr.pk_bonus on cb.pk_id = cr.pk_bonus