From eaee52ffbd9e1b65ccdbc424839e6182680c3f6a Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Tue, 8 Apr 2025 09:39:13 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E5=8E=BB=E6=8E=89=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E5=8D=A1=E7=9B=B4=E6=8E=A8=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/service/impl/CuMemberBonusServiceImpl.java | 12 ++++++------
 .../hzs/bonus/bonus/vo/MemberBonusDetailSerVO.java   |  1 -
 .../java/com/hzs/common/core/enums/EBonusItems.java  |  8 ++++----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java
index f1b123a9..46853953 100644
--- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java
+++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java
@@ -405,9 +405,9 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
                 memberBonusDetailVO.setSourceMemberName(CommonUtil.getMemberName(cuMemberBonusDetail.getPkVertex(), cuMemberBonusDetail.getSourceMemberName(), cuMemberBonusDetail.getNickName()));
                 memberBonusDetailVOList.add(memberBonusDetailVO);
             });
-        } else if (EBonusItems.BOOT_CARD.getValue() == bonusItemsValue || EBonusItems.DIRECT_INCOME.getValue() == bonusItemsValue ||
-                EBonusItems.HELP_EACH_INCOME.getValue() == bonusItemsValue) {
-            // 启动卡直推 推荐收益
+        } else if (EBonusItems.DIRECT_INCOME.getValue() == bonusItemsValue
+                || EBonusItems.HELP_EACH_INCOME.getValue() == bonusItemsValue) {
+            // 直推 推荐收益
             List<CuMemberBonusPushExt> cuMemberBonusPushList = cuMemberBonusPushMapper.queryMemberBonusPushByBonusItems(bonusParam);
             dataTable = getDataTable(cuMemberBonusPushList);
             cuMemberBonusPushList.forEach(cuMemberBonusPush -> {
@@ -524,9 +524,9 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
                 MemberBonusDetailSerVO memberBonusDetailVO = BeanUtil.copyProperties(cuMemberBonusDetail, MemberBonusDetailSerVO.class);
                 memberBonusDetailSerVoS.add(memberBonusDetailVO);
             });
-        } else if (EBonusItems.BOOT_CARD.getValue() == bonusItemsValue || EBonusItems.DIRECT_INCOME.getValue() == bonusItemsValue ||
-                EBonusItems.HELP_EACH_INCOME.getValue() == bonusItemsValue) {
-            // 启动卡直推 推荐收益
+        } else if (EBonusItems.DIRECT_INCOME.getValue() == bonusItemsValue
+                || EBonusItems.HELP_EACH_INCOME.getValue() == bonusItemsValue) {
+            // 直推 推荐收益
             List<CuMemberBonusPushExt> cuMemberBonusPushList = cuMemberBonusPushMapper.queryMemberBonusPushByBonusItemsFoServer(bonusParam);
             dataTable = getDataTable(cuMemberBonusPushList);
             cuMemberBonusPushList.forEach(cuMemberBonusPush -> {
diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailSerVO.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailSerVO.java
index 75d97ed6..7735a07c 100644
--- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailSerVO.java
+++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailSerVO.java
@@ -3,7 +3,6 @@ package com.hzs.bonus.bonus.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.hzs.common.core.annotation.BigDecimalFormat;
 import com.hzs.common.core.annotation.Excel;
 import com.hzs.common.core.annotation.Transaction;
 import com.hzs.common.core.constant.EnumsPrefixConstants;
diff --git a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java
index 959e7851..b870c889 100644
--- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java
+++ b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java
@@ -20,10 +20,10 @@ public enum EBonusItems {
      */
     HI_PINK(1, "嗨粉直推", 1, EnumsPrefixConstants.BONUS_ITEMS + 1),
 
-    /**
-     * 启动卡直推
-     */
-    BOOT_CARD(2, "启动卡直推", 0, EnumsPrefixConstants.BONUS_ITEMS + 2),
+//    /**
+//     * 启动卡直推
+//     */
+//    BOOT_CARD(2, "启动卡直推", 0, EnumsPrefixConstants.BONUS_ITEMS + 2),
 
     /**
      * 直推收益