diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuRegionAssessDetailVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuRegionAssessDetailVO.java deleted file mode 100644 index ca3ce94e..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuRegionAssessDetailVO.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.hzs.bonus.detail.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.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 考核区域明细 - * @author: sui q - * @time: 2025/1/16 11:32 - * @classname: CuRegionAssessDetailVO - * @package_name: com.hzs.bonus.detail.vo - * version 1.0.0 - */ -@Data -public class CuRegionAssessDetailVO implements Serializable { - - /** - * 会员主键 - */ - private Long pkMember; - - /** - * 考核日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date assessDate; - - /** - * 会员等级 - */ - private Integer pkAwards; - - /** - * 团队月消费pv - */ - private BigDecimal teamMonthPv; - - /** - * 团队月消费pv - */ - private BigDecimal smallAreaPv; - - /** - * 考核状态 (0=考核通过,1=免考通过,2=考核不通过,3=不考核) - */ - @Transaction(transactionKey = EnumsPrefixConstants.ASSESS_STATUS) - private Integer assessStatus; - - private String assessStatusVal; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuRegionAssessExcelVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuRegionAssessExcelVO.java deleted file mode 100644 index 73b3791c..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuRegionAssessExcelVO.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.hzs.bonus.detail.vo; - -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * @description: 导出excel - * @author: sui q - * @time: 2025/1/16 16:27 - * @classname: CuRegionAssessExcelVO - * @package_name: com.hzs.bonus.detail.vo - * version 1.0.0 - */ -@Data -public class CuRegionAssessExcelVO implements Serializable { - - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - /** - * 会员姓名 - */ - @Excel(name = "会员姓名") - private String memberName; - - /** - * 考核区域 省+市+县 - */ - @Excel(name = "考核区域") - private String assessAddress; - - /** - * 考核期 - */ - @Excel(name = "考核期间") - private Integer assessPeriod; - - /** - * 考核开始日期 - */ - @Excel(name = "开始日期", dateFormat = "yyyy-MM-dd") - private Date assessStartDate; - - /** - * 考核期结束日期 - */ - @Excel(name = "结束日期", dateFormat = "yyyy-MM-dd") - private Date assessEndDate; - - /** - * 达标次数 - */ - @Excel(name = "达标次数") - private Integer reachNum; - - /** - * 考核日期 - */ - @Excel(name = "考核日期", dateFormat = "yyyy-MM-dd") - private Date assessDate; - - /** - * 团队月消费pv - */ - @Excel(name = "团队业绩") - private BigDecimal teamMonthPv; - - /** - * 团队月消费pv - */ - @Excel(name = "小区业绩") - private BigDecimal smallAreaPv; - - /** - * 考核状态 (0=考核通过,1=免考通过,2=考核不通过,3=不考核) - */ - @Excel(name = "考核状态", readConverterExp = "0=考核通过,1=免考通过,2=考核不通过,3=不考核") - private Integer assessStatus; - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuRegionAssessVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuRegionAssessVO.java deleted file mode 100644 index f57b23ac..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuRegionAssessVO.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.hzs.bonus.detail.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Transaction; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -/** - * @description: 区域考核结果 - * @author: sui q - * @time: 2025/1/16 11:13 - * @classname: CuRegionAssessVO - * @package_name: com.hzs.bonus.detail.vo - * version 1.0.0 - */ -@Data -public class CuRegionAssessVO implements Serializable { - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员姓名 - */ - private String memberName; - - /** - * 考核区域 省+市+县 - */ - private String assessAddress; - - /** - * 考核期 - */ - private Integer assessPeriod; - - /** - * 考核开始日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date assessStartDate; - - /** - * 考核期结束日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date assessEndDate; - - /** - * 达标次数 - */ - private Integer reachNum; - - @Transaction - private List regionAssessDetailVoList; -} 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 deleted file mode 100644 index 9ba93847..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/param/CuRegionAssessParam.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.hzs.bonus.param; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 查询参数 - */ -@Data -public class CuRegionAssessParam implements Serializable { - - private Date assessDate; - - private Long pkMember; - - private Integer pkCountry; - - private String memberCode; - - private String memberName; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/vo/MemberRiskControlVo.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/vo/MemberRiskControlVo.java index 96af2d88..bfb855a1 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/vo/MemberRiskControlVo.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/vo/MemberRiskControlVo.java @@ -1,32 +1,15 @@ -package com.hzs.bonus.risk.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2024/4/9 17:01 - * @Classname: MemberRiskControlVo - * @PackageName: com.hzs.bonus.risk.vo - */ +package com.hzs.bonus.risk.vo; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.math.BigDecimal; import java.util.Date; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.bonus.risk.vo - *@Author: yh - *@CreateTime: 2024-04-09 17:01 - *@Description: TODO - *@Version: 1.0 - */ @Data public class MemberRiskControlVo { - /** * 会员名称 */