From 3e7c57c2a084f439b21d7a4d373d378cbbf93a1b Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 29 Sep 2025 10:27:14 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=A5=96=E9=87=91=E6=9D=A5=E6=BA=90?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A2=86=E5=AF=BC=E5=A5=96=E3=80=81=E5=B9=B3?= =?UTF-8?q?=E7=BA=A7=E5=A5=96=E7=AD=9B=E9=80=89=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/service/impl/CuMemberBonusServiceImpl.java | 12 +++++++++++- .../mapper/bonus/bonus/CuMemberBonusRangeMapper.xml | 7 ++++--- 2 files changed, 15 insertions(+), 4 deletions(-) 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 7d7d1259..b989b4ea 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 @@ -22,6 +22,7 @@ import com.hzs.common.core.utils.ComputeUtil; import com.hzs.common.core.utils.DateUtils; import com.hzs.common.core.web.page.TableDataInfo; 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.system.config.BdBonusItems; import com.hzs.common.domain.system.config.ext.BdBonusItemsExt; @@ -400,7 +401,16 @@ public class CuMemberBonusServiceImpl extends ServiceImpl 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 cuMemberBonusDetailList = cuMemberBonusStageMapper.queryMemberBonusStageByBonusItemsFoServer(bonusParam); dataTable = getDataTable(cuMemberBonusDetailList); diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusRangeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusRangeMapper.xml index fc0abe67..67e847a1 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusRangeMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusRangeMapper.xml @@ -161,9 +161,10 @@ where so.del_flag = 0 ) so inner join ( - select - 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.remark,cr.income_ratio,cr.income_dial_ratio,cr.order_dial_ratio + select cb.pk_member, cr.pk_order, cb.period, cb.pk_country, cr.pk_bonus_items, + cr.income_status, cr.cal_achieve, cr.remark, + 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 inner join CU_MEMBER_BONUS_RANGE cr on cb.pk_id = cr.pk_bonus