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

## 真实奖衔分析、等级升级查询；

This commit is contained in:
cabbage 2025-06-17 16:57:14 +08:00
parent 2d8ca9919f
commit 7bd14618d9
24 changed files with 427 additions and 1903 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/ICuMemberSettlePeriodServiceApi.java
View File

@ -4,20 +4,12 @@ import com.hzs.common.core.domain.R;
import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
/** /**
* @Description: 会员结算期间api接口 * 会员结算期间api接口
* @Author: zhangjing
* @Time: 2022/10/26 15:12
* @Classname: IMemberAchieveServiceAPI
* @PackageName: com.hzs.member.achieve
*/ */
public interface ICuMemberSettlePeriodServiceApi { public interface ICuMemberSettlePeriodServiceApi {
/** /**
* @description: 根据日期获得日期对应的期间 * 根据日期获得日期对应的期间
* @author: zhang jing
* @date: 2023/8/26 10:25
* @param: [date]
* @return: com.hzs.common.core.domain.R<com.hzs.common.domain.member.achieve.CuMemberSettlePeriod>
**/ **/
R<CuMemberSettlePeriod> getCuMemberSettlePeriodByDate(String date); R<CuMemberSettlePeriod> getCuMemberSettlePeriodByDate(String date);

13
bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/provider/CuMemberSettlePeriodServiceProvider.java
View File

@ -8,11 +8,7 @@ import org.apache.dubbo.config.annotation.DubboService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
/** /**
* @Description: 会员结算期间 * 会员结算期间
* @Author: zhangjing
* @Time: 2022/10/26 15:14
* @Classname: MemberAchieveServiceProvider
* @PackageName: com.hzs.member.achieve.provider
*/ */
@DubboService @DubboService
public class CuMemberSettlePeriodServiceProvider implements ICuMemberSettlePeriodServiceApi { public class CuMemberSettlePeriodServiceProvider implements ICuMemberSettlePeriodServiceApi {
@ -20,13 +16,6 @@ public class CuMemberSettlePeriodServiceProvider implements ICuMemberSettlePerio
@Autowired @Autowired
private ICuMemberSettlePeriodService iCuMemberSettlePeriodService; private ICuMemberSettlePeriodService iCuMemberSettlePeriodService;
/**
* @description: 根据日期获得日期对应的期间
* @author: zhang jing
* @date: 2023/8/26 10:25
* @param: [date]
* @return: com.hzs.common.core.domain.R<com.hzs.common.domain.member.achieve.CuMemberSettlePeriod>
**/
@Override @Override
public R<CuMemberSettlePeriod> getCuMemberSettlePeriodByDate(String date) { public R<CuMemberSettlePeriod> getCuMemberSettlePeriodByDate(String date) {
return R.ok(iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date)); return R.ok(iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date));

639
bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/CuMemberAwardsStatController.java
View File

File diff suppressed because it is too large Load Diff

246
bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberAwardsStatMapper.java
View File

@ -9,82 +9,41 @@ import java.util.List;
/** /**
* 会员信息-奖衔升级记录 Mapper 接口 * 会员信息-奖衔升级记录 Mapper 接口
*
* @author hzs
* @since 2022-08-31
*/ */
public interface CuMemberAwardsStatMapper extends BaseMapper<CuMemberAwards> { public interface CuMemberAwardsStatMapper extends BaseMapper<CuMemberAwards> {
/** /**
* @description: 真实业绩新增奖衔查询 * 真实业绩新增奖衔查询
* @author: zhang jing
* @date: 2023/8/24 17:55
* @param: [cuMemberAwardsVO]
* @return: java.util.List<com.hzs.member.detail.vo.CuMemberAwardsVO>
**/ **/
List<CuMemberAwardsStatVO> selectCuMemberAwardsList(CuMemberAwardsStatVO cuMemberAwardsStatVO); List<CuMemberAwardsStatVO> selectCuMemberAwardsList(CuMemberAwardsStatVO cuMemberAwardsStatVO);
/** /**
* @description: 奖衔晋升列表 * 奖衔晋升列表
* @author: zhang jing
* @date: 2024/1/2 10:37
* @param: [awardPromotionVO]
* @return: java.util.List<com.hzs.report.member.vo.AwardPromotionVO>
**/ **/
List<AwardPromotionVO> awardPromotionList(AwardPromotionVO awardPromotionVO); List<AwardPromotionVO> awardPromotionList(AwardPromotionVO awardPromotionVO);
/** /**
* @description: 会员业绩数据查询 * 会员业绩数据查询
* @author: zhang jing
* @date: 2024/1/4 14:32
* @param: [memberAchieveVO]
* @return: java.util.List<com.hzs.report.member.vo.MemberAchieveVO>
**/ **/
List<MemberAchieveVO> memberAchieveList(MemberAchieveVO memberAchieveVO); List<MemberAchieveVO> memberAchieveList(MemberAchieveVO memberAchieveVO);
/** /**
* @description: 个人统计 * 个人统计
* @author: zhang jing
* @date: 2023/9/1 10:37
* @param: [personStatVO]
* @return: java.util.List<com.hzs.report.member.vo.PersonStatVO>
**/ **/
List<PersonStatVO> selectPersonStatList(PersonStatVO personStatVO); List<PersonStatVO> selectPersonStatList(PersonStatVO personStatVO);
/** /**
* @description: 真实奖衔分析 * 真实奖衔分析
* @author: zhang jing
* @date: 2023/8/26 16:01
* @param: [cuMemberAwardsAnalysisVO]
* @return: java.util.List<com.hzs.report.member.vo.CuMemberAwardsAnalysisVO>
**/ **/
List<CuMemberAwardsAnalysisVO> selectCuMemberAwardsAnalysisList(CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO); List<CuMemberAwardsAnalysisVO> selectCuMemberAwardsAnalysisList(CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO);
/** /**
* @description: 查询会员结算等级升级记录 * 查询会员结算等级升级记录
* @author: zhang jing
* @date: 2025/3/3 16:01
* @param: [cuMemberGradeRecordVO]
* @return: java.util.List<com.hzs.report.member.vo.CuMemberGradeRecordVO>
**/ **/
List<CuMemberGradeRecordVO> querMemberGradeRecordList(CuMemberGradeRecordVO cuMemberGradeRecordVO); List<CuMemberGradeRecordVO> queryMemberGradeRecordList(CuMemberGradeRecordVO cuMemberGradeRecordVO);
/** /**
* @description:查询会员左右区累计真实业绩 * 查询全部伞下血缘业绩
* @author: zhang jing
* @date: 2024/8/20 9:59
* @param: [cuMemberAwardsAnalysisVO]
* @return: java.util.List<com.hzs.report.member.vo.CuMemberAwardsAnalysisVO>
**/
List<CuMemberAwardsAnalysisVO> selectAwardsAnalysisList(@Param("list") List<CuMemberAwardsAnalysisVO> list);
/**
* @description: 查询全部伞下血缘业绩
* @author: zhang jing
* @date: 2023/10/14 16:05
* @param: [bloodList]
* @return: java.util.List<com.hzs.report.member.vo.BloodRemoveSameVO>
**/ **/
List<BloodRemoveSameVO> bloodRemoveSameAllList(@Param("brs") BloodRemoveSameVO bloodList, List<BloodRemoveSameVO> bloodRemoveSameAllList(@Param("brs") BloodRemoveSameVO bloodList,
@Param("startDate") String startDate, @Param("startDate") String startDate,
@ -94,11 +53,7 @@ public interface CuMemberAwardsStatMapper extends BaseMapper<CuMemberAwards> {
); );
/** /**
* @description: 查询会员推荐伞下业绩(历史) * 查询会员推荐伞下业绩(历史)
* @author: zhang jing
* @date: 2024/5/15 14:03
* @param: [bloodList, periodEnd, periodSta, achieveTableNameEnd, achieveTableNameSta, settleTableNameSta, settleTableNameEnd, orderType]
* @return: java.util.List<com.hzs.report.member.vo.BloodRemoveSameVO>
**/ **/
List<BloodRemoveSameVO> bloodSameAllListHistory(@Param("bloodList") List<BloodRemoveSameVO> bloodList, List<BloodRemoveSameVO> bloodSameAllListHistory(@Param("bloodList") List<BloodRemoveSameVO> bloodList,
@Param("periodEnd") Integer periodEnd, @Param("periodEnd") Integer periodEnd,
@ -122,34 +77,21 @@ public interface CuMemberAwardsStatMapper extends BaseMapper<CuMemberAwards> {
@Param("pkCountry") Integer pkCountry, @Param("pkCountry") Integer pkCountry,
@Param("pkAwardsList") List<Integer> pkAwardsList @Param("pkAwardsList") List<Integer> pkAwardsList
); );
/** /**
* @description: 根据奖衔查询所有会员 * 根据奖衔查询所有会员
* @author: zhang jing
* @date: 2023/10/11 14:06
* @param: [bloodRemoveSameVO]
* @return: java.util.List<com.hzs.report.member.vo.BloodRemoveSameVO>
**/ **/
List<BloodRemoveSameVO> queryAwardAchieList(BloodRemoveSameVO bloodRemoveSameVO); List<BloodRemoveSameVO> queryAwardAchieList(BloodRemoveSameVO bloodRemoveSameVO);
/** /**
* @description: 根据奖衔查询会员（历史） * 根据奖衔查询会员（历史）
* @author: zhang jing
* @date: 2024/5/17 14:14
* @param: [bloodRemoveSameVO]
* @return: java.util.List<com.hzs.report.member.vo.BloodRemoveSameVO>
**/ **/
List<BloodRemoveSameVO> queryAwardAchieListHistory(BloodRemoveSameVO bloodRemoveSameVO); List<BloodRemoveSameVO> queryAwardAchieListHistory(BloodRemoveSameVO bloodRemoveSameVO);
/** /**
* @description: 真实奖衔分析详情（穿透页面接口） * 真实奖衔分析详情（穿透页面接口）
* @author: zhang jing
* @date: 2023/9/26 14:27
* @param: [cuMemberAwardsAnalysisVO]
* @return: java.util.List<com.hzs.report.member.vo.CuMemberAwardsAnalysisVO>
**/ **/
List<CuMemberAwardsAnalysisVO> selectCuMemberAwardsAnalysisDetailsList(CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO); List<CuMemberAwardsAnalysisVO> selectCuMemberAwardsAnalysisDetailsList(CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO);
@ -157,235 +99,119 @@ public interface CuMemberAwardsStatMapper extends BaseMapper<CuMemberAwards> {
List<RevenueDetailsVO> selectRevenueDetailsList(RevenueDetailsVO revenueDetailsVO); List<RevenueDetailsVO> selectRevenueDetailsList(RevenueDetailsVO revenueDetailsVO);
/** /**
* @description: 复购bv统计-业绩，考核记录 * 复购bv统计-业绩，考核记录
* @author: zhang jing
* @date: 2023/8/29 15:31
* @param: [repurchasePVStatVO]
* @return: java.util.List<com.hzs.report.member.vo.RepurchasePVStatVO>
**/ **/
List<RepurchasePVStatVO> selectRepurchasePVStatList(RepurchasePVStatVO repurchasePVStatVO); List<RepurchasePVStatVO> selectRepurchasePVStatList(RepurchasePVStatVO repurchasePVStatVO);
/** /**
* @description: 商城BV统计 * 商城BV统计
* @author: zhang jing
* @date: 2023/8/30 10:52
* @param: [mallPVStatVO]
* @return: java.util.List<com.hzs.report.member.vo.RepurchasePVStatVO>
**/ **/
List<MallPVStatVO> selectMallPVStatList(MallPVStatVO mallPVStatVO); List<MallPVStatVO> selectMallPVStatList(MallPVStatVO mallPVStatVO);
/** /**
* @description: 个人统计业绩查询 * 个人统计业绩查询
* @author: zhang jing
* @date: 2023/9/1 11:04
* @param: [personStatVO]
* @return: java.util.List<com.hzs.report.member.vo.PersonStatVO>
**/ **/
List<PersonStatVO> selectPersonPvList(@Param("perList") List<PersonStatVO> perList); List<PersonStatVO> selectPersonPvList(@Param("perList") List<PersonStatVO> perList);
/** /**
* @description: 直推统计 * 直推统计
* @author: zhang jing
* @date: 2023/9/4 11:46
* @param: [directPushVO]
* @return: java.util.List<com.hzs.report.member.vo.DirectPushVO>
**/ **/
List<DirectPushVO> selectDirectPushStatList(DirectPushVO directPushVO); List<DirectPushVO> selectDirectPushStatList(DirectPushVO directPushVO);
/** /**
* @description: 三方直推统计 * 直推数据列表
* @author: zhang jing
* @date: 2023/10/25 16:16
* @param: [directPushVO]
* @return: java.util.List<com.hzs.report.member.vo.DirectPushVO>
**/
List<DirectPushVO> selectThreeDirectPushStatList(DirectPushVO directPushVO);
/**
* @description: 直推数据列表
* @author: zhang jing
* @date: 2023/12/18 17:15
* @param: [dpdVO]
* @return: java.util.List<com.hzs.report.member.vo.DirectPushDataVO>
**/ **/
List<DirectPushDataVO> selectDirectPushDataList(@Param("dpdVO") DirectPushDataVO dpdVO); List<DirectPushDataVO> selectDirectPushDataList(@Param("dpdVO") DirectPushDataVO dpdVO);
/** /**
* @description: 直推数据详情 * 直推数据详情
* @author: zhang jing
* @date: 2023/12/20 14:36
* @param: [dpdVO]
* @return: java.util.List<com.hzs.report.member.vo.DirectPushDataVO>
**/ **/
List<DirectPushDataVO> selectDirectPushDataDetails(DirectPushDataVO dpdVO); List<DirectPushDataVO> selectDirectPushDataDetails(DirectPushDataVO dpdVO);
/** /**
* @description: 会员订单分布统计 * 会员订单分布统计
* @author: zhang jing
* @date: 2023/9/20 14:47
* @param: [orderScatterVO]
* @return: java.util.List<com.hzs.report.member.vo.OrderScatterVO>
**/ **/
List<OrderScatterVO> memberOrderScatter(OrderScatterVO orderScatterVO); List<OrderScatterVO> memberOrderScatter(OrderScatterVO orderScatterVO);
/** /**
* @description: 三方会员订单分布统计 * 根据奖衔级别查询奖衔
* @author: zhang jing
* @date: 2023/10/25 16:30
* @param: [orderScatterVO]
* @return: java.util.List<com.hzs.report.member.vo.OrderScatterVO>
**/ **/
List<OrderScatterVO> memberThreeOrderScatter(OrderScatterVO orderScatterVO); List<Integer> awardsLevelList(@Param("pkAwardsList") List<Integer> pkAwardsList, @Param("pkCountry") Integer pkCountry);
/** /**
* @description: 根据奖衔级别查询奖衔 * 安置血缘查询-左右区人数
* @author: zhang jing
* @date: 2023/10/17 11:17
* @param: [pkAwardsList]
* @return: java.util.List<java.lang.Integer>
**/
List<Integer> awardsLevellist(@Param("pkAwardsList") List<Integer> pkAwardsList, @Param("pkCountry") Integer pkCountry);
/**
* @description: 安置血缘查询-左右区人数
* @author: zhang jing
* @date: 2023/12/6 15:49
* @param: [resettleBloodVOVO]
* @return: java.util.List<com.hzs.report.member.vo.ResettleBloodVOVO>
**/ **/
List<ResettleBloodVO> lrMemberCountList(ResettleBloodVO resettleBloodVO); List<ResettleBloodVO> lrMemberCountList(ResettleBloodVO resettleBloodVO);
/** /**
* @description: 安置血缘查询-左右血缘人数 * 安置血缘查询-左右血缘人数
* @author: zhang jing
* @date: 2023/12/7 9:45
* @param: [resettleBloodVOVO]
* @return: java.util.List<com.hzs.report.member.vo.ResettleBloodVOVO>
**/ **/
List<ResettleBloodVO> lrbMemberCountList(ResettleBloodVO resettleBloodVO); List<ResettleBloodVO> lrbMemberCountList(ResettleBloodVO resettleBloodVO);
/** /**
* @description: 安置血缘查询-左右区人数详情列表 * 安置血缘查询-左右区人数详情列表
* @author: zhang jing
* @date: 2023/12/7 11:34
* @param: [resettleBloodVO]
* @return: java.util.List<com.hzs.report.member.vo.ResettleBloodVO>
**/ **/
List<ResettleBloodVO> lrMemberDetailsList(ResettleBloodVO resettleBloodVO); List<ResettleBloodVO> lrMemberDetailsList(ResettleBloodVO resettleBloodVO);
/** /**
* @description: 安置血缘查询-左右区血缘人数详情列表 * 安置血缘查询-左右区血缘人数详情列表
* @author: zhang jing
* @date: 2023/12/7 11:35
* @param: [resettleBloodVO]
* @return: java.util.List<com.hzs.report.member.vo.ResettleBloodVO>
**/ **/
List<ResettleBloodVO> lrbMemberDetailsList(ResettleBloodVO resettleBloodVO); List<ResettleBloodVO> lrbMemberDetailsList(ResettleBloodVO resettleBloodVO);
/** /**
* @description: 个人复购统计 * 个人复购统计
* @author: zhang jing
* @date: 2024/1/25 15:07
* @param: [prVO]
* @return: java.util.List<com.hzs.report.member.vo.PersonRepurchaseVO>
**/ **/
List<PersonRepurchaseVO> personRepurchaseList(PersonRepurchaseVO prVO); List<PersonRepurchaseVO> personRepurchaseList(PersonRepurchaseVO prVO);
/** /**
* @description: 安置业绩统计-查询会员 * 安置业绩统计-查询会员
* @author: zhang jing
* @date: 2024/1/25 15:36
* @param: [psVO]
* @return: java.util.List<com.hzs.report.member.vo.PositStatVO>
**/ **/
List<PositStatVO> positStatList(PositStatVO psVO); List<PositStatVO> positStatList(PositStatVO psVO);
/** /**
* @description:安置业绩统计-查询左右区业绩 * 安置业绩统计-查询左右区业绩
* @author: zhang jing
* @date: 2024/1/26 11:53
* @param: [psVO]
* @return: java.util.List<com.hzs.report.member.vo.PositStatVO>
**/ **/
List<PositStatVO> positStatAchieve(@Param("psVO") PositStatVO psVO); List<PositStatVO> positStatAchieve(@Param("psVO") PositStatVO psVO);
/** /**
* @description: 查询伞下直推产品列表 * 查询伞下直推产品列表
* @author: zhang jing
* @date: 2024/2/23 16:31
* @param: [ubpVO]
* @return: java.util.List<com.hzs.report.member.vo.UmbrellaBelowProductVO>
**/ **/
List<UmbrellaBelowProductVO> umbrellaBelowProductList(@Param("ubpVO") UmbrellaBelowProductVO ubpVO); List<UmbrellaBelowProductVO> umbrellaBelowProductList(@Param("ubpVO") UmbrellaBelowProductVO ubpVO);
/** /**
* @description: 伞下直推产品去重 * 伞下直推产品去重
* @author: zhang jing
* @date: 2024/2/24 14:46
* @param: [ubrVO]
* @return: java.util.List<com.hzs.report.member.vo.UmbrellaBelowRepeatVO>
**/ **/
List<UmbrellaBelowRepeatVO> umbrellaBelowRepeatList(@Param("ubrVO") UmbrellaBelowRepeatVO ubrVO); List<UmbrellaBelowRepeatVO> umbrellaBelowRepeatList(@Param("ubrVO") UmbrellaBelowRepeatVO ubrVO);
/** /**
* @description: 伞下直推产品统计 * 伞下直推产品统计
* @author: zhang jing
* @date: 2024/2/25 11:05
* @param: [sptVO]
* @return: java.util.List<com.hzs.report.member.vo.StatProductVO>
**/ **/
List<StatProductVO> statProductList(@Param("sptVO") StatProductVO sptVO); List<StatProductVO> statProductList(@Param("sptVO") StatProductVO sptVO);
/** /**
* @description: 会员户籍数据查询 * 会员户籍数据查询
* @author: zhang jing
* @date: 2024/3/11 11:39
* @param: [ddVO]
* @return: java.util.List<com.hzs.report.member.vo.DomicileDataVO>
**/ **/
List<DomicileDataVO> domicileDataList(@Param("ddVO") DomicileDataVO ddVO); List<DomicileDataVO> domicileDataList(@Param("ddVO") DomicileDataVO ddVO);
/** /**
* @description: 地区业绩统计 * 地区业绩统计
* @author: zhang jing
* @date: 2024/5/6 16:13
* @param: [areaAchieveStatVO]
* @return: java.util.List<com.hzs.report.member.vo.OrderScatterVO>
**/ **/
List<AreaAchieveStatVO> areaAchieveStat(AreaAchieveStatVO areaAchieveStatVO); List<AreaAchieveStatVO> areaAchieveStat(AreaAchieveStatVO areaAchieveStatVO);
/** /**
* @description: 系统业绩统计 * 系统业绩统计
* @author: zhang jing
* @date: 2024/6/18 14:29
* @param: [vertexAchieveStatVO]
* @return: java.util.List<com.hzs.report.member.vo.VertexAchieveStatVO>
**/ **/
List<VertexAchieveStatVO> vertexAchieveStat(VertexAchieveStatVO vertexAchieveStatVO); List<VertexAchieveStatVO> vertexAchieveStat(VertexAchieveStatVO vertexAchieveStatVO);
/** /**
* @description: 月度职级名单查询 * 月度职级名单查询
* @author: zhang jing
* @date: 2024/6/24 15:22
* @param: [mjlvo]
* @return: java.util.List<com.hzs.report.member.vo.MonthlyJobLevelVo>
**/ **/
List<MonthlyJobLevelVo> monthlyJobLevelList(MonthlyJobLevelVo mjlvo); List<MonthlyJobLevelVo> monthlyJobLevelList(MonthlyJobLevelVo mjlvo);
/** /**
* @description: 查询收益区域数据 * 查询收益区域数据
* @author: zhang jing
* @date: 2025/1/10 16:28
* @param: [revenueAreaVO]
* @return: java.util.List<com.hzs.report.member.vo.RevenueAreaVO>
**/ **/
List<RevenueAreaVO> revenueAreaList(RevenueAreaVO revenueAreaVO); List<RevenueAreaVO> revenueAreaList(RevenueAreaVO revenueAreaVO);
} }

7
bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/CuMemberUmbrellaParam.java
View File

@ -6,12 +6,7 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
/** /**
* @description: 会员伞上数据查询 * 会员伞上数据查询
* @author: sui q
* @time: 2023/8/28 09:51
* @classname: CumemberUmbrellaVO
* @package_name: com.hzs.report.member.vo
* version 1.0.0
*/ */
@Data @Data
public class CuMemberUmbrellaParam implements Serializable { public class CuMemberUmbrellaParam implements Serializable {

16
bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/MemberConsumptionParam.java
View File

@ -1,23 +1,9 @@
package com.hzs.report.member.param;/** package com.hzs.report.member.param;
* @Description:
* @Author: yuhui
* @Time: 2023/11/28 18:16
* @Classname: MemberConsumptionParam
* @PackageName: com.hzs.report.member.param
*/
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
/**
*@BelongsProject: hzs_cloud
*@BelongsPackage: com.hzs.report.member.param
*@Author: yh
*@CreateTime: 2023-11-28 18:16
*@Description: TODO
*@Version: 1.0
*/
@Data @Data
public class MemberConsumptionParam { public class MemberConsumptionParam {
/** /**

16
bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/MemberResettleAchieveParam.java
View File

@ -1,23 +1,9 @@
package com.hzs.report.member.param;/** package com.hzs.report.member.param;
* @Description:
* @Author: yuhui
* @Time: 2023/11/28 18:21
* @Classname: MemberResettleAchieveParam
* @PackageName: com.hzs.report.member.param
*/
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
/**
* @BelongsProject: hzs_cloud
* @BelongsPackage: com.hzs.report.member.param
* @Author: yh
* @CreateTime: 2023-11-28 18:21
* @Description: TODO
* @Version: 1.0
*/
@Data @Data
public class MemberResettleAchieveParam { public class MemberResettleAchieveParam {

17
bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/ProductDetailQueryParam.java
View File

@ -1,25 +1,10 @@
package com.hzs.report.member.param;/** package com.hzs.report.member.param;
* @Description:
* @Author: yuhui
* @Time: 2023/10/8 13:56
* @Classname: ProductDetailQueryParam
* @PackageName: com.hzs.report.member.param
*/
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
/**
*@BelongsProject: hzs_cloud
*@BelongsPackage: com.hzs.report.member.param
*@Author: yh
*@CreateTime: 2023-10-08 13:56
*@Description: TODO
*@Version: 1.0
*/
@Data @Data
public class ProductDetailQueryParam { public class ProductDetailQueryParam {

16
bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/ProductShippingDetailsParam.java
View File

@ -1,23 +1,9 @@
package com.hzs.report.member.param;/** package com.hzs.report.member.param;
* @Description:
* @Author: yuhui
* @Time: 2023/11/28 18:27
* @Classname: ProductShippingDetailsParam
* @PackageName: com.hzs.report.member.param
*/
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
/**
*@BelongsProject: hzs_cloud
*@BelongsPackage: com.hzs.report.member.param
*@Author: yh
*@CreateTime: 2023-11-28 18:27
*@Description: TODO
*@Version: 1.0
*/
@Data @Data
public class ProductShippingDetailsParam { public class ProductShippingDetailsParam {

31
bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/WaresInfoParam.java
View File

@ -1,31 +0,0 @@
package com.hzs.report.member.param;/**
* @Description:
* @Author: yuhui
* @Time: 2024/7/23 11:05
* @Classname: WaresInfoParam
* @PackageName: com.hzs.report.member.param
*/
import lombok.Data;
/**
*@BelongsProject: hzs_cloud
*@BelongsPackage: com.hzs.report.member.param
*@Author: yh
*@CreateTime: 2024-07-23 11:05
*@Description: TODO
*@Version: 1.0
*/
@Data
public class WaresInfoParam {
/**
* 产品
*/
private Integer pkProduct;
/**
* 所属规格
*/
private Integer pkSpecs;
}

266
bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/ICuMemberAwardsStatService.java
View File

@ -8,81 +8,41 @@ import java.util.List;
/** /**
* 会员信息-奖衔升级记录 服务类 * 会员信息-奖衔升级记录 服务类
*
* @author hzs
* @since 2022-08-31
*/ */
public interface ICuMemberAwardsStatService { public interface ICuMemberAwardsStatService {
/** /**
* @description: 真实业绩新增奖衔查询 * 真实业绩新增奖衔查询
* @author: zhang jing
* @date: 2023/8/24 17:56
* @param: [cuMemberAwardsVO]
* @return: java.util.List<com.hzs.member.detail.vo.CuMemberAwardsVO>
**/ **/
List<CuMemberAwardsStatVO> selectCuMemberAwardsList(CuMemberAwardsStatVO cuMemberAwardsStatVO); List<CuMemberAwardsStatVO> selectCuMemberAwardsList(CuMemberAwardsStatVO cuMemberAwardsStatVO);
/** /**
* @description: 奖衔晋升列表 * 奖衔晋升列表
* @author: zhang jing
* @date: 2024/1/2 10:37
* @param: [awardPromotionVO]
* @return: java.util.List<com.hzs.report.member.vo.AwardPromotionVO>
**/ **/
List<AwardPromotionVO> awardPromotionList(AwardPromotionVO awardPromotionVO); List<AwardPromotionVO> awardPromotionList(AwardPromotionVO awardPromotionVO);
/** /**
* @description: 会员业绩数据查询 * 会员业绩数据查询
* @author: zhang jing
* @date: 2024/1/4 14:32
* @param: [memberAchieveVO]
* @return: java.util.List<com.hzs.report.member.vo.MemberAchieveVO>
**/ **/
List<MemberAchieveVO> memberAchieveList(MemberAchieveVO memberAchieveVO); List<MemberAchieveVO> memberAchieveList(MemberAchieveVO memberAchieveVO);
/** /**
* @description: 个人统计 * 个人统计
* @author: zhang jing
* @date: 2023/9/1 10:37
* @param: [personStatVO]
* @return: java.util.List<com.hzs.report.member.vo.PersonStatVO>
**/ **/
List<PersonStatVO> selectPersonStatList(PersonStatVO personStatVO); List<PersonStatVO> selectPersonStatList(PersonStatVO personStatVO);
/** /**
* @description: 真实奖衔分析 * 真实奖衔分析
* @author: zhang jing
* @date: 2023/8/26 16:01
* @param: [cuMemberAwardsAnalysisVO]
* @return: java.util.List<com.hzs.report.member.vo.CuMemberAwardsAnalysisVO>
**/ **/
List<CuMemberAwardsAnalysisVO> selectCuMemberAwardsAnalysisList(CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO); List<CuMemberAwardsAnalysisVO> selectCuMemberAwardsAnalysisList(CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO);
/** /**
* @description: 查询会员结算等级升级记录 * 查询会员结算等级升级记录
* @author: zhang jing
* @date: 2025/3/3 16:02
* @param: [cuMemberGradeRecordVO]
* @return: java.util.List<com.hzs.report.member.vo.CuMemberGradeRecordVO>
**/ **/
List<CuMemberGradeRecordVO> querMemberGradeRecordList(CuMemberGradeRecordVO cuMemberGradeRecordVO); List<CuMemberGradeRecordVO> queryMemberGradeRecordList(CuMemberGradeRecordVO cuMemberGradeRecordVO);
/** /**
* @description: 查询会员左右区累计真实业绩 * 查询全部伞下血缘业绩
* @author: zhang jing
* @date: 2024/8/20 9:59
* @param: [cuMemberAwardsAnalysisVO]
* @return: java.util.List<com.hzs.report.member.vo.CuMemberAwardsAnalysisVO>
**/
List<CuMemberAwardsAnalysisVO> selectAwardsAnalysisList(List<CuMemberAwardsAnalysisVO> list);
/**
* @description: 查询全部伞下血缘业绩
* @author: zhang jing
* @date: 2023/10/14 16:05
* @param: [bloodList]
* @return: java.util.List<com.hzs.report.member.vo.BloodRemoveSameVO>
**/ **/
List<BloodRemoveSameVO> bloodRemoveSameAllList(BloodRemoveSameVO bloodList, List<BloodRemoveSameVO> bloodRemoveSameAllList(BloodRemoveSameVO bloodList,
String startDate, String endDate, String startDate, String endDate,
@ -90,11 +50,7 @@ public interface ICuMemberAwardsStatService {
List<Integer> pkAwardsList); List<Integer> pkAwardsList);
/** /**
* @description: 查询会员推荐伞下业绩(历史) * 查询会员推荐伞下业绩(历史)
* @author: zhang jing
* @date: 2024/5/15 14:03
* @param: [bloodList, periodEnd, periodSta, achieveTableNameEnd, achieveTableNameSta, settleTableNameSta, settleTableNameEnd, orderType]
* @return: java.util.List<com.hzs.report.member.vo.BloodRemoveSameVO>
**/ **/
List<BloodRemoveSameVO> bloodSameAllListHistory(List<BloodRemoveSameVO> bloodList, List<BloodRemoveSameVO> bloodSameAllListHistory(List<BloodRemoveSameVO> bloodList,
Integer periodEnd, Integer periodEnd,
@ -120,297 +76,155 @@ public interface ICuMemberAwardsStatService {
); );
/** /**
* @description: 查询奖衔业绩 * 查询奖衔业绩
* @author: zhang jing
* @date: 2023/10/11 14:05
* @param: [bloodRemoveSameVO]
* @return: java.util.List<com.hzs.report.member.vo.BloodRemoveSameVO>
**/ **/
List<BloodRemoveSameVO> queryAwardAchieList(BloodRemoveSameVO bloodRemoveSameVO); List<BloodRemoveSameVO> queryAwardAchieList(BloodRemoveSameVO bloodRemoveSameVO);
/** /**
* @description: 根据奖衔查询会员（历史） * 根据奖衔查询会员（历史）
* @author: zhang jing
* @date: 2024/5/17 14:15
* @param: [bloodRemoveSameVO]
* @return: java.util.List<com.hzs.report.member.vo.BloodRemoveSameVO>
**/ **/
List<BloodRemoveSameVO> queryAwardAchieListHistory(BloodRemoveSameVO bloodRemoveSameVO); List<BloodRemoveSameVO> queryAwardAchieListHistory(BloodRemoveSameVO bloodRemoveSameVO);
/** /**
* @description: 真实奖衔分析详情（穿透页面接口） * 真实奖衔分析详情（穿透页面接口）
* @author: zhang jing
* @date: 2023/9/26 14:28
* @param: [cuMemberAwardsAnalysisVO]
* @return: java.util.List<com.hzs.report.member.vo.CuMemberAwardsAnalysisVO>
**/ **/
List<CuMemberAwardsAnalysisVO> selectCuMemberAwardsAnalysisDetailsList(CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO); List<CuMemberAwardsAnalysisVO> selectCuMemberAwardsAnalysisDetailsList(CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO);
/** /**
* @description: 收入明细 * 收入明细
* @author: zhang jing
* @date: 2023/9/26 15:07
* @param: [revenueDetailsVO]
* @return: java.util.List<com.hzs.report.member.vo.RevenueDetailsVO>
**/ **/
List<RevenueDetailsVO> selectRevenueDetailsList(RevenueDetailsVO revenueDetailsVO); List<RevenueDetailsVO> selectRevenueDetailsList(RevenueDetailsVO revenueDetailsVO);
/** /**
* @description: 复购bv统计 * 复购bv统计
* @author: zhang jing
* @date: 2023/8/29 15:30
* @param: [repurchasePVStatVO]
* @return: java.util.List<com.hzs.report.member.vo.RepurchasePVStatVO>
**/ **/
List<RepurchasePVStatVO> selectRepurchasePVStatList(RepurchasePVStatVO repurchasePVStatVO); List<RepurchasePVStatVO> selectRepurchasePVStatList(RepurchasePVStatVO repurchasePVStatVO);
/** /**
* @description: 商城BV统计 * 商城BV统计
* @author: zhang jing
* @date: 2023/8/30 10:53
* @param: [mallPVStatVO]
* @return: java.util.List<com.hzs.report.member.vo.RepurchasePVStatVO>
**/ **/
List<MallPVStatVO> selectMallPVStatList(MallPVStatVO mallPVStatVO); List<MallPVStatVO> selectMallPVStatList(MallPVStatVO mallPVStatVO);
/** /**
* @description: 个人统计业绩查询 * 个人统计业绩查询
* @author: zhang jing
* @date: 2023/9/4 9:35
* @param: [perList]
* @return: java.util.List<com.hzs.report.member.vo.PersonStatVO>
**/ **/
List<PersonStatVO> selectPersonPvList(List<PersonStatVO> perList); List<PersonStatVO> selectPersonPvList(List<PersonStatVO> perList);
/** /**
* @description: 直推统计 * 直推统计
* @author: zhang jing
* @date: 2023/9/4 11:47
* @param: [directPushVO]
* @return: java.util.List<com.hzs.report.member.vo.DirectPushVO>
**/ **/
List<DirectPushVO> selectDirectPushStatList(DirectPushVO directPushVO); List<DirectPushVO> selectDirectPushStatList(DirectPushVO directPushVO);
/** /**
* @description: 三方直推统计 * 直推数据列表
* @author: zhang jing
* @date: 2023/10/25 16:17
* @param: [directPushVO]
* @return: java.util.List<com.hzs.report.member.vo.DirectPushVO>
**/
List<DirectPushVO> selectThreeDirectPushStatList(DirectPushVO directPushVO);
/**
* @description: 直推数据列表
* @author: zhang jing
* @date: 2023/12/18 17:15
* @param: [dpdVO]
* @return: java.util.List<com.hzs.report.member.vo.DirectPushDataVO>
**/ **/
List<DirectPushDataVO> selectDirectPushDataList(DirectPushDataVO dpdVO); List<DirectPushDataVO> selectDirectPushDataList(DirectPushDataVO dpdVO);
/** /**
* @description: 直推数据列表详情 * 直推数据列表详情
* @author: zhang jing
* @date: 2023/12/20 14:11
* @param: [dpdVO]
* @return: java.util.List<com.hzs.report.member.vo.DirectPushDataVO>
**/ **/
List<DirectPushDataVO> selectDirectPushDataDetails(DirectPushDataVO dpdVO); List<DirectPushDataVO> selectDirectPushDataDetails(DirectPushDataVO dpdVO);
/** /**
* @description: 会员订单分布统计 * 会员订单分布统计
* @author: zhang jing
* @date: 2023/9/20 14:46
* @param: [orderScatterVO]
* @return: java.util.List<com.hzs.report.member.vo.OrderScatterVO>
**/ **/
List<OrderScatterVO> memberOrderScatter(OrderScatterVO orderScatterVO); List<OrderScatterVO> memberOrderScatter(OrderScatterVO orderScatterVO);
/** /**
* @description: 三方会员订单分布统计 * 根据奖衔级别查询奖衔
* @author: zhang jing
* @date: 2023/10/25 16:31
* @param: [orderScatterVO]
* @return: java.util.List<com.hzs.report.member.vo.OrderScatterVO>
**/ **/
List<OrderScatterVO> memberThreeOrderScatter(OrderScatterVO orderScatterVO); List<Integer> awardsLevelList(List<Integer> pkAwardsList, Integer pkCountry);
/** /**
* @description: 根据奖衔级别查询奖衔 * 处理伞下去重查询方法
* @author: zhang jing
* @date: 2023/10/17 11:15
* @param: []
* @return: java.util.List<java.lang.Integer>
**/
List<Integer> awardsLevellist(List<Integer> pkAwardsList, Integer pkCountry);
/**
* @description: 处理伞下去重查询方法
* @author: zhang jing
* @date: 2023/12/6 15:45
* @param: [bloodRemoveSameVO]
* @return: java.util.List<com.hzs.report.member.vo.BloodRemoveSameVO>
**/ **/
List<BloodRemoveSameVO> bloodRemoveSameList(BloodRemoveSameVO bloodRemoveSameVO); List<BloodRemoveSameVO> bloodRemoveSameList(BloodRemoveSameVO bloodRemoveSameVO);
/** /**
* @description: 伞下去重业绩查询（新） * 伞下去重业绩查询（新）
* @author: zhang jing
* @date: 2024/5/23 14:50
* @param: [bloodRemoveSameVO]
* @return: java.util.List<com.hzs.report.member.vo.BloodRemoveSameVO>
**/ **/
List<BloodRemoveSameVO> bloodRemoveSameListHistoryNew(BloodRemoveSameVO bloodRemoveSameVO); List<BloodRemoveSameVO> bloodRemoveSameListHistoryNew(BloodRemoveSameVO bloodRemoveSameVO);
/** /**
* @description: 安置血缘查询 * 安置血缘查询
* @author: zhang jing
* @date: 2023/12/6 16:01
* @param: [resettleBloodVOVO]
* @return: java.util.List<com.hzs.report.member.vo.ResettleBloodVOVO>
**/ **/
List<ResettleBloodVO> resettleBloodList(ResettleBloodVO resettleBloodVO); List<ResettleBloodVO> resettleBloodList(ResettleBloodVO resettleBloodVO);
/** /**
* @description: 安置血缘查询-左右区人数详情列表 * 安置血缘查询-左右区人数详情列表
* @author: zhang jing
* @date: 2023/12/7 11:38
* @param: [resettleBloodVO]
* @return: java.util.List<com.hzs.report.member.vo.ResettleBloodVO>
**/ **/
List<ResettleBloodVO> lrMemberDetailsList(ResettleBloodVO resettleBloodVO); List<ResettleBloodVO> lrMemberDetailsList(ResettleBloodVO resettleBloodVO);
/** /**
* @description: 安置血缘查询-左右区血缘人数详情列表 * 安置血缘查询-左右区血缘人数详情列表
* @author: zhang jing
* @date: 2023/12/7 11:38
* @param: [resettleBloodVO]
* @return: java.util.List<com.hzs.report.member.vo.ResettleBloodVO>
**/ **/
List<ResettleBloodVO> lrbMemberDetailsList(ResettleBloodVO resettleBloodVO); List<ResettleBloodVO> lrbMemberDetailsList(ResettleBloodVO resettleBloodVO);
/** /**
* @description: 个人复购统计 * 个人复购统计
* @author: zhang jing
* @date: 2024/1/25 15:07
* @param: [prVO]
* @return: java.util.List<com.hzs.report.member.vo.PersonRepurchaseVO>
**/ **/
List<PersonRepurchaseVO> personRepurchaseList(PersonRepurchaseVO prVO); List<PersonRepurchaseVO> personRepurchaseList(PersonRepurchaseVO prVO);
/** /**
* @description: 安置业绩统计-查询会员 * 安置业绩统计-查询会员
* @author: zhang jing
* @date: 2024/1/25 15:36
* @param: [psVO]
* @return: java.util.List<com.hzs.report.member.vo.PositStatVO>
**/ **/
List<PositStatVO> positStatList(PositStatVO psVO); List<PositStatVO> positStatList(PositStatVO psVO);
/** /**
* @description:安置业绩统计 查询左右区业绩 * 安置业绩统计 查询左右区业绩
* @author: zhang jing
* @date: 2024/1/26 14:50
* @param: [psVO]
* @return: java.util.List<com.hzs.report.member.vo.PositStatVO>
**/ **/
List<PositStatVO> positStatAchieve(PositStatVO psVO); List<PositStatVO> positStatAchieve(PositStatVO psVO);
/** /**
* @description: 查询伞下直推产品列表 * 查询伞下直推产品列表
* @author: zhang jing
* @date: 2024/2/23 16:02
* @param: [ubpVO]
* @return: java.util.List<com.hzs.report.member.vo.UmbrellaBelowProductVO>
**/ **/
List<UmbrellaBelowProductVO> umbrellaBelowProductList(UmbrellaBelowProductVO ubpVO); List<UmbrellaBelowProductVO> umbrellaBelowProductList(UmbrellaBelowProductVO ubpVO);
/** /**
* @description: 伞下直推产品去重 * 伞下直推产品去重
* @author: zhang jing
* @date: 2024/2/24 14:46
* @param: [ubrVO]
* @return: java.util.List<com.hzs.report.member.vo.UmbrellaBelowRepeatVO>
**/ **/
List<UmbrellaBelowRepeatVO> umbrellaBelowRepeatList(UmbrellaBelowRepeatVO ubrVO); List<UmbrellaBelowRepeatVO> umbrellaBelowRepeatList(UmbrellaBelowRepeatVO ubrVO);
/** /**
* @description: 伞下直推产品统计 * 伞下直推产品统计
* @author: zhang jing
* @date: 2024/2/24 14:46
* @param: [ubrVO]
* @return: java.util.List<com.hzs.report.member.vo.UmbrellaBelowRepeatVO>
**/ **/
List<StatProductVO> statProductList(StatProductVO sptVO); List<StatProductVO> statProductList(StatProductVO sptVO);
/** /**
* @description: 会员户籍数据查询 * 会员户籍数据查询
* @author: zhang jing
* @date: 2024/3/11 11:40
* @param: [ddVO]
* @return: java.util.List<com.hzs.report.member.vo.DomicileDataVO>
**/ **/
List<DomicileDataVO> domicileDataList(DomicileDataVO ddVO); List<DomicileDataVO> domicileDataList(DomicileDataVO ddVO);
/** /**
* @description: 地区业绩统计 * 地区业绩统计
* @author: zhang jing
* @date: 2024/5/6 16:12
* @param: [areaAchieveStatVO]
* @return: java.util.List<com.hzs.report.member.vo.OrderScatterVO>
**/ **/
List<AreaAchieveStatVO> areaAchieveStat(AreaAchieveStatVO areaAchieveStatVO); List<AreaAchieveStatVO> areaAchieveStat(AreaAchieveStatVO areaAchieveStatVO);
/** /**
* @description: 系统业绩统计 * 系统业绩统计
* @author: zhang jing
* @date: 2024/5/6 16:12
* @param: [areaAchieveStatVO]
* @return: java.util.List<com.hzs.report.member.vo.OrderScatterVO>
**/ **/
List<VertexAchieveStatVO> vertexAchieveStat(VertexAchieveStatVO vertexAchieveStatVO); List<VertexAchieveStatVO> vertexAchieveStat(VertexAchieveStatVO vertexAchieveStatVO);
/** /**
* @description: 导出地区业绩 * 导出地区业绩
* @author: zhang jing
* @date: 2024/5/20 14:58
* @param: [response, fileName, dataList]
* @return: void
**/ **/
void exportExcelWithMergedCells(HttpServletResponse response, String fileName, void exportExcelWithMergedCells(HttpServletResponse response, String fileName,
List<AreaAchieveStatVO> dataList) throws IOException; List<AreaAchieveStatVO> dataList) throws IOException;
/** /**
* @description: 导出系统业绩统计 * 导出系统业绩统计
* @author: zhang jing
* @date: 2024/5/20 14:58
* @param: [response, fileName, dataList]
* @return: void
**/ **/
void exportExcelVertexWithMergedCells(HttpServletResponse response, String fileName, void exportExcelVertexWithMergedCells(HttpServletResponse response, String fileName,
List<VertexAchieveStatVO> dataList) throws IOException; List<VertexAchieveStatVO> dataList) throws IOException;
/** /**
* @description: 月度职级名单查询 * 月度职级名单查询
* @author: zhang jing
* @date: 2024/6/24 15:22
* @param: [mjlvo]
* @return: java.util.List<com.hzs.report.member.vo.MonthlyJobLevelVo>
**/ **/
List<MonthlyJobLevelVo> monthlyJobLevelList(MonthlyJobLevelVo mjlvo); List<MonthlyJobLevelVo> monthlyJobLevelList(MonthlyJobLevelVo mjlvo);
/** /**
* @description: 查询收益区域数据 * 查询收益区域数据
* @author: zhang jing
* @date: 2025/1/10 16:29
* @param: [revenueAreaVO]
* @return: java.util.List<com.hzs.report.member.vo.RevenueAreaVO>
**/ **/
List<RevenueAreaVO> revenueAreaList(RevenueAreaVO revenueAreaVO); List<RevenueAreaVO> revenueAreaList(RevenueAreaVO revenueAreaVO);

389
bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberAwardsStatServiceImpl.java
View File

@ -8,9 +8,9 @@ import com.hzs.report.member.vo.*;
import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
@ -21,124 +21,52 @@ import java.util.stream.Collectors;
/** /**
* 会员信息-奖衔升级记录 服务实现类 * 会员信息-奖衔升级记录 服务实现类
*
* @author hzs
* @since 2022-08-31
*/ */
@Service @Service
public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService { public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService {
@Autowired @Resource
private CuMemberAwardsStatMapper memberAwardsStatMapper; private CuMemberAwardsStatMapper cuMemberAwardsStatMapper;
/**
* @description: 真实业绩新增奖衔查询
* @author: zhang jing
* @date: 2023/8/24 17:56
* @param: [cuMemberAwardsVO]
* @return: java.util.List<com.hzs.member.detail.vo.CuMemberAwardsVO>
**/
@Override @Override
public List<CuMemberAwardsStatVO> selectCuMemberAwardsList(CuMemberAwardsStatVO cuMemberAwardsStatVO) { public List<CuMemberAwardsStatVO> selectCuMemberAwardsList(CuMemberAwardsStatVO cuMemberAwardsStatVO) {
return memberAwardsStatMapper.selectCuMemberAwardsList(cuMemberAwardsStatVO); return cuMemberAwardsStatMapper.selectCuMemberAwardsList(cuMemberAwardsStatVO);
} }
/**
* @description: 奖衔晋升列表
* @author: zhang jing
* @date: 2024/1/2 10:37
* @param: [awardPromotionVO]
* @return: java.util.List<com.hzs.report.member.vo.AwardPromotionVO>
**/
@Override @Override
public List<AwardPromotionVO> awardPromotionList(AwardPromotionVO awardPromotionVO) { public List<AwardPromotionVO> awardPromotionList(AwardPromotionVO awardPromotionVO) {
return memberAwardsStatMapper.awardPromotionList(awardPromotionVO); return cuMemberAwardsStatMapper.awardPromotionList(awardPromotionVO);
} }
/**
* @description: 会员业绩数据查询
* @author: zhang jing
* @date: 2024/1/4 14:32
* @param: [memberAchieveVO]
* @return: java.util.List<com.hzs.report.member.vo.MemberAchieveVO>
**/
@Override @Override
public List<MemberAchieveVO> memberAchieveList(MemberAchieveVO memberAchieveVO) { public List<MemberAchieveVO> memberAchieveList(MemberAchieveVO memberAchieveVO) {
return memberAwardsStatMapper.memberAchieveList(memberAchieveVO); return cuMemberAwardsStatMapper.memberAchieveList(memberAchieveVO);
} }
/**
* @description: 个人统计
* @author: zhang jing
* @date: 2023/9/1 10:37
* @param: [personStatVO]
* @return: java.util.List<com.hzs.report.member.vo.PersonStatVO>
**/
@Override @Override
public List<PersonStatVO> selectPersonStatList(PersonStatVO personStatVO) { public List<PersonStatVO> selectPersonStatList(PersonStatVO personStatVO) {
return memberAwardsStatMapper.selectPersonStatList(personStatVO); return cuMemberAwardsStatMapper.selectPersonStatList(personStatVO);
} }
/**
* @description: 真实奖衔分析
* @author: zhang jing
* @date: 2023/8/26 16:01
* @param: [cuMemberAwardsAnalysisVO]
* @return: java.util.List<com.hzs.report.member.vo.CuMemberAwardsAnalysisVO>
**/
@Override @Override
public List<CuMemberAwardsAnalysisVO> selectCuMemberAwardsAnalysisList(CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO) { public List<CuMemberAwardsAnalysisVO> selectCuMemberAwardsAnalysisList(CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO) {
return memberAwardsStatMapper.selectCuMemberAwardsAnalysisList(cuMemberAwardsAnalysisVO); return cuMemberAwardsStatMapper.selectCuMemberAwardsAnalysisList(cuMemberAwardsAnalysisVO);
} }
/**
* @description: 查询会员结算等级升级记录
* @author: zhang jing
* @date: 2025/3/3 16:01
* @param: [cuMemberGradeRecordVO]
* @return: java.util.List<com.hzs.report.member.vo.CuMemberGradeRecordVO>
**/
@Override @Override
public List<CuMemberGradeRecordVO> querMemberGradeRecordList(CuMemberGradeRecordVO cuMemberGradeRecordVO) { public List<CuMemberGradeRecordVO> queryMemberGradeRecordList(CuMemberGradeRecordVO cuMemberGradeRecordVO) {
return memberAwardsStatMapper.querMemberGradeRecordList(cuMemberGradeRecordVO); return cuMemberAwardsStatMapper.queryMemberGradeRecordList(cuMemberGradeRecordVO);
} }
/**
* @description: 查询会员左右区累计真实业绩
* @author: zhang jing
* @date: 2024/8/20 10:00
* @param: [cuMemberAwardsAnalysisVO]
* @return: java.util.List<com.hzs.report.member.vo.CuMemberAwardsAnalysisVO>
**/
@Override
public List<CuMemberAwardsAnalysisVO> selectAwardsAnalysisList(List<CuMemberAwardsAnalysisVO> list) {
return memberAwardsStatMapper.selectAwardsAnalysisList(list);
}
/**
* @description: 查询全部伞下血缘业绩
* @author: zhang jing
* @date: 2023/10/14 16:05
* @param: [bloodList]
* @return: java.util.List<com.hzs.report.member.vo.BloodRemoveSameVO>
**/
@Override @Override
public List<BloodRemoveSameVO> bloodRemoveSameAllList(BloodRemoveSameVO bloodList, public List<BloodRemoveSameVO> bloodRemoveSameAllList(BloodRemoveSameVO bloodList,
String startDate, String endDate, String startDate, String endDate,
List<Integer> orderTypeList, List<Integer> orderTypeList,
List<Integer> pkAwardsList List<Integer> pkAwardsList
) { ) {
return memberAwardsStatMapper.bloodRemoveSameAllList(bloodList, startDate, endDate, orderTypeList, pkAwardsList); return cuMemberAwardsStatMapper.bloodRemoveSameAllList(bloodList, startDate, endDate, orderTypeList, pkAwardsList);
} }
/**
* @description: 查询会员推荐伞下业绩(历史)
* @author: zhang jing
* @date: 2024/5/15 14:03
* @param: [bloodList, periodEnd, periodSta, achieveTableNameEnd, achieveTableNameSta, settleTableNameSta, settleTableNameEnd, orderType]
* @return: java.util.List<com.hzs.report.member.vo.BloodRemoveSameVO>
**/
@Override @Override
public List<BloodRemoveSameVO> bloodSameAllListHistory(List<BloodRemoveSameVO> bloodList, public List<BloodRemoveSameVO> bloodSameAllListHistory(List<BloodRemoveSameVO> bloodList,
Integer periodEnd, Integer periodEnd,
@ -150,17 +78,10 @@ public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService
Integer orderType Integer orderType
) { ) {
return memberAwardsStatMapper.bloodSameAllListHistory(bloodList, periodEnd, periodSta, achieveTableNameEnd, return cuMemberAwardsStatMapper.bloodSameAllListHistory(bloodList, periodEnd, periodSta, achieveTableNameEnd,
achieveTableNameSta, settleTableNameSta, settleTableNameEnd, orderType); achieveTableNameSta, settleTableNameSta, settleTableNameEnd, orderType);
} }
/**
* @description: 伞下去重业绩查询（新）
* @author: zhang jing
* @date: 2024/5/23 14:50
* @param: [bloodList, periodEnd, periodSta, achieveTableNameEnd, achieveTableNameSta, settleTableNameSta, settleTableNameEnd, orderType, pkCountry, pkAwardsList]
* @return: java.util.List<com.hzs.report.member.vo.BloodRemoveSameVO>
**/
@Override @Override
public List<BloodRemoveSameVO> bloodRemoveSameMemberAchieveNew(List<BloodRemoveSameVO> bloodList, public List<BloodRemoveSameVO> bloodRemoveSameMemberAchieveNew(List<BloodRemoveSameVO> bloodList,
Integer periodEnd, Integer periodEnd,
@ -173,176 +94,70 @@ public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService
Integer pkCountry, List<Integer> pkAwardsList Integer pkCountry, List<Integer> pkAwardsList
) { ) {
return memberAwardsStatMapper.bloodRemoveSameMemberAchieveNew(bloodList, periodEnd, periodSta, achieveTableNameEnd, return cuMemberAwardsStatMapper.bloodRemoveSameMemberAchieveNew(bloodList, periodEnd, periodSta, achieveTableNameEnd,
achieveTableNameSta, settleTableNameSta, settleTableNameEnd, orderType, pkCountry, pkAwardsList); achieveTableNameSta, settleTableNameSta, settleTableNameEnd, orderType, pkCountry, pkAwardsList);
} }
/**
* @description: 根据奖衔查询所有会员
* @author: zhang jing
* @date: 2023/10/11 14:05
* @param: [bloodRemoveSameVO]
* @return: java.util.List<com.hzs.report.member.vo.BloodRemoveSameVO>
**/
@Override @Override
public List<BloodRemoveSameVO> queryAwardAchieList(BloodRemoveSameVO bloodRemoveSameVO) { public List<BloodRemoveSameVO> queryAwardAchieList(BloodRemoveSameVO bloodRemoveSameVO) {
return memberAwardsStatMapper.queryAwardAchieList(bloodRemoveSameVO); return cuMemberAwardsStatMapper.queryAwardAchieList(bloodRemoveSameVO);
} }
/**
* @description: 根据奖衔查询会员（历史）
* @author: zhang jing
* @date: 2024/5/17 14:15
* @param: [bloodRemoveSameVO]
* @return: java.util.List<com.hzs.report.member.vo.BloodRemoveSameVO>
**/
@Override @Override
public List<BloodRemoveSameVO> queryAwardAchieListHistory(BloodRemoveSameVO bloodRemoveSameVO) { public List<BloodRemoveSameVO> queryAwardAchieListHistory(BloodRemoveSameVO bloodRemoveSameVO) {
return memberAwardsStatMapper.queryAwardAchieListHistory(bloodRemoveSameVO); return cuMemberAwardsStatMapper.queryAwardAchieListHistory(bloodRemoveSameVO);
} }
/**
* @description: 真实奖衔分析详情（穿透页面接口）
* @author: zhang jing
* @date: 2023/9/26 14:27
* @param: [cuMemberAwardsAnalysisVO]
* @return: java.util.List<com.hzs.report.member.vo.CuMemberAwardsAnalysisVO>
**/
@Override @Override
public List<CuMemberAwardsAnalysisVO> selectCuMemberAwardsAnalysisDetailsList(CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO) { public List<CuMemberAwardsAnalysisVO> selectCuMemberAwardsAnalysisDetailsList(CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO) {
return memberAwardsStatMapper.selectCuMemberAwardsAnalysisDetailsList(cuMemberAwardsAnalysisVO); return cuMemberAwardsStatMapper.selectCuMemberAwardsAnalysisDetailsList(cuMemberAwardsAnalysisVO);
} }
/**
* @description: 收入明细
* @author: zhang jing
* @date: 2023/9/26 15:07
* @param: [revenueDetailsVO]
* @return: java.util.List<com.hzs.report.member.vo.RevenueDetailsVO>
**/
@Override @Override
public List<RevenueDetailsVO> selectRevenueDetailsList(RevenueDetailsVO revenueDetailsVO) { public List<RevenueDetailsVO> selectRevenueDetailsList(RevenueDetailsVO revenueDetailsVO) {
return memberAwardsStatMapper.selectRevenueDetailsList(revenueDetailsVO); return cuMemberAwardsStatMapper.selectRevenueDetailsList(revenueDetailsVO);
} }
/**
* @description: 复购bv统计
* @author: zhang jing
* @date: 2023/8/29 15:31
* @param: [repurchasePVStatVO]
* @return: java.util.List<com.hzs.report.member.vo.RepurchasePVStatVO>
**/
@Override @Override
public List<RepurchasePVStatVO> selectRepurchasePVStatList(RepurchasePVStatVO repurchasePVStatVO) { public List<RepurchasePVStatVO> selectRepurchasePVStatList(RepurchasePVStatVO repurchasePVStatVO) {
return memberAwardsStatMapper.selectRepurchasePVStatList(repurchasePVStatVO); return cuMemberAwardsStatMapper.selectRepurchasePVStatList(repurchasePVStatVO);
} }
/**
* @description: 商城BV统计
* @author: zhang jing
* @date: 2023/8/30 10:54
* @param: [mallPVStatVO]
* @return: java.util.List<com.hzs.report.member.vo.RepurchasePVStatVO>
**/
@Override @Override
public List<MallPVStatVO> selectMallPVStatList(MallPVStatVO mallPVStatVO) { public List<MallPVStatVO> selectMallPVStatList(MallPVStatVO mallPVStatVO) {
return memberAwardsStatMapper.selectMallPVStatList(mallPVStatVO); return cuMemberAwardsStatMapper.selectMallPVStatList(mallPVStatVO);
} }
/**
* @description: 个人统计业绩查询
* @author: zhang jing
* @date: 2023/9/1 11:04
* @param: [personStatVO]
* @return: java.util.List<com.hzs.report.member.vo.PersonStatVO>
**/
@Override @Override
public List<PersonStatVO> selectPersonPvList(List<PersonStatVO> perList) { public List<PersonStatVO> selectPersonPvList(List<PersonStatVO> perList) {
return memberAwardsStatMapper.selectPersonPvList(perList); return cuMemberAwardsStatMapper.selectPersonPvList(perList);
} }
/**
* @description: 直推统计
* @author: zhang jing
* @date: 2023/9/4 11:46
* @param: [directPushVO]
* @return: java.util.List<com.hzs.report.member.vo.DirectPushVO>
**/
@Override @Override
public List<DirectPushVO> selectDirectPushStatList(DirectPushVO directPushVO) { public List<DirectPushVO> selectDirectPushStatList(DirectPushVO directPushVO) {
return memberAwardsStatMapper.selectDirectPushStatList(directPushVO); return cuMemberAwardsStatMapper.selectDirectPushStatList(directPushVO);
} }
@Override
public List<DirectPushVO> selectThreeDirectPushStatList(DirectPushVO directPushVO) {
return memberAwardsStatMapper.selectThreeDirectPushStatList(directPushVO);
}
/**
* @description: 直推数据列表
* @author: zhang jing
* @date: 2023/12/18 17:15
* @param: [dpdVO]
* @return: java.util.List<com.hzs.report.member.vo.DirectPushDataVO>
**/
@Override @Override
public List<DirectPushDataVO> selectDirectPushDataList(DirectPushDataVO dpdVO) { public List<DirectPushDataVO> selectDirectPushDataList(DirectPushDataVO dpdVO) {
return memberAwardsStatMapper.selectDirectPushDataList(dpdVO); return cuMemberAwardsStatMapper.selectDirectPushDataList(dpdVO);
} }
/**
* @description: 直推数据详情
* @author: zhang jing
* @date: 2023/12/20 14:36
* @param: [dpdVO]
* @return: java.util.List<com.hzs.report.member.vo.DirectPushDataVO>
**/
@Override @Override
public List<DirectPushDataVO> selectDirectPushDataDetails(DirectPushDataVO dpdVO) { public List<DirectPushDataVO> selectDirectPushDataDetails(DirectPushDataVO dpdVO) {
return memberAwardsStatMapper.selectDirectPushDataDetails(dpdVO); return cuMemberAwardsStatMapper.selectDirectPushDataDetails(dpdVO);
} }
/**
* @description: 会员订单分布统计
* @author: zhang jing
* @date: 2023/9/20 14:46
* @param: [orderScatterVO]
* @return: java.util.List<com.hzs.report.member.vo.OrderScatterVO>
**/
@Override @Override
public List<OrderScatterVO> memberOrderScatter(OrderScatterVO orderScatterVO) { public List<OrderScatterVO> memberOrderScatter(OrderScatterVO orderScatterVO) {
return memberAwardsStatMapper.memberOrderScatter(orderScatterVO); return cuMemberAwardsStatMapper.memberOrderScatter(orderScatterVO);
} }
@Override @Override
public List<OrderScatterVO> memberThreeOrderScatter(OrderScatterVO orderScatterVO) { public List<Integer> awardsLevelList(List<Integer> pkAwardsList, Integer pkCountry) {
return memberAwardsStatMapper.memberThreeOrderScatter(orderScatterVO); return cuMemberAwardsStatMapper.awardsLevelList(pkAwardsList, pkCountry);
} }
/**
* @description: 根据奖衔级别查询奖衔
* @author: zhang jing
* @date: 2023/10/17 11:17
* @param: [pkAwardsList]
* @return: java.util.List<java.lang.Integer>
**/
@Override
public List<Integer> awardsLevellist(List<Integer> pkAwardsList, Integer pkCountry) {
return memberAwardsStatMapper.awardsLevellist(pkAwardsList, pkCountry);
}
/**
* @description: 处理伞下去重查询方法
* @author: zhang jing
* @date: 2024/5/14 14:38
* @param: [bloodRemoveSameVO]
* @return: java.util.List<com.hzs.report.member.vo.BloodRemoveSameVO>
**/
@Override @Override
public List<BloodRemoveSameVO> bloodRemoveSameList(BloodRemoveSameVO bloodRemoveSameVO) { public List<BloodRemoveSameVO> bloodRemoveSameList(BloodRemoveSameVO bloodRemoveSameVO) {
List<Integer> orderTypeList = bloodRemoveSameVO.getOrderTypeList(); List<Integer> orderTypeList = bloodRemoveSameVO.getOrderTypeList();
@ -369,13 +184,6 @@ public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService
return allList; return allList;
} }
/**
* @description: 伞下去重业绩查询（新）
* @author: zhang jing
* @date: 2024/5/23 14:50
* @param: [bloodRemoveSameVO]
* @return: java.util.List<com.hzs.report.member.vo.BloodRemoveSameVO>
**/
@Override @Override
public List<BloodRemoveSameVO> bloodRemoveSameListHistoryNew(BloodRemoveSameVO bloodRemoveSameVO) { public List<BloodRemoveSameVO> bloodRemoveSameListHistoryNew(BloodRemoveSameVO bloodRemoveSameVO) {
List<Integer> orderTypeList = bloodRemoveSameVO.getOrderTypeList(); List<Integer> orderTypeList = bloodRemoveSameVO.getOrderTypeList();
@ -388,8 +196,6 @@ public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService
List<BloodRemoveSameVO> allList = new ArrayList<>(); List<BloodRemoveSameVO> allList = new ArrayList<>();
//根据奖衔查询所有会员 //根据奖衔查询所有会员
List<BloodRemoveSameVO> achieList = queryAwardAchieListHistory(bloodRemoveSameVO); List<BloodRemoveSameVO> achieList = queryAwardAchieListHistory(bloodRemoveSameVO);
// List<BloodRemoveSameVO> achieList1 = new ArrayList<>();
// achieList1.add(achieList.get(0));
if (CollectionUtil.isNotEmpty(achieList)) { if (CollectionUtil.isNotEmpty(achieList)) {
//查询会员的所有血缘业绩 //查询会员的所有血缘业绩
@ -425,17 +231,10 @@ public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService
return allList; return allList;
} }
/**
* @description: 安置血缘查询
* @author: zhang jing
* @date: 2023/12/6 15:50
* @param: [resettleBloodVOVO]
* @return: java.util.List<com.hzs.report.member.vo.ResettleBloodVOVO>
**/
@Override @Override
public List<ResettleBloodVO> resettleBloodList(ResettleBloodVO resettleBloodVO) { public List<ResettleBloodVO> resettleBloodList(ResettleBloodVO resettleBloodVO) {
List<ResettleBloodVO> resettleBloodList = new ArrayList<>(); List<ResettleBloodVO> resettleBloodList = new ArrayList<>();
List<ResettleBloodVO> lrMemberCountList = memberAwardsStatMapper.lrMemberCountList(resettleBloodVO); List<ResettleBloodVO> lrMemberCountList = cuMemberAwardsStatMapper.lrMemberCountList(resettleBloodVO);
if (CollectionUtil.isNotEmpty(lrMemberCountList)) { if (CollectionUtil.isNotEmpty(lrMemberCountList)) {
lrMemberCountList.forEach(itm -> { lrMemberCountList.forEach(itm -> {
if (itm.getPlaceDept() == EPlaceDept.LEFT_DEPT.getValue()) { if (itm.getPlaceDept() == EPlaceDept.LEFT_DEPT.getValue()) {
@ -446,7 +245,7 @@ public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService
} }
}); });
} }
List<ResettleBloodVO> lrbMemberCountList = memberAwardsStatMapper.lrbMemberCountList(resettleBloodVO); List<ResettleBloodVO> lrbMemberCountList = cuMemberAwardsStatMapper.lrbMemberCountList(resettleBloodVO);
if (CollectionUtil.isNotEmpty(lrbMemberCountList)) { if (CollectionUtil.isNotEmpty(lrbMemberCountList)) {
lrbMemberCountList.forEach(itm -> { lrbMemberCountList.forEach(itm -> {
if (itm.getPlaceDept() == EPlaceDept.LEFT_DEPT.getValue()) { if (itm.getPlaceDept() == EPlaceDept.LEFT_DEPT.getValue()) {
@ -461,146 +260,61 @@ public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService
return resettleBloodList; return resettleBloodList;
} }
/**
* @description: 安置血缘查询-左右区人数详情列表
* @author: zhang jing
* @date: 2023/12/7 11:38
* @param: [resettleBloodVO]
* @return: java.util.List<com.hzs.report.member.vo.ResettleBloodVO>
**/
@Override @Override
public List<ResettleBloodVO> lrMemberDetailsList(ResettleBloodVO resettleBloodVO) { public List<ResettleBloodVO> lrMemberDetailsList(ResettleBloodVO resettleBloodVO) {
return memberAwardsStatMapper.lrMemberDetailsList(resettleBloodVO); return cuMemberAwardsStatMapper.lrMemberDetailsList(resettleBloodVO);
} }
/**
* @description: 安置血缘查询-左右区血缘人数详情列表
* @author: zhang jing
* @date: 2023/12/7 11:38
* @param: [resettleBloodVO]
* @return: java.util.List<com.hzs.report.member.vo.ResettleBloodVO>
**/
@Override @Override
public List<ResettleBloodVO> lrbMemberDetailsList(ResettleBloodVO resettleBloodVO) { public List<ResettleBloodVO> lrbMemberDetailsList(ResettleBloodVO resettleBloodVO) {
return memberAwardsStatMapper.lrbMemberDetailsList(resettleBloodVO); return cuMemberAwardsStatMapper.lrbMemberDetailsList(resettleBloodVO);
} }
/**
* @description: 个人复购统计
* @author: zhang jing
* @date: 2024/1/25 15:07
* @param: [prVO]
* @return: java.util.List<com.hzs.report.member.vo.PersonRepurchaseVO>
**/
@Override @Override
public List<PersonRepurchaseVO> personRepurchaseList(PersonRepurchaseVO prVO) { public List<PersonRepurchaseVO> personRepurchaseList(PersonRepurchaseVO prVO) {
return memberAwardsStatMapper.personRepurchaseList(prVO); return cuMemberAwardsStatMapper.personRepurchaseList(prVO);
} }
/**
* @description: 安置业绩统计-查询会员
* @author: zhang jing
* @date: 2024/1/25 15:36
* @param: [psVO]
* @return: java.util.List<com.hzs.report.member.vo.PositStatVO>
**/
@Override @Override
public List<PositStatVO> positStatList(PositStatVO psVO) { public List<PositStatVO> positStatList(PositStatVO psVO) {
return memberAwardsStatMapper.positStatList(psVO); return cuMemberAwardsStatMapper.positStatList(psVO);
} }
/**
* @description: 安置业绩统计 查询左右区业绩
* @author: zhang jing
* @date: 2024/1/26 14:50
* @param: [psVO]
* @return: java.util.List<com.hzs.report.member.vo.PositStatVO>
**/
@Override @Override
public List<PositStatVO> positStatAchieve(PositStatVO psVO) { public List<PositStatVO> positStatAchieve(PositStatVO psVO) {
return memberAwardsStatMapper.positStatAchieve(psVO); return cuMemberAwardsStatMapper.positStatAchieve(psVO);
} }
/**
* @description: 查询伞下直推产品列表
* @author: zhang jing
* @date: 2024/2/23 16:04
* @param: [ubpVO]
* @return: java.util.List<com.hzs.report.member.vo.UmbrellaBelowProductVO>
**/
@Override @Override
public List<UmbrellaBelowProductVO> umbrellaBelowProductList(UmbrellaBelowProductVO ubpVO) { public List<UmbrellaBelowProductVO> umbrellaBelowProductList(UmbrellaBelowProductVO ubpVO) {
return memberAwardsStatMapper.umbrellaBelowProductList(ubpVO); return cuMemberAwardsStatMapper.umbrellaBelowProductList(ubpVO);
} }
/**
* @description: 伞下直推产品去重
* @author: zhang jing
* @date: 2024/2/24 14:46
* @param: [ubrVO]
* @return: java.util.List<com.hzs.report.member.vo.UmbrellaBelowRepeatVO>
**/
@Override @Override
public List<UmbrellaBelowRepeatVO> umbrellaBelowRepeatList(UmbrellaBelowRepeatVO ubrVO) { public List<UmbrellaBelowRepeatVO> umbrellaBelowRepeatList(UmbrellaBelowRepeatVO ubrVO) {
return memberAwardsStatMapper.umbrellaBelowRepeatList(ubrVO); return cuMemberAwardsStatMapper.umbrellaBelowRepeatList(ubrVO);
} }
/**
* @description: 伞下直推产品统计
* @author: zhang jing
* @date: 2024/2/25 11:05
* @param: [sptVO]
* @return: java.util.List<com.hzs.report.member.vo.StatProductVO>
**/
@Override @Override
public List<StatProductVO> statProductList(StatProductVO sptVO) { public List<StatProductVO> statProductList(StatProductVO sptVO) {
return memberAwardsStatMapper.statProductList(sptVO); return cuMemberAwardsStatMapper.statProductList(sptVO);
} }
/**
* @description: 会员户籍数据查询
* @author: zhang jing
* @date: 2024/3/11 11:39
* @param: [ddVO]
* @return: java.util.List<com.hzs.report.member.vo.DomicileDataVO>
**/
@Override @Override
public List<DomicileDataVO> domicileDataList(DomicileDataVO ddVO) { public List<DomicileDataVO> domicileDataList(DomicileDataVO ddVO) {
return memberAwardsStatMapper.domicileDataList(ddVO); return cuMemberAwardsStatMapper.domicileDataList(ddVO);
} }
/**
* @description: 地区业绩统计
* @author: zhang jing
* @date: 2024/5/6 16:12
* @param: [areaAchieveStatVO]
* @return: java.util.List<com.hzs.report.member.vo.OrderScatterVO>
**/
@Override @Override
public List<AreaAchieveStatVO> areaAchieveStat(AreaAchieveStatVO areaAchieveStatVO) { public List<AreaAchieveStatVO> areaAchieveStat(AreaAchieveStatVO areaAchieveStatVO) {
return memberAwardsStatMapper.areaAchieveStat(areaAchieveStatVO); return cuMemberAwardsStatMapper.areaAchieveStat(areaAchieveStatVO);
} }
/*
* @description: 系统业绩统计
* @author: zhang jing
* @date: 2024/6/18 14:29
* @param: [vertexAchieveStatVO]
* @return: java.util.List<com.hzs.report.member.vo.VertexAchieveStatVO>
**/
@Override @Override
public List<VertexAchieveStatVO> vertexAchieveStat(VertexAchieveStatVO vertexAchieveStatVO) { public List<VertexAchieveStatVO> vertexAchieveStat(VertexAchieveStatVO vertexAchieveStatVO) {
return memberAwardsStatMapper.vertexAchieveStat(vertexAchieveStatVO); return cuMemberAwardsStatMapper.vertexAchieveStat(vertexAchieveStatVO);
} }
/**
* @description: 导出地区业绩
* @author: zhang jing
* @date: 2024/5/20 10:09
* @param: [response, fileName, dataList]
* @return: void
**/
@Override @Override
public void exportExcelWithMergedCells(HttpServletResponse response, String fileName, public void exportExcelWithMergedCells(HttpServletResponse response, String fileName,
List<AreaAchieveStatVO> dataList) throws IOException { List<AreaAchieveStatVO> dataList) throws IOException {
@ -686,13 +400,6 @@ public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService
workbook.close(); workbook.close();
} }
/**
* @description: 导出系统业绩统计
* @author: zhang jing
* @date: 2024/6/18 15:39
* @param: [response, fileName, dataList]
* @return: void
**/
@Override @Override
public void exportExcelVertexWithMergedCells(HttpServletResponse response, String fileName, public void exportExcelVertexWithMergedCells(HttpServletResponse response, String fileName,
List<VertexAchieveStatVO> dataList) throws IOException { List<VertexAchieveStatVO> dataList) throws IOException {
@ -778,28 +485,14 @@ public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService
workbook.close(); workbook.close();
} }
/**
* @description: 月度职级名单查询
* @author: zhang jing
* @date: 2024/6/24 15:22
* @param: [mjlvo]
* @return: java.util.List<com.hzs.report.member.vo.MonthlyJobLevelVo>
**/
@Override @Override
public List<MonthlyJobLevelVo> monthlyJobLevelList(MonthlyJobLevelVo mjlvo) { public List<MonthlyJobLevelVo> monthlyJobLevelList(MonthlyJobLevelVo mjlvo) {
return memberAwardsStatMapper.monthlyJobLevelList(mjlvo); return cuMemberAwardsStatMapper.monthlyJobLevelList(mjlvo);
} }
/**
* @description: 查询收益区域数据
* @author: zhang jing
* @date: 2025/1/10 16:28
* @param: [revenueAreaVO]
* @return: java.util.List<com.hzs.report.member.vo.RevenueAreaVO>
**/
@Override @Override
public List<RevenueAreaVO> revenueAreaList(RevenueAreaVO revenueAreaVO) { public List<RevenueAreaVO> revenueAreaList(RevenueAreaVO revenueAreaVO) {
return memberAwardsStatMapper.revenueAreaList(revenueAreaVO); return cuMemberAwardsStatMapper.revenueAreaList(revenueAreaVO);
} }
// 获取对象属性值的通用方法 // 获取对象属性值的通用方法

37
bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemAchieveStatVO.java
View File

@ -1,37 +0,0 @@
package com.hzs.report.member.vo;
import lombok.Data;
import java.util.List;
/**
* <p>
* 会员信息-奖衔升级记录VO
* </p>
*
* @author hzs
* @since 2022-08-31
*/
@Data
public class CuMemAchieveStatVO {
private static final long serialVersionUID = 1L;
/**
* 会员编号
*/
private List<Long> pkMemberList;
/**
* 结算期间
*/
private Integer period;
/**
* 业绩表
*/
private String achieveTableName;
}

85
bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberAchieveVO.java
View File

@ -1,85 +0,0 @@
package com.hzs.report.member.vo;
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.io.Serializable;
/**
* @description: 安置反差返回的数据
* @author: sui q
* @time: 2023/8/28 10:17
* @classname: CuMemberAchieveVO
* @package_name: com.hzs.report.member.vo
* version 1.0.0
*/
@Data
public class CuMemberAchieveVO implements Serializable {
// private Long pkMember;
/**
* 层/代
*/
@Excel(name = "层级")
private Integer algebra;
/**
* 会员编号
*/
@Excel(name = "会员编号")
private String memberCode;
/**
* 会员名称
*/
@Excel(name = "会员姓名")
private String memberName;
/**
* 手机号码
*/
@Excel(name = "联系方式")
private String phone;
/**
* 等级
*/
@Transaction(transactionKey = EnumsPrefixConstants.KEY_GRADE)
private Integer pkGrade;
@Excel(name = "注册等级")
private String pkGradeVal;
/**
* 真实奖衔
*/
@Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD)
private Integer pkAwards;
@Excel(name = "真实奖衔")
private String pkAwardsVal;
/**
* 体系名称
*/
@Excel(name = "隶属体系")
private String vertexName;
/**
* 团队名称
*/
@Excel(name = "隶属团队")
private String teamName;
/**
* 考核状态 (0=考核通过,1=免考通过,2=考核不通过,3=不考核)
*/
@Transaction(transactionKey = EnumsPrefixConstants.ASSESS_STATUS)
private Integer assessStatus;
@Excel(name = "考核状态")
private String assessStatusVal;
}

34
bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberAwardsAnalysisVO.java
View File

@ -11,12 +11,7 @@ import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/** /**
* <p>
* 会员信息-真实奖衔分析VO * 会员信息-真实奖衔分析VO
* </p>
*
* @author hzs
* @since 2022-08-31
*/ */
@Data @Data
public class CuMemberAwardsAnalysisVO { public class CuMemberAwardsAnalysisVO {
@ -63,6 +58,7 @@ public class CuMemberAwardsAnalysisVO {
*/ */
@Excel(name = "注册等级") @Excel(name = "注册等级")
private String pkRegisterGradeVal; private String pkRegisterGradeVal;
/** /**
* 奖衔 * 奖衔
*/ */
@ -73,20 +69,19 @@ public class CuMemberAwardsAnalysisVO {
* 荣誉奖衔 * 荣誉奖衔
*/ */
@Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD)
private Integer pkRangeAwards; private Integer pkMaxAwards;
/** /**
* 奖衔 * 当月奖衔
*/ */
@Excel(name = "真实奖衔") @Excel(name = "当月奖衔")
private String pkAwardsVal; private String pkAwardsVal;
/** /**
* 荣誉奖衔 * 荣誉奖衔
*/ */
@Excel(name = "荣誉奖衔") @Excel(name = "荣誉奖衔")
private String pkRangeAwardsVal; private String pkMaxAwardsVal;
/** /**
* 隶属体系 * 隶属体系
@ -113,11 +108,20 @@ public class CuMemberAwardsAnalysisVO {
* 结算期间 * 结算期间
*/ */
private Integer period; private Integer period;
/**
* 有效日期
*/
@Excel(name = "有效日期", dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endValidityDate;
/** /**
* 晋升方式 * 晋升方式
*/ */
@Transaction(transactionKey = EnumsPrefixConstants.UPGRADE_TYPE) @Transaction(transactionKey = EnumsPrefixConstants.UPGRADE_TYPE)
private Integer upType; private Integer upType;
@Excel(name = "晋升方式") @Excel(name = "晋升方式")
private String upTypeVal; private String upTypeVal;
@ -128,14 +132,6 @@ public class CuMemberAwardsAnalysisVO {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date creationTime; private Date creationTime;
/**
* 有效日期
*/
@Excel(name = "有效日期",dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endValidityDate;
/** /**
* 创建时间开始时间 * 创建时间开始时间
*/ */
@ -157,7 +153,6 @@ public class CuMemberAwardsAnalysisVO {
private String endEffectiveDate; private String endEffectiveDate;
/** /**
* 隶属体系 * 隶属体系
*/ */
@ -187,5 +182,4 @@ public class CuMemberAwardsAnalysisVO {
private Integer pkGrade; private Integer pkGrade;
} }

8
bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberAwardsStatVO.java
View File

@ -11,12 +11,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
/** /**
* <p>
* 会员信息-奖衔升级记录VO * 会员信息-奖衔升级记录VO
* </p>
*
* @author hzs
* @since 2022-08-31
*/ */
@Data @Data
public class CuMemberAwardsStatVO { public class CuMemberAwardsStatVO {
@ -143,7 +138,4 @@ public class CuMemberAwardsStatVO {
private List<Long> pkMemberList; private List<Long> pkMemberList;
} }

20
bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberGradeRecordVO.java
View File

@ -9,12 +9,7 @@ import lombok.Data;
import java.util.Date; import java.util.Date;
/** /**
* <p>
* 会员信息-结算等级升级记录VO * 会员信息-结算等级升级记录VO
* </p>
*
* @author hzs
* @since 2022-08-31
*/ */
@Data @Data
public class CuMemberGradeRecordVO { public class CuMemberGradeRecordVO {
@ -41,6 +36,13 @@ public class CuMemberGradeRecordVO {
*/ */
@Excel(name = "会员姓名") @Excel(name = "会员姓名")
private String memberName; private String memberName;
/**
* 订单编号
*/
@Excel(name = "订单编号")
private String orderCode;
/** /**
* 手机号码 * 手机号码
*/ */
@ -87,13 +89,6 @@ public class CuMemberGradeRecordVO {
@Excel(name = "隶属体系") @Excel(name = "隶属体系")
private String teamName; private String teamName;
/**
* 订单编号
*/
@Excel(name = "订单编号")
private String orderCode;
/** /**
@ -144,5 +139,4 @@ public class CuMemberGradeRecordVO {
private Integer pkGrade; private Integer pkGrade;
} }

7
bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberImportVO.java
View File

@ -8,13 +8,8 @@ import lombok.NoArgsConstructor;
import java.util.Date; import java.util.Date;
/** /**
* @Description: 会员编号导入实体vo * 会员编号导入实体vo
* @Author: zhangjing
* @Time: 2022/12/28 11:21
* @Classname: UpdateCodeVO
* @PackageName: com.hzs.member.base.vo
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

7
bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberPushAchieveVO.java
View File

@ -10,12 +10,7 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
/** /**
* @description: 推荐反差返回的数据 * 推荐反差返回的数据
* @author: zhangjing
* @time: 2023/8/28 10:17
* @classname: CuMemberAchieveVO
* @package_name: com.hzs.report.member.vo
* version 1.0.0
*/ */
@Data @Data
public class CuMemberPushAchieveVO implements Serializable { public class CuMemberPushAchieveVO implements Serializable {

6
bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberUmbrellaBalanceVO.java
View File

@ -12,11 +12,7 @@ import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
* @Description: 安置伞下账户余额 * 安置伞下账户余额
* @Author: zhangjing
* @Time: 2022/10/13 11:21
* @Classname: CuMemberVO
* @PackageName: com.hzs.member.base.vo
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)

5
bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberWalletVO.java
View File

@ -15,12 +15,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
/** /**
* <p>
* 会员钱包 * 会员钱包
* </p>
*
* @author hzs
* @since 2024-03-22
*/ */
@Data @Data
@AllArgsConstructor @AllArgsConstructor

352
bd-business/bd-business-report/src/main/resources/mapper/report/member/CuMemberAwardsStatMapper.xml
View File

@ -265,71 +265,71 @@
</select> </select>
<!-- 真实奖衔分析--> <!-- 真实奖衔分析-->
<select id="selectCuMemberAwardsAnalysisList" <select id="selectCuMemberAwardsAnalysisList" resultType="com.hzs.report.member.vo.CuMemberAwardsAnalysisVO">
resultType="com.hzs.report.member.vo.CuMemberAwardsAnalysisVO"> select pkmember,
period,
SELECT PKMEMBER, uptype,
PERIOD, membercode,
UPTYPE, membername,
pkRangeAwards, phone,
MEMBERCODE, pkAwardsVal,
MEMBERNAME, pkMaxAwardsVal,
PHONE, pkRegisterGradeVal,
PKAWARDS, vertexname,
PKREGISTERGRADE, creationtime,
VERTEXNAME, endvaliditydate
CREATIONTIME, from (select cm.pk_id as pkmember,
endValidityDate cma.period,
FROM ( cma.up_type as uptype,
SELECT CM.PK_ID AS PKMEMBER, cm.member_code as membercode,
CMA.PERIOD, cm.member_name as membername,
CMA.UP_TYPE AS UPTYPE, cm.phone,
CM.MEMBER_CODE AS MEMBERCODE, baa.awards_name as pkAwardsVal,
CM.MEMBER_NAME AS MEMBERNAME, bam.awards_name as pkMaxAwardsVal,
CM.PHONE, bg.grade_name as pkRegisterGradeVal,
AW.PK_TRANSACTION AS PKAWARDS, ver.vertex_name as vertexname,
AWW.PK_TRANSACTION AS pkRangeAwards, cma.creation_time as creationtime,
BG.PK_TRANSACTION AS PKREGISTERGRADE, cma.end_validity_date as endvaliditydate,
VER.VERTEX_NAME AS VERTEXNAME, row_number() over(partition by cm.member_code order by cma.new_level desc) as rn
CMA.CREATION_TIME AS CREATIONTIME, from cu_member cm
CMA.END_VALIDITY_DATE AS endValidityDate, left join bd_grade bg
ROW_NUMBER() OVER (PARTITION BY CM.MEMBER_CODE ORDER BY CMA.NEW_LEVEL DESC) AS rn on bg.pk_id = cm.pk_register_grade
FROM CU_MEMBER CM and bg.del_flag = 0
LEFT JOIN CU_MEMBER_AWARDS CMA left join bd_vertex ver
ON CM.PK_ID = CMA.PK_MEMBER AND CMA.AWARD_TYPE = 2 on cm.pk_vertex = ver.pk_id
LEFT JOIN CU_MEMBER_AWARDS cmas and ver.del_flag = 0
ON CM.PK_ID = cmas.PK_MEMBER AND cmas.AWARD_TYPE = 1 left join cu_member_awards cma
left join CU_MEMBER_SETTLE_PERIOD cmsp on cmsp.pk_id=CMA.PERIOD on cma.pk_member = cm.pk_id
LEFT JOIN BD_AWARDS AW and cma.award_type = 1
ON AW.PK_ID = cmas.NEW_LEVEL and cma.del_flag = 0
LEFT JOIN BD_AWARDS AWW left join cu_member_settle_period cmsp
ON AWW.PK_ID = CMA.NEW_LEVEL on cmsp.pk_id = cma.period
LEFT JOIN BD_GRADE BG left join bd_awards baa
ON BG.PK_ID = CM.PK_REGISTER_GRADE on baa.pk_id = cma.new_level
LEFT JOIN BD_VERTEX VER and baa.del_flag = 0
ON CM.PK_VERTEX = VER.PK_ID left join bd_awards bam
WHERE CMA.DEL_FLAG = 0 on bam.pk_id = cm.pk_max_awards
AND CM.DEL_FLAG = 0 and bam.del_flag = 0
AND AW.DEL_FLAG = 0 where cm.del_flag = 0
AND BG.DEL_FLAG = 0 and cm.pk_settle_country = #{pkCountry}
AND cm.PK_SETTLE_COUNTRY=#{pkCountry} and cma.del_flag = 0
<if test="memberCode != null and memberCode !='' "> <if test="memberCode != null and memberCode !='' ">
AND cm.MEMBER_CODE like #{memberCode} || '%' AND cm.MEMBER_CODE like #{memberCode} || '%'
</if> </if>
<if test="upType != null">
AND cma.UP_TYPE=#{upType}
</if>
<if test="memberName != null and memberName !='' "> <if test="memberName != null and memberName !='' ">
AND cm.MEMBER_NAME like #{memberName} || '%' AND cm.MEMBER_NAME like #{memberName} || '%'
</if> </if>
<if test="phone != null and phone !='' "> <if test="phone != null and phone !='' ">
AND cm.phone like #{phone} || '%' AND cm.phone like #{phone} || '%'
</if> </if>
<if test="upType != null">
AND cma.UP_TYPE = #{upType}
</if>
<if test="pkAwards != null"> <if test="pkAwards != null">
AND AW.PK_ID = #{pkAwards} AND AW.PK_ID = #{pkAwards}
</if> </if>
<if test="pkRangeAwards != null"> <if test="pkMaxAwards != null">
AND AWW.PK_ID=#{pkRangeAwards} AND AWW.PK_ID = #{pkMaxAwards}
</if> </if>
<if test="startDate != null and startDate!='' "> <if test="startDate != null and startDate!='' ">
and cmsp.SETTLE_DATE &gt;= to_date(#{startDate}, 'yyyy-mm-dd') and cmsp.SETTLE_DATE &gt;= to_date(#{startDate}, 'yyyy-mm-dd')
@ -346,20 +346,16 @@
<if test="pkVertex != null"> <if test="pkVertex != null">
AND cm.pk_vertex = #{pkVertex} AND cm.pk_vertex = #{pkVertex}
</if> </if>
<if test="pkTeamCode != null">
AND cm.pk_team_code=#{pkTeamCode}
</if>
<if test="pkRegisterGrade != null"> <if test="pkRegisterGrade != null">
AND cm.PK_REGISTER_GRADE = #{pkRegisterGrade} AND cm.PK_REGISTER_GRADE = #{pkRegisterGrade}
</if> </if>
) t ) t
WHERE rn = 1 where rn = 1
ORDER BY CREATIONTIME DESC order by creationtime desc
</select> </select>
<!-- 查询会员结算等级升级记录--> <!-- 查询会员结算等级升级记录-->
<select id="querMemberGradeRecordList" <select id="queryMemberGradeRecordList" resultType="com.hzs.report.member.vo.CuMemberGradeRecordVO">
resultType="com.hzs.report.member.vo.CuMemberGradeRecordVO">
select * from ( select * from (
SELECT SELECT
CM.PK_ID AS PKMEMBER, CM.PK_ID AS PKMEMBER,
@ -393,29 +389,20 @@
<if test="memberCode != null and memberCode !='' "> <if test="memberCode != null and memberCode !='' ">
AND cm.MEMBER_CODE like #{memberCode} || '%' AND cm.MEMBER_CODE like #{memberCode} || '%'
</if> </if>
<if test="upType != null">
AND CML.UP_TYPE=#{upType}
</if>
<if test="memberName != null and memberName !='' ">
AND cm.MEMBER_NAME like #{memberName} || '%'
</if>
<if test="phone != null and phone !='' ">
AND cm.phone like #{phone} || '%'
</if>
<if test="startDate != null and startDate!='' ">
and CML.CREATION_TIME &gt;= to_date(#{startDate}, 'yyyy-mm-dd')
</if>
<if test="endDate != null and endDate!='' ">
and CML.CREATION_TIME &lt;= to_date(#{endDate} || ' 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
</if>
<if test="pkVertex != null"> <if test="pkVertex != null">
AND cm.pk_vertex = #{pkVertex} AND cm.pk_vertex = #{pkVertex}
</if> </if>
<if test="pkTeamCode != null"> <if test="pkTeamCode != null">
AND cm.pk_team_code = #{pkTeamCode} AND cm.pk_team_code = #{pkTeamCode}
</if> </if>
<if test="pkRegisterGrade != null"> <if test="upType != null">
AND cm.PK_REGISTER_GRADE=#{pkRegisterGrade} AND CML.UP_TYPE = #{upType}
</if>
<if test="startDate != null and startDate!='' ">
and CML.CREATION_TIME &gt;= to_date(#{startDate}, 'yyyy-mm-dd')
</if>
<if test="endDate != null and endDate!='' ">
and CML.CREATION_TIME &lt;= to_date(#{endDate} || ' 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
</if> </if>
UNION UNION
SELECT SELECT
@ -448,57 +435,25 @@
<if test="memberCode != null and memberCode !='' "> <if test="memberCode != null and memberCode !='' ">
AND cm.MEMBER_CODE like #{memberCode} || '%' AND cm.MEMBER_CODE like #{memberCode} || '%'
</if> </if>
<if test="pkVertex != null">
AND cm.pk_vertex = #{pkVertex}
</if>
<if test="pkTeamCode != null">
AND cm.pk_team_code = #{pkTeamCode}
</if>
<if test="upType != null"> <if test="upType != null">
AND CMG.UP_TYPE = #{upType} AND CMG.UP_TYPE = #{upType}
</if> </if>
<if test="memberName != null and memberName !='' ">
AND cm.MEMBER_NAME like #{memberName} || '%'
</if>
<if test="phone != null and phone !='' ">
AND cm.phone like #{phone} || '%'
</if>
<if test="startDate != null and startDate!='' "> <if test="startDate != null and startDate!='' ">
and CMG.CREATION_TIME &gt;= to_date(#{startDate}, 'yyyy-mm-dd') and CMG.CREATION_TIME &gt;= to_date(#{startDate}, 'yyyy-mm-dd')
</if> </if>
<if test="endDate != null and endDate!='' "> <if test="endDate != null and endDate!='' ">
and CMG.CREATION_TIME &lt;= to_date(#{endDate} || ' 23:59:59', 'yyyy-mm-dd hh24:mi:ss') and CMG.CREATION_TIME &lt;= to_date(#{endDate} || ' 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
</if> </if>
<if test="pkVertex != null">
AND cm.pk_vertex=#{pkVertex}
</if>
<if test="pkTeamCode != null">
AND cm.pk_team_code=#{pkTeamCode}
</if>
<if test="pkRegisterGrade != null">
AND cm.PK_REGISTER_GRADE=#{pkRegisterGrade}
</if>
) )
ORDER BY CREATIONTIME DESC ORDER BY CREATIONTIME DESC
</select> </select>
<!-- 查询奖衔分析会员业绩-->
<select id="selectAwardsAnalysisList"
resultType="com.hzs.report.member.vo.CuMemberAwardsAnalysisVO">
<foreach collection="list" item="item" separator="UNION">
select
cma.period,
cmat.PK_MEMBER pkMember,
cmat.A_SUM_REAL_PV aSumRealPv,
cmat.B_SUM_REAL_PV bSumRealPv,
cmat.A_SUM_PV aSumPv,
cmat.B_SUM_PV bSumPv,
cmat.REP_A_SUM_PV repASumPv,
cmat.REP_B_SUM_PV repBSumPv
FROM CU_MEMBER_AWARDS cma
left join ${item.achieveTableName} cmat on cma.PK_MEMBER=cmat.PK_MEMBER
where cma.DEL_FLAG=0
and cma.PK_MEMBER=#{item.pkMember}
and cma.period=#{item.period}
</foreach>
</select>
<!-- 真实奖衔分析详情（穿透页面接口）--> <!-- 真实奖衔分析详情（穿透页面接口）-->
<select id="selectCuMemberAwardsAnalysisDetailsList" <select id="selectCuMemberAwardsAnalysisDetailsList"
resultType="com.hzs.report.member.vo.CuMemberAwardsAnalysisVO"> resultType="com.hzs.report.member.vo.CuMemberAwardsAnalysisVO">
@ -981,112 +936,6 @@
</if> </if>
ORDER BY subq.orderAchieve DESC,cm.PK_PARENT DESC ORDER BY subq.orderAchieve DESC,cm.PK_PARENT DESC
</select> </select>
<!-- 主推统计 三方-->
<select id="selectThreeDirectPushStatList" resultType="com.hzs.report.member.vo.DirectPushVO">
SELECT
#{orderType} orderType,
cm.PK_ID pkMember,
cm.member_code memberCode,
cm.member_name memberName,
cm.phone,
gr.PK_TRANSACTION AS pkRegisterGrade,
awa.PK_TRANSACTION AS pkAwards,
par.member_code parMemberCode,
par.member_name parMemberName,
place.member_code placeMemberCode,
place.member_name placeMemberName,
cm.CREATION_TIME creationTime,
ver.VERTEX_NAME AS vertexName,
ct.TEAM_NAME AS teamName,
subq.orderAchieve
FROM
cu_member cm
LEFT JOIN bd_vertex ver ON cm.pk_vertex = ver.pk_id
LEFT JOIN cu_member_team ct ON ct.pk_id = cm.pk_team_code
inner JOIN ( select * from (
SELECT
sum(so.ORDER_ACHIEVE * #{rate}) orderAchieve,
so.PK_REFERENCE pkMember
FROM
SA_T_ORDER so
WHERE
so.DEL_FLAG = 0
AND so.order_status = 1
<if test="pkCountry != null">
and so.pk_Country=#{pkCountry}
</if>
<if test="orderTypeList != null">
and so.ORDER_TYPE in
<foreach collection="orderTypeList" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="startDate != null and startDate!='' ">
and so.PAY_TIME &gt;= to_date(#{startDate}, 'yyyy-mm-dd')
</if>
<if test="endDate != null and endDate!='' ">
and so.PAY_TIME &lt;= to_date(#{endDate} || ' 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
</if>
GROUP BY
so.PK_REFERENCE
)
) subq ON cm.PK_PARENT = subq.pkMember
INNER JOIN cu_member par ON par.pk_id = cm.pk_parent
INNER JOIN cu_member place ON place.pk_id = cm.pk_place_parent
LEFT JOIN bd_awards awa ON awa.pk_id = cm.PK_AWARDS
LEFT JOIN bd_grade gr ON gr.pk_id = cm.PK_REGISTER_GRADE
LEFT JOIN SA_T_ORDER so ON so.PK_MEMBER = cm.PK_ID
and so.DEL_FLAG = 0 and so.ORDER_STATUS=1
<if test="orderTypeList != null">
and so.ORDER_TYPE in
<foreach collection="orderTypeList" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
where cm.del_flag = 0 and ver.del_flag = 0 and par.del_flag = 0 and place.del_flag = 0
and awa.del_flag = 0 and gr.del_flag = 0 and so.DEL_FLAG = 0 and cm.PK_SETTLE_COUNTRY=#{pkCountry}
<if test="startDate != null and startDate!='' ">
and so.PAY_TIME &gt;= to_date(#{startDate}, 'yyyy-mm-dd')
</if>
<if test="endDate != null and endDate!='' ">
and so.PAY_TIME &lt;= to_date(#{endDate} || ' 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
</if>
<if test="pkCountry != null">
and so.pk_Country=#{pkCountry}
</if>
<if test="pkRegisterGrade != null">
and cm.PK_REGISTER_GRADE =#{pkRegisterGrade}
</if>
<if test="pkAwards != null">
and cm.PK_AWARDS =#{pkAwards}
</if>
<if test="pkTeamCode != null">
and cm.pk_team_code =#{pkTeamCode}
</if>
<if test="pkVertex != null">
and cm.pk_vertex =#{pkVertex}
</if>
<if test="memberName != null and memberName!=''">
and cm.member_name like #{memberName} || '%'
</if>
<if test="parMemberCode != null and parMemberCode!=''">
and par.member_code like #{parMemberCode} || '%'
</if>
<if test="parMemberName != null and parMemberName!=''">
and par.member_name like #{parMemberName} || '%'
</if>
<if test="phone != null and phone!=''">
and cm.phone like #{phone} || '%'
</if>
<if test="orderAchieve != null">
and subq.orderAchieve &gt;=#{orderAchieve}
</if>
ORDER BY subq.orderAchieve DESC
</select>
<!-- 直推数据列表--> <!-- 直推数据列表-->
<select id="selectDirectPushDataList" resultType="com.hzs.report.member.vo.DirectPushDataVO"> <select id="selectDirectPushDataList" resultType="com.hzs.report.member.vo.DirectPushDataVO">
@ -1341,63 +1190,7 @@
</if> </if>
) ORDER BY orderAchieve DESC ) ORDER BY orderAchieve DESC
</select> </select>
<!-- 三方订单分布统计-->
<select id="memberThreeOrderScatter" resultType="com.hzs.report.member.vo.OrderScatterVO">
select * from (
SELECT
(sum(so.ORDER_ACHIEVE)*#{rate}) orderAchieve,
(sum(ORDER_AMOUNT)) orderAmount,
#{orderType} orderType,
<if test="areaType == 1">
pr.name prName
</if>
<if test="areaType == 2">
pr.name prName,
ct.name ctName
</if>
<if test="areaType == 3">
pr.name prName,
ct.name ctName,
co.name coName
</if>
from SA_T_ORDER so
left join BD_AREA pr on pr.pk_id=so.REC_PROVINCE
left join BD_AREA ct on ct.pk_id=so.REC_CITY
left join BD_AREA co on co.pk_id=so.REC_COUNTY
where
pr.del_flag = 0
and ct.del_flag = 0
and co.del_flag = 0
and so.del_flag = 0
and so.pk_Country=#{pkCountry}
and so.ORDER_STATUS=1
<if test="startDate != null and startDate!='' ">
and so.CREATION_TIME &gt;= to_date(#{startDate}, 'yyyy-mm-dd')
</if>
<if test="endDate != null and endDate!='' ">
and so.CREATION_TIME &lt;= to_date(#{endDate} || ' 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
</if>
<if test="orderTypeList != null">
and so.ORDER_TYPE in
<foreach collection="orderTypeList" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
GROUP BY
<if test="areaType == 1">
pr.name
</if>
<if test="areaType == 2">
pr.name,
ct.name
</if>
<if test="areaType == 3">
pr.name,
ct.name,
co.name
</if>
) ORDER BY orderAchieve DESC
</select>
<!-- 根据奖衔查询所有会员--> <!-- 根据奖衔查询所有会员-->
<select id="queryAwardAchieList" <select id="queryAwardAchieList"
resultType="com.hzs.report.member.vo.BloodRemoveSameVO" parameterType="com.hzs.report.member.vo.BloodRemoveSameVO"> resultType="com.hzs.report.member.vo.BloodRemoveSameVO" parameterType="com.hzs.report.member.vo.BloodRemoveSameVO">
@ -1828,9 +1621,8 @@
</select> </select>
<!-- 根据奖衔级别查询奖衔--> <!-- 根据奖衔级别查询奖衔-->
<select id="awardsLevellist" <select id="awardsLevelList"
resultType="java.lang.Integer"> resultType="java.lang.Integer">
select pk_id pkId select pk_id pkId
from BD_AWARDS aw from BD_AWARDS aw

16
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresInfoParam.java
View File

@ -1,23 +1,9 @@
package com.hzs.sale.wares.param;/** package com.hzs.sale.wares.param;
* @Description:
* @Author: yuhui
* @Time: 2023/6/15 10:11
* @Classname: WaresInfoParam
* @PackageName: com.hzs.sale.wares.param
*/
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
/**
*@BelongsProject: hzs_cloud
*@BelongsPackage: com.hzs.sale.wares.param
*@Author: yh
*@CreateTime: 2023-06-15 10:11
*@Description: TODO
*@Version: 1.0
*/
@Data @Data
public class WaresInfoParam { public class WaresInfoParam {

19
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUpgradeType.java
View File

@ -53,4 +53,23 @@ public enum EUpgradeType {
* 国际化翻译key值 * 国际化翻译key值
*/ */
private final String key; private final String key;
/**
* 根据值获取显示
*
* @param val
* @return
*/
public static String getLabelByValue(Integer val) {
if (null == val) {
return null;
}
for (EUpgradeType value : EUpgradeType.values()) {
if (value.getValue() == val) {
return value.getLabel();
}
}
return null;
}
} }