From 35724620d8fe813d10d852dfcba2991e81b31d0f Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Sun, 27 Apr 2025 10:22:55 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=A5=96=E9=87=91=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=A1=A5=E5=85=A8=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/ApiCuMemberBonusController.java | 3 +++ .../impl/CuMemberBonusServiceImpl.java | 2 ++ .../hzs/bonus/bonus/vo/CuMemberBonusVO.java | 7 +----- .../bonus/vo/MemberBonusFirstPurchaseVO.java | 7 +++++- .../member/bonus/CuMemberBonusMapper.xml | 23 ++++++++++--------- .../achieve/param/MemberAchieveDisParam.java | 6 +---- .../impl/CuMemberAchieveServiceImpl.java | 11 ++++----- .../common/core/enums/EAchievementType.java | 2 -- .../domain/member/bonus/CuMemberBonus.java | 3 --- .../domain/member/ext/CuMemberBonusExt.java | 6 +---- 10 files changed, 30 insertions(+), 40 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java index ea3f9cb5..a88a95fa 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java @@ -113,6 +113,9 @@ public class ApiCuMemberBonusController extends BaseController { // 拓展收益 = 首购拓展 + 复购拓展 + 复购推荐 memberBonusFirstPurchaseVO.setExpandIncome(ComputeUtil.computeAddNum(memberBonusFirstPurchaseVO.getExpandIncome(), memberBonusFirstPurchaseVO.getRepurExpandIncome(), memberBonusFirstPurchaseVO.getRepurPushIncome())); + // 辅导收益 = 首购辅导 + 复购辅导 + memberBonusFirstPurchaseVO.setCoachIncome(ComputeUtil.computeAddNum(memberBonusFirstPurchaseVO.getCoachIncome(), + memberBonusFirstPurchaseVO.getRepurCoachIncome())); // 首购实发小计 = 首购实发小计 + 复购实发小计 memberBonusFirstPurchaseVO.setPurRealSubtotal(ComputeUtil.computeAdd(memberBonusFirstPurchaseVO.getPurRealSubtotal(), memberBonusFirstPurchaseVO.getRepurRealSubtotal())); 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 f11766c2..778740d2 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 @@ -154,6 +154,7 @@ public class CuMemberBonusServiceImpl extends ServiceImpl select - cp.settle_date,cb.direct_income,cb.expand_income, - cb.expand_no_capping, cb.expand_capping, - cb.coach_income,cb.share_income,cb.service_income, - cb.back_points,cb.service_spend, cb.pur_real_subtotal, - cb.repur_push_income,cb.repur_range_income,cb.repur_expand_income,cb.repur_real_subtotal, - cb.cloud_direct_income,cb.cloud_pur_income,cb.cloud_repur_income,cb.cloud_real_subtotal, - cb.repur_coupon,cb.repur_coupon_share,cb.repur_coupon_subtotal, - cb.store_income, cb.maker_direct_income, cb.maker_share_income, cb.maker_real_subtotal, + cp.settle_date, + cb.direct_income, cb.expand_income, cb.expand_no_capping, cb.expand_capping, + cb.coach_income, cb.share_income, cb.service_income, + cb.back_points, cb.service_spend, cb.pur_real_subtotal, + cb.repur_push_income, cb.repur_range_income, cb.repur_expand_income, cb.repur_coach_income, + cb.repur_real_subtotal, cb.store_income, + cb.repur_coupon, cb.repur_coupon_share, cb.repur_coupon_subtotal, + cb.maker_direct_income, cb.maker_share_income, cb.maker_real_subtotal, cb.global_points, cb.car_award_points, - cb.hi_fun_income,cb.hai_fun_income, + cb.cloud_direct_income, cb.cloud_pur_income, cb.cloud_repur_income, cb.cloud_real_subtotal, + cb.hi_fun_income, cb.hai_fun_income, cb.real_income_total from cu_member_bonus cb inner join cu_member_settle_period cp on cb.period = cp.pk_id - where cb.del_flag=0 and cp.del_flag=0 - and cb.pk_member=#{pkMember} + where cb.del_flag = 0 and cp.del_flag = 0 + and cb.pk_member = #{pkMember} and cb.grant_status >= #{grantStatus} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/param/MemberAchieveDisParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/param/MemberAchieveDisParam.java index 1027d3bb..837d43b2 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/param/MemberAchieveDisParam.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/param/MemberAchieveDisParam.java @@ -7,11 +7,6 @@ import java.util.Date; /** * description: 会员业绩分布 - * - * @author: sui q - * @time: 2023/4/7 15:16 - * @classname: MemberAchieveDisParam - * @package_name: com.hzs.member.achieve.param * version 1.0.0 */ @Data @@ -41,4 +36,5 @@ public class MemberAchieveDisParam implements Serializable { * 国家 */ private Integer pkCountry; + } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java index 99f99613..67f85e46 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java @@ -123,6 +123,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl cuMemberExtList = iCuMemberService.queryMemberByCondition(CuMember.builder().pkId(memberAchieveDisParam.getPkMember()).build()); CuMemberExt cuMember = cuMemberExtList.get(0); String image = setGradeImageUrl(cuMember.getCategory(), cuMember.getGradeValue()); @@ -147,6 +148,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl