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 cuMemberBonusPushList = cuMemberBonusPushMapper.queryMemberBonusPushByBonusItems(bonusParam); dataTable = getDataTable(cuMemberBonusPushList); cuMemberBonusPushList.forEach(cuMemberBonusPush -> { @@ -524,9 +524,9 @@ public class CuMemberBonusServiceImpl extends ServiceImpl 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), /** * 直推收益