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-06-27 11:27:49 +08:00
parent 9f9bdc17ed 18519ad213
commit 7b1889f6b1
270 changed files with 537 additions and 21125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/MemberAmountDTO.java
View File

@ -10,12 +10,6 @@ import java.math.BigDecimal;
/**
* 会员业务手续费
*
* @Description:
* @Author: ljc
* @Time: 2023/1/6 15:15
* @Classname: BusinessCommissionDTO
* @Package_name: com.hzs.member.account.dto
*/
@Data
@Builder

39
bd-api/bd-api-sale/src/main/java/com/hzs/activity/pick/IAcPickServiceApi.java
View File

@ -1,39 +0,0 @@
package com.hzs.activity.pick;
import com.hzs.common.core.domain.R;
import com.hzs.common.domain.activity.pick.AcPickMemberLog;
import com.hzs.common.domain.activity.pick.ext.AcPickExt;
import com.hzs.common.domain.sale.ext.SaOrderExt;
import java.math.BigDecimal;
import java.util.List;
/**
* @Description: 提货相关dubbo服务入口
* @Author: jiang chao
* @Time: 2023/5/15 11:20
* @Classname: IAcPickServiceApi
* @PackageName: com.hzs.activity.base
*/
public interface IAcPickServiceApi {
/*
* @description: 查询会员提货使用记录
* @author: sui q
* @date: 2023/6/3 10:51
* @param: null null
**/
R<List<AcPickMemberLog>> queryPickMemberLog(List<SaOrderExt> saOrderExtList);
/**
* 根据订单查询邮费
*
* @param orderCode 订单编号
* @param recProvince 省
* @param recCity 市
* @param pkCountry 国家
* @return
*/
R<BigDecimal> queryOrderPostage(String orderCode, Integer recProvince, Integer recCity, Integer pkCountry);
}

43
bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java
View File

@ -27,14 +27,6 @@ public interface ISaOrderServiceApi {
*/
R<List<SaOrderExt>> queryRetailSaOrderByDay(Date startDate, Date endDate, String orderCode);
/**
* 查询时间范围内的所有订单，按照订单时间排序,只能用于奖金结算
*
* @param startDate 开始日期
* @param endDate 结束日期
*/
R<List<SaOrderExt>> queryRepeatSaOrderByDay(Date startDate, Date endDate);
/*
* 根据主键查询订单,需要查询del_flag=1的，存在先撤单在退货
**/
@ -45,32 +37,6 @@ public interface ISaOrderServiceApi {
**/
R<List<SaOrderExt>> querySaOrderByDeliverList(List<SaDeliverItemsExt> deliverItemExtList);
/**
* 查询时间范围内的所有订单，按照订单时间排序，不查询删除的，用于云代奖金计算，只需要主表
*
* @param startDate 开始日期
* @param endDate 结束日期
*/
R<List<SaOrder>> querySaOrderByDayForCloud(Date startDate, Date endDate, List<Integer> orderType);
/**
* 计算复购券分享奖金，查询订单
*
* @param startDate 开始日期
* @param endDate 结束日期
* @param orderTypeList 订单类型
* @param orderAmount 订单金额
* @param orderAchieve 订单业绩
*/
R<List<SaOrder>> querySaOrderByTimeForCouponShare(Date startDate, Date endDate, List<Integer> orderTypeList,
BigDecimal orderAmount, BigDecimal orderAchieve, Integer pkCountry);
/*
* 计算店铺奖金，查询订单
**/
R<List<SaOrderExt>> querySaOrderByTimeForStore(Date startDate, Date endDate);
/**
* 根据订单ID查询订单详细列表
*
@ -80,15 +46,6 @@ public interface ISaOrderServiceApi {
*/
R<List<SaOrderItemsExt>> queryOrderItemsListByOrderId(List<Long> pkOrderList, Integer pkCountry);
/**
* 根据订单编号查询订单信息
*
* @param orderCode 订单编号
* @param pkMember 会员主键
* @return
*/
R<SaOrderExt> queryOrderByCode(String orderCode, Long pkMember);
/**
* 空单注册审核通过
*

335
bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/OrderParamDTO.java
View File

@ -1,335 +0,0 @@
package com.hzs.sale.order.dto;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.hzs.common.core.constant.msg.MemberMsgConstants;
import jdk.nashorn.internal.ir.annotations.Ignore;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.Size;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class OrderParamDTO implements Serializable {
/**
* 订单编号
*/
private String orderCode;
/**
* 会员编号
*/
private Long pkMember;
/**
* 会员编号
*/
private String memberCode;
/**
* 会员姓名
*/
private String memberName;
/**
* 会员类型（0.正常 1.空单 2.死点 4.嗨粉）
*/
private Integer customerType;
/**
* 等级
*/
private Integer pkGrade;
/**
* 手机号码
*/
@Size(min = 1, max = 30, message = MemberMsgConstants.PHONE_LENGTH)
private String phone;
/**
* 证件号码
*/
private String idCard;
/**
* 性别（0=未知,1=男,2=女）
*/
private Integer sex;
/**
* 自然国家
*/
private Integer pkCountry;
/**
* 结算国家
*/
private Integer pkSettleCountry;
/**
* 创建人结算国家，用于跨国报单
*/
@JsonIgnore
private Integer pkLoginSettleCountry;
/**
* 推荐人编号
*/
private String parent;
@JsonIgnore
private Long parentId;
/**
* 推荐人ID，为防止之前业务有问题，不使用上面的字段
*/
private Long pkParent;
/**
* 会员ID，为防止之前业务有问题，新添加会员ID字段
*/
private Long pkMemberId;
/**
* 推荐人姓名
*/
private String parentName;
/**
* 安置人编号
*/
private String placeParent;
@JsonIgnore
private Long placeParentId;
/**
* 安置人姓名
*/
private String placeParentName;
/**
* 安置人部门
*/
private Integer placeDept;
/**
* 报单中心编号
*/
private Long centerCodeId;
/**
* 报单中心名称
*/
private String centerName;
/**
* 升级会员编号，需要验证安置线，只能给自己的安置以下升级
*/
private String upgradeMemberCode;
/**
* 复购会员编号，需要验证安置线，只能给自己的安置以下升级
*/
private String repurchaseMemberCode;
/**
* 会员升级姓名
*/
private String upgradeMemberName;
/**
* 数据来源（1=PC端,2=APP,3=H5）
*/
private Integer source;
/**
* 收货人
*/
private String recName;
/**
* 收货电话
*/
private String recPhone;
/**
* 收货省
*/
private Integer recProvince;
/**
* 收货市
*/
private Integer recCity;
/**
* 收货县
*/
private Integer recCounty;
/**
* 收货地址
*/
private String recAddress;
/**
* 备注
*/
private String remark;
/**
* 配送中心
*/
private Integer deliveryCenter;
/**
* 配送省
*/
private Integer deliveryProvince;
/**
* 配送市
*/
private Integer deliveryCity;
/**
* 配送县
*/
private Integer deliveryCounty;
/**
* 发货方式
*/
private Integer deliveryWay;
/**
* 运输类型 1=陆运，2=空运，3=海运
*/
private Integer transType;
/**
* 运输类型 1=陆运，2=空运，3=海运
*/
private Integer tranType;
/**
* 登录密码
*/
@JsonIgnore
private String loginPwd;
/**
* 支付密码
*/
private String payPwd;
/**
* 邮箱
*/
private String email;
/**
* 所属专区
*/
private Integer specialArea;
/**
* 银行
*/
private Integer pkBank;
/**
* 支行名称
*/
private String subBankName;
/**
* 银行卡号
*/
private String cardNumber;
/**
* 会员店铺
*/
private Integer pkMemberStore;
/**
* 仓库
*/
private Integer pkStorehouse;
/**
* 邮费
*/
private BigDecimal postage = BigDecimal.ZERO;
/**
* 特殊邮费（处理不参与复购300包邮的邮费）
*/
private BigDecimal specialPostage = BigDecimal.ZERO;
/**
* 特殊邮费金额（处理不参与复购300包邮的邮费）
*/
private BigDecimal specialPostageAmount = BigDecimal.ZERO;
/**
* 订单商品明细
*/
private List<OrderItemsParamDTO> orderItemsParams;
/**
* 是否首单
*/
private Boolean isFirst = false;
/**
* 是否海粉订单
*/
@JsonIgnore
private Boolean isHaiFun = false;
/**
* 显示默认，0=快速注册，1=普通注册
*/
private Integer displayDefault;
/**
* @Description: 验证保存的必输字段
* @return: List
* @Author: sui q
* @Date: 2022/8/29 11:10
*/
@JsonIgnore
public List<String> getValidSaveField() {
List<String> fieldList = getValidConfirmField();
fieldList.add("payPwd");
return fieldList;
}
@JsonIgnore
public List<String> getFunValidConfirmField() {
List<String> fieldList = getList();
fieldList.add("memberName");
fieldList.add("phone");
fieldList.add("parent");
return fieldList;
}
@JsonIgnore
public List<String> getValidConfirmField() {
List<String> fieldList = getFunValidConfirmField();
fieldList.add("placeParent");
fieldList.add("placeDept");
return fieldList;
}
@Ignore
private List<String> getList() {
return new ArrayList<>();
}
}

33
bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/IScmBillServiceApi.java
View File

@ -11,12 +11,7 @@ import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
import java.util.List;
/**
* @description: 供应链单据对外接口发布
* @author: sui q
* @time: 2023/11/25 09:21
* @classname: IScmBillServiceApi
* @package_name: com.hzs.scm.ic
* version 1.0.0
* 供应链单据对外接口发布
*/
public interface IScmBillServiceApi {
@ -29,42 +24,28 @@ public interface IScmBillServiceApi {
R<Boolean> approvalCallback(ApprovalBusinessResultDTO approvalBusinessResultDTO);
/*
* @description: 查询单据信息
* @author: sui q
* @date: 2023/11/25 9:38
* @param: null null
* 查询单据信息
**/
R<List<BillDTO>> queryBillDtoByCondition(EApprovalBusiness eApprovalBusiness, String businessCode);
/*
* @description: 下单时验证可用量
* @author: sui q
* @date: 2023/12/11 10:01
* @param: null null
* 下单时验证可用量
**/
R<List<IcAvailableNumExt>> queryAvailableNumByProduct(List<IcAvailableNum> availableNumList);
/*
* @description: 更新可用量
* @author: sui q
* @date: 2023/12/18 9:28
* @param: null null
* 更新可用量
**/
R<Boolean> updateDeductIcAvailableNumByList(List<IcAvailableNumExt> availableNumList);
/*
* @description: 更新单据号规则
* @author: sui q
* @date: 2024/2/21 15:40
* @param: null null
* 更新单据号规则
**/
R<Boolean> updateScmBillNoNextValue();
/*
* @description: 撤单、退单回退可用量
* @author: sui q
* @date: 2024/4/17 10:13
* @param: null null
* 撤单、退单回退可用量
**/
R<Boolean> backSaOrderAvailable(SaOrderExt saOrderExt);
}

6
bd-api/bd-api-system/src/main/java/com/hzs/system/config/IGradeServiceApi.java
View File

@ -2,7 +2,6 @@ package com.hzs.system.config;
import com.hzs.common.core.domain.R;
import com.hzs.common.domain.system.config.BdGrade;
import com.hzs.common.domain.system.config.ext.BdStoreLevelExt;
import com.hzs.system.config.dto.GradeDTO;
import java.math.BigDecimal;
@ -69,11 +68,6 @@ public interface IGradeServiceApi {
*/
R<List<GradeDTO>> selectGradeAll(Integer dataCountry);
/*
* 查询店铺等级
**/
R<List<BdStoreLevelExt>> queryStoreLevel();
/**
* 根据国家查询等级配置列表
*

13
bd-api/bd-api-system/src/main/java/com/hzs/system/config/IServiceChargeServiceApi.java
View File

@ -6,20 +6,12 @@ import com.hzs.system.config.dto.ServiceChargeDTO;
import java.util.List;
/**
* @Description: 办理业务手续费api
* @Author: zhangjing
* @Time: 2022/9/9 14:07
* @Classname: IGradeServiceApi
* @PackageName: com.hzs.system.config
* 办理业务手续费api
*/
public interface IServiceChargeServiceApi {
/**
* @description: 根据业务类型查询扣款
* @author: zhang jing
* @date: 2023/1/7 15:01
* @param: [type, quantity]
* @return: com.hzs.common.core.domain.R<com.hzs.system.config.dto.ServiceChargeDTO>
* 根据业务类型查询扣款
**/
R<ServiceChargeDTO> getServiceChargeByType(ServiceChargeDTO serviceChargeDTO);
@ -31,5 +23,4 @@ public interface IServiceChargeServiceApi {
*/
R<List<ServiceChargeDTO>> getServiceChargeByType(List<ServiceChargeDTO> serviceChargeDTOList);
}

7
bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusExpandDTO.java
View File

@ -5,13 +5,6 @@ import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @Description:
* @Author: sui q
* @Time: 2023/2/21 15:32
* @Classname: BonusExpandDTO
* @PackageName: com.hzs.system.config.dto
*/
@Data
public class BonusExpandDTO implements Serializable {

6
bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/RangeDTO.java
View File

@ -9,11 +9,7 @@ import java.io.Serializable;
import java.math.BigDecimal;
/**
* @Description: 极差的配置
* @Author: sui q
* @Time: 2023/1/3 13:42
* @Classname: RangeDTO
* @PackageName: com.hzs.system.config.dto
* 极差的配置
*/
@Data
public class RangeDTO implements Serializable {

107
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberAccountMapper.java
View File

@ -2,113 +2,17 @@ package com.hzs.bonus.account.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.common.domain.member.account.CuMemberAccount;
import com.hzs.common.domain.member.ext.CuMemberAccountExt;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
import java.util.List;
/**
* 会员账户信息 Mapper 接口
*
* @author hzs
* @since 2022-08-11
*/
public interface CuMemberAccountMapper extends BaseMapper<CuMemberAccount> {
/**
* 查询会员账户状态，账户信息
*
* @param cuMemberAccount 会员账户条件信息
* @return: List<CuMemberAccountExt>
* @Author: sui q
* @Date: 2022/9/5 11:57
*/
List<CuMemberAccountExt> queryMemberAccountByCondition(CuMemberAccount cuMemberAccount);
/**
* 根据会员编码获取余额
*
* @param pkMember 会员编号
* @param accountType 账户类型
* @return BigDecimal
*/
BigDecimal selectBalanceByMemberCode(@Param("pkMember") Long pkMember, @Param("accountType") Integer accountType);
/**
* 更新账户余额
*
* @param cuMemberAccount 会员账户表
* @return: Integer
* @Author: sui q
* @Date: 2022/9/21 21:42
*/
Integer updateMemberAccount(CuMemberAccount cuMemberAccount);
/**
* 根据用户ID集合查询用户余额
*
* @param pkMembers 用户ID集合
* @return List<CuMemberAccount>
*/
List<CuMemberAccount> selectMemberAccountByPkMember(@Param(value = "pkMembers") List<Long> pkMembers);
/**
* 根据国家查询余额与银行卡信息
*
* @param pkCountry 国家ID
* @return List<CuMemberAccountExt>
*/
List<CuMemberAccountExt> queryMemberAccountByPkCountry(@Param("pkCountry") Integer pkCountry);
/**
* 获得更新账户余额 奖金账户、可提现账户、可消费账户
* 奖金账户 = 可提现账户+可消费账户
* 奖金账户操作时 ：入的金额 进可消费账户 出的金额 进可提现账户
* <p>
* 根据用户batch 批量更新余额
*
* @param batch 批次号
* @param type 操作类型（1：转入、2：转出）
* @return Boolean
*/
Boolean updateBatchMemberAccountByPkmember(@Param("batch") String batch, @Param("pkModified") Long pkModified, @Param("type") int type);
/**
* 根据用户编号集查询用户账户的全部字段信息
*
* @param memberCodes 用户编号
* @return List<CuMemberAccountExt>
*/
List<CuMemberAccountExt> queryMemberAccountAllByMemberCodes(@Param(value = "memberCodes") List<String> memberCodes);
/**
* 根据用户编号查询用户ID
*
* @param memberCodes 用户编号
* @param pkCountry 国家
* @return List<Long>
*/
List<Long> selectPkMembersByMemberCode(@Param("memberCodes") List<String> memberCodes, @Param("pkCountry") Integer pkCountry);
/**
* 更新冻结账户信息
*
* @param cuMemberAccount
* @return Integer
*/
Integer updateFrozenAmountInfo(CuMemberAccountExt cuMemberAccount);
/**
* 奖金发放，根据期间发放奖金，更新奖金余额
*
* @param startPeriod 期间
* @return: void
* @Author: sui q
* @Date: 2023/3/21 14:12
*/
void updateMemberAccountGrantByPeriod(@Param("pkCountry") Integer pkCountry, @Param("startPeriod") Integer startPeriod,
@Param("endPeriod") Integer endPeriod);
@ -117,18 +21,7 @@ public interface CuMemberAccountMapper extends BaseMapper<CuMemberAccount> {
* 奖金可提现，根据期间更新可提现金额，减少可消费金额
*
* @param startPeriod 期间
* @return: void
* @Author: sui q
* @Date: 2023/3/21 14:12
*/
void updateMemberAccountWithdrawalByPeriod(@Param("startPeriod") Integer startPeriod, @Param("endPeriod") Integer endPeriod, @Param("pkCountry") Integer pkCountry);
/**
* 根据来源单号查询奖金账号信息
*
* @param sourceCode 来源单号
* @return List<CuMemberAccount>
*/
List<CuMemberAccount> selectMemberBonusAccountBySourceCode(String sourceCode);
}

5
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeBonusMapper.java
View File

@ -4,12 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.common.domain.member.account.CuMemberTradeBonus;
/**
* <p>
* 会员已发放奖金交易明细表 Mapper 接口
* </p>
*
* @author hzs
* @since 2023-03-24
*/
public interface CuMemberTradeBonusMapper extends BaseMapper<CuMemberTradeBonus> {

59
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeDetailMapper.java
View File

@ -1,19 +1,13 @@
package com.hzs.bonus.account.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.common.domain.member.account.CuMemberTradeBonus;
import com.hzs.common.domain.member.account.CuMemberTradeDetail;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
* Mapper 接口
* </p>
*
* @author hzs
* @since 2023-03-21
*/
public interface CuMemberTradeDetailMapper extends BaseMapper<CuMemberTradeDetail> {
@ -21,9 +15,6 @@ public interface CuMemberTradeDetailMapper extends BaseMapper<CuMemberTradeDetai
* 批量插入会员交易流水，用于奖金发放插入流水
*
* @param cuMemberTradeDetailList 交易流水
* @return: void
* @Author: sui q
* @Date: 2023/3/21 11:45
*/
void batchInsertCuMemberTradeDetail(@Param("cuMemberTradeDetailList") List<?> cuMemberTradeDetailList);
@ -31,55 +22,7 @@ public interface CuMemberTradeDetailMapper extends BaseMapper<CuMemberTradeDetai
* 奖金可提现 根据期间发放奖金
*
* @param startPeriod 期间
* @return: void
* @Author: sui q
* @Date: 2023/3/21 15:30
*/
void updateCuMemberTradeDetailByPeriod(@Param("startPeriod") Integer startPeriod, @Param("endPeriod") Integer endPeriod, @Param("pkCountry") Integer pkCountry);
void updateCuMemberTradeDetailByPeriod(@Param("startPeriod") Integer startPeriod, @Param("endPeriod") Integer endPeriod, @Param("pkCountry") Integer pkCountry);
/**
* 根据会员编号查询会员奖金的发放明细
*
* @param pkMember 会员编号
* @return: List<CuMemberTradeDetail>
* @Author: sui q
* @Date: 2023/3/24 16:05
*/
List<CuMemberTradeDetail> queryCuMemberTradeDetail(Long pkMember);
/**
* 批量更新会员奖金发放明细
*
* @param cuMemberTradeDetailList 会员奖金发放明细
* @return: void
* @Author: sui q
* @Date: 2023/3/24 17:41
*/
void updateCuMemberTradeDetail(@Param("cuMemberTradeDetailList") List<?> cuMemberTradeDetailList);
/**
* 批量更新会员奖金发放明细
*
* @param cuMemberTradeDetailList 会员奖金发放明细
* @return: void
* @Author: sui q
* @Date: 2023/3/24 17:41
*/
void updateAddCuMemberTradeDetail(@Param("cuMemberTradeDetailList") List<?> cuMemberTradeDetailList);
/**
* 根据交易流水信息 批量插入会员奖金发放
*
* @param sourceCode 单号
* @return Integer
*/
Integer batchInsertMemberTradeDetailFromTrade(@Param("sourceCode") String sourceCode, @Param("period") Integer period);
/**
* 根据用户ID查询用户扣款金额
*
* @param pkMember 用户ID
* @return List<CuMemberTradeDetail>
*/
List<CuMemberTradeDetail> selectMemberTradeDetailByPkMember(@Param("pkMember") Long pkMember);
}

11
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/mapper/CuMemberTradeMapper.java
View File

@ -7,12 +7,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
* 会员交易明细 Mapper 接口
* </p>
*
* @author hzs
* @since 2022-09-06
*/
public interface CuMemberTradeMapper extends BaseMapper<CuMemberTrade> {
@ -20,9 +15,6 @@ public interface CuMemberTradeMapper extends BaseMapper<CuMemberTrade> {
* 批量获取cuMemberBonus主键
*
* @param rowNum 数量
* @return: List<Integer>
* @Author: sui q
* @Date: 2022/12/13 13:47
*/
List<Long> batchQueryCuMemberTradeSeq(Integer rowNum);
@ -30,9 +22,6 @@ public interface CuMemberTradeMapper extends BaseMapper<CuMemberTrade> {
* 批量插入会员交易流水，用于奖金发放插入流水
*
* @param cuMemberTradeList 交易流水
* @return: void
* @Author: sui q
* @Date: 2023/3/21 11:45
*/
void batchInsertCuMemberTrade(@Param("cuMemberTradeList") List<?> cuMemberTradeList);

30
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberAccountService.java
View File

@ -3,42 +3,15 @@ package com.hzs.bonus.account.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.member.account.CuMemberAccount;
import java.util.List;
/**
* 会员账户信息 服务类
*
* @author hzs
* @since 2022-08-11
*/
public interface ICuMemberAccountService extends IService<CuMemberAccount> {
/**
* 更新账户余额
*
* @param cuMemberAccount 会员账户表
* @param pkModified 修改人
* @return: Boolean
* @Author: sui q
* @Date: 2022/9/21 21:42
*/
Boolean updateMemberAccount(CuMemberAccount cuMemberAccount, Long pkModified);
/**
* 根据用户ID集合查询用户余额
*
* @param pkMembers 用户ID集合
* @return List<CuMemberAccount>
*/
List<CuMemberAccount> selectMemberAccountByPkMember(List<Long> pkMembers);
/**
* 奖金发放，根据期间发放奖金，更新奖金余额
*
* @param startPeriod 期间
* @return: void
* @Author: sui q
* @Date: 2023/3/21 14:12
*/
void updateMemberAccountGrantByPeriod(Integer pkCountry, Integer startPeriod, Integer endPeriod);
@ -46,9 +19,6 @@ public interface ICuMemberAccountService extends IService<CuMemberAccount> {
* 奖金可提现，根据期间更新可提现金额，减少可消费金额
*
* @param startPeriod 期间
* @return: void
* @Author: sui q
* @Date: 2023/3/21 14:12
*/
void updateMemberAccountWithdrawalByPeriod(Integer startPeriod, Integer endPeriod, Integer pkCountry);

5
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeBonusService.java
View File

@ -4,12 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.member.account.CuMemberTradeBonus;
/**
* <p>
* 会员已发放奖金交易明细表 服务类
* </p>
*
* @author hzs
* @since 2023-03-24
*/
public interface ICuMemberTradeBonusService extends IService<CuMemberTradeBonus> {

61
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeDetailService.java
View File

@ -1,18 +1,12 @@
package com.hzs.bonus.account.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.member.account.CuMemberTradeBonus;
import com.hzs.common.domain.member.account.CuMemberTradeDetail;
import java.util.List;
/**
* <p>
* 服务类
* </p>
*
* @author hzs
* @since 2023-03-21
*/
public interface ICuMemberTradeDetailService extends IService<CuMemberTradeDetail> {
@ -20,9 +14,6 @@ public interface ICuMemberTradeDetailService extends IService<CuMemberTradeDetai
* 批量插入会员交易流水，用于奖金发放插入流水
*
* @param cuMemberTradeDetailList 交易流水
* @return: void
* @Author: sui q
* @Date: 2023/3/21 11:45
*/
void batchInsertCuMemberTradeDetail(List<CuMemberTradeDetail> cuMemberTradeDetailList);
@ -30,57 +21,7 @@ public interface ICuMemberTradeDetailService extends IService<CuMemberTradeDetai
* 奖金可提现 根据期间发放奖金
*
* @param startPeriod 期间
* @return: void
* @Author: sui q
* @Date: 2023/3/21 15:30
*/
void updateCuMemberTradeDetailByPeriod(Integer startPeriod, Integer endPeriod, Integer pkCountry);
/**
* 根据会员编号查询会员奖金的发放明细
*
* @param pkMember 会员编号
* @return: List<CuMemberTradeDetail>
* @Author: sui q
* @Date: 2023/3/24 16:05
*/
List<CuMemberTradeDetail> queryCuMemberTradeDetail(Long pkMember);
/**
* 批量更新会员奖金发放明细
*
* @param cuMemberTradeDetailList 会员奖金发放明细
* @return: void
* @Author: sui q
* @Date: 2023/3/24 17:41
*/
void updateCuMemberTradeDetail(List<CuMemberTradeDetail> cuMemberTradeDetailList);
/**
* 批量更新会员奖金发放明细
*
* @param cuMemberTradeDetailList 会员奖金发放明细
* @return: void
* @Author: sui q
* @Date: 2023/3/24 17:41
*/
void updateAddCuMemberTradeDetail(List<CuMemberTradeDetail> cuMemberTradeDetailList);
/**
* 根据交易流水信息 批量插入会员奖金发放
*
* @param sourceCode 单号
* @param period 期间
* @return Integer
*/
Integer batchInsertMemberTradeDetailFromTrade(String sourceCode, Integer period);
/**
* 根据用户ID查询用户扣款金额
*
* @param pkMember 用户ID
* @return List<CuMemberTradeDetail>
*/
List<CuMemberTradeDetail> selectMemberTradeDetailByPkMember(Long pkMember);
void updateCuMemberTradeDetailByPeriod(Integer startPeriod, Integer endPeriod, Integer pkCountry);
}

11
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/ICuMemberTradeService.java
View File

@ -7,12 +7,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
* 会员交易明细 服务类
* </p>
*
* @author hzs
* @since 2022-09-06
*/
public interface ICuMemberTradeService extends IService<CuMemberTrade> {
@ -20,9 +15,6 @@ public interface ICuMemberTradeService extends IService<CuMemberTrade> {
* 批量获取cuMemberBonus主键
*
* @param rowNum 数量
* @return: List<Integer>
* @Author: sui q
* @Date: 2022/12/13 13:47
*/
List<Long> batchQueryCuMemberTradeSeq(Integer rowNum);
@ -30,9 +22,6 @@ public interface ICuMemberTradeService extends IService<CuMemberTrade> {
* 批量插入会员交易流水，用于奖金发放插入流水
*
* @param cuMemberTradeList 交易流水
* @return: void
* @Author: sui q
* @Date: 2023/3/21 11:45
*/
void batchInsertCuMemberTrade(@Param("cuMemberTradeList") List<CuMemberTrade> cuMemberTradeList);

16
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberAccountServiceImpl.java
View File

@ -7,29 +7,13 @@ import com.hzs.bonus.account.mapper.CuMemberAccountMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 会员账户信息 服务实现类
*
* @author hzs
* @since 2022-08-11
*/
@Service
@Slf4j
public class CuMemberAccountServiceImpl extends ServiceImpl<CuMemberAccountMapper, CuMemberAccount> implements ICuMemberAccountService {
@Override
public Boolean updateMemberAccount(CuMemberAccount cuMemberAccount, Long pkModified) {
cuMemberAccount.setPkModified(pkModified);
return baseMapper.updateMemberAccount(cuMemberAccount) > 0;
}
@Override
public List<CuMemberAccount> selectMemberAccountByPkMember(List<Long> pkMembers) {
return baseMapper.selectMemberAccountByPkMember(pkMembers);
}
@Override
public void updateMemberAccountGrantByPeriod(Integer pkCountry, Integer startPeriod, Integer endPeriod) {
baseMapper.updateMemberAccountGrantByPeriod(pkCountry, startPeriod, endPeriod);

5
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeBonusServiceImpl.java
View File

@ -7,12 +7,7 @@ import com.hzs.common.domain.member.account.CuMemberTradeBonus;
import org.springframework.stereotype.Service;
/**
* <p>
* 会员已发放奖金交易明细表 服务实现类
* </p>
*
* @author hzs
* @since 2023-03-24
*/
@Service
public class CuMemberTradeBonusServiceImpl extends ServiceImpl<CuMemberTradeBonusMapper, CuMemberTradeBonus> implements ICuMemberTradeBonusService {

52
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeDetailServiceImpl.java
View File

@ -11,28 +11,19 @@ import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 服务实现类
* </p>
*
* @author hzs
* @since 2023-03-21
* 服务实现类
*/
@Service
public class CuMemberTradeDetailServiceImpl extends ServiceImpl<CuMemberTradeDetailMapper, CuMemberTradeDetail> implements ICuMemberTradeDetailService {
private CuMemberBonusSettle cuMemberBonusSettle;
@Autowired
public void setCuMemberBonusSettle(CuMemberBonusSettle cuMemberBonusSettle) {
this.cuMemberBonusSettle = cuMemberBonusSettle;
}
private CuMemberBonusSettle cuMemberBonusSettle;
@Override
public void batchInsertCuMemberTradeDetail(List<CuMemberTradeDetail> cuMemberTradeDetailList) {
List<List<?>> cutList = cuMemberBonusSettle.handleCutList(cuMemberTradeDetailList);
cutList.forEach(memberTradeDetailList ->
baseMapper.batchInsertCuMemberTradeDetail(memberTradeDetailList));
baseMapper.batchInsertCuMemberTradeDetail(memberTradeDetailList));
}
@Override
@ -40,41 +31,4 @@ public class CuMemberTradeDetailServiceImpl extends ServiceImpl<CuMemberTradeDet
baseMapper.updateCuMemberTradeDetailByPeriod(startPeriod, endPeriod, pkCountry);
}
@Override
public List<CuMemberTradeDetail> queryCuMemberTradeDetail(Long pkMember) {
// QueryWrapper<CuMemberTradeDetail> queryWrapper = new QueryWrapper<>();
// queryWrapper.eq(MemberFieldConstants.PK_MEMBER, pkMember)
// .gt(MemberFieldConstants.CONSUME_MONEY, 0);
// queryWrapper.orderByAsc(MemberFieldConstants.PERIOD);
// return baseMapper.selectList(queryWrapper);
return baseMapper.queryCuMemberTradeDetail(pkMember);
}
@Override
public void updateCuMemberTradeDetail(List<CuMemberTradeDetail> cuMemberTradeDetailList) {
if (cuMemberTradeDetailList.size() > 0) {
List<List<?>> cutList = cuMemberBonusSettle.handleCutList(cuMemberTradeDetailList);
cutList.forEach(memberTradeDetailList ->
baseMapper.updateCuMemberTradeDetail(memberTradeDetailList));
}
}
@Override
public void updateAddCuMemberTradeDetail(List<CuMemberTradeDetail> cuMemberTradeDetailList) {
if (cuMemberTradeDetailList.size() > 0) {
List<List<?>> cutList = cuMemberBonusSettle.handleCutList(cuMemberTradeDetailList);
cutList.forEach(memberTradeDetailList ->
baseMapper.updateAddCuMemberTradeDetail(memberTradeDetailList));
}
}
@Override
public Integer batchInsertMemberTradeDetailFromTrade(String sourceCode, Integer period){
return baseMapper.batchInsertMemberTradeDetailFromTrade(sourceCode,period);
}
@Override
public List<CuMemberTradeDetail> selectMemberTradeDetailByPkMember(Long pkMember){
return baseMapper.selectMemberTradeDetailByPkMember(pkMember);
}
}

17
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/account/service/impl/CuMemberTradeServiceImpl.java
View File

@ -1,11 +1,9 @@
package com.hzs.bonus.account.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.bonus.account.service.ICuMemberAccountService;
import com.hzs.bonus.account.service.ICuMemberTradeService;
import com.hzs.bonus.achieve.service.impl.CuMemberBonusSettle;
import com.hzs.common.domain.member.account.CuMemberTrade;
import com.hzs.common.service.ITransactionCommonService;
import com.hzs.bonus.account.mapper.CuMemberTradeMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -13,29 +11,14 @@ import org.springframework.stereotype.Service;
import java.util.*;
/**
* <p>
* 会员交易明细 服务实现类
* </p>
*
* @author hzs
* @since 2022-09-06
*/
@Service
public class CuMemberTradeServiceImpl extends ServiceImpl<CuMemberTradeMapper, CuMemberTrade> implements ICuMemberTradeService {
@Autowired
ICuMemberAccountService cuMemberAccountService;
@Autowired
ITransactionCommonService iTransactionCommonService;
private CuMemberBonusSettle cuMemberBonusSettle;
@Autowired
public void setCuMemberBonusSettle(CuMemberBonusSettle cuMemberBonusSettle) {
this.cuMemberBonusSettle = cuMemberBonusSettle;
}
@Override
public List<Long> batchQueryCuMemberTradeSeq(Integer rowNum) {
return baseMapper.batchQueryCuMemberTradeSeq(rowNum);

15
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/controller/manage/CuMemberSettleController.java
View File

@ -2,7 +2,6 @@ package com.hzs.bonus.achieve.controller.manage;
import cn.hutool.core.bean.BeanUtil;
import com.hzs.bonus.achieve.param.MemberPeriodParam;
import com.hzs.bonus.achieve.service.ICuMemberMonthAchieveService;
import com.hzs.bonus.achieve.service.ICuMemberSettlePeriodService;
import com.hzs.bonus.achieve.service.ICuMemberTreeService;
import com.hzs.bonus.bonus.service.IBonusGrantService;
@ -45,8 +44,6 @@ public class CuMemberSettleController extends BaseController {
private ICuMemberSettlePeriodService iCuMemberSettlePeriodService;
@Autowired
private IBonusGrantService iBonusGrantService;
@Autowired
private ICuMemberMonthAchieveService iCuMemberMonthAchieveService;
/**
@ -183,22 +180,10 @@ public class CuMemberSettleController extends BaseController {
if (StringUtils.isEmpty(orderCode)) {
return AjaxResult.error();
}
// iBonusSettleService.calculateCumberBonusBySecond(orderCode);
iBonusSettleService.calculateCuMemberRetailRangeBonusBySaOrder(orderCode);
return AjaxResult.success();
}
/**
* 秒接结算业绩，仅用于测试
*
* @return AjaxResult
*/
@GetMapping("/settle-month")
public AjaxResult settleMonth() {
iCuMemberMonthAchieveService.insertCuMemberAchieveByEveryDay(DateUtils.beforeDate(1, ChronoUnit.DAYS));
return AjaxResult.success();
}
/*
* 查询奖金计算期数列表
**/

9
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberAchieveMapper.java
View File

@ -29,15 +29,6 @@ public interface CuMemberAchieveMapper extends BaseMapper<CuMemberAchieve> {
**/
void mergeCuMemberMonth(@Param("date") String date, @Param("period") Integer period);
/**
* 将昨天日表数据插入今天日表中, 昨日日表更新今天日表网体表
* 根据昨天结算表数据更新今天结算表的业绩数据
*
* @param sourceTable 来源表，记录10天跟月表一摸一样的滚动表数据
* @param targetTable 目标表 记录10天跟月表一摸一样的滚动表数据
*/
void updateCuMemberExpandSettleAchieveByBeforeDay(@Param("sourceTable") String sourceTable, @Param("targetTable") String targetTable);
/*
* 退单回退业绩
**/

47
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberRangeMapper.java
View File

@ -1,47 +0,0 @@
package com.hzs.bonus.achieve.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.common.domain.member.achieve.CuMemberRange;
import com.hzs.common.domain.member.achieve.ext.CuMemberRangeExt;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
/**
* Mapper 接口
*/
public interface CuMemberRangeMapper extends BaseMapper<CuMemberRange> {
/*
* 推荐推荐人查询推荐人下的所有部门, 该订单日期之前的算他的网体
**/
List<CuMemberRangeExt> queryCuMemberRangeExtByParent(@Param("tableName") String tableName, @Param("pkParent") Long pkParent, @Param("orderDate") Date orderDate);
/*
* 推荐推荐人查询推荐人下的所有部门, 该订单日期之前的算他的网体
**/
List<CuMemberRangeExt> querySecondCuMemberRangeExtByParent(@Param("tableName") String tableName, @Param("secondTableName") String secondTableName, @Param("pkParent") Long pkParent);
/*
* 批量更新网体
**/
void mergeCuMemberRangeExt(@Param("rangeTableName") String rangeTableName, @Param("cuMemberRangeExtList") List<?> cuMemberRangeExtList);
/*
* 批量更新网体
**/
void mergeSecondCuMemberRangeExt(@Param("secondTableName") String secondTableName, @Param("cuMemberRangeExtList") List<CuMemberRangeExt> cuMemberRangeExtList);
/*
* 验证血缘部门 有多少个满足等级
**/
Integer validateCuMemberPlaceAwards(@Param("rangeTableName") String rangeTableName, @Param("cuMemberRangeExtList") List<CuMemberRangeExt> cuMemberRangeExtList,
@Param("pkRangeAwards") Integer pkRangeAwards, @Param("orderDate") Date orderDate);
/*
* 验证血缘部门 有多少个满足等级
**/
Integer validateSecondCuMemberPlaceAwards(@Param("secondTableName") String secondTableName, @Param("cuMemberRangeExtList") List<CuMemberRangeExt> cuMemberRangeExtList,
@Param("pkRangeAwards") Integer pkRangeAwards);
}

32
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java
View File

@ -130,12 +130,6 @@ public interface CuMemberTreeMapper extends BaseMapper<CuMemberTree> {
List<CuMemberSettleExt> queryMemberSettleBySaOrder(@Param("settleTableName") String settleTableName,
@Param("memberPkList") List<?> memberPkList);
/*
* 查询所有有奖衔的会员
**/
List<CuMemberSettleExt> queryMemberSettleByAwards(@Param("settleTableName") String settleTableName, @Param("rangeTableName") String rangeTableName,
@Param("startPeriod") Integer startPeriod, @Param("endPeriod") Integer endPeriod);
/**
* 根据订单，查询出网体中记录的会员数据及推荐人
*
@ -144,15 +138,6 @@ public interface CuMemberTreeMapper extends BaseMapper<CuMemberTree> {
*/
List<CuMemberSettleExt> batchQueryMemberSettleParentByMemberPk(@Param("settleTableName") String settleTableName, @Param("memberPkList") List<?> serviceMemberSet);
/**
* 批量根据订单信息查询会员结算表中的数据
*
* @param settleTableName 结算表
* @param firPurchaseOrderList 首单列表
*/
List<CuMemberSettleExt> batchQueryCuMemberSettlePlaceParent(@Param("settleTableName") String settleTableName,
@Param("firPurchaseOrderList") List<?> firPurchaseOrderList);
/**
* 批量根据量奖信息查询会员结算表中的父级血缘数据
*
@ -162,21 +147,4 @@ public interface CuMemberTreeMapper extends BaseMapper<CuMemberTree> {
List<CuMemberSettleExt> batchQueryCuMemberSettleParent(@Param("settleTableName") String settleTableName,
@Param("pkMemberList") List<?> pkMemberList);
/**
* 批量根据量奖信息查询会员结算表中的父级血缘数据
*
* @param settleTableName 结算表
* @param pkMemberList 有量奖的会员列表
*/
List<CuMemberSettleExt> batchQueryCuMemberSettleParentForSpecial(@Param("settleTableName") String settleTableName,
@Param("pkMemberList") List<?> pkMemberList);
/**
* 更新会员树的累计业绩
*
* @param settleTableName 结算表
* @param cuMemberTreeList 树
*/
void updateCuMemberExpandSettle(@Param("settleTableName") String settleTableName, @Param("cuMemberTreeList") List<?> cuMemberTreeList);
}

5
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/param/MemberAchieveParam.java
View File

@ -13,12 +13,7 @@ import java.io.Serializable;
import java.math.BigDecimal;
/**
* <p>
* 会员业绩记录
* </p>
*
* @author hzs
* @since 2022-10-26
*/
@Data
@Builder

9
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberAchieveService.java
View File

@ -28,15 +28,6 @@ public interface ICuMemberAchieveService extends IService<CuMemberAchieve> {
**/
void mergeCuMemberMonth(Integer day, String date);
/**
* 将昨天日表数据插入今天日表中, 昨日日表更新今天日表网体表
* 根据昨天结算表数据更新今天结算表的业绩数据
*
* @param sourceTable 来源表，记录10天跟月表一摸一样的滚动表数据
* @param targetTable 目标表 记录10天跟月表一摸一样的滚动表数据
*/
void updateCuMemberExpandSettleAchieveByBeforeDay(String sourceTable, String targetTable);
/*
* 退单回退业绩
**/

45
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberRangeService.java
View File

@ -1,45 +0,0 @@
package com.hzs.bonus.achieve.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.member.achieve.CuMemberRange;
import com.hzs.common.domain.member.achieve.ext.CuMemberRangeExt;
import java.util.Date;
import java.util.List;
/**
* 服务类
*/
public interface ICuMemberRangeService extends IService<CuMemberRange> {
/**
* 推荐推荐人查询推荐人下的所有部门, 该订单日期之前的算他的网体
*/
List<CuMemberRangeExt> queryCuMemberRangeExtByParent(String tableName, Long pkParent, Date orderDate);
/**
* 推荐推荐人查询推荐人下的所有部门, 该订单日期之前的算他的网体
*/
List<CuMemberRangeExt> querySecondCuMemberRangeExtByParent(String tableName, String secondTableName, Long pkParent);
/**
* 批量更新网体
*/
void mergeCuMemberRangeExt(String rangeTableName, List<CuMemberRangeExt> cuMemberRangeExtList);
/**
* 批量更新网体
*/
void mergeSecondCuMemberRangeExt(String secondTableName, List<CuMemberRangeExt> cuMemberRangeExtList);
/**
* 验证血缘部门 有多少个满足等级
*/
Integer validateCuMemberPlaceAwards(String rangeTableName, List<CuMemberRangeExt> cuMemberRangeExtList, Integer pkRangeAwards, Date orderDate);
/**
* 验证血缘部门 有多少个满足等级
*/
Integer validateSecondCuMemberPlaceAwards(String secondTableName, List<CuMemberRangeExt> cuMemberRangeExtList, Integer pkRangeAwards);
}

14
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberSettlePeriodDetailService.java
View File

@ -5,20 +5,12 @@ import com.hzs.common.domain.member.achieve.CuMemberSettlePeriodDetail;
import com.hzs.common.domain.member.achieve.ext.CuMemberSettlePeriodExt;
/**
* <p>
* 会员结算期间明细 服务类
* </p>
*
* @author hzs
* @since 2023-07-27
*/
public interface ICuMemberSettlePeriodDetailService extends IService<CuMemberSettlePeriodDetail> {
/*
* @description: 更新明细表
* @author: sui q
* @date: 2023/7/28 17:43
* @param: null null
**/
/**
* 更新明细表
*/
boolean updateCuMemberSettlePeriodDetailByPeriod(CuMemberSettlePeriodExt cuMemberSettlePeriodExt);
}

74
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java
View File

@ -2,13 +2,8 @@ package com.hzs.bonus.achieve.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.member.achieve.CuMemberTree;
import com.hzs.common.domain.member.ext.CuMemberSettleExt;
import com.hzs.common.domain.sale.ext.SaOrderExt;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* 会员网体历史记录 服务类
@ -22,14 +17,6 @@ public interface ICuMemberTreeService extends IService<CuMemberTree> {
*/
void createCuMemberTree(String date);
/**
* 初始用来结算奖金的表，多次重算奖金，只更新结余
*
* @param yesterdaySettleTableName 昨天的结算表
* @param currentSettleTableName 结算日的结算表
*/
void initCuMemberExpandTreeTable(String yesterdaySettleTableName, String currentSettleTableName);
/**
* 判断是否存在临时表
*
@ -67,67 +54,6 @@ public interface ICuMemberTreeService extends IService<CuMemberTree> {
*/
void updateCuMemberRetailRangeInitAward(String rangeTableName);
/**
* 根据订单，查询出网体中记录的会员数据，推荐人、安置人
*
* @param settleTableName 结算表
* @param saOrderExtList 订单
*/
List<CuMemberSettleExt> batchQueryMemberSettleBySaOrder(String settleTableName, List<SaOrderExt> saOrderExtList);
/**
* 根据订单，查询出网体中记录的会员数据，推荐人、安置人
*
* @param settleTableName 结算表
* @param serviceMemberSet 会员编号
*/
List<CuMemberSettleExt> batchQueryMemberSettleByMemberPk(String settleTableName, Set<Long> serviceMemberSet);
/*
* 查询所有有奖衔的会员
**/
List<CuMemberSettleExt> queryMemberSettleByAwards(String settleTableName, String rangeTableName, Integer startPeriod, Integer endPeriod);
/**
* 根据订单，查询出网体中记录的会员数据及推荐人
*
* @param settleTableName 结算表
* @param serviceMemberSet 会员编号
*/
List<CuMemberSettleExt> batchQueryMemberSettleParentByMemberPk(String settleTableName, Set<Long> serviceMemberSet);
/**
* 批量根据订单信息查询会员结算表中的父级安置数据
*
* @param settleTableName 结算表
* @param firPurchaseOrderList 首单列表
*/
Map<Long, List<CuMemberSettleExt>> batchQueryCuMemberSettlePlaceParent(String settleTableName, List<SaOrderExt> firPurchaseOrderList);
/**
* 批量根据量奖信息查询会员结算表中的父级血缘数据
*
* @param settleTableName 结算表
* @param expandMemberSet 有量奖的会员
*/
List<CuMemberSettleExt> batchQueryCuMemberSettleParent(String settleTableName, Set<Long> expandMemberSet);
/**
* 批量根据量奖信息查询会员结算表中的父级血缘数据
*
* @param settleTableName 结算表
* @param expandMemberSet 有量奖的会员列表
*/
List<CuMemberSettleExt> batchQueryCuMemberSettleParentForSpecial(String settleTableName, Set<Long> expandMemberSet);
/**
* 更新会员树的累计业绩
*
* @param settleTableName 结算日期
* @param cuMemberTreeMap 树
*/
void updateCuMemberExpandSettle(String settleTableName, Map<Long, CuMemberSettleExt> cuMemberTreeMap);
/**
* 删除日表数据
*

5
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java
View File

@ -77,11 +77,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
baseMapper.mergeCuMemberMonth(DateUtils.getMonth(date), cuMemberSettlePeriod.getPkId());
}
@Override
public void updateCuMemberExpandSettleAchieveByBeforeDay(String sourceTable, String targetTable) {
baseMapper.updateCuMemberExpandSettleAchieveByBeforeDay(sourceTable, targetTable);
}
@Override
public Boolean chargeBackSaOrder(SaOrder saOrder) {
// 根据支付时间查询期间

83
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberMonthAchieveServiceImpl.java
View File

@ -1,23 +1,15 @@
package com.hzs.bonus.achieve.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.bonus.achieve.service.ICuMemberAchieveService;
import com.hzs.bonus.achieve.service.ICuMemberMonthAchieveService;
import com.hzs.bonus.achieve.service.ICuMemberSettlePeriodService;
import com.hzs.bonus.base.service.ICuMemberHonorWallService;
import com.hzs.common.core.constant.MagicNumberConstants;
import com.hzs.common.core.constant.TableNameConstants;
import com.hzs.common.core.enums.HonorWallType;
import com.hzs.common.core.utils.DateUtils;
import com.hzs.common.domain.member.achieve.CuMemberMonthAchieve;
import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
import com.hzs.common.domain.member.ext.CuMemberMonthAchieveExt;
import com.hzs.common.domain.member.honor.CuHonorWall;
import com.hzs.common.domain.member.honor.CuMemberHonorWall;
import com.hzs.bonus.achieve.mapper.CuMemberMonthAchieveMapper;
import com.hzs.bonus.achieve.service.ICuMemberTreeService;
import com.hzs.bonus.base.service.ICuHonorWallService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -33,10 +25,6 @@ public class CuMemberMonthAchieveServiceImpl extends ServiceImpl<CuMemberMonthAc
@Autowired
private ICuMemberSettlePeriodService iCuMemberSettlePeriodService;
@Autowired
private ICuHonorWallService iCuHonorWallService;
@Autowired
private ICuMemberHonorWallService iCuMemberHonorWallService;
@Autowired
private ICuMemberTreeService iCuMemberTreeService;
@Autowired
private ICuMemberAchieveService iCuMemberAchieveService;
@ -72,44 +60,6 @@ public class CuMemberMonthAchieveServiceImpl extends ServiceImpl<CuMemberMonthAc
// 计算当前月
String settleMonth = DateUtils.getMonth(currentMonthDate);
baseMapper.insertCuMemberMonthAchieve(table, cuMemberSettlePeriod.getPkId(), settleMonth);
// 每月7号发放徽章,发放上个月的
if (day == 7) {
// 查询徽章
List<CuHonorWall> cuHonorWallList = iCuHonorWallService.queryCuHonorWall();
Map<String, CuHonorWall> honorWallMap = new HashMap<>();
cuHonorWallList.forEach(cuHonorWall -> {
String key = cuHonorWall.getPkCountry().toString() + cuHonorWall.getType() + cuHonorWall.getValue();
honorWallMap.put(key, cuHonorWall);
});
List<CuMemberHonorWall> cuMemberHonorWallList = new ArrayList<>();
// 上月期间，作为结束期间
String beforeFirstMonthDate = DateUtils.beforeMonthFirstDateStr(settleDate);
CuMemberSettlePeriod beforePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(beforeFirstMonthDate);
// 月徽章
grantHonorWall(beforePeriod.getPkId(), cuMemberSettlePeriod.getPkId(), settleMonth,
HonorWallType.RECOMMEND_MONTH.getValue(), HonorWallType.ANTIFADING_MONTH.getValue(), honorWallMap, cuMemberHonorWallList);
// 再发季度徽章
if (month == 1 || month == 4 || month == 7 || month == 10) {
// 3个月期间，作为开始期间
String quarterFirstMonthDate = DateUtils.beforeMonthFirstDateStr(3, settleDate);
CuMemberSettlePeriod quarterPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(quarterFirstMonthDate);
grantHonorWall(quarterPeriod.getPkId(), cuMemberSettlePeriod.getPkId(), settleMonth,
HonorWallType.RECOMMEND_QUARTER.getValue(), HonorWallType.ANTIFADING_QUARTER.getValue(), honorWallMap, cuMemberHonorWallList);
if (month == 1) {
// 再发年度徽章
// 3个月期间，作为开始期间
String yearFirstMonthDate = DateUtils.beforeMonthFirstDateStr(12, settleDate);
CuMemberSettlePeriod yearPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(yearFirstMonthDate);
if (yearPeriod != null) {
grantHonorWall(yearPeriod.getPkId(), cuMemberSettlePeriod.getPkId(), settleMonth,
HonorWallType.RECOMMEND_QUARTER.getValue(), HonorWallType.ANTIFADING_QUARTER.getValue(), honorWallMap, cuMemberHonorWallList);
}
}
}
if (cuMemberHonorWallList.size() > 0) {
iCuMemberHonorWallService.saveBatch(cuMemberHonorWallList);
}
}
}
@Override
@ -133,37 +83,4 @@ public class CuMemberMonthAchieveServiceImpl extends ServiceImpl<CuMemberMonthAc
iCuMemberAchieveService.mergeCuMemberMonth(0, DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, settleDate));
}
private void grantHonorWall(Integer startPeriod, Integer endPeriod, String settleMonth, Integer recommend, Integer repurchase,
Map<String, CuHonorWall> honorWallMap, List<CuMemberHonorWall> cuMemberHonorWallList) {
// 先发月徽章 查询值，查询前3名
List<CuMemberMonthAchieveExt> cuMemberMonthAchieveList = baseMapper.queryCuMemberMonthAchieveByDate(startPeriod, endPeriod, recommend, repurchase);
if (CollectionUtil.isNotEmpty(cuMemberMonthAchieveList)) {
Map<Integer, List<CuMemberMonthAchieveExt>> monthAchieveMap = new HashMap<>();
cuMemberMonthAchieveList.forEach(cuMemberMonthAchieve -> {
if (monthAchieveMap.containsKey(cuMemberMonthAchieve.getWallType())) {
monthAchieveMap.get(cuMemberMonthAchieve.getWallType()).add(cuMemberMonthAchieve);
} else {
List<CuMemberMonthAchieveExt> cuMemberMonthAchieveExtList = new ArrayList<>();
cuMemberMonthAchieveExtList.add(cuMemberMonthAchieve);
monthAchieveMap.put(cuMemberMonthAchieve.getWallType(), cuMemberMonthAchieveExtList);
}
});
monthAchieveMap.forEach((wallType, cuMemberMonthAchieveExtList) -> {
for (int i = 1; i <= cuMemberMonthAchieveExtList.size(); i++) {
CuMemberMonthAchieveExt cuMemberMonthAchieveExt = cuMemberMonthAchieveExtList.get(i - 1);
String key = cuMemberMonthAchieveExt.getPkCountry().toString() + cuMemberMonthAchieveExt.getWallType() + i;
if (honorWallMap.containsKey(key)) {
CuMemberHonorWall cuMemberHonorWall = CuMemberHonorWall.builder()
.pkMember(cuMemberMonthAchieveExt.getPkMember())
.pkHonorWall(honorWallMap.get(key).getPkId())
.settleMonth(settleMonth)
.build();
cuMemberHonorWall.setPkCountry(cuMemberMonthAchieveExt.getPkCountry());
cuMemberHonorWall.setPkCreator(MagicNumberConstants.PK_ADMIN);
cuMemberHonorWallList.add(cuMemberHonorWall);
}
}
});
}
}
}

55
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberRangeServiceImpl.java
View File

@ -1,55 +0,0 @@
package com.hzs.bonus.achieve.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.bonus.achieve.mapper.CuMemberRangeMapper;
import com.hzs.bonus.achieve.service.ICuMemberRangeService;
import com.hzs.common.domain.member.achieve.CuMemberRange;
import com.hzs.common.domain.member.achieve.ext.CuMemberRangeExt;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
/**
* 服务实现类
*/
@Service
public class CuMemberRangeServiceImpl extends ServiceImpl<CuMemberRangeMapper, CuMemberRange> implements ICuMemberRangeService {
@Autowired
private CuMemberBonusSettle cuMemberBonusSettle;
@Override
public List<CuMemberRangeExt> queryCuMemberRangeExtByParent(String tableName, Long pkParent, Date orderDate) {
return baseMapper.queryCuMemberRangeExtByParent(tableName, pkParent, orderDate);
}
@Override
public List<CuMemberRangeExt> querySecondCuMemberRangeExtByParent(String tableName, String secondTableName, Long pkParent) {
return baseMapper.querySecondCuMemberRangeExtByParent(tableName, secondTableName, pkParent);
}
@Override
public void mergeCuMemberRangeExt(String rangeTableName, List<CuMemberRangeExt> cuMemberRangeExtList) {
List<List<?>> lists = cuMemberBonusSettle.handleCutList(cuMemberRangeExtList);
for (List<?> list : lists) {
baseMapper.mergeCuMemberRangeExt(rangeTableName, list);
}
}
@Override
public void mergeSecondCuMemberRangeExt(String secondTableName, List<CuMemberRangeExt> cuMemberRangeExtList) {
baseMapper.mergeSecondCuMemberRangeExt(secondTableName, cuMemberRangeExtList);
}
@Override
public Integer validateCuMemberPlaceAwards(String rangeTableName, List<CuMemberRangeExt> cuMemberRangeExtList, Integer pkRangeAwards, Date orderDate) {
return baseMapper.validateCuMemberPlaceAwards(rangeTableName, cuMemberRangeExtList, pkRangeAwards, orderDate);
}
@Override
public Integer validateSecondCuMemberPlaceAwards(String secondTableName, List<CuMemberRangeExt> cuMemberRangeExtList, Integer pkRangeAwards) {
return baseMapper.validateSecondCuMemberPlaceAwards(secondTableName, cuMemberRangeExtList, pkRangeAwards);
}
}

135
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java
View File

@ -4,14 +4,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.bonus.achieve.service.ICuMemberAchieveService;
import com.hzs.bonus.achieve.service.ICuMemberSettlePeriodService;
import com.hzs.bonus.achieve.service.ICuMemberTreeService;
import com.hzs.common.core.constant.MagicNumberConstants;
import com.hzs.common.core.constant.TableNameConstants;
import com.hzs.common.core.enums.EAwardsType;
import com.hzs.common.core.utils.ComputeUtil;
import com.hzs.common.core.utils.DateUtils;
import com.hzs.common.domain.member.achieve.CuMemberTree;
import com.hzs.common.domain.member.ext.CuMemberSettleExt;
import com.hzs.common.domain.sale.ext.SaOrderExt;
import com.hzs.bonus.achieve.mapper.CuMemberTreeMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@ -28,32 +24,16 @@ import java.util.*;
@Service
public class CuMemberTreeServiceImpl extends ServiceImpl<CuMemberTreeMapper, CuMemberTree> implements ICuMemberTreeService {
private ICuMemberAchieveService cuMemberAchieveService;
private CuMemberBonusSettle cuMemberBonusSettle;
private ICuMemberSettlePeriodService cuMemberSettlePeriodService;
@Autowired
public void setCuMemberSettlePeriodService(ICuMemberSettlePeriodService cuMemberSettlePeriodService) {
this.cuMemberSettlePeriodService = cuMemberSettlePeriodService;
}
private ICuMemberAchieveService iCuMemberAchieveService;
@Autowired
public void setCuMemberBonusSettle(CuMemberBonusSettle cuMemberBonusSettle) {
this.cuMemberBonusSettle = cuMemberBonusSettle;
}
@Autowired
public void setCuMemberAchieveService(ICuMemberAchieveService cuMemberAchieveService) {
this.cuMemberAchieveService = cuMemberAchieveService;
}
private ICuMemberSettlePeriodService iCuMemberSettlePeriodService;
@Override
@Transactional(rollbackFor = Exception.class)
public void createCuMemberTree(String date) {
// 创建日表记录表
int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date).getPkId();
int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date).getPkId();
String settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period;
Integer number = baseMapper.queryExistOracleTable(settleTableName);
if (number == null || number <= 0) {
@ -78,12 +58,12 @@ public class CuMemberTreeServiceImpl extends ServiceImpl<CuMemberTreeMapper, CuM
// 创建月表记录表
createMonthTreeTableName(date);
// 创建月表业绩记录表
cuMemberAchieveService.createCuMemberAchieve(date);
iCuMemberAchieveService.createCuMemberAchieve(date);
// 创建秒接表，秒结表只需要表结构，跟日表一模一样，秒结表期间是date+1期间
Date tomorrowDate = DateUtils.afterDate(1, ChronoUnit.DAYS, DateUtils.parseStringToDate(date));
String tomorrow = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, tomorrowDate);
int nextPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(tomorrow).getPkId();
int nextPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(tomorrow).getPkId();
String secondRetailRangeTableName = TableNameConstants.CU_MEMBER_RETAIL_S + nextPeriod;
number = baseMapper.queryExistOracleTable(secondRetailRangeTableName);
if (number == null || number <= 0) {
@ -107,11 +87,6 @@ public class CuMemberTreeServiceImpl extends ServiceImpl<CuMemberTreeMapper, CuM
return monthTableName;
}
@Override
public void initCuMemberExpandTreeTable(String yesterdaySettleTableName, String currentSettleTableName) {
cuMemberAchieveService.updateCuMemberExpandSettleAchieveByBeforeDay(yesterdaySettleTableName, currentSettleTableName);
}
@Override
public Integer queryExistOracleTable(String tableName) {
return baseMapper.queryExistOracleTable(tableName);
@ -145,106 +120,6 @@ public class CuMemberTreeServiceImpl extends ServiceImpl<CuMemberTreeMapper, CuM
baseMapper.updateCuMemberRetailRangeInitV5Award(rangeTableName);
}
@Override
public List<CuMemberSettleExt> batchQueryMemberSettleBySaOrder(String settleTableName, List<SaOrderExt> saOrderExtList) {
// 查询出推荐人
Set<Long> serviceMemberSet = new HashSet<>();
saOrderExtList.forEach(saOrderExt -> {
serviceMemberSet.add(saOrderExt.getPkReference());
// 查出自己跟推荐人
serviceMemberSet.add(saOrderExt.getPkMember());
});
return getCuMemberSettleExtList(settleTableName, serviceMemberSet);
}
private List<CuMemberSettleExt> getCuMemberSettleExtList(String settleTableName, Set<Long> serviceMemberSet) {
List<CuMemberSettleExt> cuMemberSettleExtList = new ArrayList<>();
if (serviceMemberSet.size() > 0) {
List<Long> memberPkList = Arrays.asList(serviceMemberSet.toArray(new Long[]{}));
List<List<?>> listList = cuMemberBonusSettle.handleCutList(memberPkList);
listList.forEach(list ->
cuMemberSettleExtList.addAll(baseMapper.queryMemberSettleBySaOrder(settleTableName, list)));
}
return cuMemberSettleExtList;
}
@Override
public List<CuMemberSettleExt> batchQueryMemberSettleByMemberPk(String settleTableName, Set<Long> serviceMemberSet) {
return getCuMemberSettleExtList(settleTableName, serviceMemberSet);
}
@Override
public List<CuMemberSettleExt> queryMemberSettleByAwards(String settleTableName, String rangeTableName, Integer startPeriod, Integer endPeriod) {
return baseMapper.queryMemberSettleByAwards(settleTableName, rangeTableName, startPeriod, endPeriod);
}
@Override
public List<CuMemberSettleExt> batchQueryMemberSettleParentByMemberPk(String settleTableName, Set<Long> serviceMemberSet) {
List<CuMemberSettleExt> cuMemberSettleExtList = new ArrayList<>();
if (serviceMemberSet.size() > 0) {
List<Long> memberPkList = Arrays.asList(serviceMemberSet.toArray(new Long[]{}));
List<List<?>> listList = cuMemberBonusSettle.handleCutList(memberPkList);
listList.forEach(list ->
cuMemberSettleExtList.addAll(baseMapper.batchQueryMemberSettleParentByMemberPk(settleTableName, list)));
}
return cuMemberSettleExtList;
}
@Override
public Map<Long, List<CuMemberSettleExt>> batchQueryCuMemberSettlePlaceParent(String settleTableName, List<SaOrderExt> firPurchaseOrderList) {
// 查询出所有父级安置人
List<CuMemberSettleExt> cuMemberSettleExtList = new ArrayList<>();
List<List<?>> listList = cuMemberBonusSettle.handleCutList(firPurchaseOrderList, MagicNumberConstants.DELETE_DATA_BATCH_UPDATE_NUM);
listList.forEach(list ->
cuMemberSettleExtList.addAll(baseMapper.batchQueryCuMemberSettlePlaceParent(settleTableName, list)));
Map<Long, List<CuMemberSettleExt>> memberSettleMap = new HashMap<>(ComputeUtil.mapInitCapacity(firPurchaseOrderList.size()));
cuMemberSettleExtList.forEach(cuMemberSettleExt -> {
if (memberSettleMap.containsKey(cuMemberSettleExt.getPkOrder())) {
memberSettleMap.get(cuMemberSettleExt.getPkOrder()).add(cuMemberSettleExt);
} else {
List<CuMemberSettleExt> cuMemberSettles = new ArrayList<>();
cuMemberSettles.add(cuMemberSettleExt);
memberSettleMap.put(cuMemberSettleExt.getPkOrder(), cuMemberSettles);
}
});
return memberSettleMap;
}
@Override
public List<CuMemberSettleExt> batchQueryCuMemberSettleParent(String settleTableName, Set<Long> expandMemberSet) {
List<CuMemberSettleExt> cuMemberSettleExtList = new ArrayList<>();
if (expandMemberSet == null || expandMemberSet.size() == 0) {
return cuMemberSettleExtList;
}
List<Long> memberPkList = Arrays.asList(expandMemberSet.toArray(new Long[]{}));
List<List<?>> listList = cuMemberBonusSettle.handleCutList(memberPkList, MagicNumberConstants.DELETE_DATA_BATCH_UPDATE_NUM);
listList.forEach(list ->
cuMemberSettleExtList.addAll(baseMapper.batchQueryCuMemberSettleParent(settleTableName, list)));
return cuMemberSettleExtList;
}
@Override
public List<CuMemberSettleExt> batchQueryCuMemberSettleParentForSpecial(String settleTableName, Set<Long> expandMemberSet) {
List<CuMemberSettleExt> cuMemberSettleExtList = new ArrayList<>();
List<Long> memberPkList = Arrays.asList(expandMemberSet.toArray(new Long[]{}));
List<List<?>> listList = cuMemberBonusSettle.handleCutList(memberPkList, MagicNumberConstants.DELETE_DATA_BATCH_UPDATE_NUM);
listList.forEach(list ->
cuMemberSettleExtList.addAll(baseMapper.batchQueryCuMemberSettleParentForSpecial(settleTableName, list)));
return cuMemberSettleExtList;
}
@Override
public void updateCuMemberExpandSettle(String settleTableName, Map<Long, CuMemberSettleExt> cuMemberTreeMap) {
List<List<?>> treeList = setUpdCuMemberTreeLists(cuMemberTreeMap);
treeList.forEach(list -> baseMapper.updateCuMemberExpandSettle(settleTableName, list));
}
private List<List<?>> setUpdCuMemberTreeLists(Map<Long, CuMemberSettleExt> cuMemberTreeMap) {
List<CuMemberSettleExt> cuMemberTreeList = new ArrayList<>();
cuMemberTreeMap.forEach((key, value) -> cuMemberTreeList.add(value));
return cuMemberBonusSettle.handleCutList(cuMemberTreeList);
}
@Override
public void truncateCuMemberTreeTable(String tableName) {
baseMapper.truncateCuMemberTreeTable(tableName);

135
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberAwardsUnderVO.java
View File

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

59
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberMonthAchieveContrastVO.java
View File

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

99
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/vo/CuMemberNewAddAchieveVO.java
View File

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

29
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuAwardsControlMapper.java
View File

@ -1,29 +0,0 @@
package com.hzs.bonus.base.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.common.domain.member.base.CuAwardsControl;
import com.hzs.bonus.base.vo.CuAwardsControlVO;
import java.util.List;
/**
* <p>
* 真实奖衔控制 Mapper 接口
* </p>
*
* @author hzs
* @since 2023-04-07
*/
public interface CuAwardsControlMapper extends BaseMapper<CuAwardsControl> {
/**
* @description: 查询奖衔控制列表
* @author: zhang jing
* @date: 2023/4/8 11:40
* @param: [controlVO]
* @return: java.util.List<com.hzs.member.base.vo.CuAwardsControlVO>
**/
List<CuAwardsControlVO> queryAwardsControlList(CuAwardsControlVO controlVO);
}

14
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuHonorWallMapper.java
View File

@ -1,14 +0,0 @@
package com.hzs.bonus.base.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.common.domain.member.honor.CuHonorWall;
/**
* 荣誉墙 Mapper 接口
*
* @author hzs
* @since 2023-04-26
*/
public interface CuHonorWallMapper extends BaseMapper<CuHonorWall> {
}

16
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberAchieveLogMapper.java
View File

@ -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;
/**
* <p>
* 注水业绩记录表 Mapper 接口
* </p>
*
* @author zhangjing
* @since 2023-02-03
*/
public interface CuMemberAchieveLogMapper extends BaseMapper<CuMemberAchieveLog> {
}

16
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberAgentMapper.java
View File

@ -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;
/**
* <p>
* 会员信息-代理商信息 Mapper 接口
* </p>
*
* @author hzs
* @since 2022-08-31
*/
public interface CuMemberAgentMapper extends BaseMapper<CuMemberAgent> {
}

16
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberHonorWallMapper.java
View File

@ -1,16 +0,0 @@
package com.hzs.bonus.base.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.common.domain.member.honor.CuMemberHonorWall;
/**
* <p>
* 会员荣誉墙关联表 Mapper 接口
* </p>
*
* @author hzs
* @since 2023-04-26
*/
public interface CuMemberHonorWallMapper extends BaseMapper<CuMemberHonorWall> {
}

15
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberMapper.java
View File

@ -27,14 +27,23 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
/**
* 更新会员奖衔根据临时表
*/
Integer updateCuMemberRetailAwardsByPeriod(@Param("period") Integer period, @Param("awardType") Integer awardType);
int updateCuMemberRetailAwardsByPeriod(@Param("period") Integer period, @Param("awardType") Integer awardType);
/**
* 更新会员最高奖衔
*
* @param period
* @param awardType
* @return
*/
int updateCuMemberMaxAwardsByPeriod(@Param("period") Integer period, @Param("awardType") Integer awardType);
/**
* 更新会员奖衔根据临时表
*
* @param cuMemberAwardsList 修改奖衔的会员
*/
Integer updateCuMemberRetailRangeByList(@Param("cuMemberAwardsList") List<CuMemberAwards> cuMemberAwardsList,
int updateCuMemberRetailRangeByList(@Param("cuMemberAwardsList") List<CuMemberAwards> cuMemberAwardsList,
@Param("period") Integer period,
@Param("awardType") Integer awardType);
@ -43,7 +52,7 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
*
* @param cuMemberGradeList 修改奖衔的会员
*/
Integer updateCuMemberMinGradeByList(@Param("cuMemberGradeList") List<CuMemberGrade> cuMemberGradeList, @Param("period") Integer period);
int updateCuMemberMinGradeByList(@Param("cuMemberGradeList") List<CuMemberGrade> cuMemberGradeList, @Param("period") Integer period);
/**
* 更新会员的等级

38
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberRegisterMapper.java
View File

@ -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;
/**
* <p>
* 会员历史记录 Mapper 接口
* </p>
*
* @author hzs
* @since 2022-08-22
*/
public interface CuMemberRegisterMapper extends BaseMapper<CuMemberRegister> {
/**
* 根据条件查询会员注册信息
*
* @param memberParam 会员查询条件
* @return: List<CuMemberRegisterExt>
* @Author: sui q
* @Date: 2022/10/13 9:51
*/
List<CuMemberVO> queryCuMemberRegisterExeByCondition(MemberParam memberParam);
/**
* 将用户注册表信息更改为死点
* @param cuMemberRegister 会员注册信息
* @return: void
* @Author: sui q
* @Date: 2022/10/22 21:11
*/
void updateCuMemberRegister(CuMemberRegister cuMemberRegister);
}

16
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberUpgradeMapper.java
View File

@ -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;
/**
* <p>
* 会员升级权限表 Mapper 接口
* </p>
*
* @author hzs
* @since 2023-05-22
*/
public interface CuMemberUpgradeMapper extends BaseMapper<CuMemberUpgrade> {
}

50
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/FansRegisterParam.java
View File

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

44
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/HonorWallParam.java
View File

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

51
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberAddressParam.java
View File

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

26
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberChargingDetailParam.java
View File

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

50
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberDataParam.java
View File

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

144
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberRealInfoParam.java
View File

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

52
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberSelectParam.java
View File

@ -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<Integer> pkRegisterGrade;
/**
* 结算等级
*/
private List<Integer> pkSettleGrade;
/**
* 真实奖衔
*/
private List<Integer> pkAwards;
/**
* 会员编号列表
*/
private List<String> memberCodeList;
}

27
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberServiceLogParam.java
View File

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

81
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberTeamInfoParam.java
View File

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

57
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/ParentParam.java
View File

@ -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<String> fileList;
/**
* 签呈业务类型（EApprovalBusiness） -- 非必传
*/
private Integer approvalBusiness;
/**
* 修改直推集合
*/
private List<UpdateParentParam> updateParentParamList;
/**
* 业务涨及会员ID列表 --提交审核必传
*/
private Set<Long> pkMemberList;
private List<Long> userIdList;
/**
* 会员手续费
*/
List<MemberAmountDTO> memberAmountDTOList;
}

54
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/PlaceParentParam.java
View File

@ -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<String> fileList;
/**
* 业务涨及会员ID列表 --提交审核必传
*/
private Set<Long> pkMemberList;
/**
* 修改直推列表
*/
List<UpdatePlaceParentParam> updatePlaceParentList;
private List<Long> userIdList;
/**
* 会员手续费
*/
List<MemberAmountDTO> memberAmountDTOList;
}

60
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdateParentParam.java
View File

@ -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<MemberAmountDTO> memberAmountDTOList;
/**
* 审核状态 2 待审核 4 已驳回 5 已完成(审核成功) 枚举 ： EApproveStatus
*/
private Integer approveStatus;
}

72
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdateParentPetitionParam.java
View File

@ -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<UpdateParentParam> updateParentParamList;
/**
* 签呈流程类型（1 免签呈 2免付费 3免签呈+免付费 4 需要签呈需要付费）
*/
private Integer processType;
/**
* 签呈类型（ESignType） -- 必传
*/
private Integer signType;
/**
* 审批流程用户ID列表 -- 必传
*/
private List<Long> userIdList;
/**
* 业务涨及会员ID列表 --提交审核必传
*/
private Set<Long> pkMemberList;
/**
* 会员手续费
*/
List<MemberAmountDTO> memberAmountDTOList;
/**
* 抄送人用户ID列表 -- 非必传
*/
private List<Long> sendIdList;
/**
* 备注
*/
private String remark;
/**
* 签呈附件
*/
private List<String> fileList;
}

69
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/UpdatePlaceParentParam.java
View File

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

25
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuAwardsControlService.java
View File

@ -1,25 +0,0 @@
package com.hzs.bonus.base.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.member.base.CuAwardsControl;
import java.util.List;
/**
* <p>
* 真实奖衔控制 服务类
* </p>
*
* @author hzs
* @since 2023-04-07
*/
public interface ICuAwardsControlService extends IService<CuAwardsControl> {
/*
* @description: 查询所有的真实奖衔控制会员，用于奖金计算
* @author: sui q
* @date: 2023/4/11 11:03
* @param: null null
**/
List<CuAwardsControl> queryAllCuAwardsControl();
}

27
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuHonorWallService.java
View File

@ -1,27 +0,0 @@
package com.hzs.bonus.base.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.member.ext.CuHonorWallExt;
import com.hzs.common.domain.member.honor.CuHonorWall;
import java.util.List;
/**
* <p>
* 荣誉墙 服务类
* </p>
*
* @author hzs
* @since 2023-04-26
*/
public interface ICuHonorWallService extends IService<CuHonorWall> {
/*
* @description: 查询所有的徽章
* @author: sui q
* @date: 2023/6/7 14:30
* @param: null null
**/
List<CuHonorWall> queryCuHonorWall();
}

27
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberAchieveLogService.java
View File

@ -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;
/**
* <p>
* 注水业绩记录表 服务类
* </p>
*
* @author zhangjing
* @since 2023-02-03
*/
public interface ICuMemberAchieveLogService extends IService<CuMemberAchieveLog> {
/**
* 根据期间查询特殊业务注水业务，用于更新业绩，奖金计算使用
* @param period 期间
* @return: List<CuMemberAchieveLog>
* @Author: sui q
* @Date: 2023/3/11 11:26
*/
List<CuMemberAchieveLog> queryMemberAchieveLogByPeriod(Integer period);
}

26
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberAgentService.java
View File

@ -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;
/**
* <p>
* 会员信息-代理商信息 服务类
* </p>
*
* @author hzs
* @since 2022-08-31
*/
public interface ICuMemberAgentService extends IService<CuMemberAgent> {
/**
* 查询所有的代理商会员会员 key 国家 +省 + 市
* @return: List<CuMemberAgent>
* @Author: sui q
* @Date: 2023/1/5 15:16
*/
Map<String, List<CuMemberAgent>> queryCuMemberAgent();
}

16
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberHonorWallService.java
View File

@ -1,16 +0,0 @@
package com.hzs.bonus.base.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.member.honor.CuMemberHonorWall;
/**
* <p>
* 会员荣誉墙关联表 服务类
* </p>
*
* @author hzs
* @since 2023-04-26
*/
public interface ICuMemberHonorWallService extends IService<CuMemberHonorWall> {
}

47
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberRegisterService.java
View File

@ -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;
/**
* <p>
* 会员历史记录 服务类
* </p>
*
* @author hzs
* @since 2022-08-22
*/
public interface ICuMemberRegisterService extends IService<CuMemberRegister> {
/**
* 根据条件查询会员注册信息
* @param memberParam 会员查询条件
* @return: List<CuMemberRegisterExt>
* @Author: sui q
* @Date: 2022/10/13 9:51
*/
List<CuMemberVO> 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);
}

15
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberService.java
View File

@ -5,7 +5,6 @@ import com.hzs.common.domain.member.base.CuMember;
import com.hzs.common.domain.member.detail.CuMemberAwards;
import com.hzs.common.domain.member.detail.CuMemberGrade;
import com.hzs.common.domain.member.ext.CuMemberExt;
import com.hzs.common.domain.member.ext.CuMemberSettleExt;
import java.util.Date;
import java.util.List;
@ -24,19 +23,9 @@ public interface ICuMemberService extends IService<CuMember> {
CuMemberExt getMemberByCode(String memberCode);
/**
* 获取会员缓存
*
* @param memberCode 会员编号的值
* @return CuMember
* 更新会员奖衔根据临时表 -- 日结
*/
CuMember getMember(String memberCode);
/**
* 更新会员奖衔根据临时表
*
* @param cuMemberAwardsList 修改奖衔的会员
*/
void updateCuMemberRetailRangeByPeriod(List<CuMemberAwards> cuMemberAwardsList, Integer period);
void updateCuMemberRetailRangeByPeriod(Integer period);
/**
* 更新会员奖衔根据临时表

29
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuAwardsControlServiceImpl.java
View File

@ -1,29 +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.ICuAwardsControlService;
import com.hzs.common.domain.member.base.CuAwardsControl;
import com.hzs.bonus.base.mapper.CuAwardsControlMapper;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 真实奖衔控制 服务实现类
* </p>
*
* @author hzs
* @since 2023-04-07
*/
@Service
public class CuAwardsControlServiceImpl extends ServiceImpl<CuAwardsControlMapper, CuAwardsControl> implements ICuAwardsControlService {
@Override
public List<CuAwardsControl> queryAllCuAwardsControl() {
QueryWrapper<CuAwardsControl> queryWrapper = new QueryWrapper<>();
return baseMapper.selectList(queryWrapper);
}
}

28
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuHonorWallServiceImpl.java
View File

@ -1,28 +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.mapper.CuHonorWallMapper;
import com.hzs.bonus.base.service.ICuHonorWallService;
import com.hzs.common.domain.member.honor.CuHonorWall;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 荣誉墙 服务实现类
*
* @author hzs
* @since 2023-04-26
*/
@Service
public class CuHonorWallServiceImpl extends ServiceImpl<CuHonorWallMapper, CuHonorWall> implements ICuHonorWallService {
@Override
public List<CuHonorWall> queryCuHonorWall() {
QueryWrapper<CuHonorWall> queryWrapper = new QueryWrapper<>();
queryWrapper.select("pk_id,PK_COUNTRY,TYPE,VALUE,IMG");
return baseMapper.selectList(queryWrapper);
}
}

35
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberAchieveLogServiceImpl.java
View File

@ -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.*;
/**
* <p>
* 注水业绩记录表 服务实现类
* </p>
*
* @author zhangjing
* @since 2023-02-03
*/
@Service
public class CuMemberAchieveLogServiceImpl extends ServiceImpl<CuMemberAchieveLogMapper, CuMemberAchieveLog> implements ICuMemberAchieveLogService {
@Override
public List<CuMemberAchieveLog> queryMemberAchieveLogByPeriod(Integer period) {
QueryWrapper<CuMemberAchieveLog> 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);
}
}

48
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberAgentServiceImpl.java
View File

@ -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;
/**
* <p>
* 会员信息-代理商信息 服务实现类
* </p>
*
* @author hzs
* @since 2022-08-31
*/
@Service
public class CuMemberAgentServiceImpl extends ServiceImpl<CuMemberAgentMapper, CuMemberAgent> implements ICuMemberAgentService {
@Override
public Map<String,List<CuMemberAgent>> queryCuMemberAgent() {
QueryWrapper<CuMemberAgent> 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<CuMemberAgent> cuMemberAgentList = baseMapper.selectList(queryWrapper);
Map<String,List<CuMemberAgent>> 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<CuMemberAgent> cuMemberAgents = new ArrayList<>();
cuMemberAgents.add(cuMemberAgent);
cuMemberAgentMap.put(key, cuMemberAgents);
}
});
return cuMemberAgentMap;
}
}

20
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberHonorWallServiceImpl.java
View File

@ -1,20 +0,0 @@
package com.hzs.bonus.base.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.bonus.base.mapper.CuMemberHonorWallMapper;
import com.hzs.bonus.base.service.ICuMemberHonorWallService;
import com.hzs.common.domain.member.honor.CuMemberHonorWall;
import org.springframework.stereotype.Service;
/**
* <p>
* 会员荣誉墙关联表 服务实现类
* </p>
*
* @author hzs
* @since 2023-04-26
*/
@Service
public class CuMemberHonorWallServiceImpl extends ServiceImpl<CuMemberHonorWallMapper, CuMemberHonorWall> implements ICuMemberHonorWallService {
}

51
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberRegisterServiceImpl.java
View File

@ -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;
/**
* <p>
* 会员历史记录 服务实现类
* </p>
*
* @author hzs
* @since 2022-08-22
*/
@Service
public class CuMemberRegisterServiceImpl extends ServiceImpl<CuMemberRegisterMapper, CuMemberRegister> implements ICuMemberRegisterService {
@Override
public List<CuMemberVO> 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<CuMemberRegister> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(MemberFieldConstants.PK_MEMBER, pkMember);
queryWrapper.orderByAsc(SaOrderFieldConstants.PAY_TIME);
List<CuMemberRegister> cuMemberRegisters = baseMapper.selectList(queryWrapper);
return cuMemberRegisters.get(0);
}
@Override
public void updateCuMemberRegister(CuMemberRegister cuMemberRegister) {
baseMapper.updateCuMemberRegister(cuMemberRegister);
}
}

12
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberServiceImpl.java
View File

@ -25,17 +25,11 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
}
@Override
public CuMember getMember(String memberCode) {
if (StringUtils.isEmpty(memberCode)) {
return null;
}
return baseMapper.queryLoginMember(memberCode, null);
}
@Override
public void updateCuMemberRetailRangeByPeriod(List<CuMemberAwards> cuMemberAwardsList, Integer period) {
public void updateCuMemberRetailRangeByPeriod(Integer period) {
baseMapper.updateCuMemberRetailAwardsByPeriod(period, EAwardsType.RANGE_TYPE.getValue());
baseMapper.updateCuMemberRetailAwardsByPeriod(period, EAwardsType.SHARE_TYPE.getValue());
// 更新会员最高奖衔
baseMapper.updateCuMemberMaxAwardsByPeriod(period, EAwardsType.RANGE_TYPE.getValue());
}
@Override

32
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/AccountPointOutVO.java
View File

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

154
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/AwardsVo.java
View File

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

28
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuAwardsControlImportVO.java
View File

@ -1,28 +0,0 @@
package com.hzs.bonus.base.vo;
import com.hzs.common.core.annotation.Excel;
import lombok.Data;
/**
* <p>
* 导入真实奖衔控制VO
* </p>
*
* @author hzs
* @since 2023-04-07
*/
@Data
public class CuAwardsControlImportVO {
private static final long serialVersionUID = 1L;
/**
* 会员编号
*/
@Excel(name = "会员编号")
private String memberCode;
}

250
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuAwardsControlVO.java
View File

@ -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;
/**
* <p>
* 真实奖衔控制VO
* </p>
*
* @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<String> 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<CuAwardsControlVO> updateParentParamList;
/**
* 办理次数
*/
private Integer changeNumber;
/**
* 业务涉及会员ID列表 -- 提交审核必传
*/
private Set<Long> 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<MemberAmountDTO> memberAmountDTOList;
/**
* 新值
*/
@TableField("NEW_VALUE")
private String newValue;
}

63
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuHonorWallVo.java
View File

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

139
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogImportVO.java
View File

@ -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;
/**
* <p>
* 注水业绩记录表下载模板VO
* </p>
*
* @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;
}

100
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogParentVO.java
View File

@ -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;
/**
* <p>
* 注水业绩记录表VO
* </p>
*
* @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<MemberAmountDTO> memberAmountDTOList;
/**
* 错误信息
*/
private String errorMasg;
/**
* 情况说明
*/
private String remark;
/**
* 业务涨及会员ID列表 --提交审核必传
*/
private Set<Long> pkMemberList;
/**
* 期间
*/
private Integer period;
/**
* 注水业绩记录
*/
private List<CuMemberAchieveLogVO> cmalvList;
/**
* 国家
*/
private Integer pkCountry;
}

354
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogVO.java
View File

@ -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;
/**
* <p>
* 注水业绩记录表VO
* </p>
*
* @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<String> memberCodeList;
/**
* 注水业绩枚举列表
*/
private List<Integer> 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<CuMemberAchieveLogVO> 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<MemberAmountDTO> memberAmountDTOList;
/**
* 错误信息
*/
private String errorMsg;
/**
* 会员ID列表 --提交审核必传
*/
private Set<Long> 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<Long> pkMemberParamList;
private String tableName;
}

40
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberTeamVO.java
View File

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

496
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberVO.java
View File

@ -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<Long> vertexList;
/**
* 团队列表
*/
private List<Long> teamList;
/**
* 国家
*/
private Integer pkCountry;
}

77
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/DirectPushNewVo.java
View File

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

36
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/ImportPolicyCurrencyVO.java
View File

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

36
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/ImportSettleCountryVO.java
View File

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

69
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberAddressVO.java
View File

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

39
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberCardVO.java
View File

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

36
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberChargingDetailVo.java
View File

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

65
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberChargingVo.java
View File

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

139
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberDataVO.java
View File

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

156
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberInfoVO.java
View File

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

45
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberMeritsSummaryVo.java
View File

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

110
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberParentExportVo.java
View File

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

105
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberParentVo.java
View File

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

92
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberPlaceParentServiceLogVo.java
View File

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

436
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberRealInfoVO.java
View File

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

89
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberSelectVO.java
View File

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

91
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberServiceLogVo.java
View File

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

72
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/MemberShare.java
View File

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

Some files were not shown because too many files have changed in this diff Show More