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

## 安置、推荐正反查修改；

This commit is contained in:
cabbage 2025-04-30 14:23:30 +08:00
parent 6f35fc8e61
commit 88b79fb841
12 changed files with 159 additions and 558 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -386,7 +386,6 @@ public class MemberReportController extends BaseController {
List<MemberResettleAchieveVo> memberResettleAchieveList = memberReportService.memberResettleAchieve(member.getPkId(), memberName, startPayTime, endPayTime, pkVertex, pkTeamCode, pkCountry, pkAwards, orderTypeList);
Map<Integer, MemberResettleAchieveVo> memberResettleAchieveMap = memberResettleAchieveList.stream().collect(Collectors.toMap(MemberResettleAchieveVo::getPlaceDept, Function.identity()));
// 左区新增业绩
BigDecimal leftNewAddAchieve = memberResettleAchieveMap.get(EPlaceDept.LEFT_DEPT.getValue()).getAchieve();
// 右区新增业绩
BigDecimal rightNewAddAchieve = memberResettleAchieveMap.get(EPlaceDept.RIGHT_DEPT.getValue()).getAchieve();
@ -752,7 +751,6 @@ public class MemberReportController extends BaseController {
// 查询区县
orderDistributionList = memberReportService.getByDistrictOrderDistribution(startTime, endTime, pkCountry);
}
return getDataTable(orderDistributionList);
}
@ -952,6 +950,8 @@ public class MemberReportController extends BaseController {
R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
for (CuMemberAchieveExt cuMemberAchieveExt : cuMemberAchieveExtList) {
CuMemberPushAchieveVO vo = BeanUtil.copyProperties(cuMemberAchieveExt, CuMemberPushAchieveVO.class);
vo.setPlaceDeptVal(EPlaceDept.getEPlaceDept(cuMemberAchieveExt.getPlaceDept()));
vo.setCategoryVal(ECategory.getLabelByValue(cuMemberAchieveExt.getCategory()));
vo.setABalance(cuMemberAchieveExt.getABalance().multiply(currency.getData().getInExchangeRate()).setScale(2, BigDecimal.ROUND_HALF_UP));
vo.setBBalance(cuMemberAchieveExt.getBBalance().multiply(currency.getData().getInExchangeRate()).setScale(2, BigDecimal.ROUND_HALF_UP));
cuMemberPushAchieveVOList.add(vo);
@ -983,18 +983,10 @@ public class MemberReportController extends BaseController {
List<CuMemberAchieveExt> cuMemberAchieveExtList = iMemberService.queryPlaceCuMemberAchieveExt(cuMemberUmbrellaParam);
if (CollectionUtil.isNotEmpty(cuMemberAchieveExtList)) {
R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
// 获取需要翻译的枚举翻译
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EDealerYesNo.values(), EAssessStatus.values(), EPlaceDept.values(), ECategory.values());
Map<Integer, String> transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, EnumsPrefixConstants.KEY_AWARD);
for (CuMemberAchieveExt cuMemberAchieveExt : cuMemberAchieveExtList) {
CuMemberPushAchieveVO vo = BeanUtil.copyProperties(cuMemberAchieveExt, CuMemberPushAchieveVO.class);
vo.setAssessStatusVal(transactionMap.get(EnumsPrefixConstants.ASSESS_STATUS + cuMemberAchieveExt.getAssessStatus()));
vo.setPkRegisterGradeVal(transactionMap1.get(cuMemberAchieveExt.getPkRegisterGrade()));
vo.setPkGradeVal(transactionMap1.get(cuMemberAchieveExt.getPkGrade()));
vo.setPkAwardsVal(transactionMap1.get(cuMemberAchieveExt.getPkAwards()));
vo.setPlaceDeptVal(transactionMap.get(EnumsPrefixConstants.PLACE_DEPT + cuMemberAchieveExt.getPlaceDept()));
vo.setCategoryVal(transactionMap.get(EnumsPrefixConstants.ENU_CAT + cuMemberAchieveExt.getCategory()));
vo.setPlaceDeptVal(EPlaceDept.getEPlaceDept(cuMemberAchieveExt.getPlaceDept()));
vo.setCategoryVal(ECategory.getLabelByValue(cuMemberAchieveExt.getCategory()));
vo.setABalance(cuMemberAchieveExt.getABalance().multiply(currency.getData().getInExchangeRate()).setScale(2, BigDecimal.ROUND_HALF_UP));
vo.setBBalance(cuMemberAchieveExt.getBBalance().multiply(currency.getData().getInExchangeRate()).setScale(2, BigDecimal.ROUND_HALF_UP));
cuMemberPushAchieveVOList.add(vo);
@ -1015,9 +1007,13 @@ public class MemberReportController extends BaseController {
if (StringUtils.isNotEmpty(cuMemberUmbrellaParam.getMemberCode())) {
startPage();
List<CuMemberAchieveExt> cuMemberAchieveExtList = iMemberService.queryParentCuMemberAchieveExt(cuMemberUmbrellaParam);
for (CuMemberAchieveExt cuMemberAchieveExt : cuMemberAchieveExtList) {
CuMemberPushAchieveVO vo = BeanUtil.copyProperties(cuMemberAchieveExt, CuMemberPushAchieveVO.class);
cuMemberPushAchieveVOList.add(vo);
if (CollectionUtil.isNotEmpty(cuMemberAchieveExtList)) {
for (CuMemberAchieveExt cuMemberAchieveExt : cuMemberAchieveExtList) {
CuMemberPushAchieveVO vo = BeanUtil.copyProperties(cuMemberAchieveExt, CuMemberPushAchieveVO.class);
vo.setPlaceDeptVal(EPlaceDept.getEPlaceDept(cuMemberAchieveExt.getPlaceDept()));
vo.setCategoryVal(ECategory.getLabelByValue(cuMemberAchieveExt.getCategory()));
cuMemberPushAchieveVOList.add(vo);
}
}
TableDataInfo tableDataInfo = getDataTable(cuMemberAchieveExtList);
tableDataInfo.setRows(cuMemberPushAchieveVOList);
@ -1037,18 +1033,10 @@ public class MemberReportController extends BaseController {
if (StringUtils.isNotEmpty(cuMemberUmbrellaParam.getMemberCode())) {
List<CuMemberAchieveExt> cuMemberAchieveExtList = iMemberService.queryParentCuMemberAchieveExt(cuMemberUmbrellaParam);
if (CollectionUtil.isNotEmpty(cuMemberAchieveExtList)) {
// 获取需要翻译的枚举翻译
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EDealerYesNo.values(), EAssessStatus.values(), EPlaceDept.values(), ECategory.values());
Map<Integer, String> transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, EnumsPrefixConstants.KEY_AWARD);
for (CuMemberAchieveExt cuMemberAchieveExt : cuMemberAchieveExtList) {
CuMemberPushAchieveVO vo = BeanUtil.copyProperties(cuMemberAchieveExt, CuMemberPushAchieveVO.class);
vo.setAssessStatusVal(transactionMap.get(EnumsPrefixConstants.ASSESS_STATUS + cuMemberAchieveExt.getAssessStatus()));
vo.setPkRegisterGradeVal(transactionMap1.get(cuMemberAchieveExt.getPkRegisterGrade()));
vo.setPkGradeVal(transactionMap1.get(cuMemberAchieveExt.getPkGrade()));
vo.setPkAwardsVal(transactionMap1.get(cuMemberAchieveExt.getPkAwards()));
vo.setPlaceDeptVal(transactionMap.get(EnumsPrefixConstants.PLACE_DEPT + cuMemberAchieveExt.getPlaceDept()));
vo.setCategoryVal(transactionMap.get(EnumsPrefixConstants.ENU_CAT + cuMemberAchieveExt.getCategory()));
vo.setPlaceDeptVal(EPlaceDept.getEPlaceDept(cuMemberAchieveExt.getPlaceDept()));
vo.setCategoryVal(ECategory.getLabelByValue(cuMemberAchieveExt.getCategory()));
cuMemberPushAchieveVOList.add(vo);
}
}

91
bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/MemberMapper.java
View File

@ -12,73 +12,92 @@ import java.util.List;
/**
* 会员信息-奖衔升级记录 Mapper 接口
*
* @author hzs
* @since 2022-08-31
*/
public interface MemberMapper extends BaseMapper<CuMember> {
/**
* @description: 查询伞下账户余额
* @param: [umbrellaBalanceVO]
* @return: java.util.List<com.hzs.member.base.vo.CuMemberUmbrellaBalanceVO>
**/
* 查询伞下账户余额
*
* @param umbrellaBalanceVO
* @return
*/
List<CuMemberUmbrellaBalanceVO> selectUmbrellaLowerBalance(CuMemberUmbrellaBalanceVO umbrellaBalanceVO);
/*
* @description: 用于反查统计分析，反差伞下，
* @param: null null
**/
/**
* 用于反查统计分析，反差伞下，
*
* @param tableName
* @param assesTableName
* @param period
* @param param
* @return
*/
List<CuMemberAchieveExt> queryPlaceParentHisCuMemberAchieveExt(@Param("tableName") String tableName,
@Param("assesTableName") String assesTableName,
@Param("period") Integer period,
@Param("param") CuMemberUmbrellaParam param);
/*
* @description: 用于反查统计分析，反差伞下，
* @param: null null
**/
/**
* 安置正反查
*
* @param tableName
* @param assesTableName
* @param period
* @param param
* @return
*/
List<CuMemberAchieveExt> queryPlaceParentCuMemberAchieveExt(@Param("tableName") String tableName,
@Param("assesTableName") String assesTableName,
@Param("period") Integer period,
@Param("param") CuMemberUmbrellaParam param);
/*
* @description: 用于反查统计分析，反差伞下，
* @param: null null
**/
/**
* 用于反查统计分析，反差伞下，
*
* @param tableName
* @param assesTableName
* @param period
* @param param
* @return
*/
List<CuMemberAchieveExt> queryParentParentHisCuMemberAchieveExt(@Param("tableName") String tableName,
@Param("assesTableName") String assesTableName,
@Param("period") Integer period,
@Param("param") CuMemberUmbrellaParam param);
/*
* @description: 用于反查统计分析，反差伞下，
* @param: null null
**/
/**
* 用于反查统计分析，反差伞下，
*
* @param assesTableName
* @param period
* @param param
* @return
*/
List<CuMemberAchieveExt> queryParentParentCuMemberAchieveExt(@Param("assesTableName") String assesTableName,
@Param("period") Integer period,
@Param("param") CuMemberUmbrellaParam param);
/**
* @description: 统计分析-伞下直推
* @param: [memberId]
* @return: java.util.List<com.hzs.member.statis.vo.UmbrellaBelowPushVO>
**/
* 统计分析-伞下直推
*
* @param umbrellaBelowPushVO
* @return
*/
List<UmbrellaBelowPushVO> queryUmbrellaBelowPush(UmbrellaBelowPushVO umbrellaBelowPushVO);
/**
* @description: 查询会员订单消费业绩
* @param: [umbrellaBelowPushVO]
* @return: java.util.List<com.hzs.report.member.vo.UmbrellaBelowPushVO>
**/
* 查询会员订单消费业绩
*
* @param umbrellaBelowPushVO
* @return
*/
List<UmbrellaBelowPushVO> queryOrderExpend(UmbrellaBelowPushVO umbrellaBelowPushVO);
/**
* @description: 统计分析-伞下直推会员信息
* @param: [pkId]
* @return: java.util.List<com.hzs.member.statis.vo.UmbrellaBelowPushVO>
**/
* 统计分析-伞下直推会员信息
*
* @param pkId
* @return
*/
UmbrellaBelowPushVO queryUmbrellaBelowInfo(@Param("pkId") Long pkId);
}

50
bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/MemberReportMapper.java
View File

@ -7,15 +7,8 @@ import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
/**
* @BelongsProject: hzs_cloud
* @BelongsPackage: com.hzs.report.member.mapper
* @Author: yh
* @CreateTime: 2023-08-26 09:53
* @Description: TODO
* @Version: 1.0
*/
public interface MemberReportMapper {
/**
* 查询伞下直推新增业绩-查询会员
*
@ -24,11 +17,7 @@ public interface MemberReportMapper {
List<DirectPushNewVo> directPushNewList(@Param("pkMember") Long pkMember, @Param("memberName") String memberName, @Param("pkAwards") Integer pkAwards, @Param("pkTeamCode") Integer pkTeamCode, @Param("pkCountry") Integer pkCountry, @Param("startPayTime") Date startPayTime, @Param("endPayTime") Date endPayTime, @Param("pkVertex") Integer pkVertex);
/**
* @description: 查询伞下直推新增业绩-业绩
* @author: zhang jing
* @date: 2023/9/6 14:10
* @param: [pkMember, memberName, pkAwards, pkTeamCode, pkCountry, startPayTime, endPayTime, pkVertex]
* @return: java.util.List<com.hzs.report.member.vo.DirectPushNewVo>
* 查询伞下直推新增业绩-业绩
**/
List<DirectPushNewVo> directPushNewAchieList(@Param("pkMember") Long pkMember,
@Param("startPayTime") Date startPayTime,
@ -37,11 +26,7 @@ public interface MemberReportMapper {
@Param("pkCountry") Integer pkCountry);
/**
* @description: 查询伞下直推新增业绩-业绩
* @author: zhang jing
* @date: 2024/3/18 15:41
* @param: [pkMember, startPayTime, endPayTime, pkCountry, monthList]
* @return: java.util.List<com.hzs.report.member.vo.DirectPushNewVo>
* 查询伞下直推新增业绩-业绩
**/
List<DirectPushNewVo> directPushNewAchieUpList(@Param("dpo") DirectPushNewVo dpo,
@Param("pkMember") Long pkMember,
@ -67,11 +52,7 @@ public interface MemberReportMapper {
List<MemberResettleAchieveVo> memberResettleAchieve(@Param("pkMember") Long pkMember, @Param("memberName") String memberName, @Param("startPayTime") Date startPayTime, @Param("endPayTime") Date endPayTime, @Param("pkVertex") Integer pkVertex, @Param("pkTeamCode") Integer pkTeamCode, @Param("pkCountry") Integer pkCountry, @Param("pkAwards") Integer pkAwards, @Param("orderTypeList") List<Integer> orderTypeList);
/**
* @description: 伞下新增安置业绩
* @author: zhang jing
* @date: 2024/3/12 16:57
* @param: [pkMember, memberName, startPayTime, endPayTime, pkVertex, pkTeamCode, pkCountry, pkAwards, orderTypeList]
* @return: java.util.List<com.hzs.report.member.vo.MemberResettleAchieveVo>
* 伞下新增安置业绩
**/
List<MemberResettleAchieveVo> selectBrollyNewABAchieve(@Param("pkMember") Long pkMember,
@Param("memberName") String memberName,
@ -156,14 +137,6 @@ public interface MemberReportMapper {
*/
List<ReportSummaryVo> reportSummaryList(ReportSummaryVo reportSummaryVo);
/**
* 查询会员伞下订单左右区业绩
*
* @param pkMember
* @return
*/
List<MemberPerformanceVo> brollyBelowResettle(@Param("pkMember") Long pkMember, @Param("startPayTime") Date startPayTime, @Param("endPayTime") Date endPayTime, @Param("orderTypeList") List<Integer> orderTypeList);
/**
* 出货明细汇总统计详情
*
@ -213,20 +186,6 @@ public interface MemberReportMapper {
*/
List<CuMemberWalletVO> selectMemberUnderWalletList(CuMemberWalletVO walletVO);
/**
* 产品销量排行
*/
List<ProductSaleStatVo> productSalesStat(@Param("skuCode") String skuCode, @Param("productName") String productName, @Param("orderType") Integer orderType, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
/**
* 查询商品统计信息
*
* @param pkProduct
* @return
*/
List<WaresInfoVO> queryWaresInfoByProduct(@Param("pkProduct") Integer pkProduct, @Param("orderType") Integer orderType, @Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("pkSpecs") Integer pkSpecs);
/**
* 查询商品统计信息
*
@ -247,4 +206,5 @@ public interface MemberReportMapper {
* @return
*/
Integer sumQuantity(@Param("productName") String productName, @Param("pkClassify") Integer pkClassify, @Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("pkCountry") Integer pkCountry, @Param("orderTypeList") List<Integer> orderTypeList);
}

12
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;
/**
* @description: 会员伞上数据查询
* @author: sui q
* @time: 2023/8/28 09:51
* @classname: CumemberUmbrellaVO
* @package_name: com.hzs.report.member.vo
* version 1.0.0
* 会员伞上数据查询
*/
@Data
public class CuMemberUmbrellaParam implements Serializable {
@ -31,11 +26,6 @@ public class CuMemberUmbrellaParam implements Serializable {
*/
private Integer placeDept;
/**
* 考核状态
*/
private Integer isAssess;
/**
* 查询方向（1=反查，2=正查）
*/

50
bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/MemberReportService.java
View File

@ -6,13 +6,6 @@ import com.hzs.report.member.vo.*;
import java.util.Date;
import java.util.List;
/**
* @Description:
* @Author: yuhui
* @Time: 2023/8/26 9:49
* @Classname: MemberReportService
* @PackageName: com.hzs.report.member.service
*/
public interface MemberReportService {
/**
@ -23,24 +16,14 @@ public interface MemberReportService {
List<DirectPushNewVo> directPushNewList(Long pkMember, String memberName, Integer pkAwards, Integer pkTeamCode, Integer pkCountry, Date startPayTime, Date endPayTime, Integer pkVertex);
/**
* @description: 查询伞下直推新增业绩-业绩
* @author: zhang jing
* @date: 2024/1/3 16:17
* @param: [pkMember, startPayTime, endPayTime, orderType, pkCountry]
* @return: java.util.List<com.hzs.report.member.vo.DirectPushNewVo>
* 查询伞下直推新增业绩-业绩
**/
List<DirectPushNewVo> directPushNewAchieList(Long pkMember, Date startPayTime, Date endPayTime, List<Integer> orderType, Integer pkCountry);
/**
* @description: 查询伞下直推新增业绩-业绩
* @author: zhang jing
* @date: 2024/3/18 15:41
* @param: [pkMember, startPayTime, endPayTime, pkCountry, monthList]
* @return: java.util.List<com.hzs.report.member.vo.DirectPushNewVo>
* 查询伞下直推新增业绩-业绩
**/
List<DirectPushNewVo> directPushNewAchieUpList(DirectPushNewVo dpo,
Long pkMember,
Integer orderType);
List<DirectPushNewVo> directPushNewAchieUpList(DirectPushNewVo dpo, Long pkMember, Integer orderType);
/**
* 用户消费统计
@ -62,11 +45,7 @@ public interface MemberReportService {
List<MemberResettleAchieveVo> memberResettleAchieve(Long pkMember, String memberName, Date startPayTime, Date endPayTime, Integer pkVertex, Integer pkTeamCode, Integer pkCountry, Integer pkAwards, List<Integer> orderTypeList);
/**
* @description: 查询伞下新增安置业绩
* @author: zhang jing
* @date: 2024/3/12 16:55
* @param: [pkMember, memberName, startPayTime, endPayTime, pkVertex, pkTeamCode, pkCountry, pkAwards, orderTypeList]
* @return: java.util.List<com.hzs.report.member.vo.MemberResettleAchieveVo>
* 查询伞下新增安置业绩
**/
List<MemberResettleAchieveVo> selectBrollyNewABAchieve(Long pkMember, String memberName, Date startPayTime, Date endPayTime, Integer pkVertex,
Integer pkTeamCode, Integer pkCountry, Integer pkAwards, String achieveTableName, int period);
@ -120,7 +99,6 @@ public interface MemberReportService {
*/
List<OrderDistribution> getByDistrictOrderDistribution(Date startTime, Date endTime, Integer pkCountry);
/**
* 出货明细汇总
*
@ -140,11 +118,6 @@ public interface MemberReportService {
/**
* 出货明细汇总统计详情
*
* @param pkProduct
* @param productName
* @param orderType
* @return
*/
List<ProductShippingDetailsInfoVo> productShippingDetailsList(Integer pkProduct, String productName, Integer pkClassify, Integer pkAwards, List<Integer> orderTypeList, Date startTime, Date endTime, Integer pkCountry);
@ -164,7 +137,6 @@ public interface MemberReportService {
*/
List<SmallAreaNewAddAchieveVO> selectSmallAreaNewAdd(SmallAreaNewAddAchieveVO addAchieveVO);
/**
* 查询伞下钱包明细
*
@ -173,19 +145,6 @@ public interface MemberReportService {
*/
List<CuMemberWalletVO> selectMemberUnderWalletList(CuMemberWalletVO walletVO);
/**
* 产品销量排行
*/
List<ProductSaleStatVo> productSalesStat(String skuCode, String productName, Integer orderType, Date startTime, Date endTime);
/**
* 查询商品统计信息
*
* @param pkProduct
* @return
*/
List<WaresInfoVO> queryWaresInfoByProduct(Integer pkProduct, Integer orderType, Date startTime, Date endTime, Integer pkSpecs);
/**
* 查询商品统计信息
*
@ -196,6 +155,7 @@ public interface MemberReportService {
/**
* 统计产品所有汇总
*
* @param productName
* @param pkClassify
* @param startTime

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

@ -18,7 +18,6 @@ import com.hzs.system.base.dto.CurrencyDTO;
import com.hzs.system.config.IAccountServiceApi;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -34,14 +33,6 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @BelongsProject: hzs_cloud
* @BelongsPackage: com.hzs.report.member.service.Impl
* @Author: yh
* @CreateTime: 2023-08-26 09:51
* @Description: TODO
* @Version: 1.0
*/
@Slf4j
@Service
public class MemberReportServiceImpl implements MemberReportService {
@ -49,203 +40,92 @@ public class MemberReportServiceImpl implements MemberReportService {
@Autowired
private MemberReportMapper memberReportMapper;
@Autowired
private ICuMemberSettlePeriodService cuMemberSettlePeriodService;
private ICuMemberSettlePeriodService iCuMemberSettlePeriodService;
@Autowired
private ITransactionCommonService iTransactionCommonService;
@DubboReference
IAccountServiceApi accountServiceApi;
IAccountServiceApi iAccountServiceApi;
@DubboReference
ICurrencyServiceApi currencyServiceApi;
/**
* 查询伞下直推新增业绩-查询会员
*
* @return
*/
@Override
public List<DirectPushNewVo> directPushNewList(Long pkMember, String memberName, Integer pkAwards, Integer pkTeamCode, Integer pkCountry, Date startPayTime, Date endPayTime, Integer pkVertex) {
return memberReportMapper.directPushNewList(pkMember, memberName, pkAwards, pkTeamCode, pkCountry, startPayTime, endPayTime, pkVertex);
}
/**
* @description: 查询伞下直推新增业绩-业绩
* @author: zhang jing
* @date: 2023/9/6 14:16
* @param: [pkMember, startPayTime, endPayTime]
* @return: java.util.List<com.hzs.report.member.vo.DirectPushNewVo>
**/
@Override
public List<DirectPushNewVo> directPushNewAchieList(Long pkMember, Date startPayTime, Date endPayTime, List<Integer> orderType, Integer pkCountry) {
return memberReportMapper.directPushNewAchieList(pkMember, startPayTime, endPayTime, orderType, pkCountry);
}
/**
* @description: 查询伞下直推新增业绩-业绩
* @author: zhang jing
* @date: 2024/3/18 11:54
* @param: [pkMember, startPayTime, endPayTime, orderType, pkCountry]
* @return: java.util.List<com.hzs.report.member.vo.DirectPushNewVo>
**/
@Override
public List<DirectPushNewVo> directPushNewAchieUpList(DirectPushNewVo dpo, Long pkMember, Integer orderType) {
return memberReportMapper.directPushNewAchieUpList(dpo, pkMember, orderType);
}
/**
* 用户消费统计
*
* @param memberCode 用户编号
* @param memberName 用户姓名
* @param startPayTime 开始支付时间
* @param endPayTime 结束支付时间
* @param pkWares 商品主键
* @return
*/
@Override
public List<MemberConsumptionVo> memberConsumptionList(String memberCode, String memberName, Date startPayTime, Date endPayTime, Integer pkWares) {
return memberReportMapper.memberConsumptionList(memberCode, memberName, startPayTime, endPayTime, pkWares);
}
/**
* 伞下新增安置业绩
*
* @return
*/
@Override
public List<MemberResettleAchieveVo> memberResettleAchieve(Long pkMember, String memberName, Date startPayTime, Date endPayTime, Integer pkVertex, Integer pkTeamCode, Integer pkCountry, Integer pkAwards, List<Integer> orderTypeList) {
return memberReportMapper.memberResettleAchieve(pkMember, memberName, startPayTime, endPayTime, pkVertex, pkTeamCode, pkCountry, pkAwards, orderTypeList);
}
/**
* @description: 伞下新增安置业绩
* @author: zhang jing
* @date: 2024/3/14 15:14
* @param: [pkMember, memberName, startPayTime, endPayTime, pkVertex, pkTeamCode, pkCountry, pkAwards, achieveTableName, treeTableName, period]
* @return: java.util.List<com.hzs.report.member.vo.MemberResettleAchieveVo>
**/
@Override
public List<MemberResettleAchieveVo> selectBrollyNewABAchieve(Long pkMember, String memberName, Date startPayTime, Date endPayTime, Integer pkVertex,
Integer pkTeamCode, Integer pkCountry, Integer pkAwards, String achieveTableName,
int period) {
Integer pkTeamCode, Integer pkCountry, Integer pkAwards, String achieveTableName, int period) {
return memberReportMapper.selectBrollyNewABAchieve(pkMember, memberName, startPayTime, endPayTime,
pkVertex, pkTeamCode, pkCountry, pkAwards, achieveTableName, period);
}
/**
* 订单币种查询
*
* @param memberCode 会员编号
* @param memberName 会员名称
* @param orderCode 订单编号
* @param orderType 订单类型
* @return
*/
@Override
public List<OrderCurrencyVo> getOrderCurrencyList(String memberCode, String memberName, String orderCode, Integer orderType) {
return memberReportMapper.getOrderCurrencyList(memberCode, memberName, orderCode, orderType);
}
/**
* 查询订单币种
*
* @param orderCodeList
* @return
*/
@Override
public List<MemberTradeVo> getBySourceCodeMemberTradeList(List<String> orderCodeList) {
return memberReportMapper.getBySourceCodeMemberTradeList(orderCodeList);
}
/**
* 查询省订单
*
* @param startTime 开始时间
* @param endTime 结束时间
* @param pkCountry 所属国家
* @return
*/
@Override
public List<OrderDistribution> getByProvinceOrderDistribution(Date startTime, Date endTime, Integer pkCountry) {
return memberReportMapper.getByProvinceOrderDistribution(startTime, endTime, pkCountry);
}
/**
* 查询市订单
*
* @param startTime 开始时间
* @param endTime 结束时间
* @param pkCountry 所属国家
* @return
*/
@Override
public List<OrderDistribution> getByCityOrderDistribution(Date startTime, Date endTime, Integer pkCountry) {
return memberReportMapper.getByCityOrderDistribution(startTime, endTime, pkCountry);
}
/**
* 查询区县订单
*
* @param startTime 开始时间
* @param endTime 结束时间
* @param pkCountry 所属国家
* @return
*/
@Override
public List<OrderDistribution> getByDistrictOrderDistribution(Date startTime, Date endTime, Integer pkCountry) {
return memberReportMapper.getByDistrictOrderDistribution(startTime, endTime, pkCountry);
}
/**
* 出货明细汇总
*
* @param productName
* @param pkClassify
* @param startTime
* @param endTime
* @return
*/
@Override
public List<ProductOrderInfoVo> getProductOrderInfo(String productName, Integer pkClassify, Date startTime, Date endTime, Integer pkCountry, List<Integer> orderTypeList) {
return memberReportMapper.getProductOrderInfo(productName, pkClassify, startTime, endTime, pkCountry, orderTypeList);
}
/**
* 报单汇总
*
* @return
*/
@Override
public List<ReportSummaryVo> reportSummaryList(ReportSummaryVo reportSummaryVo) {
return memberReportMapper.reportSummaryList(reportSummaryVo);
}
/**
* 出货明细汇总统计详情
*
* @param pkProduct
* @param productName
* @param orderType
* @return
*/
@Override
public List<ProductShippingDetailsInfoVo> productShippingDetailsList(Integer pkProduct, String productName, Integer pkClassify, Integer pkAwards, List<Integer> orderTypeList, Date startTime, Date endTime, Integer pkCountry) {
return memberReportMapper.productShippingDetailsList(pkProduct, productName, pkClassify, pkAwards, orderTypeList, startTime, endTime, pkCountry);
}
/**
* 产品明细查询
*
* @param productDetailQueryParam
* @return
*/
@Override
public List<ProductDetailQueryVo> productDetailQueryList(ProductDetailQueryParam productDetailQueryParam) {
return memberReportMapper.productDetailQueryList(productDetailQueryParam);
}
@Override
public List<SmallAreaNewAddAchieveVO> selectSmallAreaNewAdd(SmallAreaNewAddAchieveVO addAchieveVO) {
List<SmallAreaNewAddAchieveVO> areaNewAddAchieveVOList = null;
@ -258,7 +138,7 @@ public class MemberReportServiceImpl implements MemberReportService {
//获取期数
String date = beforeLocalDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
//开始时间减一天的期数
int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date).getPkId();
int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date).getPkId();
addAchieveVO.setBeforePeriod(period);
//查询大小区业绩表
//String settleTable = TableNameConstants.CU_MEMBER_SETTLE + period;
@ -295,9 +175,8 @@ public class MemberReportServiceImpl implements MemberReportService {
* @param endDate 结束时间
* @return List<MonthAchieveVO>
*/
private List<MonthAchieveVO> getAchieveMonthTable(String startDate, String endDate) {
MonthAchieveVO monthAchieveVO = null;
MonthAchieveVO monthAchieveVO;
List<MonthAchieveVO> monthAchieveVOList = new ArrayList<>();
LocalDate startLocalDate = DateUtils.getStringToLocalDate(startDate);
LocalDate endLocalDate = DateUtils.getStringToLocalDate(endDate);
@ -307,39 +186,38 @@ public class MemberReportServiceImpl implements MemberReportService {
//相差两个月及以上
if (months >= 2) {
//初月信息
int startPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDate).getPkId();
int startPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDate).getPkId();
MonthAchieveVO startMonthAchieveVO = MonthAchieveVO.builder().achieveTable(getMonthTableName(startLocalDate))
.startPeriod(startPeriod)
.build();
monthAchieveVOList.add(startMonthAchieveVO);
//中间月信息
for (int i = 1; i < months; i++) {
System.out.println(startLocalDate.plusMonths(i));
monthAchieveVO = MonthAchieveVO.builder().achieveTable(getMonthTableName(startLocalDate.plusMonths(i))).build();
monthAchieveVOList.add(monthAchieveVO);
}
//末月信息
int endPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDate).getPkId();
int endPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDate).getPkId();
MonthAchieveVO endMonthAchieveVO = MonthAchieveVO.builder().achieveTable(getMonthTableName(endLocalDate))
.endPeriod(endPeriod)
.build();
monthAchieveVOList.add(endMonthAchieveVO);
//同一个月
} else if (months == 0) {
int startPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDate).getPkId();
int endPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDate).getPkId();
int startPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDate).getPkId();
int endPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDate).getPkId();
monthAchieveVO = MonthAchieveVO.builder().achieveTable(getMonthTableName(startLocalDate))
.startPeriod(startPeriod).endPeriod(endPeriod).build();
monthAchieveVOList.add(monthAchieveVO);
} else {
//初月信息
int startPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDate).getPkId();
int startPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDate).getPkId();
MonthAchieveVO startMonthAchieveVO = MonthAchieveVO.builder().achieveTable(getMonthTableName(startLocalDate))
.startPeriod(startPeriod)
.build();
monthAchieveVOList.add(startMonthAchieveVO);
//末月信息
int endPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDate).getPkId();
int endPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDate).getPkId();
MonthAchieveVO endMonthAchieveVO = MonthAchieveVO.builder().achieveTable(getMonthTableName(endLocalDate))
.endPeriod(endPeriod)
.build();
@ -348,14 +226,13 @@ public class MemberReportServiceImpl implements MemberReportService {
return monthAchieveVOList;
}
@Override
public List<CuMemberWalletVO> selectMemberUnderWalletList(CuMemberWalletVO walletVO) {
List<CuMemberWalletVO> cuMemberWalletVOList = memberReportMapper.selectMemberUnderWalletList(walletVO);
if (CollUtil.isNotEmpty(cuMemberWalletVOList)) {
Integer pkCountry = walletVO.getPkCountry();
//查询币种值
List<BdAccount> allAccounts = accountServiceApi.queryAccountByType(null, pkCountry).getData();
List<BdAccount> allAccounts = iAccountServiceApi.queryAccountByType(null, pkCountry).getData();
Map<Integer, BdAccount> map = allAccounts.stream().collect(Collectors.toMap(BdAccount::getPkId, o -> o));
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(ETradeType.values());
//根据国家查询汇率
@ -385,27 +262,6 @@ public class MemberReportServiceImpl implements MemberReportService {
return cuMemberWalletVOList;
}
/**
* 产品销量排行
*/
@Override
public List<ProductSaleStatVo> productSalesStat(String skuCode, String productName, Integer orderType, Date startTime, Date endTime) {
return memberReportMapper.productSalesStat(skuCode, productName, orderType, startTime, endTime);
}
/**
* 查询商品统计信息
*
* @param pkProduct
* @return
*/
@Override
public List<WaresInfoVO> queryWaresInfoByProduct(Integer pkProduct, Integer orderType, Date startTime, Date endTime, Integer pkSpecs) {
return memberReportMapper.queryWaresInfoByProduct(pkProduct, orderType, startTime, endTime, pkSpecs);
}
/**
* 查询商品统计信息
*

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

@ -143,15 +143,6 @@ public class CuMemberPushAchieveVO implements Serializable {
@BigDecimalFormat
private BigDecimal bBalance;
/**
* 考核状态 (0=考核通过,1=免考通过,2=考核不通过,3=不考核)
*/
@Transaction(transactionKey = EnumsPrefixConstants.ASSESS_STATUS)
private Integer assessStatus;
@Excel(name = "考核状态")
private String assessStatusVal;
/**
* 注册日期
*/

73
bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberMapper.xml
View File

@ -78,7 +78,7 @@
member_code, member_name, phone, pk_grade, pk_awards, pk_vertex, pk_team_code,
category, 1 algebra
from ${tableName}
where member_code = #{param.memberCode}
where member_code = #{param.memberCode}
union
select pk_member, pk_parent, pk_place_parent, place_dept, purchase_status,
member_code, member_name, phone, pk_grade, pk_awards, pk_vertex, pk_team_code,
@ -150,13 +150,14 @@
order by a.algebra
</select>
<!-- 安置正反查 -->
<select id="queryPlaceParentCuMemberAchieveExt" resultType="com.hzs.common.domain.member.achieve.ext.CuMemberAchieveExt">
select a.algebra, a.pk_member, a.pk_place_parent, a.place_dept,
a.member_code, a.member_name, a.phone, bdr.pk_transaction pk_register_grade, bd.pk_transaction pk_grade,
ba.pk_transaction pk_awards, bv.vertex_name, ct.team_name, a.pay_time, a.category,
(case when a.purchase_status = 0 then 0 when b.pk_member is not null then 0 else 1 end) assess_status,
select a.algebra, a.pk_member, a.member_code, a.member_name, a.phone,
a.pk_place_parent, a.place_dept,
bdr.grade_name pkRegisterGradeVal, bd.grade_name pkGradeVal, ba.awards_name pkAwardsVal,
bv.vertex_name, ct.team_name, a.pay_time, a.category,
cmp.member_code parentCode, cmp.member_name parentName, cmpl.member_code placeCode, cmpl.member_name placeName,
bha.awards_name old_awards_name, a.a_balance, a.b_balance
a.a_balance, a.b_balance
from (
select b.pk_member, b.pk_parent, b.pk_place_parent, b.place_dept,
(case when b.purchase_status = 0 then 0 else a.purchase_status end) purchase_status,
@ -199,11 +200,8 @@
</otherwise>
</choose>
) b
on a.pk_member = b.pk_member) a
left join(
select pk_member from ${assesTableName} where period= #{period} and ASSESS_TYPE = 0 and ASSESS_STATUS in (0, 1)
) b
on a.pk_member = b.pk_member
) a
left join bd_grade bdr
on a.pk_register_grade = bdr.pk_id
left join bd_grade bd
@ -218,10 +216,6 @@
on a.pk_parent = cmp.pk_id
left join cu_member cmpl
on a.pk_place_parent = cmpl.pk_id
left join CU_MEMBER_HISTROY_AWARDS cmha
on cmha.pk_member = a.pk_member
left join BD_HISTROY_AWARDS bha
on bha.pk_id = cmha.pk_awards
where 1 = 1
<if test="param.pkRegisterGrade != null">
and a.pk_register_grade = #{param.pkRegisterGrade}
@ -238,16 +232,6 @@
<if test="param.pkTeamCode != null">
and a.pk_team_code = #{param.pkTeamCode}
</if>
<if test="param.isAssess != null">
<choose>
<when test="param.isAssess == 0 ">
and a.purchase_status in (0, 1)
</when>
<otherwise>
and a.purchase_status = 2
</otherwise>
</choose>
</if>
order by a.algebra
</select>
@ -320,11 +304,11 @@
</select>
<select id="queryParentParentCuMemberAchieveExt" resultType="com.hzs.common.domain.member.achieve.ext.CuMemberAchieveExt">
select a.algebra, a.pk_member, a.pk_parent, a.pk_settle_country,
a.member_code, a.member_name, a.phone, bdr.pk_transaction pk_register_grade, bd.pk_transaction pk_grade,
ba.pk_transaction pk_awards, bv.vertex_name, ct.team_name,
(case when a.purchase_status = 0 then 0 when b.pk_member is not null then 0 else 1 end) assess_status,
cmp.member_code parentCode, cmp.member_name parentName, cmpl.member_code placeCode, cmpl.member_name placeName, a.place_dept placeDept,
select a.algebra, a.pk_member, a.member_code, a.member_name, a.phone, a.pk_parent, a.pk_settle_country,
a.pk_place_parent, a.place_dept placeDept,
bdr.grade_name pkRegisterGradeVal, bd.grade_name pkGradeVal, ba.awards_name pkAwardsVal,
bv.vertex_name, ct.team_name,
cmp.member_code parentCode, cmp.member_name parentName, cmpl.member_code placeCode, cmpl.member_name placeName,
a.category, a.pay_time
from
(
@ -341,10 +325,6 @@
<otherwise>connect by prior pk_id = pk_parent</otherwise>
</choose>
) a
left join(
select pk_member from ${assesTableName} where period= #{period} and ASSESS_TYPE = 0 and ASSESS_STATUS in (0, 1)
) b
on a.pk_member = b.pk_member
left join bd_grade bdr
on a.pk_register_grade = bdr.pk_id
left join bd_grade bd
@ -375,16 +355,6 @@
<if test="param.pkTeamCode != null">
and a.pk_team_code = #{param.pkTeamCode}
</if>
<if test="param.isAssess != null">
<choose>
<when test="param.isAssess == 0 ">
and a.purchase_status in (0,1)
</when>
<otherwise>
and a.purchase_status = 2
</otherwise>
</choose>
</if>
order by a.algebra
</select>
@ -415,29 +385,29 @@
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
<if test="pkRegisterGrade != null">
and cm.PK_REGISTER_GRADE = #{pkRegisterGrade}
and cm.PK_REGISTER_GRADE = #{pkRegisterGrade}
</if>
<if test="pkAwards != null">
and cm.PK_AWARDS = #{pkAwards}
and cm.PK_AWARDS = #{pkAwards}
</if>
<if test="pkTeamCode != null">
and cm.pk_team_code = #{pkTeamCode}
and cm.pk_team_code = #{pkTeamCode}
</if>
<if test="pkVertex != null">
and cm.pk_vertex = #{pkVertex}
and cm.pk_vertex = #{pkVertex}
</if>
<if test="memberName != null and memberName!=''">
and cm.member_name like #{memberName} || '%'
and cm.member_name like #{memberName} || '%'
</if>
<if test="parMemberCode != null and parMemberCode!=''">
and par.member_code like #{parMemberCode} || '%'
and par.member_code like #{parMemberCode} || '%'
</if>
<if test="parMemberName != null and parMemberName!=''">
and par.member_name like #{parMemberName} || '%'
and par.member_name like #{parMemberName} || '%'
</if>
<if test="phone != null and phone!=''">
and cm.phone like #{phone} || '%'
and cm.phone like #{phone} || '%'
</if>
<if test="startDate != null ">
and cm.CREATION_TIME &gt;= to_date(#{startDate}, 'yyyy-mm-dd')
@ -500,5 +470,4 @@
</select>
</mapper>

178
bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml
View File

@ -46,7 +46,8 @@
from (
select
CASE WHEN sum( so.ORDER_ACHIEVE ) is null THEN 0 ELSE sum( so.ORDER_ACHIEVE ) end orderAchieve,
CASE WHEN sum( so.ORDER_AMOUNT - nvl(so.consume_amount, 0) ) is null THEN 0 ELSE sum( so.ORDER_AMOUNT - nvl(so.consume_amount, 0) ) end orderAmount,
CASE WHEN sum( so.ORDER_AMOUNT - nvl(so.consume_amount, 0) ) is null THEN 0 ELSE sum( so.ORDER_AMOUNT - nvl(so.consume_amount, 0) ) end
orderAmount,
CASE WHEN sum(so.order_ass_achieve) is null THEN 0 ELSE sum(so.order_ass_achieve) end orderAssAchieve
from SA_ORDER so
where so.DEL_FLAG = 0
@ -100,8 +101,7 @@
)
</select>
<!-- 查询伞下直推新增业绩 -业绩-->
<!-- 查询伞下直推新增业绩 -业绩-->
<select id="directPushNewAchieUpList" resultType="com.hzs.report.member.vo.DirectPushNewVo">
select (endm.orderAchieve - stam.orderAchieve) orderAchieve,
(endm.orderAmount - stam.orderAmount) orderAmount,
@ -149,11 +149,9 @@
on endm.pkMember=stam.pkMember
</select>
<select id="memberConsumptionList" resultType="com.hzs.report.member.vo.MemberConsumptionVo">
select cm.MEMBER_CODE memberCode ,cm.MEMBER_NAME memberName,nvl(a.orderAmount,0)orderAmount,nvl(a.orderAchieve,0)orderAchieve,cm.pk_id pkMember
from cu_member cm
left join (
select nvl(sum(si.PRICE*si.QUANTITY),0) orderAmount, nvl(sum(si.ACHIEVEMENT*si.QUANTITY),0) orderAchieve,so.PK_CREATOR from SA_ORDER_ITEMS si
left join SA_ORDER so on so.PK_ID = si.PK_ORDER
@ -176,7 +174,6 @@
<if test="memberCode != null and memberCode != ''">
and cm.MEMBER_CODE=#{memberCode}
</if>
</select>
<select id="memberResettleAchieve" resultType="com.hzs.report.member.vo.MemberResettleAchieveVo">
@ -205,9 +202,9 @@
on mt.pk_id = cm.PK_TEAM_CODE
left join bd_vertex bv
on bv.pk_id = cm.PK_VERTEX
inner join (
select #{pkMember} pkMember, 1 place_dept,nvl(sum(so.ORDER_ACHIEVE), 0) achieve,nvl(sum(so.ORDER_AMOUNT - nvl(so.consume_amount, 0)), 0) amount
select #{pkMember} pkMember, 1 place_dept,nvl(sum(so.ORDER_ACHIEVE), 0) achieve,nvl(sum(so.ORDER_AMOUNT - nvl(so.consume_amount, 0)), 0)
amount
from SA_ORDER so
inner join(
select a.pk_id from (
@ -245,8 +242,8 @@
</foreach>
</if>
union all
select #{pkMember} pkMember, 2 place_dept,nvl(sum(so.ORDER_ACHIEVE), 0) achieve,nvl(sum(so.ORDER_AMOUNT - nvl(so.consume_amount, 0)), 0) amount
select #{pkMember} pkMember, 2 place_dept,nvl(sum(so.ORDER_ACHIEVE), 0) achieve,nvl(sum(so.ORDER_AMOUNT - nvl(so.consume_amount, 0)), 0)
amount
from SA_ORDER so
inner join(
select a.pk_id from (
@ -289,15 +286,12 @@
<if test="memberName != null and memberName != ''">
and cm.MEMBER_NAME=#{memberName}
</if>
<if test="pkCountry != null">
and cm.PK_SETTLE_COUNTRY=#{pkCountry}
</if>
</select>
<!-- 查询伞下新增安置业绩-->
<!-- 查询伞下新增安置业绩-->
<select id="selectBrollyNewABAchieve"
resultType="com.hzs.report.member.vo.MemberResettleAchieveVo">
select cm.PAY_TIME orderTime,
@ -341,8 +335,8 @@
</select>
<select id="getOrderCurrencyList" resultType="com.hzs.report.member.vo.OrderCurrencyVo">
select cm.MEMBER_CODE memberCode,cm.MEMBER_NAME memberName,so.ORDER_CODE orderCode,so.ORDER_TYPE orderType,so.ORDER_AMOUNT orderAmount,so.POSTAGE postage
select cm.MEMBER_CODE memberCode,cm.MEMBER_NAME memberName,so.ORDER_CODE orderCode,so.ORDER_TYPE orderType,so.ORDER_AMOUNT
orderAmount,so.POSTAGE postage
from sa_order so
left join CU_MEMBER cm on cm.pk_id = so.PK_CREATOR
where 1 = 1 and so.del_flag = 0 and so.ORDER_STATUS = 1
@ -361,7 +355,6 @@
</select>
<select id="getBySourceCodeMemberTradeList" resultType="com.hzs.report.member.vo.MemberTradeVo">
select mt.* from cu_member_trade mt where 1 = 1
<if test="orderCodeList != null and orderCodeList.size > 0">
and mt.SOURCE_CODE in
@ -496,46 +489,6 @@
<if test="registerAuthority != null">
and cm.REGISTER_AUTHORITY = #{registerAuthority}
</if>
</select>
<select id="brollyBelowResettle" resultType="com.hzs.report.member.vo.MemberPerformanceVo">
select 1 placeDept , nvl(sum(so.ORDER_ACHIEVE),0) achieve
from SA_ORDER so
left join cu_member t on so.PK_CREATOR = t.pk_id and t.PLACE_DEPT = 1
where 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>
<if test="startPayTime != null">
and to_char(so.PAY_TIME, 'yyyy-mm-dd hh24:mi:ss') &gt;= to_char(#{startPayTime}, 'yyyy-mm-dd hh24:mi:ss')
</if>
<if test="endPayTime != null">
and to_char(so.PAY_TIME, 'yyyy-mm-dd hh24:mi:ss') &lt;= to_char(#{endPayTime}, 'yyyy-mm-dd hh24:mi:ss')
</if>
union all
select 2 placeDept , nvl(sum(so.ORDER_ACHIEVE),0) achieve
from SA_ORDER so
left join cu_member t on so.PK_CREATOR = t.pk_id and t.PLACE_DEPT = 2
where 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>
<if test="startPayTime != null">
and to_char(so.PAY_TIME, 'yyyy-mm-dd hh24:mi:ss') &gt;= to_char(#{startPayTime}, 'yyyy-mm-dd hh24:mi:ss')
</if>
<if test="endPayTime != null">
and to_char(so.PAY_TIME, 'yyyy-mm-dd hh24:mi:ss') &lt;= to_char(#{endPayTime}, 'yyyy-mm-dd hh24:mi:ss')
</if>
</select>
<select id="productShippingDetailsList" resultType="com.hzs.report.member.vo.ProductShippingDetailsInfoVo">
@ -568,7 +521,6 @@
<if test="pkAwards != null">
and bw.pk_id = #{pkAwards}
</if>
<if test="orderTypeList != null and orderTypeList.size > 0">
and so.ORDER_TYPE in
<foreach collection="orderTypeList" item="item" open="(" close=")" separator=",">
@ -609,7 +561,6 @@
oi.QUANTITY quantity,
bw.WARES_CODE waresCode,
bw.WARES_NAME waresName
from SA_ORDER_ITEMS oi
inner join SA_ORDER so on so.PK_ID = oi.PK_ORDER
left join bd_product bp on bp.PK_ID = oi.PK_PRODUCT
@ -617,7 +568,6 @@
left join cu_member cme on cme.PK_ID = so.PK_MEMBER
left join bd_vertex bv on bv.PK_ID = cme.PK_VERTEX
left join cu_member_team mt on mt.PK_ID = cm.PK_TEAM_CODE
left join BD_WARES bw on bw.pk_id = oi.PK_WARES
where oi.del_flag = 0 and so.del_flag = 0 and so.ORDER_STATUS = 1
<if test="waresCode != null and waresCode != ''">
@ -638,7 +588,6 @@
FROM CU_MEMBER m
start with m.PK_PARENT = #{pkMember}
connect by m.PK_PARENT = prior m.pk_id
)
</if>
<if test="memberName != null and memberName != ''">
@ -667,10 +616,8 @@
and so.PAY_TIME between #{startPayTime, jdbcType=TIMESTAMP} and #{endPayTime, jdbcType=TIMESTAMP}
</if>
order by oi.pk_id desc
</select>
<select id="selectSmallAreaNewAdd" resultType="com.hzs.report.member.vo.SmallAreaNewAddAchieveVO">
SELECT m.member_code memberCode,
m.member_name memberName,
@ -738,7 +685,6 @@
AND bv.del_flag = 0
</select>
<select id="selectSmallAreaNewAddNemMember" resultType="com.hzs.report.member.vo.SmallAreaNewAddAchieveVO">
SELECT t5.member_code memberCode,
t5.member_name memberName,
@ -813,7 +759,6 @@
AND bv.del_flag = 0
</select>
<select id="selectSmallAreaNewAddPage" resultType="com.hzs.report.member.vo.SmallAreaNewAddAchieveVO">
SELECT m.member_code memberCode,
m.member_name memberName,
@ -1043,101 +988,11 @@
order by mt.creation_time Desc,mt.PK_ID Desc
</select>
<select id="productSalesStat" resultType="com.hzs.report.member.vo.ProductSaleStatVo">
select
bp.pk_id pkProduct,
bp.PRODUCT_NAME productName,
bu.NAME unitStr ,
a.skuCode,
bs.specs_name productSpecType,
bs.pk_id pkSpecs
from
bd_product bp
left join bd_product_specs ps on ps.PK_PRODUCT = bp.pk_id
left join bd_specs bs on bs.pk_specs_type = ps.PK_SPECS_TYPE
left join bd_unit bu on bu.PK_ID = bp.UNIT
inner join (
select
oi.SKU_CODE skuCode, oi.PK_PRODUCT pkProduct ,sum(oi.quantity) quantity from SA_ORDER_ITEMS oi
left join sa_order so on so.PK_ID = oi.PK_ORDER
inner join bd_wares bw on bw.pk_id = oi.pk_wares and bw.del_flag = 0
where oi.del_flag = 0 and oi.pk_wares != 0
<if test="skuCode != null and skuCode != ''">
and oi.SKU_CODE like '%' || #{skuCode} || '%'
</if>
<if test="orderType != null">
and so.ORDER_TYPE = #{orderType}
</if>
<if test="startTime != null">
and so.PAY_TIME &gt;= #{startTime}
</if>
<if test="endTime != null">
and so.PAY_TIME &lt;= #{endTime}
</if>
group by oi.SKU_CODE , oi.PK_PRODUCT
) a on a.pkProduct = bp.pk_id
where 1 = 1
and bs.del_flag = 0
and ps.del_flag = 0
and (select count(ws.pk_id) from BD_WARES_SPECS ws
left join bd_wares_detail d on d.pk_id = ws.PK_WARES_DETAIL
where ws.PK_SPECS = bs.pk_id and ws.del_flag = 0 and d.del_flag = 0 and d.PK_PRODUCT = bp.pk_id ) > 0
<if test="productName != null and productName != ''">
and bp.PRODUCT_NAME like '%' || #{productName} || '%'
</if>
order by a.quantity desc
</select>
<select id="queryWaresInfoByProduct" resultType="com.hzs.report.member.vo.WaresInfoVO">
select t.pk_id pkWares ,min(t.wares_code) waresCode,min(t.wares_name) waresName, coalesce(min(p.waresQuantity),0) waresQuantity ,coalesce(min(p.quantity),0) productQuantity ,min(wd.QUANTITY)
specsQuantity,wd.pk_product pkProduct from BD_WARES t
left join bd_wares_detail wd on wd.PK_WARES = t.pk_id
left join BD_WARES_SPECS ws on ws.pk_wares_detail = wd.pk_id
inner join (
select so.pk_product pkProduct,so.pk_wares pkWares,sum(so.wares_quantity) waresQuantity,sum(so.quantity) quantity from sa_order_items so
left join sa_order s on s.PK_ID = so.PK_ORDER
inner join BD_WARES bw on bw.pk_id = so.pk_wares and bw.del_flag = 0
where so.del_flag = 0 and
so.pk_product = #{pkProduct}
and instr(so.SPECS_NAME_ID, #{pkSpecs}) > 0
<if test="orderType != null">
and s.ORDER_TYPE = #{orderType}
</if>
<if test="startTime != null">
and s.PAY_TIME &gt;= #{startTime}
</if>
<if test="endTime != null">
and s.PAY_TIME &lt;= #{endTime}
</if>
group by so.pk_wares ,so.pk_product
) p on p.pkWares = t.pk_id
where wd.pk_product = #{pkProduct}
and wd.del_flag = 0
and ws.del_flag = 0
and t.del_flag = 0
and ws.pk_specs = #{pkSpecs}
group by t.pk_id, wd.pk_product
</select>
<select id="productSaleStatList" resultType="com.hzs.report.member.vo.ProductSaleStatVo">
select a.* from ( select min(oi.SKU_CODE) skuCode ,min(bp.PRODUCT_NAME) productName ,
oi.PK_PRODUCT pkProduct, min(bu.NAME) unitStr, min(bw.WARES_NAME) waresName ,
bw.pk_id pkWares, min(oi.SPECS_NAME) specsName,oi.SPECS_NAME_ID specsNameId,sum(oi.WARES_QUANTITY) waresQuantity,sum(oi.QUANTITY) productQuantity,
bw.pk_id pkWares, min(oi.SPECS_NAME) specsName,oi.SPECS_NAME_ID specsNameId,sum(oi.WARES_QUANTITY) waresQuantity,sum(oi.QUANTITY)
productQuantity,
min(bw.WARES_CODE) waresCode,sum(wd.QUANTITY) specsQuantity
from SA_ORDER_ITEMS oi
left join SA_ORDER so on so.pk_id = oi.PK_ORDER
@ -1145,10 +1000,7 @@
left join bd_wares bw on bw.pk_id = oi.PK_WARES and bw.del_flag = 0
left join bd_wares_detail wd on wd.pk_id = oi.PK_WARES_DETAIL and wd.del_flag = 0
left join bd_unit bu on bu.PK_ID = bp.UNIT
where oi.del_flag = 0 and bp.del_flag = 0 and oi.pk_country = #{pkCountry} and bp.pk_country = #{pkCountry}
<if test="skuCode != null and skuCode != ''">
and oi.SKU_CODE like '%' || #{skuCode} || '%'
</if>
@ -1165,16 +1017,11 @@
and bp.PRODUCT_NAME like '%' || #{productName} || '%'
</if>
group by bw.pk_id, oi.PK_PRODUCT , oi.SPECS_NAME_ID ) a order by a.pkproduct desc
</select>
<select id="sumQuantity" resultType="integer">
select
sum(oi.QUANTITY)quantity
from SA_ORDER_ITEMS oi
left join sa_order so on oi.PK_ORDER = so.pk_id
left join (
@ -1207,7 +1054,6 @@
#{item}
</foreach>
</if>
</select>
</mapper>

22
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECategory.java
View File

@ -5,11 +5,7 @@ import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* Description: 用户类型分类
* Author: sui q
* Time: 2022/9/8 16:39
* Classname: ECategory
* PackageName: com.hzs.common.core.enums
* 用户类型分类
*/
@AllArgsConstructor
@Getter
@ -47,4 +43,20 @@ public enum ECategory {
* 国际化翻译key值
*/
private final String key;
/**
* 根据枚举值，获取枚举显示
*
* @param value
* @return
*/
public static String getLabelByValue(int value) {
for (ECategory eCategory : ECategory.values()) {
if (eCategory.getValue() == value) {
return eCategory.getLabel();
}
}
return "";
}
}

2
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPlaceDept.java
View File

@ -46,7 +46,7 @@ public enum EPlaceDept {
return ePlaceDept.label;
}
}
return null;
return "";
}
/**

24
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberAchieveExt.java
View File

@ -8,12 +8,7 @@ import java.math.BigDecimal;
import java.util.Date;
/**
* @description: 会员业绩扩展表
* @author: sui q
* @time: 2023/8/26 10:45
* @classname: CuMemberAchieveVO
* @package_name: com.hzs.common.domain.member.achieve.ext
* version 1.0.0
* 会员业绩扩展表
*/
@EqualsAndHashCode(callSuper = true)
@Data
@ -45,15 +40,30 @@ public class CuMemberAchieveExt extends CuMemberAchieve {
private Integer pkRegisterGrade;
/**
* 等级
* 注册等级名称
*/
private String pkRegisterGradeVal;
/**
* 结算等级
*/
private Integer pkGrade;
/**
* 结算等级名称
*/
private String pkGradeVal;
/**
* 真实奖衔
*/
private Integer pkAwards;
/**
* 奖衔名称
*/
private String pkAwardsVal;
/**
* 体系名称
*/