angelo
/
java-zk-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
sangelxiu1 2025-09-09 15:45:54 +08:00
parent 19cbc5c766 10fbf97186
commit aba66a444c
6 changed files with 3 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuRegionAssessDetailVO.java
View File

@ -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;
}

87
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuRegionAssessExcelVO.java
View File

@ -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;
}

62
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/vo/CuRegionAssessVO.java
View File

@ -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<CuRegionAssessDetailVO> regionAssessDetailVoList;
}

23
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/param/CuRegionAssessParam.java
View File

@ -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;
}

19
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/vo/MemberRiskControlVo.java
View File

@ -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 {
/**
* 会员名称
*/

4
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESysName.java
View File

@ -13,9 +13,9 @@ public enum ESysName {
MANAGE("manage", "后台管理"),
/**
* 众康系统
* 康健系统
*/
ZK("zk", "众康系统"),
KG("kg", "康健系统"),
;