From 4828ded5bb0b422e41377701fc6741c50312dcab Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 26 Jun 2025 15:08:43 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=8E=BB=E6=8E=89=E5=A5=96=E9=87=91?= =?UTF-8?q?=E6=B2=A1=E7=94=A8=E7=9A=84=E5=AE=9E=E4=BD=93=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../achieve/vo/CuMemberAwardsUnderVO.java | 135 ----- .../vo/CuMemberMonthAchieveContrastVO.java | 59 --- .../achieve/vo/CuMemberNewAddAchieveVO.java | 99 ---- .../base/mapper/CuMemberAchieveLogMapper.java | 16 - .../base/mapper/CuMemberAgentMapper.java | 16 - .../base/mapper/CuMemberRegisterMapper.java | 38 -- .../base/mapper/CuMemberUpgradeMapper.java | 16 - .../bonus/base/param/FansRegisterParam.java | 50 -- .../hzs/bonus/base/param/HonorWallParam.java | 44 -- .../bonus/base/param/MemberAddressParam.java | 51 -- .../base/param/MemberChargingDetailParam.java | 26 - .../hzs/bonus/base/param/MemberDataParam.java | 50 -- .../bonus/base/param/MemberRealInfoParam.java | 144 ----- .../bonus/base/param/MemberSelectParam.java | 52 -- .../base/param/MemberServiceLogParam.java | 27 - .../bonus/base/param/MemberTeamInfoParam.java | 81 --- .../com/hzs/bonus/base/param/ParentParam.java | 57 -- .../bonus/base/param/PlaceParentParam.java | 54 -- .../bonus/base/param/UpdateParentParam.java | 60 --- .../base/param/UpdateParentPetitionParam.java | 72 --- .../base/param/UpdatePlaceParentParam.java | 69 --- .../service/ICuMemberAchieveLogService.java | 27 - .../base/service/ICuMemberAgentService.java | 26 - .../service/ICuMemberRegisterService.java | 47 -- .../impl/CuMemberAchieveLogServiceImpl.java | 35 -- .../impl/CuMemberAgentServiceImpl.java | 48 -- .../impl/CuMemberRegisterServiceImpl.java | 51 -- .../hzs/bonus/base/vo/AccountPointOutVO.java | 32 -- .../java/com/hzs/bonus/base/vo/AwardsVo.java | 154 ------ .../base/vo/CuAwardsControlImportVO.java | 28 - .../hzs/bonus/base/vo/CuAwardsControlVO.java | 250 --------- .../com/hzs/bonus/base/vo/CuHonorWallVo.java | 63 --- .../base/vo/CuMemberAchieveLogImportVO.java | 139 ----- .../base/vo/CuMemberAchieveLogParentVO.java | 100 ---- .../bonus/base/vo/CuMemberAchieveLogVO.java | 354 ------------- .../com/hzs/bonus/base/vo/CuMemberTeamVO.java | 40 -- .../com/hzs/bonus/base/vo/CuMemberVO.java | 496 ------------------ .../hzs/bonus/base/vo/DirectPushNewVo.java | 77 --- .../bonus/base/vo/ImportPolicyCurrencyVO.java | 36 -- .../bonus/base/vo/ImportSettleCountryVO.java | 36 -- .../hzs/bonus/base/vo/MemberAddressVO.java | 69 --- .../com/hzs/bonus/base/vo/MemberCardVO.java | 39 -- .../bonus/base/vo/MemberChargingDetailVo.java | 36 -- .../hzs/bonus/base/vo/MemberChargingVo.java | 65 --- .../com/hzs/bonus/base/vo/MemberDataVO.java | 139 ----- .../com/hzs/bonus/base/vo/MemberInfoVO.java | 156 ------ .../bonus/base/vo/MemberMeritsSummaryVo.java | 45 -- .../bonus/base/vo/MemberParentExportVo.java | 110 ---- .../com/hzs/bonus/base/vo/MemberParentVo.java | 105 ---- .../vo/MemberPlaceParentServiceLogVo.java | 92 ---- .../hzs/bonus/base/vo/MemberRealInfoVO.java | 436 --------------- .../com/hzs/bonus/base/vo/MemberSelectVO.java | 89 ---- .../hzs/bonus/base/vo/MemberServiceLogVo.java | 91 ---- .../com/hzs/bonus/base/vo/MemberShare.java | 72 --- .../hzs/bonus/base/vo/MemberTeamInfoVo.java | 37 -- .../com/hzs/bonus/base/vo/MemberTeamVo.java | 284 ---------- .../com/hzs/bonus/base/vo/ParentMemberVo.java | 62 --- .../com/hzs/bonus/base/vo/TheLableVO.java | 40 -- .../hzs/bonus/base/vo/UpPolicyCurrencyVO.java | 213 -------- .../hzs/bonus/base/vo/UpdateCodeImportVO.java | 45 -- .../com/hzs/bonus/base/vo/UpdateCodeVO.java | 232 -------- .../hzs/bonus/base/vo/UpdateParentExport.java | 33 -- .../com/hzs/bonus/base/vo/UpdateParentVo.java | 59 --- .../hzs/bonus/base/vo/UpdatePlaceImport.java | 41 -- .../bonus/base/vo/UpdatePlaceParentVo.java | 132 ----- .../com/hzs/bonus/base/vo/UpdatePlaceVo.java | 30 -- .../bonus/base/vo/UpdateSettleCountryVO.java | 185 ------- .../api/ApiCuMemberBonusController.java | 17 - .../bonus/bonus/param/LeXueRangeParam.java | 24 - .../bonus/bonus/vo/BonusExpandTitleVO.java | 21 - .../com/hzs/bonus/bonus/vo/BonusPubVO.java | 314 ----------- .../bonus/vo/MemberBonusCloudAgentVO.java | 48 -- .../bonus/vo/MemberBonusDetailCalVO.java | 93 ---- .../bonus/bonus/vo/MemberBonusHaiFunVO.java | 34 -- .../bonus/bonus/vo/MemberBonusHiFunVO.java | 34 -- .../vo/MemberBonusRepurchaseCouponVO.java | 39 -- .../census/param/CensusSummaryParam.java | 57 -- .../hzs/bonus/census/vo/CensusSummaryVo.java | 166 ------ .../detail/vo/CuMemberAwardsRecordVO.java | 153 ------ .../hzs/bonus/param/CuRegionAssessParam.java | 7 +- .../java/com/hzs/bonus/param/MemberParam.java | 195 ------- .../bonus/pub/tool/MemberToolsHandler.java | 13 +- .../manage/MemberRiskControlController.java | 8 - .../bonus/base/CuMemberAchieveLogMapper.xml | 66 --- .../mapper/bonus/base/CuMemberAgentMapper.xml | 22 - .../mapper/bonus/base/CuMemberMapper.xml | 89 ---- .../bonus/base/CuMemberRegisterMapper.xml | 120 ----- .../bonus/base/CuMemberUpgradeMapper.xml | 21 - .../domain/member/base/CuMemberAgent.java | 5 - .../member/detail/CuMemberAchieveLog.java | 14 +- 90 files changed, 4 insertions(+), 7748 deletions(-) delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberAwardsUnderVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberMonthAchieveContrastVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberNewAddAchieveVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberAchieveLogMapper.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberAgentMapper.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberRegisterMapper.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberUpgradeMapper.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/FansRegisterParam.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/HonorWallParam.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberAddressParam.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberChargingDetailParam.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberDataParam.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberRealInfoParam.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberSelectParam.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberServiceLogParam.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberTeamInfoParam.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/ParentParam.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/PlaceParentParam.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdateParentParam.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdateParentPetitionParam.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdatePlaceParentParam.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberAchieveLogService.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberAgentService.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberRegisterService.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberAchieveLogServiceImpl.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberAgentServiceImpl.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberRegisterServiceImpl.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/AccountPointOutVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/AwardsVo.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuAwardsControlImportVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuAwardsControlVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuHonorWallVo.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogImportVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogParentVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberTeamVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/DirectPushNewVo.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/ImportPolicyCurrencyVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/ImportSettleCountryVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberAddressVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberCardVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberChargingDetailVo.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberChargingVo.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberDataVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberInfoVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberMeritsSummaryVo.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberParentExportVo.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberParentVo.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberPlaceParentServiceLogVo.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberRealInfoVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberSelectVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberServiceLogVo.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberShare.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberTeamInfoVo.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberTeamVo.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/ParentMemberVo.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/TheLableVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpPolicyCurrencyVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateCodeImportVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateCodeVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateParentExport.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateParentVo.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceImport.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceParentVo.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceVo.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateSettleCountryVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/LeXueRangeParam.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusExpandTitleVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusPubVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusCloudAgentVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailCalVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHaiFunVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHiFunVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusRepurchaseCouponVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/census/param/CensusSummaryParam.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/census/vo/CensusSummaryVo.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuMemberAwardsRecordVO.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/param/MemberParam.java delete mode 100644 bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberAchieveLogMapper.xml delete mode 100644 bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberAgentMapper.xml delete mode 100644 bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberRegisterMapper.xml delete mode 100644 bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberUpgradeMapper.xml diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberAwardsUnderVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberAwardsUnderVO.java deleted file mode 100644 index 75aba8cb..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberAwardsUnderVO.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.hzs.bonus.achieve.vo; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.hzs.common.core.annotation.BigDecimalFormat; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * 伞下奖衔VO - * - * @Description: - * @Author: ljc - * @Time: 2023/5/5 20:08 - * @Classname: CuMemberAwardsUnderVO - * @Package_name: com.hzs.member.achieve.vo - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class CuMemberAwardsUnderVO implements Serializable { - - private static final long serialVersionUID = 1114852997109141640L; - - /** - * A区累计真实业绩 - */ - @BigDecimalFormat() - private BigDecimal aSumRealPv; - - /** - * B区累计真实业绩 - */ - @BigDecimalFormat() - private BigDecimal bSumRealPv; - - /** - * 小区累计业绩 - */ - @BigDecimalFormat() - private BigDecimal sumRealPv; - - /** - * 用户名 - */ - private String memberName; - - /** - * 用户头像 - */ - private String memberPath; - - /** - * 目标业绩 - */ - @BigDecimalFormat() - private BigDecimal targetPv; - - /** - * 目标奖衔名称 - */ - private String tarAwardsName; - - /** - * 奖衔名称 - */ - private String awardsName; - - /** - * 奖衔图片 - */ - private String image; - /** - * 奖衔ID - */ - private Integer pkAwards; - - /** - * 奖衔翻译key - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer pkTransaction; - - private String pkTransactionVal; - - /** - * 所在区 - */ - @JsonIgnore - private Integer placeDept; - /** - * 期数 - */ - @JsonIgnore - private Integer period; - - /** - * 会员ID - */ - @JsonIgnore - private Long pkMember; - - /** - * 国家ID - */ - @JsonIgnore - private Integer pkCountry; - - - /** - * 业绩表名 - */ - @JsonIgnore - private String achieveTable; - - /** - * 用户表名 - */ - @JsonIgnore - private String memberTreeTable; - - /** - * 奖金表 - */ - @JsonIgnore - private String settleTable; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberMonthAchieveContrastVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberMonthAchieveContrastVO.java deleted file mode 100644 index 955cd394..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberMonthAchieveContrastVO.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.hzs.bonus.achieve.vo; - -import com.hzs.common.core.annotation.BigDecimalFormat; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * 月度新增业绩对比VO - * - * @Description: - * @Author: ljc - * @Time: 2023/5/11 16:18 - * @Classname: CuMemberMonthAchieveContrastVO - * @Package_name: com.hzs.member.achieve.vo - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class CuMemberMonthAchieveContrastVO implements Serializable { - - private static final long serialVersionUID = -8712512223171047115L; - /** - * 左区新增业绩 - */ - @BigDecimalFormat() - private BigDecimal aNewPv; - - /** - * 右区新增业绩 - */ - @BigDecimalFormat() - private BigDecimal bNewPv; - /** - * 日期 - */ - private String date; - - /** - * 当月表名 - */ - private String achieveTable; - - - /** - * 会员ID - */ - private Long pkMember; - - /** - * 国家ID - */ - private Integer pkCountry; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberNewAddAchieveVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberNewAddAchieveVO.java deleted file mode 100644 index 1cbe9490..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberNewAddAchieveVO.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.hzs.bonus.achieve.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.BigDecimalFormat; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * 会员新增业绩 - * - * @Description: - * @Author: ljc - * @Time: 2023/5/5 14:12 - * @Classname: CuMemberNewAddAchieveVO - * @Package_name: com.hzs.member.achieve.vo - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class CuMemberNewAddAchieveVO implements Serializable { - - - private static final long serialVersionUID = -3055242811295278045L; - /** - * A区新增业绩 - */ - @BigDecimalFormat() - private BigDecimal aNewPv; - - /** - * B区新增业绩 - */ - @BigDecimalFormat() - private BigDecimal bNewPv; - - /** - * 复购A区新增业绩 - */ - @BigDecimalFormat() - private BigDecimal repANewPv; - - /** - * 复购B区新增业绩 - */ - @BigDecimalFormat() - private BigDecimal repBNewPv; - - /** - * 结算日期 - */ - @JsonFormat(pattern = "dd") - private Date settleDate; - - /** - * 天数 - */ - private Long days; - - /** - * 会员ID - */ - private Long pkMember; - - /** - * 国家ID - */ - private Integer pkCountry; - - /** - * 天数类型 - */ - private Integer dayType; - - /** - * 开始时间 - */ - private String startDate; - - /** - * 结束时间 - */ - private String endDate; - /** - * 当月表名 - */ - private String achieveTableName; - /** - * 上月表名 - */ - private String upAchieveTableName; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberAchieveLogMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberAchieveLogMapper.java deleted file mode 100644 index 89e7b547..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberAchieveLogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hzs.bonus.base.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.member.detail.CuMemberAchieveLog; - -/** - *

- * 注水业绩记录表 Mapper 接口 - *

- * - * @author zhangjing - * @since 2023-02-03 - */ -public interface CuMemberAchieveLogMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberAgentMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberAgentMapper.java deleted file mode 100644 index be8d3a77..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberAgentMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hzs.bonus.base.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.member.base.CuMemberAgent; - -/** - *

- * 会员信息-代理商信息 Mapper 接口 - *

- * - * @author hzs - * @since 2022-08-31 - */ -public interface CuMemberAgentMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberRegisterMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberRegisterMapper.java deleted file mode 100644 index a582fde7..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberRegisterMapper.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.hzs.bonus.base.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.bonus.base.vo.CuMemberVO; -import com.hzs.bonus.param.MemberParam; -import com.hzs.common.domain.member.base.CuMemberRegister; - -import java.util.List; - -/** - *

- * 会员历史记录 Mapper 接口 - *

- * - * @author hzs - * @since 2022-08-22 - */ -public interface CuMemberRegisterMapper extends BaseMapper { - - /** - * 根据条件查询会员注册信息 - * - * @param memberParam 会员查询条件 - * @return: List - * @Author: sui q - * @Date: 2022/10/13 9:51 - */ - List queryCuMemberRegisterExeByCondition(MemberParam memberParam); - - /** - * 将用户注册表信息更改为死点 - * @param cuMemberRegister 会员注册信息 - * @return: void - * @Author: sui q - * @Date: 2022/10/22 21:11 - */ - void updateCuMemberRegister(CuMemberRegister cuMemberRegister); -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberUpgradeMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberUpgradeMapper.java deleted file mode 100644 index 8f1be384..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberUpgradeMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hzs.bonus.base.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.member.base.CuMemberUpgrade; - -/** - *

- * 会员升级权限表 Mapper 接口 - *

- * - * @author hzs - * @since 2023-05-22 - */ -public interface CuMemberUpgradeMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/FansRegisterParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/FansRegisterParam.java deleted file mode 100644 index 5681ee52..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/FansRegisterParam.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.hzs.bonus.base.param; - -import lombok.Data; - -/** - * @Description: 嗨粉注册入参 - * @Author: jiang chao - * @Time: 2023/3/15 18:31 - * @Classname: FansRegisterParam - * @PackageName: com.hzs.member.base.param - */ -@Data -public class FansRegisterParam { - - /** - * 推荐人 - */ - private String pkParent; - - /** - * 会员名称 - */ - private String memberName; - - /** - * 联系方式 - */ - private String phone; - - /** - * 验证码 - */ - private String code; - - /*** - * 自然国 - */ - private Integer pkCountry; - - /** - * 登录密码 - */ - private String loginPassword; - - /** - * 支付密码 - */ - private String payPassword; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/HonorWallParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/HonorWallParam.java deleted file mode 100644 index 1680483f..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/HonorWallParam.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.hzs.bonus.base.param;/** - * @Description: - * @Author: yuhui - * @Time: 2023/6/8 14:43 - * @Classname: honorWallParam - * @PackageName: com.hzs.member.base.param - */ - -import lombok.Data; - -import java.util.Date; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.param - *@Author: yh - *@CreateTime: 2023-06-08 14:43 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class HonorWallParam { - - /** - * 展示名称 - */ - private String name; - - /** - * 开始创建时间 - */ - private Date startCreateTime; - - - /** - * 结束创建时间 - */ - private Date endCreateTime; - - /** - * 类型 1 等级 2 奖衔 3 时长 4 推荐月 5 推荐季度 6 推荐年 7 抗衰月 8 抗衰季度 9 抗衰年 - */ - private Integer type; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberAddressParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberAddressParam.java deleted file mode 100644 index 808b6ad0..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberAddressParam.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.hzs.bonus.base.param; - -import lombok.Data; - -/** - * @Description: 会员地址入参 - * @Author: jiang chao - * @Time: 2023/1/18 10:19 - * @Classname: MemberAddressParam - * @PackageName: com.hzs.member.base.param - */ -@Data -public class MemberAddressParam { - - /** - * 主键 - */ - private Long pkId; - - /** - * 收货人 - */ - private String recName; - /** - * 手机 - */ - private String recPhone; - - /** - * 收货省 - */ - private Integer recProvince; - /** - * 收货市 - */ - private Integer recCity; - /** - * 收货县 - */ - private Integer recCounty; - /** - * 详细地址 - */ - private String recAddress; - - /** - * 是否默认（1=是,0=否） - */ - private Integer isDefault; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberChargingDetailParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberChargingDetailParam.java deleted file mode 100644 index 6d36a001..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberChargingDetailParam.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.bonus.base.param;/** - * @Description: - * @Author: yuhui - * @Time: 2023/3/28 18:09 - * @Classname: MemberChargingDetailParam - * @PackageName: com.hzs.member.base.param - */ - -import com.hzs.bonus.base.vo.MemberChargingDetailVo; -import lombok.Data; - -import java.util.List; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.param - *@Author: yh - *@CreateTime: 2023-03-28 18:09 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class MemberChargingDetailParam { - - private List memberChargingDetailList; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberDataParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberDataParam.java deleted file mode 100644 index d675e5f2..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberDataParam.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.hzs.bonus.base.param; - -import lombok.Data; - -/** - * @Description: 会员资料入参 - * @Author: jiang chao - * @Time: 2023/1/11 17:44 - * @Classname: MemberDataParam - * @PackageName: com.hzs.member.base.param - */ -@Data -public class MemberDataParam { - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 昵称 - */ - private String nickName; - - /** - * 旧密码 - */ - private String oldPassword; - - /** - * 登录密码 - */ - private String loginPassword; - - /** - * 支付密码 - */ - private String payPassword; - - /** - * 邮箱 - */ - private String email; - - /** - * 验证码 - */ - private String code; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberRealInfoParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberRealInfoParam.java deleted file mode 100644 index 697aeb07..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberRealInfoParam.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.hzs.bonus.base.param;/** - * @Description: - * @Author: yuhui - * @Time: 2023/4/26 10:08 - * @Classname: MemberRealInfo - * @PackageName: com.hzs.member.base.param - */ - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.param - *@Author: yh - *@CreateTime: 2023-04-26 10:08 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class MemberRealInfoParam { - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员名称 - */ - private String memberName; - - /** - * 联系方式 - */ - private String phone; - - /** - * 真实奖衔 - */ - private Integer pkAwards; - - /** - * 注册等级 - */ - private Integer pkRegisterGrade; - - /** - * 结算等级 - */ - private Integer pkSettleGrade; - - /** - * 证件类型 - */ - - private Integer idType; - - /** - * 证件号码 - */ - private String idCard; - /** - * 出生日期（年月日） - */ - private Date birthDate; - - /** - * 省id - */ - private Integer pkProvince; - /** - * 市id - */ - private Integer pkCity; - /** - * 区县id - */ - private Integer pkCounty; - /** - * 详细地址 - */ - private String address; - - /** - * 性别（0=未知,1=男,2=女） - */ - - private Integer sex; - /** - * 银行名称 - */ - private String bankName; - - /** - * 支行名称 - */ - private String subBankName; - - /** - * 银行卡号 - */ - private String cardNumber; - - /** - * 邮箱 - */ - private String email; - - /** - * 开始认证时间 - */ - private Date startCertificationTime; - - /** - * 结束认证时间 - */ - private Date endCertificationTime; - - /** - * 开始创建时间 - */ - private Date startCreationTime; - /** - * 结束创建时间 - */ - private Date endCreationTime; - - /** - * 开始支付时间 - */ - private Date startPayTime; - /** - * 结束支付时间 - */ - private Date endPayTime; - /** - * 国家 - */ - private Integer PkCountry; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberSelectParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberSelectParam.java deleted file mode 100644 index 4f6257ff..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberSelectParam.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.hzs.bonus.base.param; - -import lombok.Data; - -import java.util.List; - -/** - * @Description: 会员选择参数 - * @Author: jiang chao - * @Time: 2023/3/10 11:51 - * @Classname: MemberSelectParam - * @PackageName: com.hzs.member.base.param - */ -@Data -public class MemberSelectParam { - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员姓名 - */ - private String memberName; - - /** - * 联系方式 - */ - private String phone; - - /** - * 注册等级 - */ - private List pkRegisterGrade; - - /** - * 结算等级 - */ - private List pkSettleGrade; - - /** - * 真实奖衔 - */ - private List pkAwards; - - /** - * 会员编号列表 - */ - private List memberCodeList; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberServiceLogParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberServiceLogParam.java deleted file mode 100644 index be91cf7f..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberServiceLogParam.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hzs.bonus.base.param;/** - * @Description: - * @Author: yuhui - * @Time: 2023/3/29 10:48 - * @Classname: MemberServiceLogParam - * @PackageName: com.hzs.member.base.param - */ - -import com.hzs.bonus.base.vo.MemberServiceLogVo; -import lombok.Data; - -import java.util.List; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.param - *@Author: yh - *@CreateTime: 2023-03-29 10:48 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class MemberServiceLogParam { - - - private List MemberServiceLogList; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberTeamInfoParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberTeamInfoParam.java deleted file mode 100644 index e22ea0ad..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberTeamInfoParam.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.hzs.bonus.base.param;/** - * @Description: - * @Author: yuhui - * @Time: 2023/5/29 14:53 - * @Classname: MemberTeamInfoParam - * @PackageName: com.hzs.member.base.param - */ - -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.param - *@Author: yh - *@CreateTime: 2023-05-29 14:53 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class MemberTeamInfoParam { - - /** - * 查询date 时间 - */ - private Date queryDate; - - /** - * 查询业绩表名 - */ - private String settleTableName; - - /** - * 期间值 - */ - private Integer period; - - /** - * 会员编号 - */ - private String memberCode ; - - /** - * 真实奖衔 - */ - private Integer pkAwards; - - /** - * 关系类型 1 血缘 2 安置 - */ - private Integer relaType; - - /** - * 安置部门 - */ - private Integer placeDept; - - /** - * 血缘代数 - */ - private Integer consanguinityAlgebra; - - - /** - * 安置层级 - * 查询当前会员在团队的第几层 （查询伞下的所有人） - */ - private Integer resettleLevel; - - /** - * 安置位置 - */ - private String resettleLocation; - - /** - * 奖金收益 - */ - private BigDecimal realIncomeTotal; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/ParentParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/ParentParam.java deleted file mode 100644 index e643513a..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/ParentParam.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.hzs.bonus.base.param; - -import com.hzs.member.account.dto.MemberAmountDTO; -import lombok.Data; - -import java.util.List; -import java.util.Set; - -/** - * @Description: - * @Author: yuhui - * @Time: 2023/1/5 10:49 - * @Classname: ParentParam - * @PackageName: com.hzs.member.base.param - */ -@Data -public class ParentParam { - - - /** - * 提交方式 （对应枚举EsubmitType） - */ - private Integer processType; - /** - * 签呈类型 - */ - private Integer signType; - - /** - * 备注 - */ - private String remark; - - /** - * 签呈附件 - */ - private List fileList; - /** - * 签呈业务类型（EApprovalBusiness） -- 非必传 - */ - private Integer approvalBusiness; - - /** - * 修改直推集合 - */ - private List updateParentParamList; - /** - * 业务涨及会员ID列表 --提交审核必传 - */ - private Set pkMemberList; - - private List userIdList; - /** - * 会员手续费 - */ - List memberAmountDTOList; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/PlaceParentParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/PlaceParentParam.java deleted file mode 100644 index bb61a85c..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/PlaceParentParam.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.hzs.bonus.base.param; - -import com.hzs.member.account.dto.MemberAmountDTO; -import lombok.Data; - -import java.util.List; -import java.util.Set; - -/** - * @Description: - * @Author: yuhui - * @Time: 2023/1/5 9:28 - * @Classname: PlaceParent - * @PackageName: com.hzs.member.base.param - */ -@Data -public class PlaceParentParam { - - - /** - * 提交方式 （对应枚举EsubmitType） - */ - private Integer processType; - /** - * 签呈类型 - */ - private Integer signType; - - /** - * 备注 - */ - private String remark; - - - /** - * 签呈附件 - */ - private List fileList; - /** - * 业务涨及会员ID列表 --提交审核必传 - */ - private Set pkMemberList; - - /** - * 修改直推列表 - */ - List updatePlaceParentList; - - private List userIdList; - /** - * 会员手续费 - */ - List memberAmountDTOList; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdateParentParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdateParentParam.java deleted file mode 100644 index df85617e..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdateParentParam.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.hzs.bonus.base.param; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.hzs.member.account.dto.MemberAmountDTO; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.List; - -/** - * @Description: - * @Author: yuhui - * @Time: 2023/1/5 10:51 - * @Classname: UpdateParentParam - * @PackageName: com.hzs.member.base.param - */ -@Data -public class UpdateParentParam { - /** - * 会员主键 - */ - private Long pkMember; - /** - * 会员编号 - */ - private String memberCode; - /** - * 变更后编号 - */ - private String editNewPlaceMemberCode; - - /** - * 修改次数 - */ - private Integer changeNumber; - - /** - * 费用 - */ - private BigDecimal cost; - /** - * 扣款币种类型 - */ - private Integer pkAccount; - - /** - * 流程类型（1 免签呈 2免付费 3免签呈+免付费 4 需要签呈需要付费） - */ - private Integer processType; - - /** - * 会员手续费 - */ - List memberAmountDTOList; - - /** - * 审核状态 2 待审核 4 已驳回 5 已完成(审核成功) 枚举 ： EApproveStatus - */ - private Integer approveStatus; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdateParentPetitionParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdateParentPetitionParam.java deleted file mode 100644 index 9061271e..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdateParentPetitionParam.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.hzs.bonus.base.param;/** - * @Description: - * @Author: yuhui - * @Time: 2023/7/19 17:08 - * @Classname: UpdateParentPetitionParam - * @PackageName: com.hzs.member.base.param - */ - -import com.hzs.member.account.dto.MemberAmountDTO; -import lombok.Data; - -import java.util.List; -import java.util.Set; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.param - *@Author: yh - *@CreateTime: 2023-07-19 17:08 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class UpdateParentPetitionParam { - - /** - * 业务诉求集合 - */ - private List updateParentParamList; - - - /** - * 签呈流程类型（1 免签呈 2免付费 3免签呈+免付费 4 需要签呈需要付费） - */ - private Integer processType; - - /** - * 签呈类型（ESignType） -- 必传 - */ - private Integer signType; - - - /** - * 审批流程用户ID列表 -- 必传 - */ - private List userIdList; - - - /** - * 业务涨及会员ID列表 --提交审核必传 - */ - private Set pkMemberList; - /** - * 会员手续费 - */ - List memberAmountDTOList; - - /** - * 抄送人用户ID列表 -- 非必传 - */ - private List sendIdList; - - /** - * 备注 - */ - private String remark; - - /** - * 签呈附件 - */ - private List fileList; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdatePlaceParentParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdatePlaceParentParam.java deleted file mode 100644 index 56d3513b..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdatePlaceParentParam.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hzs.bonus.base.param; - -import lombok.Data; - -import java.math.BigDecimal; - -/** - * @Description: - * @Author: yuhui - * @Time: 2023/1/4 16:04 - * @Classname: UpdatePlaceParentParam - * @PackageName: com.hzs.member.base.param - */ -@Data -public class UpdatePlaceParentParam { - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员主键 - */ - private Long pkMember; - - /** - * 修改前数据 - */ - private String oldValue; - - /** - * 修改后数据 - */ - private String newValue; - /** - * 变更后安置编号 - */ - private String editNewPlaceMemberCode; - - /** - * 安置部门 - */ - private Integer editNewPlaceDept; - - - /** - * 安置部门字符 - */ - private String editNewPlaceDeptStr; - /** - * 修改次数 - */ - private Integer changeNumber; - - /** - * 费用 - */ - private BigDecimal cost; - /** - * 扣款币种类型 - */ - private Integer pkAccount; - - /** - * 审核状态 2 待审核 4 已驳回 5 已完成(审核成功) 枚举 ： EApproveStatus - */ - private Integer approveStatus; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberAchieveLogService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberAchieveLogService.java deleted file mode 100644 index 3e27f922..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberAchieveLogService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hzs.bonus.base.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.detail.CuMemberAchieveLog; - -import java.util.List; - -/** - *

- * 注水业绩记录表 服务类 - *

- * - * @author zhangjing - * @since 2023-02-03 - */ -public interface ICuMemberAchieveLogService extends IService { - - /** - * 根据期间查询特殊业务注水业务，用于更新业绩，奖金计算使用 - * @param period 期间 - * @return: List - * @Author: sui q - * @Date: 2023/3/11 11:26 - */ - List queryMemberAchieveLogByPeriod(Integer period); - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberAgentService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberAgentService.java deleted file mode 100644 index a48f3283..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberAgentService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.bonus.base.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.base.CuMemberAgent; - -import java.util.List; -import java.util.Map; - -/** - *

- * 会员信息-代理商信息 服务类 - *

- * - * @author hzs - * @since 2022-08-31 - */ -public interface ICuMemberAgentService extends IService { - - /** - * 查询所有的代理商会员会员 key 国家 +省 + 市 - * @return: List - * @Author: sui q - * @Date: 2023/1/5 15:16 - */ - Map> queryCuMemberAgent(); -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberRegisterService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberRegisterService.java deleted file mode 100644 index c4303fb7..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberRegisterService.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.hzs.bonus.base.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.bonus.base.vo.CuMemberVO; -import com.hzs.bonus.param.MemberParam; -import com.hzs.common.domain.member.base.CuMemberRegister; - -import java.util.List; - -/** - *

- * 会员历史记录 服务类 - *

- * - * @author hzs - * @since 2022-08-22 - */ -public interface ICuMemberRegisterService extends IService { - - /** - * 根据条件查询会员注册信息 - * @param memberParam 会员查询条件 - * @return: List - * @Author: sui q - * @Date: 2022/10/13 9:51 - */ - List queryCuMemberRegisterExeByCondition(MemberParam memberParam); - - /** - * 根据会员主键查询会员注册信息 - * @param pkMember 会员主键 - * @return: CuMemberRegister - * @Author: sui q - * @Date: 2023/3/29 18:33 - */ - CuMemberRegister queryCuMemberRegister(Long pkMember); - - /** - * 将用户注册表信息更改为死点 - * @param cuMemberRegister 会员注册信息 - * @return: void - * @Author: sui q - * @Date: 2022/10/22 21:11 - */ - void updateCuMemberRegister(CuMemberRegister cuMemberRegister); - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberAchieveLogServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberAchieveLogServiceImpl.java deleted file mode 100644 index 292a7c70..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberAchieveLogServiceImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hzs.bonus.base.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.bonus.base.service.ICuMemberAchieveLogService; -import com.hzs.common.core.constant.MemberFieldConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.domain.member.detail.CuMemberAchieveLog; -import com.hzs.bonus.base.mapper.CuMemberAchieveLogMapper; -import org.springframework.stereotype.Service; - -import java.util.*; - -/** - *

- * 注水业绩记录表 服务实现类 - *

- * - * @author zhangjing - * @since 2023-02-03 - */ -@Service -public class CuMemberAchieveLogServiceImpl extends ServiceImpl implements ICuMemberAchieveLogService { - - @Override - public List queryMemberAchieveLogByPeriod(Integer period) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(MemberFieldConstants.PERIOD, period); - queryWrapper.in(SystemFieldConstants.APPROVE_STATUS, EApproveStatus.FINISH.getValue()); - queryWrapper.orderByAsc(MemberFieldConstants.PK_MEMBER, SystemFieldConstants.CREATION_TIME); - return baseMapper.selectList(queryWrapper); - } - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberAgentServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberAgentServiceImpl.java deleted file mode 100644 index e16f0e67..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberAgentServiceImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hzs.bonus.base.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.bonus.base.service.ICuMemberAgentService; -import com.hzs.common.core.constant.MemberFieldConstants; -import com.hzs.common.core.enums.EAgentType; -import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.domain.member.base.CuMemberAgent; -import com.hzs.bonus.base.mapper.CuMemberAgentMapper; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - *

- * 会员信息-代理商信息 服务实现类 - *

- * - * @author hzs - * @since 2022-08-31 - */ -@Service -public class CuMemberAgentServiceImpl extends ServiceImpl implements ICuMemberAgentService { - - @Override - public Map> queryCuMemberAgent() { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select(" pk_member,agent_province,agent_city,agent_county,agent_grade,pk_country ") - .eq(MemberFieldConstants.AGENT_TYPE, EAgentType.AGENT.getValue()); - List cuMemberAgentList = baseMapper.selectList(queryWrapper); - Map> cuMemberAgentMap = new HashMap<>(ComputeUtil.mapInitCapacity(cuMemberAgentList.size())); - cuMemberAgentList.forEach(cuMemberAgent -> { - String key = cuMemberAgent.getPkCountry().toString() + cuMemberAgent.getAgentProvince().toString() + cuMemberAgent.getAgentCity().toString(); - if(cuMemberAgentMap.containsKey(key)){ - cuMemberAgentMap.get(key).add(cuMemberAgent); - }else{ - List cuMemberAgents = new ArrayList<>(); - cuMemberAgents.add(cuMemberAgent); - cuMemberAgentMap.put(key, cuMemberAgents); - } - }); - return cuMemberAgentMap; - } -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberRegisterServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberRegisterServiceImpl.java deleted file mode 100644 index bfb0fb18..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberRegisterServiceImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.hzs.bonus.base.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.bonus.base.service.ICuMemberRegisterService; -import com.hzs.bonus.base.vo.CuMemberVO; -import com.hzs.bonus.param.MemberParam; -import com.hzs.common.core.constant.MemberFieldConstants; -import com.hzs.common.core.constant.SaOrderFieldConstants; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.member.base.CuMemberRegister; -import com.hzs.bonus.base.mapper.CuMemberRegisterMapper; -import org.springframework.stereotype.Service; - -import java.time.temporal.ChronoUnit; -import java.util.List; - -/** - *

- * 会员历史记录 服务实现类 - *

- * - * @author hzs - * @since 2022-08-22 - */ -@Service -public class CuMemberRegisterServiceImpl extends ServiceImpl implements ICuMemberRegisterService { - - @Override - public List queryCuMemberRegisterExeByCondition(MemberParam memberParam) { - if(memberParam.getEndDate() != null){ - memberParam.setEndDate(DateUtils.afterDate(1, ChronoUnit.DAYS, memberParam.getEndDate())); - } - return baseMapper.queryCuMemberRegisterExeByCondition(memberParam); - } - - @Override - public CuMemberRegister queryCuMemberRegister(Long pkMember) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(MemberFieldConstants.PK_MEMBER, pkMember); - queryWrapper.orderByAsc(SaOrderFieldConstants.PAY_TIME); - List cuMemberRegisters = baseMapper.selectList(queryWrapper); - return cuMemberRegisters.get(0); - } - - @Override - public void updateCuMemberRegister(CuMemberRegister cuMemberRegister) { - baseMapper.updateCuMemberRegister(cuMemberRegister); - } - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/AccountPointOutVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/AccountPointOutVO.java deleted file mode 100644 index d7b91ac6..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/AccountPointOutVO.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hzs.bonus.base.vo; - -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * - * 账户状态翻译 - * @Description: - * @Author: zhangjing - * @Time: 2023/2/4 14:56 - * @Classname: AccountPointOutVO - * @Package_name: com.hzs.member.base.vo - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class AccountPointOutVO implements Serializable { - /** - * 账户状态 - */ - @Transaction(transactionKey = EnumsPrefixConstants.ACCOUNT_STATUS) - private Integer accountState; - - private String accountStateVal; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/AwardsVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/AwardsVo.java deleted file mode 100644 index fc5debec..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/AwardsVo.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.hzs.bonus.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/6/26 14:01 - * @Classname: AwardsVo - * @PackageName: com.hzs.member.base.vo - */ - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.Data; - -import java.math.BigDecimal; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-06-26 14:01 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class AwardsVo { - - - private Integer pkId; - - /** - * 奖衔名称 - */ - - private String awardsName; - /** - * 奖衔名称显示 - */ - - private String awardsNameVal; - - /** - * 翻译key - */ - - private Integer pkTransaction; - - /** - * 奖衔值 - */ - - private Integer awardsValue; - - /** - * 小区考核PV (万为单位) - */ - - private BigDecimal communityCheck; - - private String communityCheckStr; - - /** - * 代数 - */ - - private Integer algebra; - - /** - * 复购考核 - */ - - private BigDecimal purchaseCheck; - - /** - * 分红考核 - */ - - - private BigDecimal shareCheck; - - /** - * 环球积分（环球比例） - */ - - private BigDecimal globalIntegral; - - /** - * 车奖积分（车奖比例） - */ - - private BigDecimal carAwardPoints; - - /** - * 左区奖衔 - */ - - private Integer pkCheckAwardsLeft; - - /** - * 右区奖衔 - */ - - - - private Integer pkCheckAwardsRight; - - /** - * 考核类型 来源于枚举 - */ - - private Integer relationType; - - /** - * 辅导代数 - */ - - private Integer coachAlgebra; - - /** - * 辅导比例 - */ - - private BigDecimal coachRatio; - - /** - * 分红比例 - */ - - private BigDecimal abonusRatio; - /** - * 图片 - */ - - private String image; - - /** - * 色值 - */ - - private String color; - - /** - * 启用状态 EnableStatus - */ - - private Integer enableState; - - /** - * 文字内容 - */ - - private String textContent; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuAwardsControlImportVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuAwardsControlImportVO.java deleted file mode 100644 index 5e8c99c7..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuAwardsControlImportVO.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.hzs.bonus.base.vo; - -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - - -/** - *

- * 导入真实奖衔控制VO - *

- * - * @author hzs - * @since 2023-04-07 - */ -@Data -public class CuAwardsControlImportVO { - - private static final long serialVersionUID = 1L; - - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuAwardsControlVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuAwardsControlVO.java deleted file mode 100644 index 320e5601..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuAwardsControlVO.java +++ /dev/null @@ -1,250 +0,0 @@ -package com.hzs.bonus.base.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.web.domain.BaseApprovalEntity; -import com.hzs.member.account.dto.MemberAmountDTO; -import com.hzs.system.sys.dto.LoginUser; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; -import java.util.Set; - -/** - *

- * 真实奖衔控制VO - *

- * - * @author hzs - * @since 2023-04-07 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class CuAwardsControlVO extends BaseApprovalEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Long pkId; - /** - * 会员主键 - */ - private Long pkMember; - /** - * 会员编号 - */ - @Excel(name = "会员编号", scale = 1) - private String memberCode; - /** - * 会员编号集合 - */ - private List memberCodeList; - - /** - * 会员姓名 - */ - @Excel(name = "会员姓名", scale = 2) - private String memberName; - - - /** - * 真实奖衔 - */ - private Long realAwards; - /** - * 真实奖衔 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer realAwardsKey; - /** - * 真实奖衔 - */ - @Excel(name = "真实奖衔", scale = 3) - private String realAwardsKeyVal; - - /** - * 辅导奖衔 - */ - private Long mentoringAward; - /** - * 辅导奖衔 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer mentoringAwardKey; - /** - * 辅导奖衔 - */ - @Excel(name = "辅导奖衔", scale = 4) - private String mentoringAwardKeyVal; - - /** - * 分红奖衔 - */ - private Long dividendAward; - /** - * 分红奖衔 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer dividendAwardKey; - /** - * 分红奖衔 - */ - @Excel(name = "分红奖衔", scale = 5) - private String dividendAwardKeyVal; - - /** - * 极差奖衔 - */ - private Long extremeAwards; - /** - * 极差奖衔 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer extremeAwardsKey; - /** - * 极差奖衔 - */ - @Excel(name = "级差奖衔", scale = 6) - private String extremeAwardsKeyVal; - - /** - * 复购考核奖衔 REPLY_EXAM_AWARD - */ - private Long replyExamAward; - /** - * 复购考核奖衔 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer replyExamAwardKey; - /** - * 复购考核奖衔 - */ - @Excel(name = "复购考核奖衔", scale = 7) - private String replyExamAwardKeyVal; - - /** - * 分红考核奖衔 DIVVY_EXAM_AWARDS - */ - private Long divvyExamAwards; - /** - * 分红考核奖衔 DIVVY_EXAM_AWARDS - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer divvyExamAwardsKey; - /** - * 分红考核奖衔 DIVVY_EXAM_AWARDS - */ - @Excel(name = "分红考核奖衔", scale = 8) - private String divvyExamAwardsKeyVal; - - /** - * 创建人ID - */ - @TableField("PK_CREATOR") - private Long pkCreator; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 修改人ID - */ - private Long pkModified; - - /** - * 修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date modifiedTime; - - /** - * 逻辑删除 (0=未删除，1已删除) - */ - @JsonIgnore - private Integer delFlag; - - /** - * 国家 - */ - private Integer pkCountry; - - /** - * 业务单号 - */ - private String businessNo; - /** - * 签呈流程类型（1 免签呈 2免付费 3免签呈+免付费 4 需要签呈需要付费） - */ - private Integer processType; - - /** - * 审核状态 2 待审核 4 已驳回 5 已完成(审核成功) 枚举 ： EApproveStatus - */ - private Integer approveStatus; - /** - * 错误信息 - */ - private String errorMsg; - /** - * 当前登录用户信息 - */ - private LoginUser loginUser; - - /** - * 真实奖衔控制集合（发起签呈） - */ - @Transaction - private List updateParentParamList; - /** - * 办理次数 - */ - private Integer changeNumber; - /** - * 业务涉及会员ID列表 -- 提交审核必传 - */ - private Set pkMemberList; - /** - * 0新增 1 修改 2删除 - * - */ - private Integer addAwards; - /** - * 费用 - */ - private BigDecimal cost; - /** - * 扣款币种类型 - */ - private Integer pkAccount; - /** - * 扣款币种翻译key - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_ACC) - private Integer pkAccountKey; - /** - * 扣款币种翻译 - */ - private String pkAccountKeyVal; - /** - * 会员手续费 - */ - List memberAmountDTOList; - /** - * 新值 - */ - @TableField("NEW_VALUE") - private String newValue; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuHonorWallVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuHonorWallVo.java deleted file mode 100644 index c12c4d25..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuHonorWallVo.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.hzs.bonus.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/6/8 11:47 - * @Classname: CuHonorWallVo - * @PackageName: com.hzs.member.base.vo - */ - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-06-08 11:47 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class CuHonorWallVo { - - /** - * 用户ID - */ - - private Long pkId; - - /** - * 类型 1 等级 2 奖衔 3 时长 4 推荐月 5 推荐季度 6 推荐年 7 抗衰月 8 抗衰季度 9 抗衰年 - */ - private Integer type; - - /** - * 类型 1 等级 2 奖衔 3 时长 4 推荐月 5 推荐季度 6 推荐年 7 抗衰月 8 抗衰季度 9 抗衰年 - */ - private String typeStr; - - private String name; - /** - * 类型属性值 - */ - private Integer value; - - /** - * 类型属性值 - */ - private String valueStr; - - /** - * 展示图片 - */ - - private String img; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - private String title; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogImportVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogImportVO.java deleted file mode 100644 index 3a84a60d..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogImportVO.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.hzs.bonus.base.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.web.domain.BaseApprovalEntity; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - *

- * 注水业绩记录表下载模板VO - *

- * - * @author hzs - * @since 2022-08-22 - */ -@Data -public class CuMemberAchieveLogImportVO extends BaseApprovalEntity { - - private static final long serialVersionUID = 1L; - - private Integer pkId; - - /** - * 会员主键 - */ - private Long pkMember; - /** - * 会员编号 - */ - @Excel(name = "会员编号",sort = 1) - private String memberCode; - - /** - * 会员姓名 - */ - private String memberName; - - /** - * 变更后A左区累计 变更后左区真实业绩 - */ - @Excel(name = "变更后左区真实业绩(PV)",sort = 3) - private BigDecimal asumRealModifyPv; - - /** - * 变更后B右区累计 更后右区真实业绩 - */ - @Excel(name = "变更后右区真实业绩(PV)",sort = 4) - private BigDecimal bsumRealModifyPv; - - /** - * 变更后A左区 变更后左区首购业绩 - */ - @Excel(name = "变更后左区首购业绩(PV)",sort = 5) - private BigDecimal afirstModifyPv; - - /** - * 变更后B右区 变更后右区首购业绩 - */ - @Excel(name = "变更后右区首购业绩(PV)",sort = 6) - private BigDecimal bfirstModifyPv; - - /** - * 变更后A左区首购结余 - */ - @Excel(name = "变更后左区首购结余",sort = 7) - private BigDecimal repAFirstModifyBalance; - /** - * 变更后B右区首购结余 - */ - @Excel(name = "变更后右区首购结余",sort = 8) - private BigDecimal repBFirstModifyBalance; - - - /** - * 变更后A左区复购结余 - */ - @Excel(name = "变更后左区复购结余",sort = 11) - private BigDecimal repAModifyBalance; - - /** - * 变更后B右区复购结余 - */ - @Excel(name = "变更后右区复购结余",sort = 12) - private BigDecimal repBModifyBalance; - - - /** - * 变更后A左区复购业绩累计业绩 - */ - @Excel(name = "变更后左区复购业绩(PV)",sort = 9) - private BigDecimal repAModifySumPv; - - /** - * 变更后B右区复购业绩累计业绩 - */ - @Excel(name = "变更后右区复购业绩(PV)",sort = 10) - private BigDecimal repBModifySumPv; - - /** - * 结算日期 注水日期（年-月-日） - */ - @Excel(name = "注水日期",dateFormat = "yyyy-MM-dd",sort = 13) - private Date settleDate; - - /** - * 到期日期 - */ - @Excel(name = "到期日期",dateFormat = "yyyy-MM-dd",sort = 14) - @JsonFormat(pattern = "yyyy-MM-dd") - private Date dueDate; - - private String errorMsg; - - /** - * 费用 - */ - private BigDecimal cost; - /** - * 扣款币种类型 - */ - private Integer pkAccount; - /** - * 扣款币种类型 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_ACC) - private Integer pkAccountKey; - /** - * 扣款币种类型 - */ - private String pkAccountKeyVal; - - - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogParentVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogParentVO.java deleted file mode 100644 index f0e232f3..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogParentVO.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.hzs.bonus.base.vo; - -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.web.domain.BaseApprovalEntity; -import com.hzs.member.account.dto.MemberAmountDTO; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.List; -import java.util.Set; - -/** - *

- * 注水业绩记录表VO - *

- * - * @author hzs - * @since 2022-08-22 - */ -@Data -public class CuMemberAchieveLogParentVO extends BaseApprovalEntity { - - private static final long serialVersionUID = 1L; - /** - * 注水方式 EInfusingWaterType 1 增加 2减少 3 最终 - */ - private Integer infusingWaterType; - private BigDecimal aSumrealModifyPv; - private BigDecimal bSumrealModifyPv; - /** - * 注水备注 - */ - private String remarks; - - /** - * 业务单号 - */ - private String businessNo; - /** - * 审批业务类型 来源于枚举 EApprovalBusiness - */ - private Integer editType; - - /** - * 审核状态 2 待审核 4 已驳回 5 已完成(审核成功) 枚举 ： EApproveStatus - */ - private Integer approveStatus; - - - /** - * 流程类型（1 免签呈 2免付费 3免签呈+免付费 4 需要签呈需要付费） - */ - private Integer processType; - /** - * 扣款币种类型 - */ - private Integer pkAccount; - /** - * 扣款币种类型 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_ACC) - private Integer pkAccountKey; - /** - * 扣款币种类型 - */ - private String pkAccountKeyVal; - /** - * 会员手续费 - */ - List memberAmountDTOList; - /** - * 错误信息 - */ - private String errorMasg; - /** - * 情况说明 - */ - private String remark; - - /** - * 业务涨及会员ID列表 --提交审核必传 - */ - private Set pkMemberList; - /** - * 期间 - */ - private Integer period; - /** - * 注水业绩记录 - */ - private List cmalvList; - /** - * 国家 - */ - private Integer pkCountry; - - - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogVO.java deleted file mode 100644 index 5509455b..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogVO.java +++ /dev/null @@ -1,354 +0,0 @@ -package com.hzs.bonus.base.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.web.domain.BaseApprovalEntity; -import com.hzs.member.account.dto.MemberAmountDTO; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; -import java.util.Set; - -/** - *

- * 注水业绩记录表VO - *

- * - * @author hzs - * @since 2022-08-22 - */ -@Data -public class CuMemberAchieveLogVO extends BaseApprovalEntity { - - private static final long serialVersionUID = 1L; - - private Integer pkId; - - /** - * 会员主键 - */ - private Long pkMember; - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - /** - * 会员编号集合 - */ - private List memberCodeList; - /** - * 注水业绩枚举列表 - */ - private List achieveList; - - /** - * 会员姓名 - */ - @Excel(name = "会员姓名") - private String memberName; - - /** - * 注水方式 EInfusingWaterType 1 增加 2减少 3 最终 - */ - @Transaction(transactionKey = EnumsPrefixConstants.INFUSING_WATER_TYPE) - private Integer infusingWaterType; - @Excel(name = "注水方式") - private String infusingWaterTypeVal; - /** - * 变更后A左区累计 变更后左区真实业绩 - */ - @Excel(name = "变更后左区真实业绩(PV)") - private BigDecimal asumRealModifyPv=BigDecimal.ZERO; - /** - * 变更后B右区累计 更后右区真实业绩 - */ - @Excel(name = "变更后右区真实业绩(PV)") - private BigDecimal bsumRealModifyPv=BigDecimal.ZERO; - /** - * 变更后A左区 变更后左区首购业绩 - */ - @Excel(name = "变更后左区首购业绩(PV)") - private BigDecimal afirstModifyPv=BigDecimal.ZERO; - /** - * 变更后B右区 变更后右区首购业绩 - */ - @Excel(name = "变更后右区首购业绩(PV)") - private BigDecimal bfirstModifyPv=BigDecimal.ZERO; - /** - * 变更后A左区首购结余 - */ - @Excel(name = "变更后左区首购结余") - private BigDecimal repAFirstModifyBalance=BigDecimal.ZERO; - /** - * 变更后B右区首购结余 - */ - @Excel(name = "变更后右区首购结余") - private BigDecimal repBFirstModifyBalance=BigDecimal.ZERO; - /** - * 变更后A左区复购业绩累计业绩 - */ - @Excel(name = "变更后左区复购业绩(PV)") - private BigDecimal repAModifySumPv=BigDecimal.ZERO; - /** - * 变更后B右区复购业绩累计业绩 - */ - @Excel(name = "变更后右区复购业绩(PV)") - private BigDecimal repBModifySumPv=BigDecimal.ZERO; - /** - * 变更后A左区复购结余 - */ - @Excel(name = "变更后左区复购结余") - private BigDecimal repAModifyBalance=BigDecimal.ZERO; - /** - * 变更后B右区复购结余 - */ - @Excel(name = "变更后右区复购结余") - private BigDecimal repBModifyBalance=BigDecimal.ZERO; - /** - * A左区累计 左区真实业绩 - */ - @Excel(name = "变更前左区真实业绩(PV)") - private BigDecimal asumRealPv; - - - /** - * B右区累计 右区真实业绩 - */ - @Excel(name = "变更前右区真实业绩(PV)") - private BigDecimal bsumRealPv; - /** - * A左区首购业绩 - */ - @Excel(name = "变更前左区首购业绩(PV)") - private BigDecimal asumPv; - - - /** - * B右区首购业绩 - */ - @Excel(name = "变更前右区首购业绩(PV)") - private BigDecimal bsumPv; - - /** - * A左区结余 左区首购结余 - */ - @Excel(name = "变更前左区首购结余") - private BigDecimal abalance; - - /** - * B右区结余 右区首购结余 - */ - @Excel(name = "变更前右区首购结余") - private BigDecimal bbalance; - /** - * A左区复购业绩累计业绩 左区复购业绩 - */ - @Excel(name = "变更前左区复购业绩(PV)") - private BigDecimal repASumPv; - - - /** - * B右区复购业绩累计业绩 右区复购业绩 - */ - @Excel(name = "变更前右区复购业绩(PV)") - private BigDecimal repBSumPv; - - /** - * A左区复购结余 左区复购结余 - */ - @Excel(name = "变更前左区复购结余") - private BigDecimal repABalance; - - - /** - * B右区复购结余 右区复购结余 - */ - @Excel(name = "变更前右区复购结余") - private BigDecimal repBBalance; - - /** - * 结算日期 注水日期（年-月-日） - */ - @Excel(name = "注水日期") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date settleDate; - private String settleDateStr; - - /** - * 到期日期 - */ - @Excel(name = "结束日期") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date dueDate; - private String dueDateStr; - /** - * 注水状态 EActivityStatus 0 未开始 1 进行中 2 已结束 - */ - @Transaction(transactionKey = EnumsPrefixConstants.ACTIVITY_STATUS) - private Integer waterStatus; - @Excel(name = "注水状态") - private String waterStatusVal; - /** - * 真实奖衔 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer awards; - @Excel(name = "真实奖衔") - private String awardsVal; - - /** - * 体系名称 - */ - @Excel(name = "隶属体系") - private String vertexName; - /** - * 团队名称 - */ - @Excel(name = "隶属团队") - private String teamName; - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - /** - * 注水开始日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date startDate; - /** - * 注水结束日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date endtDate; - - /** - * 国家 - */ - private Integer pkCountry; - - /** - * 创建人ID - */ - private Long pkCreator; - - - /** - * 注水业绩记录 - */ - private List cmalvList; - - - /** - * 注水备注 - */ - private String remarks; - - /** - * 业务单号 - */ - private String businessNo; - /** - * 审批业务类型 来源于枚举 EApprovalBusiness - */ - private Integer editType; - - /** - * 审核状态 2 待审核 4 已驳回 5 已完成(审核成功) 枚举 ： EApproveStatus - */ - private Integer approveStatus; - - /** - * 审核次数 - */ - private Integer approveNumber; - - /** - * 流程类型（1 免签呈 2免付费 3免签呈+免付费 4 需要签呈需要付费） - */ - private Integer processType; - /** - * 签呈类型文件类型 （ESignType） - */ - private Integer signType; - - /** - * 费用 - */ - private BigDecimal cost; - /** - * 扣款币种类型 - */ - private Integer pkAccount; - /** - * 扣款币种类型 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_ACC) - private Integer pkAccountKey; - /** - * 扣款币种类型 - */ - private String pkAccountKeyVal; - /** - * 会员手续费 - */ - List memberAmountDTOList; - /** - * 错误信息 - */ - private String errorMsg; - /** - * 会员ID列表 --提交审核必传 - */ - private Set pkMemberList; - /** - * 期间 期数 - */ - private Integer period; - - /** - * 结束日期开始日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date staDueDate; - /** - * 结束日期结束日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date endDueDate; - - - - /** - * 修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date modifiedTime; - - /** - * 手机 - */ - private String phone; - - private Integer pkAwards; - private Integer pkTeamCode; - private Integer pkVertex; - - /** - * 会员集合 - */ - private List pkMemberParamList; - private String tableName; - - - - - - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberTeamVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberTeamVO.java deleted file mode 100644 index 2d2e1244..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberTeamVO.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.hzs.bonus.base.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.web.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * @Description: 隶属团队 - * @Author: sui q - * @Time: 2022/10/13 11:21 - * @Classname: CuMemberVO - * @PackageName: com.hzs.member.base.vo - */ -@Data -public class CuMemberTeamVO { - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Long pkId; - - /** - * 团队名称 - */ - private String teamName; - -} - diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberVO.java deleted file mode 100644 index d48004ad..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberVO.java +++ /dev/null @@ -1,496 +0,0 @@ -package com.hzs.bonus.base.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * 会员后台查询会员的实体vo - */ -@Data -@EqualsAndHashCode(callSuper = false) -@AllArgsConstructor -@NoArgsConstructor -public class CuMemberVO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 用户ID - */ - - private Long pkId; - /** - * 会员编号 - */ - private String newMemberCode; - - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - /** - * 会员姓名 - */ - @Excel(name = "会员姓名") - private String memberName; - /** - * 联系方式 - */ - @Excel(name = "联系方式") - private String phone; - /** - * 推荐人编号 - */ - @Excel(name = "推荐编号") - private String parMemberCode; - - /** - * 推荐人姓名 - */ - @Excel(name = "推荐姓名") - private String parMemberName; - /** - * 安置人编号 - */ - @Excel(name = "安置编号") - private String placeMemberCode; - - /** - * 安置人姓名 - */ - @Excel(name = "安置姓名") - private String placeMemberName; - /** - * 真实奖衔 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer pkAwards; - - @Excel(name = "真实奖衔") - private String pkAwardsVal; - /** - * 代理等级 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_GRADE) - private Integer agentGrade; - @Excel(name = "代理等级") - private String agentGradeVal; - /** - * 订单来源 (1=实单注册,2=空单注册)订单状态 EOrderSource - */ - @Transaction(transactionKey = EnumsPrefixConstants.ORDER_SOURCE) - private Integer orderSource; - @Excel(name = "订单类型") - private String orderSourceVal; - /** - * 报单中心编号 服务中心编号 - */ - @Excel(name = "服务中心编号") - private String centerMemberCode; - - /** - * 报单中心姓名 服务中心姓名 - */ - @Excel(name = "服务中心姓名") - private String centerMemberName; - - /** - * 注册等级 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_GRADE) - private Integer pkRegisterGrade; - @Excel(name = "注册等级") - private String pkRegisterGradeVal; - - /** - * 结算等级 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_GRADE) - private Integer pkSettleGrade; - @Excel(name = "结算等级") - private String pkSettleGradeVal; - /** - * 消费金额 注册金额 - */ - @Excel(name = "注册金额(￥)") - private BigDecimal consumeMoney; - - /** - * 消费业绩 注册业绩 - */ - @Excel(name = "注册业绩($)") - private BigDecimal consumeAchieve; - /** - * 隶属体系 - */ - @Excel(name = "隶属体系") - private String vertexName; - /** - * 隶属团队 - */ - @Excel(name = "隶属团队") - private String teamName; - - /** - * 注册权限（0=普通用户,1=报单中心,2=服务中心）ERegistrationAuthority - */ - @Transaction(transactionKey = EnumsPrefixConstants.REGISTRATION_AUTHORITY) - private Integer registerAuthority; - @Excel(name = "注册权限") - private String registerAuthorityVal; - /** - * 是否实名认证（0=已认证,1=未认证） EYesNoAttestation - */ - @Transaction(transactionKey = EnumsPrefixConstants.YES_NO_ATTESTATION) - private Integer isRealName; - @Excel(name = "实名认证") - private String isRealNameVal; - /** - * 账户状态（0=正常,1=冻结,2=封停） EAccountStatus - */ - @Transaction(transactionKey = EnumsPrefixConstants.ACCOUNT_STATUS) - private Integer accountStatus; - @Excel(name = "账户状态") - private String accountStatusVal; - /** - * 钱包状态 翻译 EMemberAccount - */ - @Excel(name = "钱包状态") - private String memberAccountVal; - /** - * 创建时间 - */ - @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - /** - * 支付时间 - */ - @Excel(name = "支付时间", dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date payTime; - /** - * 变更次数 - */ - @Excel(name = "变更次数") - private Integer changeNumber; - /** - * 修改直推次数 - */ - @Excel(name = "修改直推次数") - private Integer directPushNumber; - - - /** - * 用户类型分类（0=正常（正常 空单 嗨粉） 1=死点（死点）） ECategory - */ - @Transaction(transactionKey = EnumsPrefixConstants.ENU_CAT) - private Integer category; - @Excel(name = "会员类型") - private String categoryVal; - - /** - * 会员类型（0.正常 1.空单 2.死点 4.嗨粉） - */ - @Transaction(transactionKey = EnumsPrefixConstants.CUSTOMER_TYPE) - private Integer customerType; - - private String customerTypeVal; - - /** - * 证件号码 - */ - private String idCard; - - /** - * 性别（0=未知,1=男,2=女） - */ - @Transaction(transactionKey = EnumsPrefixConstants.SEX) - - private Integer sex; - - private String sexVal; - - /** - * 出生日期（年月日） - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date birthDate; - - /** - * 结算国 - */ - private Integer pkSettleCountry; - - /** - * 安置部门 - */ - @Transaction(transactionKey = EnumsPrefixConstants.PLACE_DEPT) - - private Integer placeDept; - private String placeDeptVal; - - /** - * 是否是代理商 - */ - @Transaction(transactionKey = EnumsPrefixConstants.YES_NO) - private Integer agentType; - private String agentTypeVal; - - /** - * 数据来源（1=PC端,2=APP,3=H5） - */ - @Transaction(transactionKey = EnumsPrefixConstants.DATASOURCE) - private Integer source; - - private String sourceVal; - - /** - * 是否复购考核状态（0=是,1=否） - */ - @Transaction(transactionKey = EnumsPrefixConstants.YES_NO) - private Integer purchaseStatus; - - private String purchaseStatusVal; - - /** - * 是否分红考核状态（0=是,1=否） - */ - @Transaction(transactionKey = EnumsPrefixConstants.YES_NO) - private Integer shareStatus; - - private String shareStatusVal; - - /** - * 支付状态 EPayStatus - */ - @Transaction(transactionKey = EnumsPrefixConstants.ORDER_STATUS) - private Integer payStatus; - - private String payStatusVal; - - /** - * 修改次数 - */ - private Integer editNumber; - - /** - * 顶点编号 - */ - private String topMemberCode; - - /** - * 顶点姓名 - */ - private String topMemberName; - - /** - * 钱包状态（0=正常,1=锁定）EWalletStatus - */ - @Transaction(transactionKey = EnumsPrefixConstants.WALLET_STATUS) - private Integer walletStatus; - - private String walletStatusVal; - - - /** - * 邮箱 - */ - private String email; - - - /** - * 是否认证营业执照（0=已上传,1=未上传）EYesNoUpLoads - */ - @Transaction(transactionKey = EnumsPrefixConstants.YES_NO_UPLOADS) - private Integer isBusLicense; - private String isBusLicenseVal; - - /** - * 收益状态 EIncomeStatus - */ - @Transaction(transactionKey = EnumsPrefixConstants.INCOME_STATUS) - private Integer incomeStatus; - - private String incomeStatusVal; - - - /** - * 钱包状态 EMemberAccount - */ - @Transaction(transactionKey = EnumsPrefixConstants.MEMBER_ACCOUNT) - private Integer memberAccount; - - /** - * 能否转账（0=是,1=否）EMemberAccount - */ - private Integer isTransfer; - /** - * 能否提现（0=是,1=否）EMemberAccount - */ - private Integer isWithdraw; - - /** - * 能否消费（0=是,1=否）EMemberAccount - */ - private Integer isConsume; - /** - * ETransferStatus 全网转账 0 正常 1 全网 - */ - private Integer transferStatus; - - /** - * 体系ID - */ - private Integer vertexId; - /** - * 团队ID - */ - private Integer teamId; - - /** - * 创建时间开始时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date startDate; - - /** - * 创建时间结束时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date endDate; - - /** - * 支付时间开始时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date startDatePay; - - /** - * 支付时间结束时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date endDatePay; - - /** - * 微信 - */ - private String wechat; - - /** - * 证件类型 ECardType - */ - @Transaction(transactionKey = EnumsPrefixConstants.CARD_TYPE) - private Integer cardType; - - /** - * 证件类型 - */ - private String cardTypeVal; - - /** - * 证件正面 - */ - private String idCardJust; - /** - * 证件反面 - */ - private String idCardBack; - - /** - * 省 - */ - private String giftProvince; - - /** - * 市 - */ - private String giftCity; - /** - * 县（区） - */ - private String giftCounty; - /** - * 详细地址 - */ - private String giftAddress; - /** - * 银行名称 - */ - private String bankName; - /** - * 支行名称 - */ - private String subBankName; - /** - * 开户姓名 - */ - private String accountName; - /** - * 预留电话 - */ - private String reservePhone; - /** - * 银行卡号 - */ - private String cardNumber; - /** - * 认证时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date attestationTime; - - /** - * 认证开始时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date startAttestationTime; - - /** - * 认证结束时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date endAttestationTime; - /** - * 银行ID - */ - private Integer pkBdBank; - - /** - * 会员昵称 - */ - private String nickName; - - /** - * 会员头像 - */ - private String headPath; - - /** - * 体系列表 - */ - private List vertexList; - - /** - * 团队列表 - */ - private List teamList; - /** - * 国家 - */ - private Integer pkCountry; -} - diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/DirectPushNewVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/DirectPushNewVo.java deleted file mode 100644 index f37ae354..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/DirectPushNewVo.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.hzs.bonus.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/8/25 15:48 - * @Classname: DirectPushNewVo - * @PackageName: com.hzs.member.base.vo - */ - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-08-25 15:48 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class DirectPushNewVo { - - - /** - * 国旗 - */ - private String nationalFlag1; - - /** - * 国家名称 - */ - private String shortName; - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员名称 - */ - private String memberName; - - /** - * 联系方式 - */ - private String phone; - /** - * 真实奖衔 - */ - private String awardsVal; - /** - * 隶属体系 - */ - private String vertexVal; - /** - * 隶属团队 - */ - private String teamCode; - /** - * 新增金额 - */ - private String consumeMoney; - - /** - * 新增业绩 - */ - private String consumeAchieve; - - /** - * 支付时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date payTime; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/ImportPolicyCurrencyVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/ImportPolicyCurrencyVO.java deleted file mode 100644 index f4c6ee93..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/ImportPolicyCurrencyVO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.hzs.bonus.base.vo; - -import com.hzs.common.core.annotation.Excel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * @Description: 特殊业务-导入修改政策币实体vo - * @Author: zhangjing - * @Time: 2022/12/28 11:21 - * @Classname: UpdateCodeVO - * @PackageName: com.hzs.member.base.vo - */ -@Data -@EqualsAndHashCode(callSuper = false) -@AllArgsConstructor -@NoArgsConstructor -public class ImportPolicyCurrencyVO { - private static final long serialVersionUID = 1L; - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - /** - * 会员姓名 - */ - @Excel(name = "会员姓名") - private String newValue; - - - -} - diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/ImportSettleCountryVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/ImportSettleCountryVO.java deleted file mode 100644 index fc671257..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/ImportSettleCountryVO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.hzs.bonus.base.vo; - -import com.hzs.common.core.annotation.Excel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -/** - * @Description: 特殊业务-导入修改结算国实体vo - * @Author: zhangjing - * @Time: 2022/12/28 11:21 - * @Classname: UpdateCodeVO - * @PackageName: com.hzs.member.base.vo - */ -@Data -@EqualsAndHashCode(callSuper = false) -@AllArgsConstructor -@NoArgsConstructor -public class ImportSettleCountryVO { - private static final long serialVersionUID = 1L; - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - /** - * 国家 - */ - @Excel(name = "国家") - private String newValue; - - - -} - diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberAddressVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberAddressVO.java deleted file mode 100644 index 828f7163..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberAddressVO.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hzs.bonus.base.vo; - -import lombok.Data; - -/** - * @Description: 会员地址返回VO - * @Author: jiang chao - * @Time: 2023/1/18 10:01 - * @Classname: MemberAddresssVO - * @PackageName: com.hzs.member.base.vo - */ -@Data -public class MemberAddressVO { - - /** - * 主键 - */ - private Long pkId; - - /** - * 收货人 - */ - private String recName; - - /** - * 收货省 - */ - private Integer recProvince; - /** - * 收货省显示 - */ - private String recProvinceVal; - /** - * 收货市 - */ - private Integer recCity; - /** - * 收货市显示 - */ - private String recCityVal; - /** - * 收货县 - */ - private Integer recCounty; - /** - * 收货县显示 - */ - private String recCountyVal; - /** - * 所在地区 - */ - private String recArea; - - /** - * 详细地址 - */ - private String recAddress; - - /** - * 手机 - */ - private String recPhone; - - /** - * 是否默认（1=是,0=否） - */ - private Integer isDefault; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberCardVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberCardVO.java deleted file mode 100644 index 5de13731..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberCardVO.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.hzs.bonus.base.vo; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Description: 会员卡返回VO - * @Author: jiang chao - * @Time: 2023/7/12 9:14 - * @Classname: MemberrCardVO - * @PackageName: com.hzs.member.base.vo - */ -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Data -public class MemberCardVO { - - /** - * 等级图标 - */ - private String gradeIcon; - /** - * 等级图标base64 - */ - private String gradeIconStr; - - /** - * 奖衔图标 - */ - private String awardsIcon; - /** - * 奖衔图标base64 - */ - private String awardsIconStr; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberChargingDetailVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberChargingDetailVo.java deleted file mode 100644 index cb835d81..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberChargingDetailVo.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.hzs.bonus.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/3/28 17:08 - * @Classname: MemberChargingDetailVo - * @PackageName: com.hzs.member.base.vo - */ - -import lombok.Data; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-03-28 17:08 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class MemberChargingDetailVo { - - /** - * 会员主键 - */ - private Long pkMember; - - /** - * 变更后会员编号 - */ - private String editNewPlaceMemberCode; - /** - * 变更后部门 - */ - private String editNewPlaceDept; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberChargingVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberChargingVo.java deleted file mode 100644 index 25b90057..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberChargingVo.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.hzs.bonus.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/3/29 9:04 - * @Classname: MemberChargingVo - * @PackageName: com.hzs.member.base.vo - */ - -import lombok.Data; - -import java.math.BigDecimal; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-03-29 09:04 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class MemberChargingVo { - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员姓名 - */ - private String memberName; - - /** - * 变更前推荐编号 - */ - private String editOldParentMemberCode; - /** - * 变更前推荐姓名 - */ - private String editOldParentMemberName; - - /** - * 变更后推荐编号 - */ - private String editNewParentMemberCode; - /** - * 变更后推荐姓名 - */ - private String editNewParentMemberName; - - - /** - * 扣款币种 - */ - private Integer pkAccount; - /** - * 币种名称 - */ - private String accountName; - /** - * 扣费金额 - */ - private BigDecimal accountAmount; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberDataVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberDataVO.java deleted file mode 100644 index ec949744..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberDataVO.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.hzs.bonus.base.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 会员资料VO - */ -@Data -public class MemberDataVO { - - /** - * 昵称 - */ - private String nickName; - /** - * 真实姓名 - */ - private String memberName; - /** - * 用户编号 - */ - private String memberCode; - /** - * 电话号码（混淆） - */ - private String phone; - /** - * 邮箱 - */ - private String email; - /** - * 证件号码 - */ - private String idCard; - - /** - * 自然国家 - */ - private Integer pkCountry; - /** - * 自然国家翻译 - */ - private Integer pkCountryTransaction; - /** - * 自然国家名称 - */ - private String countryName; - - /** - * 结算国家 - */ - private Integer pkSettleCountry; - /** - * 结算国家翻译 - */ - private Integer pkSettleCountryTransaction; - /** - * 结算国家名称 - */ - private String settleCountryName; - - /** - * 注册等级 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_GRADE) - private Integer registerGrade; - /** - * 注册等级显示 - */ - private String registerGradeVal; - - /** - * 结算等级 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_GRADE) - private Integer settleGrade; - /** - * 结算等级显示 - */ - private String settleGradeVal; - - /** - * 代理等级 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_GRADE) - private Integer agentGrade; - /** - * 代理等级显示 - */ - private String agentGradeVal; - - /** - * 真实奖衔 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer awards; - /** - * 真实奖衔显示 - */ - private String awardsVal; - - /** - * 创建日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date payTime; - - /** - * 会员头像 - */ - private String headPath; - - /** - * 注册业绩 - */ - private BigDecimal consumeAchieve; - - /** - * 证件号码 - */ - private String idCardAuth; - - /** - * 注册权限 - */ - @Transaction(transactionKey = EnumsPrefixConstants.REGISTRATION_AUTHORITY) - private Integer registerAuthority; - /** - * 注册权限显示 - */ - private String registerAuthorityVal; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberInfoVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberInfoVO.java deleted file mode 100644 index cb32852b..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberInfoVO.java +++ /dev/null @@ -1,156 +0,0 @@ -package com.hzs.bonus.base.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * @Description: 会员登录信息 - * @Author: jiang chao - * @Time: 2023/1/10 15:23 - * @Classname: MemberInfo - * @PackageName: com.hzs.member.base.vo - */ -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Data -public class MemberInfoVO { - - /** - * 会员编号 - */ - private String memberCode; - /** - * 会员名称 - */ - private String memberName; - - /** - * 注册时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date registerTime; - - /** - * 自然国ID - */ - private Integer pkCountry; - /** - * 自然国 - */ - private String pkCountryVal; - /** - * 自然国家圆形国旗 - */ - private String countryCircularIcon; - /** - * 自然国家方形图旗 - */ - private String countrySquareIcon; - - /** - * 结算国ID - */ - private Integer pkSettleCountry; - /** - * 结算国 - */ - private String pkSettleCountryVal; - /** - * 结算国家圆形国旗 - */ - private String settleCountryCircularIcon; - /** - * 结算国家方形国旗 - */ - private String settleCountrySquareIcon; - /** - * 结算国家点亮名称 - */ - private String settleCountryLightName; - /* - * 结算国家地图 - */ - private String settleCountryImg; - - /** - * 等级ID - */ - private Integer pkGradeId; - /** - * 等级翻译ID - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_GRADE) - private Integer pkGrade; - /** - * 等级名称 - */ - private String pkGradeVal; - /** - * 等级图标 - */ - private String gradeIcon; - - /** - * 奖衔ID - */ - private Integer pkAwardsId; - /** - * 奖衔翻译ID - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer pkAwards; - /** - * 奖衔名称 - */ - private String pkAwardsVal; - /** - * 奖衔图标 - */ - private String awardsIcon; - - /** - * 币种图标 - */ - private String currencyIcon; - - /** - * 注册权限（0=无） - */ - private Integer registerAuthority; - - /** - * 跳转海粉注册（0=跳转，1=不跳转） - */ - private Integer registerFans; - - /** - * 跳转免费注册（0=跳转，1=不跳转） - */ - private Integer registerShare; - - /** - * 会员头像 - */ - private String headPath; - - /** - * 注册业绩 - */ - private BigDecimal consumeAchieve; - - /** - * 支付时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date payTime; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberMeritsSummaryVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberMeritsSummaryVo.java deleted file mode 100644 index 97269882..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberMeritsSummaryVo.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.hzs.bonus.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/9/8 15:10 - * @Classname: MemberMeritsSummaryVo - * @PackageName: com.hzs.member.base.vo - */ - -import lombok.Data; - -import java.math.BigDecimal; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-09-08 15:10 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class MemberMeritsSummaryVo { - - - /** - * 会员主键 - */ - private Integer pkMember; - - - /** - * 金额 - */ - private BigDecimal amount; - - /** - * 业绩 - */ - private BigDecimal achieve; - - /** - * 订单类型 对应枚举: EOrderType - */ - private Integer orderType; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberParentExportVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberParentExportVo.java deleted file mode 100644 index 9f5ee788..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberParentExportVo.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.hzs.bonus.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/8/15 15:08 - * @Classname: MemberParentExportVo - * @PackageName: com.hzs.member.base.vo - */ - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-08-15 15:08 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class MemberParentExportVo { - private Long pkMember; - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - /** - * 会员姓名 - */ - @Excel(name = "会员姓名") - private String memberName; - - /** - * 变更前推荐编号 - */ - @Excel(name = "变更前推荐编号") - private String editOldParentMemberCode; - /** - * 变更前推荐姓名 - */ - @Excel(name = "变更前推荐姓名") - private String editOldParentMemberName; - - /** - * 变更后推荐编号 - */ - @Excel(name = "变更后推荐编号") - private String editNewPlaceMemberCode; - /** - * 变更后推荐姓名 - */ - @Excel(name = "变更后推荐姓名") - private String editNewPlaceMemberName; - /** - * 变更次数 - */ - @Excel(name = "变更次数") - private Integer editNumber; - - /** - *变更时间 - */ - @Excel(name = "变更时间",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date editDate; - - /** - * 币种 - */ - private Integer pkAccount; - - /** - * 币种名称 - */ - private String accountName; - /** - * 扣费金额 - */ - private BigDecimal accountAmount; - - /** - * 真实奖衔 - */ - private Integer pkAwards; - - /** - * 真实奖衔字符 - */ - private String awardsStr; - - /** - * 电话 - */ - private String phone; - - /** - * 体系名称 - */ - private String vertexName; - /** - * 团队 - */ - private String teamCode; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberParentVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberParentVo.java deleted file mode 100644 index b00b9a0e..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberParentVo.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.hzs.bonus.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/3/28 17:25 - * @Classname: MemberParentVo - * @PackageName: com.hzs.member.base.vo - */ - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-03-28 17:25 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class MemberParentVo { - - private Long pkMember; - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - /** - * 会员姓名 - */ - private String memberName; - - /** - * 变更前推荐编号 - */ - private String parMemberCode; - /** - * 变更前推荐姓名 - */ - private String parMemberName; - - /** - * 变更后推荐编号 - */ - @Excel(name = "推荐编号") - private String editNewPlaceMemberCode; - /** - * 变更后推荐姓名 - */ - private String editNewPlaceMemberName; - /** - * 变更次数 - */ - private Integer editNumber; - - /** - *变更时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date editDate; - - /** - * 币种 - */ - private Integer pkAccount; - - /** - * 币种名称 - */ - private String pkAccountKeyVal; - /** - * 扣费金额 - */ - private BigDecimal cost; - - /** - * 真实奖衔 - */ - private Integer pkAwards; - - /** - * 真实奖衔字符 - */ - private String awardsStr; - - /** - * 电话 - */ - private String phone; - - /** - * 体系名称 - */ - private String vertexName; - /** - * 团队 - */ - private String teamCode; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberPlaceParentServiceLogVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberPlaceParentServiceLogVo.java deleted file mode 100644 index 8f7ad749..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberPlaceParentServiceLogVo.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.hzs.bonus.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/8/12 16:18 - * @Classname: MemberPlaceParentServiceLogVo - * @PackageName: com.hzs.member.base.vo - */ - -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-08-12 16:18 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class MemberPlaceParentServiceLogVo { - - - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - /** - * 会员姓名 - */ - - private String memberName; - /** - * 变更推荐/安置编号 - */ - - private String placeMemberCode; - /** - * 变更推荐/安置姓名 - */ - - private String placeMemberName; - - /** - * 变更前安置部门 - */ - private Integer placeDept; - /** - * 变更前安置部门名称 - */ - private String placeDeptVal; - - - /** - * 变更后安置编号 - */ - - @Excel(name = "安置编号") - private String editNewPlaceMemberCode; - /** - * 变更后安置姓名 - */ - private String editNewPlaceMemberName; - /** - * 变更后安置部门 - */ - - private Integer editNewPlaceDept; - /** - * 变更后安置部门名称 - */ - @Excel(name = "安置部门") - private String editNewPlaceDeptStr; - - /** - * 币种 - */ - private Integer pkAccount; - /** - * 币种名称 - */ - private String pkAccountKeyVal; - /** - * 扣费金额 - */ - private BigDecimal cost; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberRealInfoVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberRealInfoVO.java deleted file mode 100644 index 5a530fa0..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberRealInfoVO.java +++ /dev/null @@ -1,436 +0,0 @@ -package com.hzs.bonus.base.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.*; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 会员真实信息VO - */ -@Data -public class MemberRealInfoVO { - - private static final long serialVersionUID = 1L; - /** - * 用户ID - */ - private Long pkId; - - /** - * 会员编号 - */ - @Excel(name = "会员编号", sort = 1) - private String memberCode; - - /** - * 会员姓名 - */ - @Excel(name = "会员姓名", sort = 2) - private String memberName; - - /** - * 会员类型分类（0=正常（正常 空单 嗨粉） 1=死点（死点）） - */ - private Integer category; - /** - * 会员类型（0.正常 1.空单 2.死点 4.嗨粉） - */ - private Integer customerType; - - /** - * 手机号码 - */ - @Excel(name = "联系方式", sort = 3) - private String phone; - - /** - * 邮箱 - */ - @Excel(name = "邮箱地址", sort = 20) - private String email; - - /** - * 证件号码 - */ - @Excel(name = "证件号码", sort = 10) - private String idCard; - /** - * 证件类型 ECardType - */ - @Transaction(transactionKey = EnumsPrefixConstants.CARD_TYPE) - private Integer cardType; - - /** - * 性别（0=未知,1=男,2=女）Esex - */ - @Transaction(transactionKey = EnumsPrefixConstants.SEX) - private Integer sex; - - /** - * 出生日期（年月日） - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "出生日期", sort = 8) - private Date birthDate; - - /** - * 结算国 - */ - private Integer pkSettleCountry; - - /** - * 推荐人编号 - */ - private Long pkParent; - - /** - * 安置人编号 - */ - private Long pkPlaceParent; - - /** - * 安置部门 - */ - private Integer placeDept; - - /** - * 所属团队编号 - */ - private Long pkTeamCode; - - /** - * 报单中心编号 - */ - private Long pkCenterCode; - - /** - * 数据来源（1=PC端,2=APP,3=H5） - */ - private Integer source; - - /** - * 注册等级 - */ - private Integer pkRegisterGrade; - - /** - * 结算等级 - */ - private Integer pkSettleGrade; - - /** - * 真实奖衔 - */ - private Integer pkAwards; - - /** - * 消费金额 - */ - private BigDecimal consumeMoney; - - /** - * 消费业绩 - */ - private BigDecimal consumeAchieve; - - /** - * 复购免考（0=是,1=否） - */ - private Integer purchaseStatus; - - /** - * 分红免考（0=是,1=否） - */ - private Integer shareStatus; - - /** - * 支付时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "支付时间", dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 22) - private Date payTime; - - /** - * 支付状态 - */ - private Integer payStatus; - - /** - * 登录密码 - */ - private String loginPwd; - - /** - * 支付密码 - */ - private String payPwd; - - /** - * 登录密码明文 - */ - private String loginPassword; - - /** - * 支付密码明文 - */ - private String payPassword; - - /** - * 修改次数 - */ - private Integer editNumber; - - /** - * 注册权限（0=普通用户,1=报单中心,2=服务中心） - */ - private Integer registerAuthority; - - /** - * 顶点编号 - */ - private Long pkVertex; - - /** - * 账号状态（0=正常,1=冻结,2=封停） - */ - private Integer accountStatus; - - /** - * 订单来源 (1=实单注册,2=空单注册) - */ - private Integer orderSource; - - /** - * 是否实名认证（0=是,1=否） - */ - private Integer isRealName; - - /** - * 是否认证营业执照（0=是,1=否） - */ - private Integer isBusLicense; - - /** - * 收益状态 (0=正常,1=停止收益) - */ - private Integer incomeStatus; - /** - * 变更次数 - */ - private Integer changeNumber; - /** - * 微信 - */ - private String wechat; - - /** - * 会员昵称 - */ - private String nickName; - - /** - * 会员头像 - */ - private String headPath; - /** - * 修改直推次数 - */ - @Excel(name = "修改直推次数", sort = 23) - private Integer directPushNumber = 0; - - /** - * 创建人ID - */ - private Long pkCreator; - - /** - * 认证日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "认证日期", sort = 21) - private Date certificationTime; - - /** - * 创建时间 - */ - @Excel(name = "创建日期", sort = 21, dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 修改人ID - */ - private Long pkModified; - - /** - * 修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date modifiedTime; - - /** - * 逻辑删除 (0=未删除，1已删除) - */ - private Integer delFlag; - - /** - * 国家 - */ - private Integer pkCountry; - - /** - * 推荐编号 - */ - private String parent; - - /** - * 安置编号 - */ - private String placeParent; - - /** - * 空单回填金额 （奖金账户） - */ - private BigDecimal lockAccount4; - - /** - * 注册等级翻译key - */ - private Integer registerGradeKey; - /** - * 结算等级翻译key - */ - private Integer settleGradeKey; - /** - * 奖衔翻译key - */ - private Integer awardsKey; - /*** - * 证件正面 - */ - private String idFront; - /** - * 证件反面 - */ - private String idBack; - - /** - * 省id - */ - private Integer pkProvince; - /** - * 省名称 - */ - @Excel(name = "省", sort = 11) - private String provinceName; - /** - * 市id - */ - private Integer pkCity; - /** - * 市名称 - */ - @Excel(name = "市", sort = 12) - private String cityName; - /** - * 区县id - */ - private Integer pkCounty; - /** - * 区县名 - */ - @Excel(name = "区/县", sort = 13) - private String countyName; - /** - * 详细地址 - */ - @Excel(name = "详细地址", sort = 14) - private String address; - /** - * 银行名称 - */ - @Excel(name = "银行名称", sort = 15) - private String bankName; - /** - * 支行名称 - */ - @Excel(name = "支行名称", sort = 16) - private String subBankName; - /** - * 真实姓名（开户姓名） - */ - @Excel(name = "开户姓名", sort = 17) - private String accountName; - /** - * 证件类型 字符 - */ - @Excel(name = "证件类型", sort = 9) - private String cardTypeVal; - - /** - * 预留电话 - */ - @Excel(name = "预留电话", sort = 18) - private String reservedPhone; - /** - * 银行卡号 - */ - @Excel(name = "银行卡号", sort = 19) - private String cardNumber; - - - /** - * 证件类型（认证信息字段） - */ - private Integer idType; - - /** - * 证件类型（认证信息字段） - */ - private String idTypeVal; - /** - * 推荐订单数 - */ - private Long recommendedOrderNumber; - /** - * 性别（0=未知,1=男,2=女） - */ - @Excel(name = "性别", sort = 7) - private String sexVal; - - /** - * 结算等级 字符 - */ - @Excel(name = "结算等级", sort = 5) - private String settleGradeVal; - - /** - * 真实奖衔 字符 - */ - @Excel(name = "真实奖衔", sort = 6) - private String awardsVal; - - /** - * 注册等级 字符 - */ - @Excel(name = "注册等级", sort = 4) - private String registerGradeVal; - - private Integer gradeValue; - - /** - * 团队编号 - */ - private String teamCode; - - /** - * 团队名称 - */ - private String teamName; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberSelectVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberSelectVO.java deleted file mode 100644 index 4b3c46ec..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberSelectVO.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.hzs.bonus.base.vo; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Description: 会员选择返回 - * @Author: jiang chao - * @Time: 2023/3/10 11:54 - * @Classname: MemberSelectVO - * @PackageName: com.hzs.member.base.vo - */ -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Data -public class MemberSelectVO { - - /** - * 会员ID - */ - private Long pkId; - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员名称 - */ - private String memberName; - - /** - * 联系方式 - */ - private String phone; - - /** - * 注册等级 - */ - private Integer pkRegisterGrade; - /** - * 注册等级翻译KEY - */ - @JsonIgnore - @Transaction(transactionKey = EnumsPrefixConstants.KEY_GRADE) - private Integer registerGrade; - /** - * 注册等级显示 - */ - private String registerGradeVal; - - /** - * 结算等级 - */ - private Integer pkSettleGrade; - /** - * 结算等级翻译KEY - */ - @JsonIgnore - @Transaction(transactionKey = EnumsPrefixConstants.KEY_GRADE) - private Integer settleGrade; - /** - * 结算等级显示 - */ - private String settleGradeVal; - - /** - * 真实奖衔 - */ - private Integer pkAwards; - /** - * 真实奖衔翻译KEY - */ - @JsonIgnore - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer awards; - /** - * 真实奖衔显示 - */ - private String awardsVal; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberServiceLogVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberServiceLogVo.java deleted file mode 100644 index f2ae9e3c..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberServiceLogVo.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.hzs.bonus.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/3/29 10:14 - * @Classname: MemberServiceLogVo - * @PackageName: com.hzs.member.base.vo - */ - -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-03-29 10:14 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class MemberServiceLogVo { - - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - /** - * 会员姓名 - */ - - private String memberName; - /** - * 变更推荐/安置编号 - */ - - private String editOldPlaceMemberCode; - /** - * 变更推荐/安置姓名 - */ - - private String editOldPlaceMemberName; - - /** - * 变更前安置部门 - */ - private Integer editOldPlaceDept; - /** - * 变更前安置部门名称 - */ - private String editOldPlaceDeptStr; - - - /** - * 变更后安置编号 - */ - - @Excel(name = "安置编号") - private String editNewPlaceMemberCode; - /** - * 变更后安置姓名 - */ - private String editNewPlaceMemberName; - /** - * 变更后安置部门 - */ - - private Integer editNewPlaceDept; - /** - * 变更后安置部门名称 - */ - @Excel(name = "安置部门") - private String editNewPlaceDeptStr; - - /** - * 币种 - */ - private Integer pkAccount; - /** - * 币种名称 - */ - private String accountName; - - /** - * 扣费金额 - */ - private BigDecimal accountAmount; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberShare.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberShare.java deleted file mode 100644 index 4604c098..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberShare.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.hzs.bonus.base.vo; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * @Description: - * @Author: sui q - * @Time: 2023/3/15 11:07 - * @Classname: MemberShare - * @PackageName: com.hzs.member.base.vo - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class MemberShare implements Serializable { - - private static final long serialVersionUID = 5897860078560115489L; - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员姓名 - */ - private String memberName; - - /** - * 手机 - */ - private String phone; - - /** - * 推荐人 - */ - private Long pkParent; - - /** - * 登录密码明文 - */ - private String loginPassword; - - /** - * 支付密码明文 - */ - private String payPassword; - - /** - * 登录网址 - */ - private String urlAddress; - /** - * 公众号 - */ - private String gzh; - /** - * IOS - */ - private String ios; - /** - * 安卓 - */ - private String android; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberTeamInfoVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberTeamInfoVo.java deleted file mode 100644 index e3e869b3..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberTeamInfoVo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.hzs.bonus.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/8/2 15:26 - * @Classname: MemberTeamInfoVo - * @PackageName: com.hzs.member.base.vo - */ - -import lombok.Data; - -import java.math.BigDecimal; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-08-02 15:26 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class MemberTeamInfoVo { - - /** - * 伞下人数 - */ - private Integer numberCount; - /** - * 伞下业绩 - */ - private BigDecimal numberAchieve; - - /** - * 会员主键 - */ - private Long pkMember; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberTeamVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberTeamVo.java deleted file mode 100644 index 21a222c0..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberTeamVo.java +++ /dev/null @@ -1,284 +0,0 @@ -package com.hzs.bonus.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/5/29 16:02 - * @Classname: MemberTeamVo - * @PackageName: com.hzs.member.base.vo - */ - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-05-29 16:02 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class MemberTeamVo { - - /** - * 会员主键 - */ - private Long memberId; - /** - * 安置人主键 - */ - private Long pkPlaceParent; - - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - /** - * 会员名称 - */ - @Excel(name = "会员姓名") - private String memberName; - - - /** - * 真实奖衔 - */ - private Integer pkAwards; - /** - * 真实奖衔 str - */ - @Excel(name = "真实奖衔") - private String pkAwardsStr; - - - /** - * 安置层数 - * 查询当前会员在团队的第几层 （查询伞下的所有人） - */ - @Excel(name = "安置层数") - private Integer resettleLevel; - - /** - * 安置部门 str - */ - @Excel(name = "安置位置") - private String placeDeptStr; - /** - * 安置位置 - */ - private String resettleLocation; - - /** - * 安置人编号 - */ - @Excel(name = "安置编号") - private String placeParentCode; - - /** - * 血缘代数 - */ - @Excel(name = "血缘代数") - private String consanguinityAlgebra; - - - /** - * 左区首购业绩 - */ - @Excel(name = "左区首购业绩($)") - private BigDecimal afirstPv; - - /** - * 右区首购业绩 - */ - @Excel(name = "右区首购业绩($)") - private BigDecimal bfirstPv; - - /** - * 安置部门 - */ - private Integer placeDept; - - - /** - * 血缘首购业绩 - */ - @Excel(name = "血缘首购业绩($)") - private BigDecimal consanguinityFirstPv; - - /** - * 左区复购业绩 - */ - @Excel(name = "左区复购业绩($)") - private BigDecimal repASumPv; - - /** - * 右区复购业绩 - */ - @Excel(name = "右区复购业绩($)") - private BigDecimal repBSumPv; - - /** - * 血缘复购业绩 - */ - @Excel(name = "血缘复购业绩($)") - private BigDecimal consanguinityRepBSumPv; - - /** - *左区真实业绩(PV) - */ - @Excel(name = "左区真实业绩($)") - private BigDecimal aSumRealPv; - - /** - * B区真实业绩(PV) - */ - @Excel(name = "右区真实业绩($)") - private BigDecimal bSumRealPv; - - /** - * 血缘真实业绩（pv） - */ - @Excel(name = "血缘真实业绩($)") - private BigDecimal consanguinityRealPv; - - /** - * 奖金收益 - */ - @Excel(name = "奖金收益($)") - private BigDecimal realIncomeTotal; - - /** - * 奖金团队占比 - */ - @Excel(name = "奖金团队占比(%)",suffix = "%") - private BigDecimal bonusTeamProportion; - - /** - * 奖金大盘占比 - */ - @Excel(name = "奖金大盘占比%") - private BigDecimal bonusLargeMarketProportion; - - /** - * 直推人数 - */ - @Excel(name = "直推人数") - private Long directPushPeopleNumber; - /** - * 直推业绩 - */ - @Excel(name = "直推业绩") - private Long directPushPeoplePv; - /** - * 复购金额 - */ - @Excel(name = "复购金额$") - private BigDecimal repurchaseAmount; - - /** - * 复购业绩 - */ - @Excel(name = "复购业绩") - private BigDecimal repurchasePv; - - /** - * 复购积分 - */ - @Excel(name = "复购积分") - private BigDecimal repurchaseIntegral; - - /** - * 福利金额（$） - */ - @Excel(name = "福利金额($)") - private BigDecimal benefitAmount; - - /** - * 福利业绩(pv) - */ - @Excel(name = "福利业绩($)") - private BigDecimal benefitPv; - - /** - * 福利积分 - */ - @Excel(name = "福利积分") - private BigDecimal welfarePoints; - - /** - * 转账次数 - */ - @Excel(name = "转账次数") - private Integer memberTransferCount; - - /** - * 转账金额（$） - */ - @Excel(name = "转账金额($)") - private BigDecimal transferAmount; - - /** - * 充值金额（$） - */ - @Excel(name = "充值金额($)") - private BigDecimal rechargeAmount; - - /** - * 提现次数 - */ - @Excel(name = "提现次数") - private Integer withdrawalNumber; - - /** - * 提现金额（$） - */ - @Excel(name = "提现金额($)") - private Integer withdrawalAmount; - - /** - * 登录次数 - */ - // @Excel(name = "登录次数") - private Integer loginNumber; - - /** - * 最后一次登录时间 - */ - @Excel(name = "最近登录") - private Date lastLoginTime; - - /** - * 最后一次登录时间间隔天数 - */ - // @Excel(name = "最后一次登录时间间隔天数") - private Long lastLoginTimeIntervalDays; - - /** - * 创建时间 - */ - @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - /** - * 支付时间 - */ - @Excel(name = "支付时间",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date payTime; - - /** - * 修改直推次数 - */ - @Excel(name = "修改直推次数") - private Integer directPushNumber; - /** - * 层级 - */ - private Integer level; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/ParentMemberVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/ParentMemberVo.java deleted file mode 100644 index d0887750..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/ParentMemberVo.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.hzs.bonus.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/4/24 15:00 - * @Classname: ParentMemberVo - * @PackageName: com.hzs.member.base.vo - */ - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-04-24 15:00 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class ParentMemberVo { - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员名 - */ - private String memberName; - - /** - * 注册等级 - */ - - private Integer pkRegisterGrade; - /** - * 注册等级 - */ - private String pkRegisterGradeStr; - - /** - * 注册日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 累计金额 - */ - private BigDecimal consumeMoney; - /** - * 累计业绩 - */ - private BigDecimal consumeAchieve; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/TheLableVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/TheLableVO.java deleted file mode 100644 index e6d80073..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/TheLableVO.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.hzs.bonus.base.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; - -/** - * @Description: 列表筛选显现隐藏实体vo - * @Author: zhangjing - * @Time: 2022/10/13 11:21 - * @Classname: CuMemberVO - * @PackageName: com.hzs.member.base.vo - */ -@Data -@AllArgsConstructor -public class TheLableVO { - private static final long serialVersionUID = 1L; - - /** - * 表头名称 - */ - private String titel; - - /** - * 对应字段 - */ - private String prop; - - /** - * key键 - */ - private Integer keyId; - - /** - * 显示隐藏 - */ - private String show; - - -} - diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpPolicyCurrencyVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpPolicyCurrencyVO.java deleted file mode 100644 index 2f591207..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpPolicyCurrencyVO.java +++ /dev/null @@ -1,213 +0,0 @@ -package com.hzs.bonus.base.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.web.domain.BaseApprovalEntity; -import com.hzs.member.account.dto.MemberAmountDTO; -import com.hzs.system.sys.dto.LoginUser; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; -import java.util.Set; - -/** - * @Description: 特殊业务-修改政策币实体vo - * @Author: zhangjing - * @Time: 2022/12/28 11:21 - * @Classname: UpdateCodeVO - * @PackageName: com.hzs.member.base.vo - */ -@Data -@EqualsAndHashCode(callSuper = false) -@AllArgsConstructor -@NoArgsConstructor -public class UpPolicyCurrencyVO extends BaseApprovalEntity { - private static final long serialVersionUID = 1L; - - /** - * 会员主键 - */ - private Long pkId; - /** - * 会员主键 - */ - private Long pkMember; - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - /** - * 会员姓名 - */ - @Excel(name = "会员姓名") - private String memberName; - /** - * 真实奖衔 - */ - @Excel(name = "真实奖衔") - private String pkAwardsVal; - /** - * 真实奖衔 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer pkAwards; - /** - * 隶属体系 - */ - @Excel(name = "隶属体系") - private String vertexName; - /** - * 隶属体系 - */ - private Integer pkBdVertex; - - /** - * 隶属团队 - */ - @Excel(name = "隶属团队") - private String teamName; - /** - * 隶属团队 - */ - private Integer pkTeamCode; - - /** - * 联系方式 - */ - @Excel(name = "联系方式") - private String phone; - /** - * 政策币启用状态 0 已启用 1已禁用 EnableStatus - */ - @Transaction(transactionKey = EnumsPrefixConstants.ENABLE_STATUS) - private Integer enableStatus; - private Integer newEnableStatus; - - @Excel(name = "政策币业务") - private String enableStatusVal; - /** - * 政策币扣款比例(%) - */ - @Excel(name = "政策币扣款比例(%)") - private BigDecimal deductMoney; - private BigDecimal newDeductMoney; - - /** - * 政策币转账状态 1允许 2禁止 EPopupType - */ - @Transaction(transactionKey = EnumsPrefixConstants.POPUP_TYPE) - private Integer transfer; - @Excel(name = "政策币转账") - private String transferVal; - private Integer newTransfer; - - /** - * 变更前值 - */ - private String oldValue; - /** - * 改变后 - */ - private String newValue; - - /** - * 变更次数 - */ - private Integer changeNumber=0; - /** - * 创建日期 - */ - @Excel(name = "创建日期",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - /** - * 创建时间开始时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date startDate; - - /** - * 创建时间结束时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date endDate; - /** - * 签呈流程类型（1 免签呈 2免付费 3免签呈+免付费 4 需要签呈需要付费） - */ - private Integer processType; - - /** - * 业务单号 - */ - private String businessNo; - - /** - * 审核状态 2 待审核 4 已驳回 5 已完成(审核成功) 枚举 ： EApproveStatus - */ - private Integer approveStatus; - - /** - * 费用 - */ - private BigDecimal cost; - /** - * 扣款币种类型 - */ - private Integer pkAccount; - /** - * 扣款币种翻译key - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_ACC) - private Integer pkAccountKey; - /** - * 扣款币种翻译 - */ - private String pkAccountKeyVal; - /** - * 会员手续费 - */ - List memberAmountDTOList; - - /** - * 错误信息 - */ - private String errorMsg; - /** - * 国家 - */ - private Integer pkCountry; - /** - * 业务涨及会员ID列表 --提交审核必传 - */ - private Set pkMemberList; - - /** - * 当前登录用户信息 - */ - private LoginUser loginUser; - - /** - * 修改政策币集合 - */ - @Transaction - private List plculist; - - private Long pkCreator; - - - - - - - - -} - diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateCodeImportVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateCodeImportVO.java deleted file mode 100644 index c93cf55c..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateCodeImportVO.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.hzs.bonus.base.vo; - -import com.hzs.common.core.annotation.Excel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - - -/** - * @Description: 特殊业务-修改会员编号导入实体vo - * @Author: zhangjing - * @Time: 2022/12/28 11:21 - * @Classname: UpdateCodeVO - * @PackageName: com.hzs.member.base.vo - */ -@Data -@EqualsAndHashCode(callSuper = false) -@AllArgsConstructor -@NoArgsConstructor -public class UpdateCodeImportVO { - private static final long serialVersionUID = 1L; - - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - /** - * 变更后会员编号 - */ - @Excel(name = "变更后会员编号") - private String memberCodeNew; - - - - - - - - - -} - diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateCodeVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateCodeVO.java deleted file mode 100644 index 638d3f23..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateCodeVO.java +++ /dev/null @@ -1,232 +0,0 @@ -package com.hzs.bonus.base.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.web.domain.BaseApprovalEntity; -import com.hzs.member.account.dto.MemberAmountDTO; -import com.hzs.system.sys.dto.LoginUser; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; -import java.util.Set; - -/** - * @Description: 特殊业务-修改会员编号实体vo - * @Author: zhangjing - * @Time: 2022/12/28 11:21 - * @Classname: UpdateCodeVO - * @PackageName: com.hzs.member.base.vo - */ -@Data -@EqualsAndHashCode(callSuper = false) -@AllArgsConstructor -@NoArgsConstructor -public class UpdateCodeVO extends BaseApprovalEntity { - private static final long serialVersionUID = 1L; - - /** - * 会员主键 - */ - private Long pkId; - /** - * 会员主键集合 - */ - private List pkIdList; - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - /** - * 变更后会员编号 - */ - - private String memberCodeNew; - /** - * 改变后会员编号 - */ - @Excel(name = "变更后会员编号") - private String newValue; - /** - * 会员姓名 - */ - @Excel(name = "会员姓名") - private String memberName; - /** - * 联系方式 - */ - @Excel(name = "联系方式") - private String phone; - /** - * 结算等级 会员等级 - */ - @Excel(name = "会员等级") - private String pkSettleGradeVal; - /** - * 真实奖衔 - */ - @Excel(name = "真实奖衔") - private String pkAwardsVal; - /** - * 变更次数 - */ - @Excel(name = "变更次数") - private Integer changeNumber=0; - /** - * 创建时间 变更日期 - */ - @Excel(name = "变更日期",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - /** - * 结算国 - */ - private String shortName; - - - /** - * 变更前值 - */ - private String oldValue; - - - - - - /** - * 结算国 - */ - private Integer pkSettleCountry; - /** - * 结算等级 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_GRADE) - private Integer pkSettleGrade; - - - /** - * 真实奖衔 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer pkAwards; - - - - /** - * 签呈流程类型（1 免签呈 2免付费 3免签呈+免付费 4 需要签呈需要付费） - */ - private Integer processType; - - /** - * 修改会员编号集合 - */ - private List updateCodeVOList; - /** - * 业务诉求集合 - */ - private List updateParentParamList; - - /** - * 业务单号 - */ - private String businessNo; - - /** - * 审核状态 2 待审核 4 已驳回 5 已完成(审核成功) 枚举 ： EApproveStatus - */ - private Integer approveStatus; - - /** - * 修改编号业务记录表主键 - */ - private Long serviceLogId; - /** - * 费用 - */ - private BigDecimal cost; - /** - * 扣款币种类型 - */ - private Integer pkAccount; - /** - * 扣款币种翻译key - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_ACC) - private Integer pkAccountKey; - /** - * 扣款币种翻译 - */ - private String pkAccountKeyVal; - /** - * 会员手续费 - */ - List memberAmountDTOList; - - /** - * 错误信息 - */ - private String errorMsg; - /** - * 国家 - */ - private Integer pkCountry; - /** - * 业务涨及会员ID列表 --提交审核必传 - */ - private Set pkMemberList; - - /** - * 当前登录用户信息 - */ - private LoginUser loginUser; - - /** - * 推荐人编号 - */ - private String parMemberCode; - - /** - * 推荐人姓名 - */ - private String parMemberName; - - /** - * 安置人编号 - */ - private String placeMemberCode; - - /** - * 安置人姓名 - */ - private String placeMemberName; - /** - * 安置部门 EPlaceDept - */ - @Transaction(transactionKey = EnumsPrefixConstants.PLACE_DEPT) - private Integer placeDept; - private String placeDeptVal; - /** - * 创建人ID - */ - @TableField("PK_CREATOR") - private Long pkCreator; - - - - - - - - - -} - diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateParentExport.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateParentExport.java deleted file mode 100644 index 69c2d15b..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateParentExport.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.hzs.bonus.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/5/25 9:28 - * @Classname: UpdateParentExport - * @PackageName: com.hzs.member.base.vo - */ - -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-05-25 09:28 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class UpdateParentExport { - - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - /** - * 推荐编号 - */ - @Excel(name = "推荐编号") - private String parentMemberCode; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateParentVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateParentVo.java deleted file mode 100644 index 50900ea4..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateParentVo.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.hzs.bonus.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/3/29 14:54 - * @Classname: UpdateParentVo - * @PackageName: com.hzs.member.base.vo - */ - -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-03-29 14:54 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class UpdateParentVo { - - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - /** - * 变更推荐/推荐名称 - */ - @Excel(name = "推荐编号") - private String changeMemberCode; - - - /** - * 会员名称 - */ - private String memberName; - /** - * 变更推荐/推荐名称 - */ - private String changeMemberName; - - /** - * 币种 - */ - private Integer pkAccount; - /** - * 币种名称 - */ - private String accountName; - - /** - * 扣费金额 - */ - private BigDecimal accountAmount; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceImport.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceImport.java deleted file mode 100644 index fbaaa27e..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceImport.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.hzs.bonus.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/3/29 10:58 - * @Classname: UpdatePlaceImport - * @PackageName: com.hzs.member.base.vo - */ - -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-03-29 10:58 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class UpdatePlaceImport { - - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - /** - * 变更推荐/安置编号 - */ - @Excel(name = "安置编号") - private String changeMemberCode; - - /** - * 安置部门 安置左区 安置右区 - */ - @Excel(name = "安置部门") - private Integer placeDept; - - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceParentVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceParentVo.java deleted file mode 100644 index c3166da2..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceParentVo.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.hzs.bonus.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/3/28 16:37 - * @Classname: UpdatePlaceParentVo - * @PackageName: com.hzs.member.base.vo - */ - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-03-28 16:37 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class UpdatePlaceParentVo { - - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - /** - * 会员姓名 - */ - @Excel(name = "会员姓名") - private String memberName; - - /** - * 真实奖衔 - */ - @Excel(name = "真实奖衔") - private String awardsVal; - - /** - * 隶属体系 - */ - @Excel(name = "隶属体系") - private String vertexVal; - - /** - * 隶属团队 - */ - @Excel(name = "隶属团队") - private Long teamCode; - - /** - * 联系方式 - */ - @Excel(name = "联系方式") - private String phone; - /** - * 变更前安置编号 - */ - @Excel(name = "变更前安置编号") - private String parMemberCode; - /** - * 变更前安置姓名 - */ - @Excel(name = "变更前安置姓名") - private String parMemberName; - /** - * 变更前安置部门 - */ - - private Integer placeDept; - - /** - * 变更前安置部门名称 - */ - @Excel(name = "变更前安置部门") - private String placeDeptVal; - - /** - * 变更后安置编号 - */ - @Excel(name = "变更后安置编号") - private String editNewPlaceMemberCode; - /** - * 变更后安置姓名 - */ - @Excel(name = "变更后安置姓名") - private String editNewPlaceMemberName; - /** - * 变更后安置部门 - */ - private Integer editNewPlaceDept; - /** - * 变更后安置部门名称 - */ - @Excel(name = "变更后安置部门") - private String editNewPlaceDeptStr; - /** - * 变更次数 - */ - @Excel(name = "变更次数") - private Integer editNumber; - /** - * 会员主键 - */ - private Long pkMember; - - /** - *变更时间 - */ - @Excel(name = "变更时间",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date editDate; - - /** - * 扣款币种 - */ - private Integer pkAccount; - /** - * 币种名称 - */ - private String accountName; - /** - * 扣费金额 - */ - private BigDecimal accountAmount; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceVo.java deleted file mode 100644 index 00bfc8d7..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdatePlaceVo.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.hzs.bonus.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/3/28 16:51 - * @Classname: UpdatePlaceVo - * @PackageName: com.hzs.member.base.vo - */ - -import lombok.Data; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-03-28 16:51 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class UpdatePlaceVo { - - /** - * 安置编号 - */ - private String placeMemberCode; - /** - * 安置位置 - */ - private Integer placeDept; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateSettleCountryVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateSettleCountryVO.java deleted file mode 100644 index a6db3b2c..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/UpdateSettleCountryVO.java +++ /dev/null @@ -1,185 +0,0 @@ -package com.hzs.bonus.base.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.web.domain.BaseApprovalEntity; -import com.hzs.member.account.dto.MemberAmountDTO; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; -import java.util.Set; - -/** - * @Description: 特殊业务-修改结算国实体vo - * @Author: zhangjing - * @Time: 2022/12/28 11:21 - * @Classname: UpdateCodeVO - * @PackageName: com.hzs.member.base.vo - */ -@Data -@EqualsAndHashCode(callSuper = false) -@AllArgsConstructor -@NoArgsConstructor -public class UpdateSettleCountryVO extends BaseApprovalEntity { - private static final long serialVersionUID = 1L; - - /** - * 会员主键 - */ - private Long pkId; - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - /** - * 会员姓名 - */ - @Excel(name = "会员姓名") - private String memberName; - private String shortName; - /** - * 真实奖衔 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer pkAwards; - private String pkAwardsVal; - - /** - * 隶属体系 - */ - private String vertexName; - - /** - * 隶属团队 - */ - private String teamName; - - /** - * 联系方式 - */ - private String phone; - - - /** - * 结算国ID - */ - private Integer pkSettleCountry; - /** - * 变更后结算国ID - */ - private Integer newPkSettleCountry; - /** - * 变更前值 - */ - @Excel(name = "结算国家") - private String oldValue; - /** - * 变更后值 - */ - @Excel(name = "变更后结算国家") - private String newValue; - - /** - * 变更次数 - */ - @Excel(name = "变更次数") - private Integer changeNumber=0; - /** - * 变更时间 - */ - @Excel(name = "变更时间",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - /** - * 支付时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date payTime; - /** - * 流程类型（1 免签呈 2免付费 3免签呈+免付费 4 需要签呈需要付费） - */ - private Integer processType; - - /** - * 修改结算国集合(用于修改数据) - */ - private List upstcyVOList; - - /** - * 修改结算国集合签呈页面 - */ - private List updateParentParamList; - - /** - * 业务单号 - */ - private String businessNo; - - /** - * 审核状态 2 待审核 4 已驳回 5 已完成(审核成功) 枚举 ： EApproveStatus - */ - private Integer approveStatus; - - /** - * 修改编号业务记录表主键 - */ - private Long serviceLogId; - /** - * 费用 - */ - private BigDecimal cost; - /** - * 扣款币种类型 - */ - private Integer pkAccount; - /** - * 扣款币种类型 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_ACC) - private Integer pkAccountKey; - /** - * 扣款币种类型 - */ - private String pkAccountKeyVal; - /** - * 会员手续费 - */ - List memberAmountDTOList; - - /** - * 错误信息 - */ - private String errorMsg; - /** - * 国家 - */ - private Integer pkCountry; - /** - * 业务涨及会员ID列表 --提交审核必传 - */ - private Set pkMemberList; - /** - * 新结算国家 - */ - private String newSettleCountry; - - - - - - - - - - -} - 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 dda83e8b..5f611beb 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 @@ -124,23 +124,6 @@ public class ApiCuMemberBonusController extends BaseController { return getDataTable(memberBonusPurchaseVoList); } - /** - * 查询会员某个时间段内的奖金，默认查询15天内,查询复购 - */ - @PostMapping("/query-bonus-hi-fun") - public TableDataInfo listHiFunBonus(@RequestBody BonusParam bonusParam) { - setBonusParam(bonusParam); - List cuMemberBonusList = iCuMemberBonusService.queryMemberBonusVoByCondition(bonusParam); - List bonusHiFunVoList = new ArrayList<>(); - cuMemberBonusList.forEach(cuMemberBonus -> { - MemberBonusHiFunVO memberBonusHiFunVO = BeanUtil.copyProperties(cuMemberBonus, MemberBonusHiFunVO.class, "settleDate"); - packageSettleDate(cuMemberBonus, memberBonusHiFunVO); - memberBonusHiFunVO.setHiFunRealSubtotal(cuMemberBonus.getHiFunIncome()); - bonusHiFunVoList.add(memberBonusHiFunVO); - }); - return getDataTable(bonusHiFunVoList); - } - private static void packageSettleDate(CuMemberBonusExt cuMemberBonus, PubMemberBonusVO pubMemberBonusVO) { if (cuMemberBonus.getEndSettleDate() == null) { pubMemberBonusVO.setSettleDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, cuMemberBonus.getSettleDate())); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/LeXueRangeParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/LeXueRangeParam.java deleted file mode 100644 index c83d55c7..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/LeXueRangeParam.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hzs.bonus.bonus.param; - -import com.hzs.common.domain.activity.pick.AcPickMemberLog; -import com.hzs.common.domain.activity.pick.ext.AcPickExt; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * @description: 计算乐学易考特殊极差的param - * @author: sui q - * @time: 2023/6/3 14:37 - * @classname: LeXueRangeParam - * @package_name: com.hzs.member.bonus.param - * version 1.0.0 - */ -@Data -public class LeXueRangeParam implements Serializable { - - private List acPickExtList; - - private List acPickMemberLogList; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusExpandTitleVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusExpandTitleVO.java deleted file mode 100644 index 25aeb606..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusExpandTitleVO.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hzs.bonus.bonus.vo; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @description: 结算日期 - * @author: sui q - * @time: 2024/7/24 10:58 - * @classname: BonusExpandTitleVO - * @package_name: com.hzs.bonus.bonus.vo - * version 1.0.0 - */ -@Data -public class BonusExpandTitleVO implements Serializable { - - private String settleDate; - - private Integer isDisplayRed; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusPubVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusPubVO.java deleted file mode 100644 index 291fadb6..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusPubVO.java +++ /dev/null @@ -1,314 +0,0 @@ -package com.hzs.bonus.bonus.vo; - -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @description: 奖金收益的公共字段 - * @author: sui q - * @time: 2023/5/20 17:47 - * @classname: BonusPubVO - * @package_name: com.hzs.member.bonus.vo - * version 1.0.0 - */ -@Data -public class BonusPubVO implements Serializable { - - /** - * 直推收益 - */ - @Excel(name = "直推收益", scale = 2) - private BigDecimal directIncomeOri; - - /** - * 拓展收益 - */ - @Excel(name = "拓展收益", scale = 2) - private BigDecimal expandIncomeOri; - - /** - * 拓展无封 (拓展收益按等级正常比例结算，并 拓展收益按等级正常比例结算 无封顶) - */ - private BigDecimal expandNoCappingOri; - - /** - * 拓展封顶 (拓展收益按等级正常比例结算，不按4-N结算，根据配置的封顶值限制最大收益) - */ - private BigDecimal expandCappingOri; - - /** - * 辅导收益 - */ - @Excel(name = "辅导收益", scale = 2) - private BigDecimal coachIncomeOri; - - /** - * 分红收益 - */ - @Excel(name = "分红收益", scale = 2) - private BigDecimal shareIncomeOri; - - /** - * 报单收益 - */ - @Excel(name = "报单收益", scale = 2) - private BigDecimal serviceIncomeOri; - - - /** - * 云代直推收益 - */ - @Excel(name = "云代直推收益", scale = 2) - private BigDecimal cloudDirectIncomeOri; - - /** - * 云代首购收益 - */ - @Excel(name = "云代首购收益", scale = 2) - private BigDecimal cloudPurIncomeOri; - - /** - * 云代复购收益 - */ - @Excel(name = "云代复购收益", scale = 2) - private BigDecimal cloudRepurIncomeOri; - - /** - * 复购级差收益 - */ - @Excel(name = "复购级差收益", scale = 2) - private BigDecimal repurRangeIncomeOri; - - /** - * 复购拓展收益 - */ - @Excel(name = "复购拓展收益", scale = 2) - private BigDecimal repurExpandIncomeOri; - - /** - * 复购卷 - */ - @Excel(name = "复购卷", scale = 2) - private BigDecimal repurCouponOri; - - /** - * 复购券均分收益 - */ - @Excel(name = "复购券均分", scale = 2) - private BigDecimal repurCouponShareOri; - - /** - * 商城重消 - */ - @Excel(name = "商城重消", scale = 2) - private BigDecimal backPointsOri; - - /** - * 平台服务费 - */ - @Excel(name = "平台服务费", scale = 2) - private BigDecimal serviceSpendOri; - - /** - * 环球积分 - */ - @Excel(name = "直推极差", scale = 2) - private BigDecimal globalPointsOri; - - /** - * 车奖积分 - */ - @Excel(name = "车奖积分", scale = 2) - private BigDecimal carAwardPointsOri; - - /** - * 店铺收益 - */ - @Excel(name = "店铺收益", scale = 2) - private BigDecimal storeIncomeOri; - - /** - * 嗨粉推荐收益 - */ - private BigDecimal hiFunIncomeOri; - - /** - * 首购实发小计 - */ - @Excel(name = "首购实发小计", scale = 2) - private BigDecimal purRealSubtotalOri; - - /** - * 云代实发小计 - */ - @Excel(name = "云代实发小计", scale = 2) - private BigDecimal cloudRealSubtotalOri; - - /** - * 复购实发小计 - */ - @Excel(name = "复购实发小计", scale = 2) - private BigDecimal repurRealSubtotalOri; - - /** - * 复购券小计 - */ - @Excel(name = "复购券实发小计", scale = 2) - private BigDecimal repurCouponSubtotalOri; - - /** - * 实发收益总计 - */ - @Excel(name = "实发收益总计", scale = 2) - private BigDecimal realIncomeTotalOri; - - /** - * 直推收益 - */ - @Excel(name = "直推收益($)", scale = 2) - private BigDecimal directIncome; - - /** - * 拓展收益 - */ - @Excel(name = "拓展收益($)", scale = 2) - private BigDecimal expandIncome; - - /** - * 拓展无封 (拓展收益按等级正常比例结算，并 拓展收益按等级正常比例结算 无封顶) - */ - private BigDecimal expandNoCapping; - - /** - * 拓展封顶 (拓展收益按等级正常比例结算，不按4-N结算，根据配置的封顶值限制最大收益) - */ - private BigDecimal expandCapping; - - /** - * 辅导收益 - */ - @Excel(name = "辅导收益($)", scale = 2) - private BigDecimal coachIncome; - - /** - * 分红收益 - */ - @Excel(name = "分红收益($)", scale = 2) - private BigDecimal shareIncome; - - /** - * 报单收益 - */ - @Excel(name = "报单收益($)", scale = 2) - private BigDecimal serviceIncome; - - /** - * 云代直推收益 - */ - @Excel(name = "云代直推收益($)", scale = 2) - private BigDecimal cloudDirectIncome; - - /** - * 云代首购收益 - */ - @Excel(name = "云代首购收益($)", scale = 2) - private BigDecimal cloudPurIncome; - - /** - * 云代复购收益 - */ - @Excel(name = "云代复购收益($)", scale = 2) - private BigDecimal cloudRepurIncome; - - /** - * 复购级差收益 - */ - @Excel(name = "复购级差收益($)", scale = 2) - private BigDecimal repurRangeIncome; - - /** - * 复购拓展收益 - */ - @Excel(name = "复购拓展收益($)", scale = 2) - private BigDecimal repurExpandIncome; - - /** - * 复购卷 - */ - @Excel(name = "复购卷($)", scale = 2) - private BigDecimal repurCoupon; - - /** - * 复购券均分收益 - */ - @Excel(name = "复购券均分($)", scale = 2) - private BigDecimal repurCouponShare; - - /** - * 商城重消 - */ - @Excel(name = "商城重消($)", scale = 2) - private BigDecimal backPoints; - - /** - * 平台服务费 - */ - @Excel(name = "平台服务费($)", scale = 2) - private BigDecimal serviceSpend; - - /** - * 环球积分 - */ - @Excel(name = "直推极差($)", scale = 2) - private BigDecimal globalPoints; - - /** - * 车奖积分 - */ - @Excel(name = "车奖积分($)", scale = 2) - private BigDecimal carAwardPoints; - - /** - * 店铺收益 - */ - @Excel(name = "店铺收益($)", scale = 2) - private BigDecimal storeIncome; - - /** - * 嗨粉推荐收益 - */ - private BigDecimal hiFunIncome; - - /** - * 首购实发小计 - */ - @Excel(name = "首购实发小计($)", scale = 2) - private BigDecimal purRealSubtotal; - - /** - * 云代实发小计 - */ - @Excel(name = "云代实发小计($)", scale = 2) - private BigDecimal cloudRealSubtotal; - - /** - * 复购实发小计 - */ - @Excel(name = "复购实发小计($)", scale = 2) - private BigDecimal repurRealSubtotal; - - /** - * 复购券小计 - */ - @Excel(name = "复购券实发小计($)", scale = 2) - private BigDecimal repurCouponSubtotal; - - /** - * 实发收益总计 - */ - @Excel(name = "实发收益总计($)", scale = 2) - private BigDecimal realIncomeTotal; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusCloudAgentVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusCloudAgentVO.java deleted file mode 100644 index 1f40682a..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusCloudAgentVO.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hzs.bonus.bonus.vo; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; - -/** - * @description: 会员端云代收益 - * @author: sui q - * @time: 2023/4/28 10:36 - * @classname: MemberBonusPurchaseVO - * @package_name: com.hzs.member.bonus.vo - * version 1.0.0 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class MemberBonusCloudAgentVO extends PubMemberBonusVO { - - /** - * 云代直推收益 - */ - private BigDecimal cloudDirectIncome; - - /** - * 云代首购收益 - */ - private BigDecimal cloudPurIncome; - - /** - * 云代复购收益 - */ - private BigDecimal cloudRepurIncome; - - /** - * 云代实发小计 - */ - private BigDecimal cloudRealSubtotal; - - /** - * 实发收益总计 - */ - private BigDecimal realIncomeTotal; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailCalVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailCalVO.java deleted file mode 100644 index 233c4770..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailCalVO.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.hzs.bonus.bonus.vo; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * 用于奖金计算订单波比的实体 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class MemberBonusDetailCalVO implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * 订单主键 - */ - @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) - private Long pkOrder; - - /** - * 订单编号 - */ - private String orderCoder; - - /** - * 计算业绩 - */ - private BigDecimal calAchieve; - - /** - * 税前收益 - */ - private BigDecimal pretaxIncome; - - /** - * 扣除个税 - */ - private BigDecimal incomeTax; - - /** - * 实际收益 - */ - private BigDecimal realIncome; - - /** - * 直推收益 - */ - private BigDecimal pushIncome; - - /** - * 拓展收益 - */ - private BigDecimal expandIncome; - - /** - * 辅导收益 - */ - private BigDecimal coachIncome; - - /** - * 报单服务费 - */ - private BigDecimal serviceIncome; - - /** - * 复购拓展收益 - */ - private BigDecimal repExpandIncome; - - /** - * 复购极差收益 - */ - private BigDecimal repRangeIncome; - - /** - * 嗨粉直推收益 - */ - private BigDecimal hiFunIncome; - - /** - * 海粉直推收益 - */ - private BigDecimal haiFunIncome; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHaiFunVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHaiFunVO.java deleted file mode 100644 index 27e79578..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHaiFunVO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.hzs.bonus.bonus.vo; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; - -/** - * @description: 会员端海粉收益 - * @author: sui q - * @time: 2023/4/28 10:36 - * @classname: MemberBonusPurchaseVO - * @package_name: com.hzs.member.bonus.vo - * version 1.0.0 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class MemberBonusHaiFunVO extends PubMemberBonusVO { - - /** - * 嗨粉推荐收益 - */ - private BigDecimal haiFunIncome; - - /** - * 海粉收益小计 - */ - private BigDecimal haiFunRealSubtotal; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHiFunVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHiFunVO.java deleted file mode 100644 index 15bda60a..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHiFunVO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.hzs.bonus.bonus.vo; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; - -/** - * @description: 会员端嗨粉收益 - * @author: sui q - * @time: 2023/4/28 10:36 - * @classname: MemberBonusPurchaseVO - * @package_name: com.hzs.member.bonus.vo - * version 1.0.0 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class MemberBonusHiFunVO extends PubMemberBonusVO { - - /** - * 嗨粉推荐收益 - */ - private BigDecimal hiFunIncome; - - /** - * 嗨粉小计 - */ - private BigDecimal hiFunRealSubtotal; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusRepurchaseCouponVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusRepurchaseCouponVO.java deleted file mode 100644 index 40a80937..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusRepurchaseCouponVO.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.hzs.bonus.bonus.vo; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; - -/** - * @description: 会员端复购券收益 - * @author: sui q - * @time: 2023/4/28 10:36 - * @classname: MemberBonusPurchaseVO - * @package_name: com.hzs.member.bonus.vo - * version 1.0.0 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class MemberBonusRepurchaseCouponVO extends PubMemberBonusVO{ - - /** - * 复购卷 - */ - private BigDecimal repurCoupon; - - /** - * 复购卷均分 每月推荐满足3.6w直推，业绩的1%放入复购券 - */ - private BigDecimal repurCouponShare; - - /** - * 复购券小计 - */ - private BigDecimal repurCouponSubtotal; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/census/param/CensusSummaryParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/census/param/CensusSummaryParam.java deleted file mode 100644 index 81928678..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/census/param/CensusSummaryParam.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.hzs.bonus.census.param; - -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * @Description: - * @Author: yuhui - * @Time: 2023/2/22 10:25 - * @Classname: CensusSummaryParam - * @PackageName: com.hzs.member.censusSummary.param - */ -@Data -public class CensusSummaryParam { - - /** - * 结算期数 - */ - private Long memberSettlePeriodId; - - /** - * 币种展示 - */ - private Long pkCurrency; - - /** - * 所属国家 - */ - private Integer pkCountry; - - /** - * 开始时间 - */ - private Date startDate; - - /** - * 结束时间 - */ - private Date endDate; - - /** - * 查询时间 - */ - private String time; - - /** - * 体系 - */ - private List pkVertex; - - /** - * 团队 - */ - private List pkMemberTeam; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/census/vo/CensusSummaryVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/census/vo/CensusSummaryVo.java deleted file mode 100644 index 581082f2..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/census/vo/CensusSummaryVo.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.hzs.bonus.census.vo; - -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; - -/** - * @Description: - * @Author: yuhui - * @Time: 2023/2/6 15:36 - * @Classname: censusSummaryVo - * @PackageName: com.hzs.member.censusSummary.vo - */ -@Data -public class CensusSummaryVo { - - /** - * 结算期数 - */ - @Excel(name = "结算期数") - private Integer numberPeriods; - - /** - * 结算日期 - */ -// @TableField("SETTLE_DATE") - @Excel(name = "结算时间") - private String settleDate; - - /** - * 注册金额 - */ - @Excel(name = "注册金额(￥)") - private BigDecimal registerAmount; - - - /** - * 升级金额 - */ - @Excel(name = "升级金额(￥)") - private BigDecimal upgradeAmount; - - /** - * 首购金额(￥) - */ - @Excel(name = "首购金额(￥)") - private BigDecimal firstPurchaseAmount; - - /** - * 直供金额 - */ - @Excel(name = "直供金额(￥)") - private BigDecimal directSupplyAmount; - - /** - * 嗨粉金额 - */ - @Excel(name = "嗨粉金额(￥)") - private BigDecimal fansAmount; - - /** - * 复购金额 - */ - private BigDecimal repurchaseAmount; - /** - * 三方金额 - */ - @Excel(name = "三方金额(￥)") - private BigDecimal tripartiteAmount; - /** - * 注册金额($) - */ - @Excel(name = "注册金额($)") - private BigDecimal registerAmountDollar; - - - /** - * 升级金额($) - */ - @Excel(name = "升级金额($)") - private BigDecimal upgradeAmountDollar; - - /** - * 首购金额 - */ - @Excel(name = "首购金额($)") - private BigDecimal firstPurchaseAmountDollar; - - /** - * 直供金额($) - */ - @Excel(name = "直供金额($)") - private BigDecimal directSupplyAmountDollar; - - /** - * 嗨粉金额($) - */ - @Excel(name = "嗨粉金额($)") - private BigDecimal fansAmountDollar; - - /** - * 复购金额($) - */ - private BigDecimal repurchaseAmountDollar; - /** - * 三方金额 - */ - @Excel(name = "三方金额($)") - private BigDecimal tripartiteAmountDollar; - - /** - * 注册业绩 - */ - private BigDecimal registerPv; - /** - *升级业绩 - */ - private BigDecimal upgradePv; - - /** - * 首购业绩 - */ - @Excel(name = "首购业绩") - private BigDecimal firstPurchasePv; - /** - * - * 直供业绩 - */ - private BigDecimal directSupplyPv; - - /** - * 嗨粉业绩 - */ - private BigDecimal hiFunPv; - /** - * 复购pv - */ - private BigDecimal repurchasePv; - /** - * 三方业绩 - */ - @Excel(name = "三方业绩") - private BigDecimal tripartitePv; - - - /** - * 金额总计 - */ - @Excel(name = "金额总计") - private BigDecimal amountTotal; - - /** - * 金额总计($) - */ - private BigDecimal amountTotalDollar; - - /** - * 业绩汇总 - */ - private BigDecimal pvTotal; - - - - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuMemberAwardsRecordVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuMemberAwardsRecordVO.java deleted file mode 100644 index df145186..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuMemberAwardsRecordVO.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.hzs.bonus.detail.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.*; - -import java.math.BigDecimal; -import java.util.Date; - -/** - *

- * 会员信息-奖衔升级记录VO - *

- * - * @author hzs - * @since 2022-08-31 - */ -@Data -public class CuMemberAwardsRecordVO { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Long pkId; - - /** - * 会员编号 - */ - private Long pkMember; - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - /** - * 会员姓名 - */ - @Excel(name = "会员姓名") - private String memberName; - /** - * 手机号码 - */ - @Excel(name = "联系方式") - private String phone; - /** - * 隶属体系 - */ - @Excel(name = "隶属体系") - private String vertexName; - /** - * 团队名称 - */ - @Excel(name = "隶属团队") - private String teamName; - /** - * A区新增业绩 - */ - @Excel(name = "左区新增业绩(PV)") - private BigDecimal aNewPv; - - /** - * B区新增业绩 - */ - @Excel(name = "右左区新增业绩(PV)") - private BigDecimal bNewPv; - - - /** - * 结算期间 - */ - private Integer period; - - /** - * 升级类型 (1=自动升级,2=手动升级,3=购买赠予) - */ - private Integer upType; - - /** - * 奖衔 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer pkAwards; - - /** - * 奖衔 - */ - private String pkAwardsVal; - - - /** - * 复购免考（0=是,1=否） - */ - private Integer purchaseStatus; - - /** - * 订单，购买赠予的时候保存，用于撤单时撤销等级 - */ - private Long pkOrder; - - /** - * 备注 - */ - private String remark; - /** - * 创建时间 - */ - @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - /** - * 创建时间开始时间 - */ - private String startDate; - - /** - * 创建时间结束时间 - */ - private String endDate; - - /** - * 隶属体系 - */ - private Integer pkVertex; - /** - * 隶属团队 - */ - private Integer pkTeamCode; - /** - * 业绩表 - */ - private String achieveTableName; - - /** - * 国家 - */ - private Integer pkCountry; - /** - * 国家 - */ - private String shortName; - /** - * 圆图 - */ - private String nationalFlag1; - - - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/param/CuRegionAssessParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/param/CuRegionAssessParam.java index 2a52928e..9ba93847 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/param/CuRegionAssessParam.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/param/CuRegionAssessParam.java @@ -6,12 +6,7 @@ import java.io.Serializable; import java.util.Date; /** - * @description: 查询参数 - * @author: sui q - * @time: 2025/1/15 17:22 - * @classname: CuRegionAssessParam - * @package_name: com.hzs.bonus.param - * version 1.0.0 + * 查询参数 */ @Data public class CuRegionAssessParam implements Serializable { diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/param/MemberParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/param/MemberParam.java deleted file mode 100644 index f9ee9d44..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/param/MemberParam.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.hzs.bonus.param; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.Data; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * 后台查询会员的统一入口参数 - */ -@Data -public class MemberParam implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员名称 - */ - private String memberName; - - /** - * 用户类型分类（0=正常（正常 空单 嗨粉） 1=死点（死点）） - */ - private Integer category; - /** - * 会员类型（0.正常 1.空单 2.死点 4.嗨粉） - */ - private Integer customerType; - - /** - * 手机号码 - */ - private String phone; - - /** - * 邮箱 - */ - private String email; - - /** - * 证件号码 - */ - private String idCard; - - /** - * 性别（0=未知,1=男,2=女） - */ - private Integer sex; - - /** - * 推荐人编号 - */ - private String parent; - - /** - * 推荐人主键 - */ - private Long pkParent; - - /** - * 推荐人姓名 - */ - private String parentName; - - /** - * 安置人编号 - */ - private String placeParent; - - /** - * 安置人姓名 - */ - private String placeParentName; - - /** - * 安置部门 - */ - private Integer placeDept; - - /** - * 所属团队编号 - */ - private String teamCode; - - /** - * 所属团队编号 - */ - private String teamName; - - /** - * 报单中心编号 - */ - private String centerCode; - - /** - * 数据来源（1=PC端,2=APP,3=H5） - */ - private Integer source; - - /** - * 结算等级 - */ - private Integer pkGrade; - - /** - * 真实奖衔 - */ - private Integer pkAwards; - - /** - * 开始时间 - */ - private Date startDate; - - /** - * 结束时间 - */ - private Date endDate; - - /** - * 支付时间 - */ - private Date payTime; - - /** - * 支付状态 - */ - private Integer payStatus; - - /** - * 修改次数 - */ - private Integer editNumber; - - /** - * 注册权限（0=普通用户,1=报单中心,2=服务中心） - */ - private Integer registerAuthority; - - /** - * 顶点团队编号 - */ - private String vertexCode; - - /** - * 账号状态（0=正常,1=冻结,2=封停） - */ - private Integer accountStatus; - - /** - * 钱包状态（0=正常,1=锁定） - */ - private Integer walletStatus; - - /** - * 国家 - */ - private Integer pkCountry; - - /** - * 登录密码 - */ - private String loginPassword; - - /** - * 支付密码 - */ - private String payPassword; - - /** - * 手机验证码 - */ - private String code; - - @JsonIgnore - public List getValidConfirmField() { - List fieldList = new ArrayList<>(); - fieldList.add("memberCode"); - fieldList.add("memberName"); - fieldList.add("phone"); - fieldList.add("parent"); - fieldList.add("loginPassword"); - fieldList.add("payPassword"); - fieldList.add("code"); - return fieldList; - } -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/pub/tool/MemberToolsHandler.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/pub/tool/MemberToolsHandler.java index 3397d93a..fe0ff646 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/pub/tool/MemberToolsHandler.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/pub/tool/MemberToolsHandler.java @@ -9,23 +9,12 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -/** - * @Description: - * @Author: sui q - * @Time: 2023/3/21 10:04 - * @Classname: MemberToolsHandler - * @PackageName: com.hzs.member.pub.tool - */ @Component @Slf4j public class MemberToolsHandler { - private RedisService redisService; - @Autowired - public void setRedisService(RedisService redisService) { - this.redisService = redisService; - } + private RedisService redisService; /** * @param orderPrefix 订单前缀 diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/controller/manage/MemberRiskControlController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/controller/manage/MemberRiskControlController.java index 36b5a827..091a0e5b 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/controller/manage/MemberRiskControlController.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/controller/manage/MemberRiskControlController.java @@ -25,14 +25,6 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -/** - * @BelongsProject: hzs_cloud - * @BelongsPackage: com.hzs.bonus.risk.controller.manage - * @Author: yh - * @CreateTime: 2024-04-09 16:55 - * @Description: TODO - * @Version: 1.0 - */ @RestController @RequestMapping("/manage/member-risk-control") public class MemberRiskControlController extends BaseController { diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberAchieveLogMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberAchieveLogMapper.xml deleted file mode 100644 index 4fb6fc86..00000000 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberAchieveLogMapper.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberAgentMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberAgentMapper.xml deleted file mode 100644 index ce8813da..00000000 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberAgentMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberMapper.xml index ea79d7b3..5724d651 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberMapper.xml @@ -85,95 +85,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select cm.pk_id, - cm.member_code, - cm.member_name, - cm.phone, - cm.pk_settle_country, - cm.pk_parent, - cm.pk_place_parent, - cm.place_dept, - cm.pk_team_code, - cm.pk_center_code, - cm.category, - cm.pk_settle_grade, - cm.pk_awards, - cm.purchase_status, - cm.order_source, - cm.is_real_name, - cm.is_bus_license, - cm.is_maker_space, - cm.share_status, - cm.pay_pwd, - cm.register_authority, - cm.nick_name - from cu_member cm - where cm.del_flag = 0 - - merge into cu_member a using ( diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberRegisterMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberRegisterMapper.xml deleted file mode 100644 index d9817426..00000000 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberRegisterMapper.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - update cu_member_register set customer_type = 1,pk_modified = #{pkModified},modified_time=sysdate - where pk_member=#{pkMember} and pk_country=#{pkCountry} - and del_flag=0 - - - - diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberUpgradeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberUpgradeMapper.xml deleted file mode 100644 index 0f369520..00000000 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberUpgradeMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/CuMemberAgent.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/CuMemberAgent.java index f164cbb3..84b03eff 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/CuMemberAgent.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/CuMemberAgent.java @@ -9,12 +9,7 @@ import lombok.*; import lombok.experimental.Accessors; /** - *

* 会员信息-代理商信息 - *

- * - * @author hzs - * @since 2022-08-31 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberAchieveLog.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberAchieveLog.java index 197954fb..497b4d72 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberAchieveLog.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberAchieveLog.java @@ -15,12 +15,7 @@ import java.math.BigDecimal; import java.util.Date; /** - *

* 注水业绩记录表 - *

- * - * @author zhangjing - * @since 2023-02-03 */ @Data @EqualsAndHashCode(callSuper = true) @@ -56,7 +51,6 @@ public class CuMemberAchieveLog extends BaseEntity { private BigDecimal bSumRealModifyPv; - /** * 变更后A区首购业绩 */ @@ -64,7 +58,6 @@ public class CuMemberAchieveLog extends BaseEntity { private BigDecimal aFirstModifyPv; - /** * 变更后B区首购业绩 */ @@ -72,7 +65,6 @@ public class CuMemberAchieveLog extends BaseEntity { private BigDecimal bFirstModifyPv; - /** * 变更后A区首购结余 */ @@ -80,7 +72,6 @@ public class CuMemberAchieveLog extends BaseEntity { private BigDecimal repAFirstModifyBalance; - /** * 变更后B区首购结余 */ @@ -112,13 +103,13 @@ public class CuMemberAchieveLog extends BaseEntity { private BigDecimal repBModifyBalance; /** - * 变更前左区真实业绩 + * 变更前左区真实业绩 */ @TableField("A_SUM_REAL_PV") private BigDecimal asumRealPv; /** - * 变更前右区真实业绩 + * 变更前右区真实业绩 */ @TableField("B_SUM_REAL_PV") private BigDecimal bsumRealPv; @@ -218,7 +209,6 @@ public class CuMemberAchieveLog extends BaseEntity { private Integer pkAccount; - /** * 期间 */