From 300784ec7f1216d14ba9318e202b6320995384a1 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 20 May 2025 14:28:13 +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=87=8D=E6=B6=88=E6=94=B6=E7=9B=8A=E3=80=81?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=9C=8D=E5=8A=A1=E8=B4=B9=EF=BC=88102?= =?UTF-8?q?=EF=BC=89=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../achieve/service/ICuMemberTreeService.java | 4 --- .../manage/CuMemberBonusController.java | 16 ++++----- .../mapper/CuMemberBonusCoachMapper.java | 3 -- .../mapper/CuMemberBonusDetailMapper.java | 34 ++++-------------- .../mapper/CuMemberBonusExpandMapper.java | 20 ----------- .../bonus/mapper/CuMemberBonusPushMapper.java | 28 ++++----------- .../mapper/CuMemberBonusRangeMapper.java | 14 -------- .../bonus/service/IBonusSettleService.java | 6 +--- .../service/impl/BonusSettleServiceImpl.java | 4 +-- .../bonus/vo/MemberBonusDetailSerVO.java | 36 +++++++++++-------- .../common/core/enums/EBonusIncomeStatus.java | 19 ++++++++++ .../com/hzs/common/core/enums/EOrderType.java | 24 +++++++++++-- .../domain/member/bonus/BdWaresBonus.java | 5 --- .../member/bonus/BdWaresBonusItems.java | 5 --- .../member/bonus/CuMemberBonusCoach.java | 3 -- .../member/bonus/CuMemberBonusDelay.java | 3 -- .../bonus/CuMemberBonusDelayDetail.java | 3 -- .../member/bonus/CuMemberBonusDetail.java | 5 --- .../member/bonus/CuMemberBonusExpand.java | 3 -- .../member/bonus/CuMemberBonusPush.java | 3 -- .../member/bonus/CuMemberBonusPushHis.java | 5 --- .../member/bonus/CuMemberBonusRange.java | 3 -- .../member/bonus/CuMemberRepeatBonus.java | 6 +--- .../member/bonus/CuMemberShareBonus.java | 5 --- .../member/bonus/CuMemberShareDetail.java | 5 --- 25 files changed, 83 insertions(+), 179 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java index 13431fc5..7f574030 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java @@ -14,9 +14,6 @@ import java.util.Set; /** * 会员网体历史记录 服务类 - * - * @author hzs - * @since 2022-10-31 */ public interface ICuMemberTreeService extends IService { @@ -144,7 +141,6 @@ public interface ICuMemberTreeService extends IService { /* * @description: 回退会员奖衔 - * @param: null null **/ void updateBackCuMemberSettleRangeAward(String rangeTableName, Integer period); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java index b6889ca9..a6266704 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java @@ -35,15 +35,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; import java.time.temporal.ChronoUnit; import java.util.*; import java.util.stream.Collectors; /** * 会员奖金-会员奖金汇总表 前端控制器 - * - * @author hzs - * @since 2022-11-11 */ @RestController @RequestMapping("/manage/bonus") @@ -224,15 +222,13 @@ public class CuMemberBonusController extends BaseController { TableDataInfo tableDataInfo = iCuMemberBonusService.queryMemberBonusDetailSerVoByCondition(bonusParam); List memberBonusDetailSerVOList = (List) tableDataInfo.getRows(); // 获取需要翻译的枚举翻译 - Map transactionMap = iTransactionCommonService.exportEnumTransaction(EOrderType.values(), EBonusIncomeStatus.values()); Map transactionLongMap = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, EnumsPrefixConstants.KEY_AWARD); for (MemberBonusDetailSerVO memberBonusDetailSerVO : memberBonusDetailSerVOList) { - if (transactionMap.containsKey(EnumsPrefixConstants.ORDER_TYPE + memberBonusDetailSerVO.getOrderType().toString())) { - memberBonusDetailSerVO.setOrderTypeVal(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + memberBonusDetailSerVO.getOrderType())); - } - if (transactionMap.containsKey(EnumsPrefixConstants.BONUS_INCOME_STATUS + memberBonusDetailSerVO.getIncomeStatus())) { - memberBonusDetailSerVO.setIncomeStatusVal(transactionMap.get(EnumsPrefixConstants.BONUS_INCOME_STATUS + memberBonusDetailSerVO.getIncomeStatus())); - } + memberBonusDetailSerVO.setOrderTypeVal(EOrderType.getLabelByValue(memberBonusDetailSerVO.getOrderType())); + memberBonusDetailSerVO.setIncomeStatusVal(EBonusIncomeStatus.getLabelByValue(memberBonusDetailSerVO.getIncomeStatus())); + memberBonusDetailSerVO.setBackPoints(memberBonusDetailSerVO.getIncomeTax().divide(new BigDecimal("2"))); + memberBonusDetailSerVO.setServiceSpend(memberBonusDetailSerVO.getIncomeTax().divide(new BigDecimal("2"))); + if (transactionLongMap.containsKey(memberBonusDetailSerVO.getPkSettleGrade())) { memberBonusDetailSerVO.setPkSettleGradeVal(transactionLongMap.get(memberBonusDetailSerVO.getPkSettleGrade())); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusCoachMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusCoachMapper.java index eeefe99e..3ce3c4d4 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusCoachMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusCoachMapper.java @@ -10,9 +10,6 @@ import java.util.List; /** * 会员奖金-辅导收益明细表 Mapper 接口 - * - * @author hzs - * @since 2022-11-15 */ public interface CuMemberBonusCoachMapper extends BaseMapper { diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDetailMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDetailMapper.java index e447c118..137ae4fe 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDetailMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDetailMapper.java @@ -9,30 +9,21 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 会员奖金-奖金收益明细表(报单费) Mapper 接口 - *

- * - * @author hzs - * @since 2022-11-17 */ public interface CuMemberBonusDetailMapper extends BaseMapper { /** * 删除会员奖金汇总表 + * * @param period 结算期间 - * @return: void - * @Author: sui q - * @Date: 2022/12/13 11:54 */ void deleteCuMemberBonusDetail(Integer period); /** * 批量插入会员奖金主表 + * * @param cuMemberBonusDetailList 会员奖金 - * @return: void - * @Author: sui q - * @Date: 2022/12/13 13:56 */ void batchInsertCuMemberBonusDetail(@Param("cuMemberBonusDetailList") List cuMemberBonusDetailList); @@ -40,45 +31,34 @@ public interface CuMemberBonusDetailMapper extends BaseMapper - * @Author: sui q - * @Date: 2023/1/14 9:18 */ List queryMemberBonusDetailByCondition(BonusParam bonusParam); /** * 会员端根据查询条件查询会员奖金明细 + * * @param bonusParam 查询条件 - * @return: List - * @Author: sui q - * @Date: 2023/1/14 9:18 */ List queryMemberBonusDetailByConditionForServer(@Param("bonusParam") BonusParam bonusParam); /** * 根据查询条件查询固定的奖金明细 + * * @param bonusParam 查询条件 - * @return: List - * @Author: sui q - * @Date: 2023/1/14 11:18 - */ + */ List queryMemberBonusDetailByBonusItems(BonusParam bonusParam); /** * 根据查询条件查询固定的奖金明细 + * * @param bonusParam 查询条件 - * @return: List - * @Author: sui q - * @Date: 2023/1/14 11:18 */ List queryMemberBonusDetailByBonusItemsForServer(@Param("bonusParam") BonusParam bonusParam); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusExpandMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusExpandMapper.java index bbeec528..e874f98d 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusExpandMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusExpandMapper.java @@ -9,12 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 会员奖金-拓展收益明细表 Mapper 接口 - *

- * - * @author hzs - * @since 2022-11-15 */ public interface CuMemberBonusExpandMapper extends BaseMapper { @@ -22,9 +17,6 @@ public interface CuMemberBonusExpandMapper extends BaseMapper cuMemberBonusExpandList); @@ -42,9 +31,6 @@ public interface CuMemberBonusExpandMapper extends BaseMapper cuMemberBonusExpandList); @@ -53,9 +39,6 @@ public interface CuMemberBonusExpandMapper extends BaseMapper - * @Author: sui q - * @Date: 2023/1/14 11:18 */ List queryMemberBonusExpandByBonusItems(BonusParam bonusParam); @@ -63,9 +46,6 @@ public interface CuMemberBonusExpandMapper extends BaseMapper - * @Author: sui q - * @Date: 2023/1/14 11:18 */ List queryMemberBonusExpandByBonusItemsForServer(@Param("bonusParam") BonusParam bonusParam); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusPushMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusPushMapper.java index 0e76a543..48caf94f 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusPushMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusPushMapper.java @@ -1,7 +1,6 @@ package com.hzs.bonus.bonus.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.bonus.bonus.param.TripleCycleListParam; import com.hzs.common.domain.member.bonus.CuMemberBonusPush; import com.hzs.common.domain.member.ext.CuMemberBonusPushExt; import com.hzs.bonus.bonus.param.BonusParam; @@ -10,58 +9,43 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 会员奖金-直推收益明细表 Mapper 接口 - *

- * - * @author hzs - * @since 2022-11-10 */ public interface CuMemberBonusPushMapper extends BaseMapper { /** * 根据查询条件查询固定的奖金明细 + * * @param bonusParam 查询条件 - * @return: List - * @Author: sui q - * @Date: 2023/1/14 11:18 */ List queryMemberBonusPushByBonusItems(BonusParam bonusParam); /** * 根据查询条件查询固定的奖金明细 + * * @param bonusParam 查询条件 - * @return: List - * @Author: sui q - * @Date: 2023/1/14 11:18 */ List queryMemberBonusPushByBonusItemsFoServer(@Param("bonusParam") BonusParam bonusParam); /** * 删除会员奖金汇总表 + * * @param period 结算期间 - * @return: void - * @Author: sui q - * @Date: 2022/12/13 11:54 */ void deleteCuMemberBonusPush(Integer period); /** * 批量插入会员直推奖 + * * @param cuMemberBonusPushList 会员奖金 - * @return: void - * @Author: sui q - * @Date: 2022/12/13 13:56 */ void batchInsertCuMemberBonusPush(@Param("cuMemberBonusPushList") List cuMemberBonusPushList); /** * 插入会员直推奖 + * * @param cuMemberBonusPush 直推奖金 - * @return: void - * @Author: sui q - * @Date: 2023/2/17 9:48 */ - void insertCuMemberBonusPush(@Param("item")CuMemberBonusPush cuMemberBonusPush); + void insertCuMemberBonusPush(@Param("item") CuMemberBonusPush cuMemberBonusPush); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusRangeMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusRangeMapper.java index 9e1d5c2e..7ce660b4 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusRangeMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusRangeMapper.java @@ -9,12 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 会员奖金-奖金收益明细表(复购极差) Mapper 接口 - *

- * - * @author hzs - * @since 2022-12-30 */ public interface CuMemberBonusRangeMapper extends BaseMapper { @@ -22,9 +17,6 @@ public interface CuMemberBonusRangeMapper extends BaseMapper * 删除会员奖金汇总表 * * @param period 结算期间 - * @return: void - * @Author: sui q - * @Date: 2022/12/13 11:54 */ void deleteCuMemberBonusRange(Integer period); @@ -39,9 +31,6 @@ public interface CuMemberBonusRangeMapper extends BaseMapper * 根据查询条件查询固定的奖金明细 * * @param bonusParam 查询条件 - * @return: List - * @Author: sui q - * @Date: 2023/1/14 11:18 */ List queryMemberBonusRangeByBonusItems(BonusParam bonusParam); @@ -49,9 +38,6 @@ public interface CuMemberBonusRangeMapper extends BaseMapper * 根据查询条件查询固定的奖金明细 * * @param bonusParam 查询条件 - * @return: List - * @Author: sui q - * @Date: 2023/1/14 11:18 */ List queryMemberBonusRangeByBonusItemsForServer(@Param("bonusParam") BonusParam bonusParam); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusSettleService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusSettleService.java index 2f03326f..8b8f1c1a 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusSettleService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBonusSettleService.java @@ -5,9 +5,7 @@ import com.hzs.common.domain.sale.ext.SaOrderExt; import java.util.List; /** - * @Description: 奖金结算服务类 - * @Classname: IBonusSettleService - * @PackageName: com.hzs.member.achieve.service + * 奖金结算服务类 */ public interface IBonusSettleService { @@ -29,13 +27,11 @@ public interface IBonusSettleService { /* * @description: 根据订单实时计算奖衔 - * @param: null null **/ void calculateCuMemberRangAwardsBySaOrder(String orderCode); /* * @description: 4-n配置修改后，重算首购奖金 - * @param: null null **/ void repeatCuMemberBonusByExpand(String settleDate, List saOrderExtList); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java index 92a35923..453b9151 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java @@ -69,9 +69,7 @@ import java.time.temporal.ChronoUnit; import java.util.*; /** - * @Description:奖金结算服务类 - * @Classname: BonusSettleService - * @PackageName: com.hzs.member.achieve.service.impl + * 奖金结算服务类 */ @Service @Slf4j diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailSerVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailSerVO.java index 6ff3fcd5..e951d893 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailSerVO.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailSerVO.java @@ -16,17 +16,14 @@ import java.math.BigDecimal; import java.util.Date; /** - * @Description: 返回后端用户端查询奖金明细vo - * @Author: sui q - * @Time: 2022/12/20 9:56 - * @Classname: MemberBonusDetailVO - * @PackageName: com.hzs.member.bonus.vo + * 返回后端用户端查询奖金明细vo */ @Data @Builder @AllArgsConstructor @NoArgsConstructor public class MemberBonusDetailSerVO implements Serializable { + private static final long serialVersionUID = 1L; /** @@ -65,7 +62,6 @@ public class MemberBonusDetailSerVO implements Serializable { /** * 来源国家名称 */ - @Excel(name = "来源国家") private String sourceCountryName; /** @@ -106,19 +102,16 @@ public class MemberBonusDetailSerVO implements Serializable { /** * 订单金额 */ - @Excel(name = "来源金额($)", scale = 2) private BigDecimal orderAmountDollar; /** * 订单业绩 */ - @Excel(name = "来源业绩($)", scale = 2) private BigDecimal orderAchieve; /** * 结算国家 */ - @Excel(name = "结算国家") private String settleCountry; /** @@ -206,6 +199,17 @@ public class MemberBonusDetailSerVO implements Serializable { @Excel(name = "税前收益", scale = 2) private BigDecimal pretaxIncomeOri; + /** + * 重消收益 + */ + @Excel(name = "重消收益", scale = 2) + private BigDecimal backPoints; + /** + * 平台服务费 + */ + @Excel(name = "平台服务费", scale = 2) + private BigDecimal serviceSpend; + /** * 实际收益 */ @@ -215,34 +219,28 @@ public class MemberBonusDetailSerVO implements Serializable { /** * 拓展无封 (拓展收益按等级正常比例结算，拓展收益按等级正常比例结算 无封顶) */ - @Excel(name = "拓展无封($)", scale = 2) private BigDecimal expandNoCapping; /** * 拓展封顶 (拓展收益按等级正常比例结算，不按4-N结算，根据配置的封顶值限制最大收益) */ - @Excel(name = "拓展封顶($)", scale = 2) private BigDecimal expandCapping; /** * 拓展正常减半 (拓展收益按等级正常比例结算，不按4-N结算，根据配置的封顶值限制最大收益，拓展封顶（￥）/2) */ - @Excel(name = "拓展正常减半($)", scale = 2) private BigDecimal expandNormalHalf; /** * 拓展实际减半 (拓展收益按4-结算，根据配置的封顶值限制最大收益，税前收益（￥）/2) */ - @Excel(name = "拓展实际减半($)", scale = 2) private BigDecimal expandNormalReal; /** * 税前收益 */ - @Excel(name = "税前收益($)", scale = 2) private BigDecimal pretaxIncome; /** * 实际收益 */ - @Excel(name = "实际收益($)", scale = 2) private BigDecimal realIncome; /** @@ -362,4 +360,12 @@ public class MemberBonusDetailSerVO implements Serializable { public BigDecimal getOrderAchieve() { return null != orderAchieve ? orderAchieve : BigDecimal.ZERO; } + + public BigDecimal getBackPoints() { + return incomeTax.divide(new BigDecimal("2")); + } + + public BigDecimal getServiceSpend() { + return incomeTax.divide(new BigDecimal("2")); + } } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusIncomeStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusIncomeStatus.java index 2e9606fd..4c7e649e 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusIncomeStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusIncomeStatus.java @@ -54,4 +54,23 @@ public enum EBonusIncomeStatus { * 国际化翻译key值 */ private final String key; + + /** + * 根据值，返回名称 + * + * @param value + * @return + */ + public static String getLabelByValue(Integer value) { + if (null == value) { + return ""; + } + for (EBonusIncomeStatus enums : EBonusIncomeStatus.values()) { + if (enums.getValue() == value) { + return enums.getLabel(); + } + } + return ""; + } + } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java index 99da88ed..2d413ac2 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java @@ -100,14 +100,32 @@ public enum EOrderType { * @return */ public static EOrderType getEnumByValue(int value) { - for (EOrderType eOrderType : EOrderType.values()) { - if (eOrderType.getValue() == value) { - return eOrderType; + for (EOrderType enums : EOrderType.values()) { + if (enums.getValue() == value) { + return enums; } } return null; } + /** + * 根据值，返回名称 + * + * @param value + * @return + */ + public static String getLabelByValue(Integer value) { + if (null == value) { + return ""; + } + for (EOrderType enums : EOrderType.values()) { + if (enums.getValue() == value) { + return enums.getLabel(); + } + } + return ""; + } + public static List getOrderTypeSpecial() { List resultList = new ArrayList<>(); diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/BdWaresBonus.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/BdWaresBonus.java index 216b8502..c39250b0 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/BdWaresBonus.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/BdWaresBonus.java @@ -12,12 +12,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 特殊商品分配奖金 - *

- * - * @author hzs - * @since 2024-10-30 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/BdWaresBonusItems.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/BdWaresBonusItems.java index 7bb6a51f..300d4570 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/BdWaresBonusItems.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/BdWaresBonusItems.java @@ -12,12 +12,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 特殊商品分配ev奖金明细 - *

- * - * @author hzs - * @since 2024-10-30 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusCoach.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusCoach.java index 81a5bbf2..bfd9c88d 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusCoach.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusCoach.java @@ -12,9 +12,6 @@ import lombok.experimental.Accessors; /** * 会员奖金-辅导收益明细表 - * - * @author hzs - * @since 2022-11-15 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusDelay.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusDelay.java index 830e61c9..e33b91f9 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusDelay.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusDelay.java @@ -12,9 +12,6 @@ import lombok.experimental.Accessors; /** * 会员奖金-拓展收益延缓表 - * - * @author bd - * @since 2025-04-16 */ @Builder @AllArgsConstructor diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusDelayDetail.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusDelayDetail.java index 3261acf8..451875fe 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusDelayDetail.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusDelayDetail.java @@ -12,9 +12,6 @@ import lombok.experimental.Accessors; /** * 会员奖金-拓展收益延缓明细表 - * - * @author bd - * @since 2025-04-16 */ @Builder @AllArgsConstructor diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusDetail.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusDetail.java index c70fc664..55655fbe 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusDetail.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusDetail.java @@ -11,12 +11,7 @@ import lombok.*; import lombok.experimental.Accessors; /** - *

* 会员奖金-奖金收益明细表(报单费、分红、嗨粉) - *

- * - * @author hzs - * @since 2022-11-17 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusExpand.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusExpand.java index e4fd0acd..d86149c3 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusExpand.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusExpand.java @@ -12,9 +12,6 @@ import lombok.experimental.Accessors; /** * 会员奖金-拓展收益明细表 - * - * @author hzs - * @since 2022-11-15 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusPush.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusPush.java index f275c720..1be0a63f 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusPush.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusPush.java @@ -12,9 +12,6 @@ import lombok.experimental.Accessors; /** * 会员奖金-直推收益明细表 - * - * @author hzs - * @since 2022-11-10 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusPushHis.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusPushHis.java index 5cd13430..dd3cd6e5 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusPushHis.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusPushHis.java @@ -12,12 +12,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 会员奖金-直推历史轮次记录 - *

- * - * @author hzs - * @since 2023-09-10 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusRange.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusRange.java index f41fa27f..2992daae 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusRange.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusRange.java @@ -12,9 +12,6 @@ import lombok.experimental.Accessors; /** * 会员奖金-奖金收益明细表(复购极差) - * - * @author hzs - * @since 2022-12-30 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberRepeatBonus.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberRepeatBonus.java index 6fcd3e1e..ff11aba1 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberRepeatBonus.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberRepeatBonus.java @@ -1,6 +1,7 @@ package com.hzs.common.domain.member.bonus; import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableField; import com.hzs.common.core.web.domain.BaseEntity; @@ -9,12 +10,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 会员奖金-4-n碰次重算奖金表 - *

- * - * @author hzs - * @since 2024-07-23 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberShareBonus.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberShareBonus.java index 2c5e5f28..948fe2c2 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberShareBonus.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberShareBonus.java @@ -12,12 +12,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 会员奖金-分红奖金配置 - *

- * - * @author hzs - * @since 2023-07-03 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberShareDetail.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberShareDetail.java index 373b5955..642f2a9a 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberShareDetail.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberShareDetail.java @@ -13,12 +13,7 @@ import lombok.*; import lombok.experimental.Accessors; /** - *

* 会员奖金-分红奖金配置明细 - *

- * - * @author hzs - * @since 2023-07-03 */ @Data @EqualsAndHashCode(callSuper = true)