From 2d8333520067e95883336ce18faa91a45d686d1d Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Fri, 11 Jul 2025 18:01:55 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=90=8E=E5=8F=B0=E5=A5=96=E9=87=91?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=A4=84=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/mapper/CuMemberBonusMapper.java | 12 -- .../bonus/service/ICuMemberBonusService.java | 17 --- .../impl/CuMemberBonusServiceImpl.java | 70 ++---------- .../com/hzs/bonus/bonus/vo/BonusTotalVO.java | 64 +++-------- .../hzs/bonus/bonus/vo/CuMemberBonusVO.java | 24 ++-- .../bonus/bonus/CuMemberBonusMapper.xml | 108 +----------------- .../hzs/common/core/enums/EOrderPrefix.java | 2 +- .../domain/member/ext/CuMemberBonusExt.java | 7 -- 8 files changed, 41 insertions(+), 263 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusMapper.java index 45cdb0f8..eb1b53c5 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusMapper.java @@ -60,13 +60,6 @@ public interface CuMemberBonusMapper extends BaseMapper { */ void batchInsertCuMemberBonus(@Param("cuMemberBonusList") List cuMemberBonusList); - /** - * 批量插入会员奖金主表 - * - * @param cuMemberBonusList 会员奖金 - */ - void insertOrUpdateCuMemberBonus(@Param("cuMemberBonusList") List cuMemberBonusList); - /** * 更新奖金状态 * @@ -77,9 +70,4 @@ public interface CuMemberBonusMapper extends BaseMapper { @Param("oldGrantStatus") Integer oldGrantStatus, @Param("startPeriod") Integer startPeriod, @Param("endPeriod") Integer endPeriod); - /** - * 回退极差奖金 - */ - void mergeBackRangeBonusIncome(@Param("pkOrder") Long pkOrder, @Param("bonusValue") Integer bonusValue); - } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusService.java index f686a25d..1bb5a4d2 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusService.java @@ -90,18 +90,6 @@ public interface ICuMemberBonusService extends IService { */ void batchInsertCuMemberBonus(List cuMemberBonusList); - /** - * 批量插入会员奖金主表 - * - * @param cuMemberBonusList 会员奖金 - */ - void insertOrUpdateCuMemberBonus(List cuMemberBonusList); - - /** - * 查询会员奖金 - */ - List queryCuMemberBonus(int period, List cuMemberBonusList); - /** * 更新奖金状态 * @@ -135,11 +123,6 @@ public interface ICuMemberBonusService extends IService { */ Set queryMemberBonusByPeriod(Integer period); - /** - * 新零售撤单，回退奖金 - */ - void mergeBackMemberBonusIncome(Long pkOrder); - void calculateBonusTotal(CuMemberBonusExt cuMemberBonusExt, CuMemberBonusExt memberBonusExt); CuMemberBonusExt initCuMemberBonus(); 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 5d159ced..fb70ef85 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 @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageInfo; -import com.hzs.bonus.achieve.service.ICuMemberSettlePeriodService; import com.hzs.bonus.achieve.service.ICuMemberTreeService; import com.hzs.bonus.achieve.service.impl.CuMemberBonusSettle; import com.hzs.bonus.bonus.mapper.*; @@ -33,8 +32,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; import java.util.*; import java.util.stream.Collectors; @@ -52,49 +49,22 @@ public class CuMemberBonusServiceImpl extends ServiceImpl batchQueryCuMemberBonusSeq(Integer rowNum) { return baseMapper.batchQueryCuMemberBonusSeq(rowNum); } - @Override public List queryMemberBonusVoByCondition(BonusParam bonusParam) { return handleMemberBonusPurchase(getCuMemberBonusExtList(bonusParam), bonusParam); @@ -228,6 +198,7 @@ public class CuMemberBonusServiceImpl extends ServiceImpl cuMemberBonusList) { - baseMapper.insertOrUpdateCuMemberBonus(cuMemberBonusList); - } - - @Override - public List queryCuMemberBonus(int period, List cuMemberBonusList) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - List memberList = cuMemberBonusList.stream().map(CuMemberBonus::getPkMember).collect(Collectors.toList()); - queryWrapper.eq(MemberFieldConstants.PERIOD, period); - queryWrapper.in(MemberFieldConstants.PK_MEMBER, memberList); - return baseMapper.selectList(queryWrapper); - } - @Override public Boolean updateCuMemberBonusStatus(Integer pkCountry, Integer grantStatus, Integer oldGrantStatus, Integer startPeriod, Integer endPeriod) { return baseMapper.updateCuMemberBonusStatus(pkCountry, grantStatus, oldGrantStatus, startPeriod, endPeriod) > 0 ? Boolean.TRUE : Boolean.FALSE; @@ -488,16 +446,16 @@ public class CuMemberBonusServiceImpl extends ServiceImpl - - merge into cu_member_bonus a - using( - select b.* from bd_bonus_items bt - inner join( - select pk_bonus,pk_bonus_items, sum(pretax_income) pretax_income, - sum(income_tax) income_tax, sum(real_income) real_income from - - cu_member_bonus_detail - cu_member_bonus_range - - where del_flag=0 and pk_order= #{pkOrder} - group by pk_bonus, pk_bonus_items) b - on bt.pk_id = b.pk_bonus_items - where bt.bonus_value = #{bonusValue}) b - on (a.pk_id = b.pk_bonus) - when matched then - update set a.retail_real_subtotal=a.retail_real_subtotal-b.real_income, - a.back_points=a.back_points-b.income_tax, - a.real_income_total=a.real_income_total-b.real_income - - ,a.retail_range_income = a.retail_range_income - b.pretax_income - - - ,a.retail_same_level_income = a.retail_same_level_income - b.pretax_income - - - ,a.retail_area_income = a.retail_area_income - b.pretax_income - - - delete from cu_member_bonus @@ -168,76 +137,6 @@ b.retail_area_income,b.retail_benefit_range_income,b.retail_benefit_avg_income,b.retail_benefit_income, b.retail_real_subtotal) - - merge into cu_member_bonus a - using( - select pk_id,pk_member,period,pk_rate,direct_income,expand_income,expand_no_capping, - expand_capping,coach_income,share_income,service_income,back_points,service_spend, - pur_real_subtotal,repur_push_income,repur_range_income,repur_expand_income,repur_real_subtotal, - cloud_direct_income,cloud_pur_income,cloud_repur_income,cloud_real_subtotal, - repur_coupon,repur_coupon_subtotal,global_points, - car_award_points,hi_fun_income,hai_fun_income,retail_range_income,retail_same_level_income,retail_area_income, - retail_benefit_range_income,retail_benefit_avg_income, - retail_benefit_income,retail_real_subtotal, - maker_direct_income,maker_share_income,maker_real_subtotal,real_income_total, - pk_country,pk_creator,grant_status,income_status from( - - select #{item.pkId} pk_id,#{item.pkMember} pk_member,#{item.period} period,#{item.pkRate} pk_rate, - #{item.directIncome} direct_income,#{item.expandIncome} expand_income,#{item.expandNoCapping} expand_no_capping, - #{item.expandCapping} expand_capping,#{item.coachIncome} coach_income,#{item.shareIncome} share_income, - #{item.serviceIncome} service_income,#{item.backPoints} back_points,#{item.serviceSpend} service_spend, - #{item.purRealSubtotal} pur_real_subtotal,#{item.repurPushIncome} repur_push_income, - #{item.repurRangeIncome} repur_range_income,#{item.repurExpandIncome} repur_expand_income, - #{item.repurRealSubtotal} repur_real_subtotal,#{item.cloudDirectIncome} cloud_direct_income, - #{item.cloudPurIncome} cloud_pur_income,#{item.cloudRepurIncome} cloud_repur_income, - #{item.cloudRealSubtotal} cloud_real_subtotal,#{item.repurCoupon} repur_coupon, - #{item.repurCouponSubtotal} repur_coupon_subtotal,#{item.globalPoints} global_points, - #{item.carAwardPoints} car_award_points,#{item.hiFunIncome} hi_fun_income, - #{item.haiFunIncome} hai_fun_income,#{item.makerDirectIncome} maker_direct_income, - #{item.makerShareIncome} maker_share_income,#{item.makerRealSubtotal} maker_real_subtotal, - #{item.realIncomeTotal} real_income_total,#{item.pkCountry} pk_country,#{item.pkCreator} pk_creator, - #{item.grantStatus} grant_status,#{item.incomeStatus} income_status, - #{item.retailRangeIncome} retail_range_income,#{item.retailSameLevelIncome} retail_same_level_income, - #{item.retailAreaIncome} retail_area_income,#{item.retailBenefitRangeIncome} retail_benefit_range_income, - #{item.retailBenefitAvgIncome} retail_benefit_avg_income,#{item.retailBenefitIncome} retail_benefit_income, - #{item.retailRealSubtotal} retail_real_subtotal from dual - ) - ) b - on (a.pk_member = b.pk_member and a.period = b.period) - when matched then - update set - a.direct_income = a.direct_income + b.direct_income,a.expand_income=a.expand_income+b.expand_income, - a.expand_no_capping=a.expand_no_capping+b.expand_no_capping,a.expand_capping=a.expand_capping+b.expand_capping, - a.coach_income=a.coach_income+b.coach_income,a.share_income=a.share_income+b.share_income, - a.service_income=a.service_income+b.service_income,a.back_points=a.back_points+b.back_points,a.service_spend=a.service_spend+b.service_spend, - a.pur_real_subtotal=a.pur_real_subtotal+b.pur_real_subtotal,a.repur_push_income=a.repur_push_income+b.repur_push_income, - a.repur_range_income=a.repur_range_income+b.repur_range_income,a.repur_expand_income=a.repur_expand_income+b.repur_expand_income, - a.repur_real_subtotal=a.repur_real_subtotal+b.repur_real_subtotal,a.cloud_direct_income=a.cloud_direct_income+b.cloud_direct_income, - a.cloud_pur_income=a.cloud_pur_income+b.cloud_pur_income,a.cloud_repur_income=a.cloud_repur_income+b.cloud_repur_income, - a.cloud_real_subtotal=a.cloud_real_subtotal+b.cloud_real_subtotal,a.repur_coupon=a.repur_coupon+b.repur_coupon, - a.global_points=a.global_points+b.global_points,a.car_award_points=a.car_award_points+b.car_award_points, - a.hi_fun_income=a.hi_fun_income+b.hi_fun_income,a.real_income_total=a.real_income_total+b.real_income_total, - a.retail_range_income=a.retail_range_income+b.retail_range_income,a.retail_same_level_income=a.retail_same_level_income+b.retail_same_level_income, - a.retail_area_income=a.retail_area_income+b.retail_area_income,a.retail_benefit_range_income=a.retail_benefit_range_income+b.retail_benefit_range_income, - a.retail_benefit_avg_income=a.retail_benefit_avg_income+b.retail_benefit_avg_income,a.retail_benefit_income=a.retail_benefit_income+b.retail_benefit_income, - a.retail_real_subtotal=a.retail_real_subtotal+b.retail_real_subtotal - when not matched then - insert (pk_id,pk_member,period,pk_rate,direct_income,expand_income,expand_no_capping, - expand_capping,coach_income,share_income,service_income,back_points,service_spend, - pur_real_subtotal,repur_push_income,repur_range_income,repur_expand_income,repur_real_subtotal, - cloud_direct_income,cloud_pur_income,cloud_repur_income,cloud_real_subtotal, - repur_coupon,global_points,car_award_points,hi_fun_income,real_income_total, - pk_country,pk_creator,grant_status,income_status,retail_range_income,retail_same_level_income, - retail_area_income,retail_benefit_range_income,retail_benefit_avg_income,retail_benefit_income,retail_real_subtotal) - values(b.pk_id,b.pk_member,b.period,b.pk_rate,b.direct_income,b.expand_income,b.expand_no_capping, - b.expand_capping,b.coach_income,b.share_income,b.service_income,b.back_points,b.service_spend, - b.pur_real_subtotal,b.repur_push_income,b.repur_range_income,b.repur_expand_income,b.repur_real_subtotal, - b.cloud_direct_income,b.cloud_pur_income,b.cloud_repur_income,b.cloud_real_subtotal, - b.repur_coupon,b.global_points,b.car_award_points,b.hi_fun_income,b.real_income_total, - b.pk_country,b.pk_creator,b.grant_status,b.income_status,b.retail_range_income,b.retail_same_level_income, - b.retail_area_income,b.retail_benefit_range_income,b.retail_benefit_avg_income,b.retail_benefit_income, - b.retail_real_subtotal) -