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-22 10:53:57 +08:00
parent 93e3b10206
commit 925b0f7568
27 changed files with 220 additions and 1011 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hzs-api/hzs-api-member/src/main/java/com/hzs/member/achieve/IMemberAchieveServiceApi.java
View File

@ -3,14 +3,8 @@ package com.hzs.member.achieve;
import com.hzs.common.core.domain.R;
import com.hzs.common.domain.member.base.CuMember;
import java.util.Date;
/**
* @Description: 提供查询实时会员业绩的api接口
* @Author: sui q
* @Time: 2022/10/26 15:12
* @Classname: IMemberAchieveServiceAPI
* @PackageName: com.hzs.member.achieve
* 提供查询实时会员业绩的api接口
*/
public interface IMemberAchieveServiceApi {
@ -26,12 +20,4 @@ public interface IMemberAchieveServiceApi {
*/
R<CuMember> queryCuMemberAchieveByPkMember(CuMember cuMember, Boolean isFirst, Boolean isFirstAchieve);
/**
* 处理会员月复购业绩统计
*
* @param date 统计时间（传入则会统计传入时间月份，如果不传入则为当前时间减一个月）
* @return
*/
R<?> handleMemberMonthRepurchase(Date date);
}

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

@ -15,11 +15,7 @@ import java.util.Date;
import java.util.List;
/**
* @Description: 订单服务对外提供接口
* @Author: sui q
* @Time: 2022/11/2 16:29
* @Classname: ISaOrderServiceApi
* @PackageName: com.hzs.sale.order
* 订单服务对外提供接口
*/
public interface ISaOrderServiceApi {
@ -28,9 +24,6 @@ public interface ISaOrderServiceApi {
*
* @param startDate 开始日期
* @param endDate 结束日期
* @return: R<List < SaOrderExt>>
* @Author: sui q
* @Date: 2022/11/2 16:30
*/
R<List<SaOrderExt>> listSaOrderByDay(Date startDate, Date endDate, String orderCode);
@ -39,33 +32,21 @@ public interface ISaOrderServiceApi {
*
* @param startDate 开始日期
* @param endDate 结束日期
* @return: R<List < SaOrderExt>>
* @Author: sui q
* @Date: 2022/11/2 16:30
*/
R<List<SaOrderExt>> queryRepeatSaOrderByDay(Date startDate, Date endDate);
/*
* @description: 根据主键查询订单,需要查询del_flag=1的，存在先撤单在退货
* @author: sui q
* @date: 2024/3/26 13:54
* @param: null null
**/
R<SaOrder> querySaOrderExtByPkId(Long pkId);
/*
* @description: 查询订单编号
* @author: sui q
* @date: 2023/7/31 16:48
* @param: null null
**/
R<SaOrderExt> querySaOrderByDay(Date startDate, Date endDate, String orderCode);
/*
* @description: 根据发货单查询销售订单
* @author: sui q
* @date: 2023/11/30 10:58
* @param: null null
**/
R<List<SaOrderExt>> querySaOrderByDeliverList(List<SaDeliverItemsExt> deliverItemExtList);
@ -74,9 +55,6 @@ public interface ISaOrderServiceApi {
*
* @param startDate 开始日期
* @param endDate 结束日期
* @return: R<List < SaOrderExt>>
* @Author: sui q
* @Date: 2022/11/2 16:30
*/
R<List<SaOrder>> querySaOrderByDayForCloud(Date startDate, Date endDate);
@ -88,18 +66,12 @@ public interface ISaOrderServiceApi {
* @param orderTypeList 订单类型
* @param orderAmount 订单金额
* @param orderAchieve 订单业绩
* @return: List<SaOrder>
* @Author: sui q
* @Date: 2023/1/5 13:57
*/
R<List<SaOrder>> querySaOrderByTimeForCouponShare(Date startDate, Date endDate, List<Integer> orderTypeList,
BigDecimal orderAmount, BigDecimal orderAchieve, Integer pkCountry);
/*
* @description: 计算店铺奖金，查询订单
* @author: sui q
* @date: 2023/5/8 15:45
* @param: null null
**/
R<List<SaOrderExt>> querySaOrderByTimeForStore(Date startDate, Date endDate);
@ -117,9 +89,6 @@ public interface ISaOrderServiceApi {
*
* @param pkMember 会员主键
* @param orderCode 订单编号
* @return: R<BigDecimal>
* @Author: sui q
* @Date: 2023/3/15 17:39
*/
R<BigDecimal> querySaOrderByOrderCode(Long pkMember, String orderCode);
@ -137,9 +106,6 @@ public interface ISaOrderServiceApi {
*
* @param pkMember 订单编号
* @param orderCode 订单编号
* @return: R<Boolean>
* @Author: sui q
* @Date: 2023/3/22 17:14
*/
R<Boolean> onlinePaymentCallBack(Long pkMember, String orderCode);
@ -184,10 +150,6 @@ public interface ISaOrderServiceApi {
/**
* @description: 根据订单类型查询当天已支付订单信息
* @author: zhang jing
* @date: 2023/5/17 17:12
* @param: [orderType]
* @return: com.hzs.common.core.domain.R<java.util.List < java.lang.Long>>
**/
R<List<SaOrder>> querySaOrderByOrderType(String payTime);
@ -244,9 +206,6 @@ public interface ISaOrderServiceApi {
/*
* @description: 查询订单某段时间累计金额，累计业绩
* @author: sui q
* @date: 2023/7/3 14:50
* @param: null null
**/
R<SaOrder> queryOrderTotalAchieveByTime(Date startDate, Date endDate);
@ -260,19 +219,11 @@ public interface ISaOrderServiceApi {
/**
* @description: 自助服务-修改收货地址订单列表
* @author: zhang jing
* @date: 2023/11/15 17:28
* @param: [orderCode, editType, memberId, pkCountry]
* @return: com.hzs.common.core.domain.R<java.util.List < com.hzs.common.domain.sale.ext.SaOrderExt>>
**/
R<List<SaOrderExt>> selfAddressOrderList(String orderCode, Integer editType, Long memberId, Integer pkCountry);
/**
* @description: 查询邮费
* @author: zhang jing
* @date: 2023/11/16 11:05
* @param: [orderParam]
* @return: com.hzs.common.core.domain.R<com.hzs.sale.order.dto.OrderParamDTO>
**/
R<OrderParamDTO> queryPostageByParam(OrderParamDTO orderParam);
@ -310,17 +261,4 @@ public interface ISaOrderServiceApi {
*/
List<SingleItemStatDTO> singleItemStat(SingleItemStatParamDTO singleItemStatParamDTO);
/**
* 查询指定订单业绩
*
* @param pkMember 会员编号
* @param orderTypeList 订单类型 -- 非必传
* @param startDate 开始时间 -- 非必传
* @param endDate 结束时间 -- 非必传
* @param pkCountry 所属国家
* @return
*/
R<SaOrder> queryOrderAchieve(Long pkMember, List<Integer> orderTypeList,
Date startDate, Date endDate, Integer pkCountry);
}

70
hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberAchieveMapper.java
View File

@ -28,9 +28,6 @@ public interface CuMemberAchieveMapper extends BaseMapper<CuMemberAchieve> {
* @param pkMember 会员主键
* @param pkCountry 公司
* @param tableName 结算表
* @return: CuMemberAchieve
* @Author: sui q
* @Date: 2022/10/26 15:04
*/
CuMemberAchieve queryCuMemberAchieveByPkMember(@Param("pkMember") Long pkMember, @Param("pkCountry") Integer pkCountry, @Param("tableName") String tableName);
@ -92,11 +89,7 @@ public interface CuMemberAchieveMapper extends BaseMapper<CuMemberAchieve> {
Integer selectExistTable(String tableName);
/**
* @description: 查询左右区新增业绩
* @author: zhang jing
* @date: 2023/5/19 11:00
* @param: [pna]
* @return: com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO
* 查询左右区新增业绩
**/
PlaceNewAddAchieveVO selectNewABAchieve(PlaceNewAddAchieveVO pna);
@ -104,119 +97,67 @@ public interface CuMemberAchieveMapper extends BaseMapper<CuMemberAchieve> {
/**
* @description: 月度业绩-左右区人数详情(最新)
* @author: zhang jing
* @date: 2023/9/28 11:38
* @param: [pna]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO>
**/
List<PlaceNewAddAchieveVO> placeNewAddAchieveDetails(PlaceNewAddAchieveVO pna);
/**
* @description: 月度业绩-左右区人数详情(历史)
* @author: zhang jing
* @date: 2023/11/29 11:47
* @param: [pna]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO>
**/
List<PlaceNewAddAchieveVO> placeNewAddAchieveHistoryDetails(PlaceNewAddAchieveVO pna);
/**
* @description: 月度业绩-左右区业绩详情
* @author: zhang jing
* @date: 2023/11/30 9:18
* @param: [pna]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO>
**/
List<PlaceNewAddAchieveVO> leftRightAchieveDetails(PlaceNewAddAchieveVO pna);
/**
* @description: 月度业绩-左右区血缘业绩详情
* @author: zhang jing
* @date: 2023/11/30 11:25
* @param: [pna]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO>
**/
List<PlaceNewAddAchieveVO> leftRightDirectAchieveDetails(PlaceNewAddAchieveVO pna);
/**
* @description: 月度业绩-查询血缘业绩详情
* @author: zhang jing
* @date: 2023/11/30 14:15
* @param: [pna]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO>
**/
List<PlaceNewAddAchieveVO> directAchieveDetails(PlaceNewAddAchieveVO pna);
/**
* @description: 查询直推业绩
* @author: zhang jing
* @date: 2023/5/19 15:50
* @param: [pna]
* @return: com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO
**/
PlaceNewAddAchieveVO selectParentAchieve(PlaceNewAddAchieveVO pna);
/**
* @description: 查询左右区人数
* @author: zhang jing
* @date: 2023/5/19 14:38
* @param: [pna]
* @return: java.lang.Integer
**/
List<PlaceNewAddAchieveVO> selectABCoun(PlaceNewAddAchieveVO pna);
/**
* @description: 查询最新月份左右区人数
* @author: zhang jing
* @date: 2023/9/10 17:51
* @param: [pna]
* @return: com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO
**/
List<PlaceNewAddAchieveVO> selectABNewMonthCoun(PlaceNewAddAchieveVO pna);
/**
* @description: 根据日期查询最新期数
* @author: zhang jing
* @date: 2023/6/6 14:51
* @param: [pna]
* @return: java.lang.Integer
**/
Integer mostNewPeriod(PlaceNewAddAchieveVO pna);
/**
* @description: 查询各个等级直推人数和业绩
* @author: zhang jing
* @date: 2023/5/23 10:18
* @param: [pav]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.ParentAchieveVO>
**/
List<ParentAchieveVO> selectParentCounAchieve(ParentAchieveVO pav);
/**
* @description: 查询本人直推业绩
* @author: zhang jing
* @date: 2023/5/23 19:29
* @param: [pav]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.ParentAchieveVO>
**/
List<ParentAchieveVO> selfParentCounAchieve(ParentAchieveVO pav);
/**
* @description: 查询前10直推业绩
* @author: zhang jing
* @date: 2023/5/23 19:31
* @param: [pav]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.ParentAchieveVO>
**/
List<ParentAchieveVO> parentCounAchieveTop(ParentAchieveVO pav);
/**
* @description: 直推业绩前十人伞下等级业绩
* @author: zhang jing
* @date: 2023/5/31 19:56
* @param: [pav]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.ParentAchieveVO>
**/
List<ParentAchieveVO> umbrellaAchieveTop(ParentAchieveVO pav);
@ -298,25 +239,16 @@ public interface CuMemberAchieveMapper extends BaseMapper<CuMemberAchieve> {
/*
* @description: 查询月统计数据，按照月倒叙
* @author: sui q
* @date: 2023/8/29 16:10
* @param: null null
**/
List<CuMemberAchieveExt> queryMemberMonthAchieve(@Param("pkMember") Long pkMember, @Param("monthList") List<String> monthList);
/*
* @description: 查询月统计数据，查询明细，安置伞下
* @author: sui q
* @date: 2023/9/6 21:12
* @param: null null
**/
List<CuMemberAchieveExt> queryPlaceParentMemberMonthAchieve(MonthAchieveParam monthAchieveParam);
/*
* @description: 查询月统计数据，查询明细，安置伞下
* @author: sui q
* @date: 2023/9/6 21:12
* @param: null null
**/
List<CuMemberAchieveExt> queryParentMemberMonthAchieve(MonthAchieveParam monthAchieveParam);
}

36
hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberMonthRepurchaseMapper.java
View File

@ -1,36 +0,0 @@
package com.hzs.member.achieve.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.common.domain.member.achieve.CuMemberMonthRepurchase;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
/**
* 会员每月复购业绩（S0使用） Mapper 接口
*
* @author jiangchao
* @since 2024-09-19
*/
public interface CuMemberMonthRepurchaseMapper extends BaseMapper<CuMemberMonthRepurchase> {
/**
* 批量处理
*
* @param startDate 开始时间
* @param endDate 结束时间
* @return
*/
int createMemberMonthBatch(@Param("startDate") Date startDate, @Param("endDate") Date endDate);
/**
* 查询会员月复购数据
*
* @param pkMember 会员ID
* @param startDate 开始时间 -- 非必传
* @return
*/
List<CuMemberMonthRepurchase> listMonthDataLis(@Param("pkMember") Long pkMember, @Param("startDate") Date startDate);
}

29
hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberTreeMapper.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.common.domain.member.achieve.CuMemberTree;
import com.hzs.common.domain.member.ext.CuMemberSettleExt;
import com.hzs.member.achieve.param.MemberParentCountParam;
import com.hzs.member.achieve.vo.CuMemberAwardsUnderVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -21,9 +22,6 @@ public interface CuMemberTreeMapper extends BaseMapper<CuMemberTree> {
*
* @param tableName 表名
* @param tableNameSeq 序列名
* @return: void
* @Author: sui q
* @Date: 2022/11/7 16:27
*/
void createCuMemberTableSequence(@Param("tableName") String tableName, @Param("tableNameSeq") String tableNameSeq);
@ -31,10 +29,6 @@ public interface CuMemberTreeMapper extends BaseMapper<CuMemberTree> {
* 判断是否存在临时表
*
* @param tableName 表名
* @Description:
* @return: void
* @Author: sui q
* @Date: 2022/4/13 19:34
*/
Integer queryExistOracleTable(String tableName);
@ -42,9 +36,6 @@ public interface CuMemberTreeMapper extends BaseMapper<CuMemberTree> {
* 查询历史会员网体信息,查询某一天免考的会员
*
* @param tableName 结算表
* @return: List<CuMemberSettleExt>
* @Author: sui q
* @Date: 2022/11/8 18:44
*/
List<CuMemberSettleExt> queryExemptCuMemberSettle(String tableName);
@ -55,9 +46,6 @@ public interface CuMemberTreeMapper extends BaseMapper<CuMemberTree> {
* @param awardsValue 验证等级对应的值
* @param placeDept 部门
* @param pkMember 会员
* @return: List<CuMemberSettleExt>
* @Author: sui q
* @Date: 2022/11/4 18:21
*/
Integer queryCuMemberSettlePlaceUnderUmbrella(@Param("settleTableName") String settleTableName,
@Param("awardsValue") Integer awardsValue,
@ -69,9 +57,6 @@ public interface CuMemberTreeMapper extends BaseMapper<CuMemberTree> {
*
* @param settleTableName 结算表
* @param pkMember 会员
* @return: List<CuMemberSettleExt>
* @Author: sui q
* @Date: 2022/11/4 18:21
*/
Integer queryCuMemberSettleBloodUnderUmbrella(@Param("settleTableName") String settleTableName,
@Param("awardsValue") Integer awardsValue,
@ -205,4 +190,16 @@ public interface CuMemberTreeMapper extends BaseMapper<CuMemberTree> {
*/
List<CuMemberSettleExt> selectByTreeMemberListFive(@Param("pkMember") Long pkMember, @Param("level") Integer level, @Param("vertexIdList") List<Integer> vertexIdList);
/**
* 查询会员显示业绩
*
* @param settleTable
* @param pkMember
* @param monthTable
* @return
*/
CuMemberAwardsUnderVO queryMemberPv(@Param("settleTable") String settleTable,
@Param("pkMember") Long pkMember,
@Param("monthTable") String monthTable);
}

28
hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/provider/MemberAchieveServiceProvider.java
View File

@ -1,51 +1,23 @@
package com.hzs.member.achieve.provider;
import com.hzs.common.core.domain.R;
import com.hzs.common.core.utils.DateUtils;
import com.hzs.common.domain.member.base.CuMember;
import com.hzs.member.achieve.IMemberAchieveServiceApi;
import com.hzs.member.achieve.service.ICuMemberMonthRepurchaseService;
import com.hzs.member.base.service.ICuMemberBusinessService;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboService;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Date;
/**
* @Description:
* @Author: sui q
* @Time: 2022/10/26 15:14
* @Classname: MemberAchieveServiceProvider
* @PackageName: com.hzs.member.achieve.provider
*/
@Slf4j
@DubboService
public class MemberAchieveServiceProvider implements IMemberAchieveServiceApi {
@Autowired
private ICuMemberBusinessService cuMemberBusinessService;
@Autowired
private ICuMemberMonthRepurchaseService iCuMemberMonthRepurchaseService;
@Override
public R<CuMember> queryCuMemberAchieveByPkMember(CuMember cuMember, Boolean isFirst, Boolean isFirstAchieve) {
return R.ok(cuMemberBusinessService.queryCuMemberPlaceDept(cuMember, isFirst, isFirstAchieve));
}
@Override
public R<?> handleMemberMonthRepurchase(Date date) {
if (null == date) {
date = new Date();
}
try {
int count = iCuMemberMonthRepurchaseService.createMemberMonthBatch(DateUtils.getFirstDayOfMonth(date), DateUtils.getLastDayOfMonth(date));
log.info("处理会员月复购业绩统计执行成功，数量: {}", count);
return R.ok();
} catch (Exception e) {
log.error("处理会员月复购业绩统计执行异常", e);
return R.fail(e.getMessage());
}
}
}

74
hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberAchieveService.java
View File

@ -3,7 +3,6 @@ package com.hzs.member.achieve.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.member.achieve.CuMemberAchieve;
import com.hzs.common.domain.member.achieve.ext.CuMemberAchieveExt;
import com.hzs.common.domain.system.config.BdAwards;
import com.hzs.member.achieve.controller.vo.*;
import com.hzs.member.achieve.param.MemberAchieveDisParam;
import com.hzs.member.achieve.param.MonthAchieveParam;
@ -18,7 +17,6 @@ import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* 会员业绩记录 服务类
@ -33,33 +31,21 @@ public interface ICuMemberAchieveService extends IService<CuMemberAchieve> {
*
* @param pkMember 会员主键
* @param pkCountry 公司
* @return: CuMemberAchieve
* @Author: sui q
* @Date: 2022/10/26 15:04
*/
CuMemberAchieve queryCuMemberAchieveByPkMember(Long pkMember, Integer pkCountry);
/*
* description: 业绩分布-安置图
* @author: sui q
* @date: 2023/4/6 18:01
* @param: null null
**/
CuMemberDisVO queryCuMemberAchieveDis(MemberAchieveDisParam memberAchieveDisParam);
/*
* @description: 点击架构树显示会员的业绩情况
* @author: sui q
* @date: 2023/5/10 16:04
* @param: null null
**/
CuMemberDisVO queryCuMemberDis(MemberAchieveDisParam memberAchieveDisParam);
/*
* description: 查询会员伞下血缘业绩
* @author: sui q
* @date: 2023/4/7 15:13
* @param: null null
**/
BigDecimal queryCuMemberUnderBloodAchieveByPkMember(MemberAchieveDisParam memberAchieveDisParam);
@ -67,7 +53,6 @@ public interface ICuMemberAchieveService extends IService<CuMemberAchieve> {
* 会员端新增业绩
*
* @param cuMemberNewAddAchieveVO 端新增业绩
* @return List<CuMemberNewAddAchieveVO>
*/
List<CuMemberNewAddAchieveVO> selectNewAddAchieve(CuMemberNewAddAchieveVO cuMemberNewAddAchieveVO);
@ -89,6 +74,15 @@ public interface ICuMemberAchieveService extends IService<CuMemberAchieve> {
*/
CuMemberAwardsUnderVO selectMemberAwards(Long pkMember, Integer pkCountry);
/**
* 会员业绩进度（首页使用）
*
* @param pkMember 会员ID
* @param pkCountry 国家ID
* @return
*/
CuMemberAwardsUnderVO indexMemberAwards(Long pkMember, Integer pkCountry);
/**
* 月度新增业绩对比
*
@ -110,10 +104,6 @@ public interface ICuMemberAchieveService extends IService<CuMemberAchieve> {
/**
* @description: 业绩分布-新增业绩统计
* @author: zhang jing
* @date: 2023/5/19 10:29
* @param: []
* @return: com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO
**/
PlaceNewAddAchieveVO placeNewAddAchieveStat(PlaceNewAddAchieveVO pna);
@ -128,65 +118,37 @@ public interface ICuMemberAchieveService extends IService<CuMemberAchieve> {
/**
* @description: 月度业绩-左右区人数详情(最新)
* @author: zhang jing
* @date: 2023/9/28 11:38
* @param: [pna]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO>
**/
List<PlaceNewAddAchieveVO> placeNewAddAchieveDetails(PlaceNewAddAchieveVO pna);
/**
* @description: 月度业绩-左右区人数详情(历史)
* @author: zhang jing
* @date: 2023/9/28 11:38
* @param: [pna]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO>
**/
List<PlaceNewAddAchieveVO> placeNewAddAchieveHistoryDetails(PlaceNewAddAchieveVO pna);
/**
* @description:月度业绩-左右区业绩详情
* @author: zhang jing
* @date: 2023/11/30 9:17
* @param: [pna]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO>
**/
List<PlaceNewAddAchieveVO> leftRightAchieveDetails(PlaceNewAddAchieveVO pna);
/**
* @description:月度业绩-左右区血缘业绩详情
* @author: zhang jing
* @date: 2023/11/30 11:15
* @param: [pna]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO>
**/
List<PlaceNewAddAchieveVO> leftRightDirectAchieveDetails(PlaceNewAddAchieveVO pna);
/**
* @description:月度业绩-查询血缘业绩详情
* @author: zhang jing
* @date: 2023/11/30 14:13
* @param: [pna]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO>
**/
List<PlaceNewAddAchieveVO> directAchieveDetails(PlaceNewAddAchieveVO pna);
/**
* @description: 业绩分布-直推业绩（右图）
* @author: zhang jing
* @date: 2023/5/20 16:22
* @param: [pa]
* @return: com.hzs.member.achieve.controller.vo.ParentAchieveVO
**/
ParentAchieveVO parentAchieveRight(ParentAchieveVO pa);
/**
* @description: 业绩分布-直推业绩（左图）
* @author: zhang jing
* @date: 2023/5/23 19:49
* @param: [pa]
* @return: java.util.List<com.hzs.member.achieve.controller.vo.ParentAchieveVO>
**/
List<ParentAchieveVO> parentAchieveLeft(ParentAchieveVO pa);
@ -254,30 +216,20 @@ public interface ICuMemberAchieveService extends IService<CuMemberAchieve> {
List<RecommendTeamImagVO> selectRecommendTeamImage(PlacementDataParam param);
/*
* @description: 查询月统计数据，按照月倒叙
* @author: sui q
* @date: 2023/8/29 16:10
* @param: null null
* 查询月统计数据，按照月倒叙
**/
List<CuMemberAchieveExt> queryMemberMonthAchieve(Long pkMember, String month);
/*
* @description: 查询月统计数据，查询明细，安置伞下
* @author: sui q
* @date: 2023/9/6 21:12
* @param: null null
* 查询月统计数据，查询明细，安置伞下
**/
List<CuMemberAchieveExt> queryPlaceParentMemberMonthAchieve(MonthAchieveParam monthAchieveParam);
/*
* @description: 查询月统计数据，查询明细，安置伞下
* @author: sui q
* @date: 2023/9/6 21:12
* @param: null null
* 查询月统计数据，查询明细，安置伞下
**/
List<CuMemberAchieveExt> queryParentMemberMonthAchieve(MonthAchieveParam monthAchieveParam);
/**
* 根据实时小区业绩获取奖衔
*
@ -288,6 +240,4 @@ public interface ICuMemberAchieveService extends IService<CuMemberAchieve> {
*/
CuMemberAwardsUnderVO getPkAwardBySmallAchieve(Long pkMember, Integer pkCountry, boolean yesterdayFlag);
CuMemberAwardsUnderVO selectMemberAwardsCopy(Long pkId, Integer pkCountry, Map<Integer, BdAwards> awardsMap, BigDecimal rate);
}

35
hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberMonthRepurchaseService.java
View File

@ -1,35 +0,0 @@
package com.hzs.member.achieve.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.member.achieve.CuMemberMonthRepurchase;
import java.util.Date;
import java.util.List;
/**
* 会员每月复购业绩（S0使用） 服务类
*
* @author jiangchao
* @since 2024-09-19
*/
public interface ICuMemberMonthRepurchaseService extends IService<CuMemberMonthRepurchase> {
/**
* 批量处理
*
* @param startDate 开始时间
* @param endDate 结束时间
* @return
*/
int createMemberMonthBatch(Date startDate, Date endDate);
/**
* 查询会员月复购数据
*
* @param pkMember 会员ID
* @param startDate 开始时间 -- 非必传
* @return
*/
List<CuMemberMonthRepurchase> listMonthDataLis(Long pkMember, Date startDate);
}

7
hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberSettlePeriodService.java
View File

@ -17,18 +17,11 @@ public interface ICuMemberSettlePeriodService extends IService<CuMemberSettlePer
* 根据日期获得日期对应的期间
*
* @param date 日期 2023-02-02
* @return: CuMemberSettlePeriod
* @Author: sui q
* @Date: 2022/11/2 13:32
*/
CuMemberSettlePeriod getCuMemberSettlePeriodByDate(String date);
/**
* 根据国家查询奖金期数返回到前台
*
* @return: List<CuMemberSettlePeriod>
* @Author: sui q
* @Date: 2023/1/30 17:27
*/
List<CuMemberSettlePeriod> queryCuMemberSettlePeriod();

28
hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.member.achieve.CuMemberTree;
import com.hzs.common.domain.member.ext.CuMemberSettleExt;
import com.hzs.member.achieve.param.MemberParentCountParam;
import com.hzs.member.achieve.vo.CuMemberAwardsUnderVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -20,10 +21,6 @@ public interface ICuMemberTreeService extends IService<CuMemberTree> {
* 判断是否存在临时表
*
* @param tableName 表名
* @Description:
* @return: void
* @Author: sui q
* @Date: 2022/4/13 19:34
*/
Integer queryExistOracleTable(String tableName);
@ -32,9 +29,6 @@ public interface ICuMemberTreeService extends IService<CuMemberTree> {
*
* @param tableName 表名
* @param tableNameSeq 序列名
* @return: void
* @Author: sui q
* @Date: 2022/11/7 16:27
*/
void createCuMemberTableSequence(String tableName, String tableNameSeq);
@ -42,9 +36,6 @@ public interface ICuMemberTreeService extends IService<CuMemberTree> {
* 查询历史会员网体信息,查询某一天免考的会员
*
* @param tableName 结算表
* @return: List<CuMemberSettleExt>
* @Author: sui q
* @Date: 2022/11/8 18:44
*/
List<CuMemberSettleExt> queryExemptCuMemberSettle(String tableName);
@ -55,9 +46,6 @@ public interface ICuMemberTreeService extends IService<CuMemberTree> {
* @param placeDept 部门
* @param awardsValue 奖衔对应的值
* @param pkMember 会员
* @return: List<CuMemberSettleExt>
* @Author: sui q
* @Date: 2022/11/4 18:21
*/
Boolean queryCuMemberSettlePlaceUnderUmbrella(String settleTableName, Integer awardsValue, Integer placeDept, Long pkMember);
@ -66,9 +54,6 @@ public interface ICuMemberTreeService extends IService<CuMemberTree> {
*
* @param settleTableName 结算表
* @param pkMember 会员
* @return: List<CuMemberSettleExt>
* @Author: sui q
* @Date: 2022/11/4 18:21
*/
Boolean queryCuMemberSettleBloodUnderUmbrella(String settleTableName, Integer awardsValue, Integer placeDept, Long pkMember);
@ -184,4 +169,15 @@ public interface ICuMemberTreeService extends IService<CuMemberTree> {
* @return
*/
List<MemberParentCountParam> queryByMemberParentSettleSumPv(@Param("settleTableName") String settleTableName, @Param("memberIds") List<Long> memberIds);
/**
* 查询会员显示业绩
*
* @param settleTable
* @param pkMember
* @param monthTable
* @return
*/
CuMemberAwardsUnderVO queryMemberPv(String settleTable, Long pkMember, String monthTable);
}

94
hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java
View File

@ -424,56 +424,58 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
return cuMemberAwardsUnderVO;
}
@Override
public CuMemberAwardsUnderVO selectMemberAwardsCopy(Long pkMember, Integer pkCountry, Map<Integer, BdAwards> map, BigDecimal rate) {
//根据实时小区业绩获取奖衔
CuMemberAwardsUnderVO cuMemberAwardsUnderVO = getPkAwardBySmallAchieve(pkMember, pkCountry, true);
//根据国家获取奖衔配置信息
List<BdAwards> awardsList = cuMemberAwardsUnderVO.getAwardsList();
//获取当前会员的奖衔
Integer pkAwards = cuMemberAwardsUnderVO.getPkAwards();
//升序排序
awardsList.sort(Comparator.comparing(BdAwards::getAwardsValue));
Map<Integer, BdAwards> awardsMap = awardsList.stream().collect(Collectors.toMap(BdAwards::getAwardsValue, o -> o));
if (pkAwards != null) {
BdAwards bdAwards = map.get(pkAwards);
public CuMemberAwardsUnderVO indexMemberAwards(Long pkMember, Integer pkCountry) {
boolean hasSettle = false;
// 昨天结算表
String settleTable = null;
for (int i = 1; i <= 3; i++) {
// 昨天的日期（最多查3天的，如果3天内都没有结算数据则直接全部返回0）
String localDate = LocalDate.now().minus(i, ChronoUnit.DAYS).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
// 查询会员昨日业绩表
settleTable = TableNameConstants.CU_MEMBER_SETTLE + iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(localDate).getPkId();
Integer number = iCuMemberTreeService.queryExistOracleTable(settleTable);
if (null != number && number > 0) {
// 结算表存在
hasSettle = true;
break;
}
}
List<BdAwards> list = awardsList.stream().filter(a -> a.getAwardsValue() > bdAwards.getAwardsValue()).collect(Collectors.toList());
//当奖衔最大级别时，目标值-1
if (CollUtil.isNotEmpty(list)) {
BigDecimal targetPv = awardsMap.get(list.get(0).getAwardsValue()).getCommunityCheck();
cuMemberAwardsUnderVO.setTargetPv(targetPv.divide(new BigDecimal("10000")));
cuMemberAwardsUnderVO.setTarAwardsName(list.get(0).getAwardsName());
cuMemberAwardsUnderVO.setPkTransaction(list.get(0).getPkTransaction());
if (hasSettle) {
// 昨日业绩 -- 昨日结算表
// 历史业绩 -- 昨日结算表
// 当月业绩 -- 月业绩表
String month = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM"));
// 当月业绩表
String monthTable = TableNameConstants.CU_MEMBER_MONTH + month;
Integer number = iCuMemberTreeService.queryExistOracleTable(monthTable);
if (null == number || number == 0) {
// 月业绩表不存在
monthTable = null;
}
// 查询会员首页业绩显示
CuMemberAwardsUnderVO awardsUnderVO = iCuMemberTreeService.queryMemberPv(settleTable, pkMember, monthTable);
return CuMemberAwardsUnderVO.builder()
.aNewPv(null != awardsUnderVO.getANewPv() ? awardsUnderVO.getANewPv() : BigDecimal.ZERO)
.bNewPv(null != awardsUnderVO.getBNewPv() ? awardsUnderVO.getBNewPv() : BigDecimal.ZERO)
.aMonthPv(null != awardsUnderVO.getAMonthPv() ? awardsUnderVO.getAMonthPv() : BigDecimal.ZERO)
.bMonthPv(null != awardsUnderVO.getBMonthPv() ? awardsUnderVO.getBMonthPv() : BigDecimal.ZERO)
.aSumPv(null != awardsUnderVO.getASumPv() ? awardsUnderVO.getASumPv() : BigDecimal.ZERO)
.bSumPv(null != awardsUnderVO.getBSumPv() ? awardsUnderVO.getBSumPv() : BigDecimal.ZERO)
.build();
} else {
BigDecimal targetPv = new BigDecimal("-1");
cuMemberAwardsUnderVO.setTargetPv(targetPv);
return CuMemberAwardsUnderVO.builder()
.aNewPv(BigDecimal.ZERO)
.bNewPv(BigDecimal.ZERO)
.aMonthPv(BigDecimal.ZERO)
.bMonthPv(BigDecimal.ZERO)
.aSumPv(BigDecimal.ZERO)
.bSumPv(BigDecimal.ZERO)
.build();
}
//中国转汇率
if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) {
//根据国家查汇率
// BigDecimal rate = iCuMemberBaseService.getCurrency(pkCountry).getInExchangeRate();
cuMemberAwardsUnderVO.setPkAwards(pkAwards);
cuMemberAwardsUnderVO.setAwardsName(bdAwards.getAwardsName());
cuMemberAwardsUnderVO.setSumRealPv(cuMemberAwardsUnderVO.getSumRealPv().divide(new BigDecimal("10000")));
cuMemberAwardsUnderVO.setTargetPv(getBigDecimal(cuMemberAwardsUnderVO.getTargetPv()).multiply(rate));
cuMemberAwardsUnderVO.setSumRealPv(getBigDecimal(cuMemberAwardsUnderVO.getSumRealPv()).multiply(rate));
//左区累计业绩
BigDecimal aSumPv = cuMemberAwardsUnderVO.getASumPv().divide(new BigDecimal("10000"));
cuMemberAwardsUnderVO.setASumPv(getBigDecimal(aSumPv).multiply(rate));
//右区累计业绩
BigDecimal bSumPv = cuMemberAwardsUnderVO.getBSumPv().divide(new BigDecimal("10000"));
cuMemberAwardsUnderVO.setBSumPv(getBigDecimal(bSumPv).multiply(rate));
//左区新增业绩
BigDecimal aNewPv = cuMemberAwardsUnderVO.getANewPv().divide(new BigDecimal("10000"));
cuMemberAwardsUnderVO.setANewPv(getBigDecimal(aNewPv).multiply(rate));
//右区新增业绩
BigDecimal bNewPv = cuMemberAwardsUnderVO.getBNewPv().divide(new BigDecimal("10000"));
cuMemberAwardsUnderVO.setBNewPv(getBigDecimal(bNewPv).multiply(rate));
}
}
return cuMemberAwardsUnderVO;
}
/**

31
hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberMonthRepurchaseServiceImpl.java
View File

@ -1,31 +0,0 @@
package com.hzs.member.achieve.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.common.domain.member.achieve.CuMemberMonthRepurchase;
import com.hzs.member.achieve.mapper.CuMemberMonthRepurchaseMapper;
import com.hzs.member.achieve.service.ICuMemberMonthRepurchaseService;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
* 会员每月复购业绩（S0使用） 服务实现类
*
* @author jiangchao
* @since 2024-09-19
*/
@Service
public class CuMemberMonthRepurchaseServiceImpl extends ServiceImpl<CuMemberMonthRepurchaseMapper, CuMemberMonthRepurchase> implements ICuMemberMonthRepurchaseService {
@Override
public int createMemberMonthBatch(Date startDate, Date endDate) {
return baseMapper.createMemberMonthBatch(startDate, endDate);
}
@Override
public List<CuMemberMonthRepurchase> listMonthDataLis(Long pkMember, Date startDate) {
return baseMapper.listMonthDataLis(pkMember, startDate);
}
}

29
hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.hzs.member.achieve.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.common.core.constant.*;
@ -36,12 +37,12 @@ public class CuMemberSettlePeriodServiceImpl extends ServiceImpl<CuMemberSettleP
@Autowired
private RedisService redisService;
@Autowired
private ICuMemberSettlePeriodDetailService cuMemberSettlePeriodDetailService;
private ICuMemberSettlePeriodDetailService iCuMemberSettlePeriodDetailService;
@DubboReference
ICountryServiceApi countryServiceApi;
ICountryServiceApi iCountryServiceApi;
@DubboReference
ISystemConfigServiceApi systemConfigServiceApi;
ISystemConfigServiceApi iSystemConfigServiceApi;
@Override
@ -117,7 +118,7 @@ public class CuMemberSettlePeriodServiceImpl extends ServiceImpl<CuMemberSettleP
}
}
}
cuMemberSettlePeriodDetailService.saveBatch(cuMemberSettlePeriodDetailList);
iCuMemberSettlePeriodDetailService.saveBatch(cuMemberSettlePeriodDetailList);
cuMemberSettlePeriod = getCuMemberSettlePeriod(date);
} else {
return null;
@ -128,9 +129,9 @@ public class CuMemberSettlePeriodServiceImpl extends ServiceImpl<CuMemberSettleP
}
private void packageSettleCountry(List<Integer> weekSettleCountry, List<Integer> daySettleCountry) {
Map<Integer, BdCountry> allCountryMap = countryServiceApi.getAllCountryMap().getData();
Map<Integer, BdCountry> allCountryMap = iCountryServiceApi.getAllCountryMap().getData();
for (Integer pkCountry : allCountryMap.keySet()) {
String value = systemConfigServiceApi.getBonusSystemConfig(pkCountry, ESystemConfig.EXPAND_CAP_METHOD.getKey()).getData();
String value = iSystemConfigServiceApi.getBonusSystemConfig(pkCountry, ESystemConfig.EXPAND_CAP_METHOD.getKey()).getData();
// 周结
if (StringUtils.isNotEmpty(value) && Objects.equals(Integer.toString(EExpandCapMethod.WEEK_SETTLE.getValue()), value)) {
weekSettleCountry.add(pkCountry);
@ -141,8 +142,8 @@ public class CuMemberSettlePeriodServiceImpl extends ServiceImpl<CuMemberSettleP
}
private CuMemberSettlePeriod getCuMemberSettlePeriod(String date) {
QueryWrapper<CuMemberSettlePeriod> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("SETTLE_DATE", DateUtils.parseStringToDate(date));
LambdaQueryWrapper<CuMemberSettlePeriod> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CuMemberSettlePeriod::getSettleDate, DateUtils.parseStringToDate(date));
return baseMapper.selectOne(queryWrapper);
}
@ -153,9 +154,9 @@ public class CuMemberSettlePeriodServiceImpl extends ServiceImpl<CuMemberSettleP
* @param: null null
**/
private Map<String, CuMemberSettlePeriod> queryCuMemberSettlePeriod(Date startDate, Date endDate) {
QueryWrapper<CuMemberSettlePeriod> queryWrapper = new QueryWrapper<>();
queryWrapper.ge("SETTLE_DATE", startDate);
queryWrapper.le("SETTLE_DATE", endDate);
LambdaQueryWrapper<CuMemberSettlePeriod> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.ge(CuMemberSettlePeriod::getSettleDate, startDate);
queryWrapper.le(CuMemberSettlePeriod::getSettleDate, endDate);
List<CuMemberSettlePeriod> memberSettlePeriodList = baseMapper.selectList(queryWrapper);
Map<String, CuMemberSettlePeriod> cuMemberSettlePeriodMap = new HashMap<>();
memberSettlePeriodList.forEach(cuMemberSettlePeriod ->
@ -165,9 +166,9 @@ public class CuMemberSettlePeriodServiceImpl extends ServiceImpl<CuMemberSettleP
@Override
public List<CuMemberSettlePeriod> queryCuMemberSettlePeriod() {
QueryWrapper<CuMemberSettlePeriod> queryWrapper = new QueryWrapper<>();
queryWrapper.select("PK_ID,SETTLE_DATE");
queryWrapper.orderByDesc(SystemFieldConstants.PK_ID);
LambdaQueryWrapper<CuMemberSettlePeriod> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.select(CuMemberSettlePeriod::getPkId, CuMemberSettlePeriod::getSettleDate);
queryWrapper.orderByDesc(CuMemberSettlePeriod::getPkId);
return baseMapper.selectList(queryWrapper);
}

20
hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberTreeServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.hzs.common.domain.member.ext.CuMemberSettleExt;
import com.hzs.member.achieve.mapper.CuMemberTreeMapper;
import com.hzs.member.achieve.param.MemberParentCountParam;
import com.hzs.member.achieve.service.ICuMemberTreeService;
import com.hzs.member.achieve.vo.CuMemberAwardsUnderVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -19,16 +20,13 @@ import java.util.stream.Collectors;
/**
* 会员网体历史记录 服务实现类
*
* @author hzs
* @since 2022-10-31
*/
@Slf4j
@Service
public class CuMemberTreeServiceImpl extends ServiceImpl<CuMemberTreeMapper, CuMemberTree> implements ICuMemberTreeService {
@Autowired
private ICuMemberTreeService memberTreeService;
private ICuMemberTreeService iCuMemberTreeService;
@Override
public Integer queryExistOracleTable(String tableName) {
@ -81,9 +79,7 @@ public class CuMemberTreeServiceImpl extends ServiceImpl<CuMemberTreeMapper, CuM
@Override
public List<CuMemberSettleExt> queryCuMemberTreeParentTable(String settleTableName, Long pkMember, Integer level, List<Integer> vertexIdList) {
long b = System.currentTimeMillis();
System.out.println("开始时间：" + b);
List<CuMemberSettleExt> memberSettleExtList = baseMapper.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList);
System.out.println("结束时间：" + (System.currentTimeMillis() - b));
List<Long> ids = memberSettleExtList.stream().map(CuMemberTree::getPkMember).collect(Collectors.toList());
// 查询会员直推人数
List<MemberParentCountParam> memberParentCountParamList = new ArrayList<>();
@ -104,9 +100,9 @@ public class CuMemberTreeServiceImpl extends ServiceImpl<CuMemberTreeMapper, CuM
List<MemberParentCountParam> memberParentCountParamPvList = new ArrayList<>();
if (settleTableName.contains(TableNameConstants.CU_MEMBER_SECOND)) {
// 查询秒结表
memberParentCountParamPvList = memberTreeService.queryByMemberParentSumPv(settleTableName, ids);
memberParentCountParamPvList = iCuMemberTreeService.queryByMemberParentSumPv(settleTableName, ids);
} else {
memberParentCountParamPvList = memberTreeService.queryByMemberParentSettleSumPv(settleTableName, ids);
memberParentCountParamPvList = iCuMemberTreeService.queryByMemberParentSettleSumPv(settleTableName, ids);
}
Map<Long, BigDecimal> memberParentPvMap = memberParentCountParamPvList.stream().collect(Collectors.toMap(MemberParentCountParam::getPkMember, MemberParentCountParam::getParentMemberSumPv));
@ -210,7 +206,7 @@ public class CuMemberTreeServiceImpl extends ServiceImpl<CuMemberTreeMapper, CuM
//查询直推业绩
if (StringUtils.isNotBlank(settleTableName)) {
List<MemberParentCountParam> memberParentCountParamPvList = memberTreeService.queryByMemberParentSumPv(settleTableName, memberIds);
List<MemberParentCountParam> memberParentCountParamPvList = iCuMemberTreeService.queryByMemberParentSumPv(settleTableName, memberIds);
Map<Long, BigDecimal> memberParentPvMap = memberParentCountParamPvList.stream().collect(Collectors.toMap(MemberParentCountParam::getPkMember, MemberParentCountParam::getParentMemberSumPv));
cuMemberSettleExt.setHistoryPerformancePv(memberParentPvMap.getOrDefault(cuMemberSettleExt.getPkMember(), BigDecimal.ZERO));
}
@ -265,4 +261,10 @@ public class CuMemberTreeServiceImpl extends ServiceImpl<CuMemberTreeMapper, CuM
}
return memberParentCountParamList;
}
@Override
public CuMemberAwardsUnderVO queryMemberPv(String settleTable, Long pkMember, String monthTable) {
return baseMapper.queryMemberPv(settleTable, pkMember, monthTable);
}
}

87
hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/vo/CuMemberAwardsUnderVO.java
View File

@ -16,13 +16,7 @@ import java.math.BigDecimal;
import java.util.List;
/**
* 伞下奖衔VO
*
* @Description:
* @Author: ljc
* @Time: 2023/5/5 20:08
* @Classname: CuMemberAwardsUnderVO
* @Package_name: com.hzs.member.achieve.vo
* 首页业绩
*/
@Data
@Builder
@ -32,6 +26,16 @@ public class CuMemberAwardsUnderVO implements Serializable {
private static final long serialVersionUID = 1114852997109141640L;
/**
* 用户名
*/
private String memberName;
/**
* 用户头像
*/
private String memberPath;
/**
* A区累计真实业绩
*/
@ -50,15 +54,6 @@ public class CuMemberAwardsUnderVO implements Serializable {
@BigDecimalFormat()
private BigDecimal sumRealPv;
/**
* 用户名
*/
private String memberName;
/**
* 用户头像
*/
private String memberPath;
/**
* 目标业绩
@ -168,30 +163,6 @@ public class CuMemberAwardsUnderVO implements Serializable {
@BigDecimalFormat()
private BigDecimal bBalance;
/**
* A区累计业绩
*/
@BigDecimalFormat()
private BigDecimal aSumPv;
/**
* B区累计业绩
*/
@BigDecimalFormat()
private BigDecimal bSumPv;
/**
* A区新增业绩
*/
@BigDecimalFormat()
private BigDecimal aNewPv;
/**
* B区新增业绩
*/
@BigDecimalFormat()
private BigDecimal bNewPv;
/**
* 小区业绩
@ -202,6 +173,7 @@ public class CuMemberAwardsUnderVO implements Serializable {
/**
* 奖衔的配置信息
*/
@JsonIgnore
List<BdAwards> awardsList;
/**
@ -215,4 +187,39 @@ public class CuMemberAwardsUnderVO implements Serializable {
}
return memberName;
}
/**
* A区新增业绩 -- 昨日业绩
*/
@BigDecimalFormat
private BigDecimal aNewPv;
/**
* B区新增业绩 -- 昨日业绩
*/
@BigDecimalFormat
private BigDecimal bNewPv;
/**
* A区当月业绩
*/
@BigDecimalFormat
private BigDecimal aMonthPv;
/**
* B区当月业绩
*/
@BigDecimalFormat
private BigDecimal bMonthPv;
/**
* A区累计业绩 -- 历史业绩
*/
@BigDecimalFormat
private BigDecimal aSumPv;
/**
* B区累计业绩 -- 历史业绩
*/
@BigDecimalFormat
private BigDecimal bSumPv;
}

97
hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHomePageController.java
View File

@ -1,36 +1,25 @@
package com.hzs.member.base.controller.api;
import cn.hutool.core.collection.CollectionUtil;
import com.hzs.common.core.config.HzsConfig;
import com.hzs.common.core.enums.EAwards;
import com.hzs.common.core.enums.EEnv;
import com.hzs.common.core.enums.EOrderType;
import com.hzs.common.core.enums.EYesNo;
import com.hzs.common.core.utils.DateUtils;
import com.hzs.common.core.web.domain.AjaxResult;
import com.hzs.common.domain.member.achieve.CuMemberMonthRepurchase;
import com.hzs.common.domain.sale.order.SaOrder;
import com.hzs.common.domain.system.config.BdAwards;
import com.hzs.common.security.utils.SecurityUtils;
import com.hzs.member.achieve.service.ICuMemberAchieveService;
import com.hzs.member.achieve.service.ICuMemberMonthRepurchaseService;
import com.hzs.member.achieve.vo.CuMemberAwardsUnderVO;
import com.hzs.member.achieve.vo.CuMemberNewAddAchieveVO;
import com.hzs.member.base.dto.MemberYearAwardsDTO;
import com.hzs.member.base.service.ICuMemberService;
import com.hzs.sale.order.ISaOrderServiceApi;
import com.hzs.system.base.ICurrencyServiceApi;
import com.hzs.system.base.dto.CurrencyDTO;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
/**
* 会员首页
@ -52,13 +41,6 @@ public class ApiHomePageController {
private ICuMemberService iCuMemberService;
@Autowired
private ICuMemberAchieveService iCuMemberAchieveService;
@Autowired
private ICuMemberMonthRepurchaseService iCuMemberMonthRepurchaseService;
@DubboReference
ICurrencyServiceApi iCurrencyServiceApi;
@DubboReference
ISaOrderServiceApi iSaOrderServiceApi;
/**
* 新增业绩
@ -90,8 +72,8 @@ public class ApiHomePageController {
* @return AjaxResult
*/
@GetMapping("/index-member-awards")
public AjaxResult selectMemberAwards(Integer pkAwards) {
return AjaxResult.success(cuMemberAchieveService.selectMemberAwards(SecurityUtils.getUserId(), SecurityUtils.getPkCountry()));
public AjaxResult selectMemberAwards() {
return AjaxResult.success(cuMemberAchieveService.indexMemberAwards(SecurityUtils.getUserId(), SecurityUtils.getPkCountry()));
}
/**
@ -226,79 +208,4 @@ public class ApiHomePageController {
return yearMonthList;
}
/**
* 首页复购提示
*
* @return
*/
@GetMapping("/index_repurchase")
public AjaxResult indexRepurchase() {
// 所属国家
Integer pkCountry = SecurityUtils.getPkCountry();
// 会员ID
Long pkMember = SecurityUtils.getUserId();
// 等于当前月，查询实时数据
CuMemberAwardsUnderVO cuMemberAwardsUnderVO = iCuMemberAchieveService.getPkAwardBySmallAchieve(pkMember, pkCountry, false);
// 奖衔列表
List<BdAwards> awardsList = cuMemberAwardsUnderVO.getAwardsList();
for (BdAwards bdAwards : awardsList) {
if (bdAwards.getAwardsValue().equals(EAwards.MEMBER.getValue())
&& bdAwards.getPkId().equals(cuMemberAwardsUnderVO.getPkAwards())) {
// 当前是会员奖衔，需要提示信息
String resultStr = "连续12个月每月复购消费业绩满99PV，可获得价值1200元的产品礼包（S1或以上不参与该活动）";
Date nowDate = new Date();
// 查询复购业务
SaOrder saOrder = iSaOrderServiceApi.queryOrderAchieve(pkMember,
Arrays.asList(EOrderType.REPURCHASE_ORDER.getValue(), EOrderType.SPECIAL_REPURCHASE_ORDER.getValue()),
DateUtils.getFirstDayOfMonth(nowDate), DateUtils.getLastDayOfMonth(nowDate), pkCountry).getData();
if (null != saOrder && null != saOrder.getOrderAchieve() && saOrder.getOrderAchieve().compareTo(BigDecimal.ZERO) > 0) {
// 有数据，并且大于0
// 查询汇率
CurrencyDTO currencyDTO = iCurrencyServiceApi.getCurrency(pkCountry).getData();
// 实际业绩
BigDecimal orderAchieve = saOrder.getOrderAchieve().multiply(currencyDTO.getInExchangeRate()).setScale(2, BigDecimal.ROUND_HALF_UP);
resultStr += "，您本月复购消费业绩" + orderAchieve + "PV";
}
// 连续符合月份
Integer monthInt = this.indexRepurchaseMonth(pkMember, nowDate);
if (null != monthInt && monthInt != 0) {
resultStr += "，截止上月已经连续符合该标准" + monthInt + "个月";
}
return AjaxResult.success(resultStr);
}
}
return AjaxResult.success("");
}
/**
* 首页复购弹框提示
*
* @param pkMember 会员ID
* @param nowDate 当前时间
* @return
*/
private Integer indexRepurchaseMonth(Long pkMember, Date nowDate) {
if (null == nowDate) {
nowDate = new Date();
}
// 查询近11个月的复购统计数据
Date startDate = DateUtils.addMonths(nowDate, -11);
List<CuMemberMonthRepurchase> monthDataList = iCuMemberMonthRepurchaseService.listMonthDataLis(pkMember, startDate);
if (CollectionUtil.isNotEmpty(monthDataList)) {
List<String> monthList = monthDataList.stream().map(CuMemberMonthRepurchase::getStatisticsTime).collect(Collectors.toList());
for (int i = 1; i < 12; i++) {
if (!monthList.contains(DateUtils.parseDateToFormat(DateUtils.YYYYMM, DateUtils.addMonths(nowDate, -i)))) {
return i - 1;
}
}
}
return null;
}
}

68
hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAssessServiceImpl.java
View File

@ -39,32 +39,18 @@ import java.util.*;
@Service
public class CuMemberAssessServiceImpl extends ServiceImpl<CuMemberAssessMapper, CuMemberAssess> implements ICuMemberAssessService {
private ICuMemberTreeService cuMemberTreeService;
private ICuMemberSettlePeriodService cuMemberSettlePeriodService;
private ICuMemberAssessDetailService cuMemberAssessDetailService;
@Autowired
private ICuMemberTreeService iCuMemberTreeService;
@Autowired
private ICuMemberSettlePeriodService iCuMemberSettlePeriodService;
@Autowired
private ICuMemberAssessDetailService iCuMemberAssessDetailService;
@Autowired
private CuMemberBonusSettle cuMemberBonusSettle;
@DubboReference
IAwardsServiceApi awardsServiceApi;
IAwardsServiceApi iAwardsServiceApi;
@Autowired
public void setCuMemberAssessDetailService(ICuMemberAssessDetailService cuMemberAssessDetailService) {
this.cuMemberAssessDetailService = cuMemberAssessDetailService;
}
@Autowired
public void setCuMemberSettlePeriodService(ICuMemberSettlePeriodService cuMemberSettlePeriodService) {
this.cuMemberSettlePeriodService = cuMemberSettlePeriodService;
}
@Autowired
public void setCuMemberTreeService(ICuMemberTreeService cuMemberTreeService) {
this.cuMemberTreeService = cuMemberTreeService;
}
@Override
@Transactional(rollbackFor = Exception.class)
@ -81,18 +67,18 @@ public class CuMemberAssessServiceImpl extends ServiceImpl<CuMemberAssessMapper,
if (DateUtils.currentDay(currentDate) == 1) {
// 考核表
String tableName = TableNameConstants.CU_MEMBER_ASSESS + DateUtils.currentYear(currentDate);
Integer num = cuMemberTreeService.queryExistOracleTable(tableName);
Integer num = iCuMemberTreeService.queryExistOracleTable(tableName);
if (num == null || num <= 0) {
// 判断是否存在年表
baseMapper.createCuMemberAssessTable(tableName);
baseMapper.createCuMemberTableUniqueIndex(tableName);
cuMemberTreeService.createCuMemberTableSequence(tableName, TableNameConstants.CU_MEMBER_ASSESS_SEQ);
iCuMemberTreeService.createCuMemberTableSequence(tableName, TableNameConstants.CU_MEMBER_ASSESS_SEQ);
}
calculationCuMemberAssess(currentDate);
// String sourceTable = TableNameConstants.CU_MEMBER_SETTLE + period;
// 判断当前时间是月初第一天，需要初始化数据,判断表中是否有数据,没有数据可以进行初始化
// String assessDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, currentDate);
// period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(assessDate).getPkId();
// period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(assessDate).getPkId();
// num = baseMapper.queryCuMemberAssessCount(tableName, period);
// if (num == null || num <= 0) {
// // 初始化复购考核
@ -117,7 +103,7 @@ public class CuMemberAssessServiceImpl extends ServiceImpl<CuMemberAssessMapper,
// 考核日期不能跨越考核，只能当月考核，当月考核上月
if (DateUtils.currentDay(currentDate) == 1) {
String currentMonthFirstDate = DateUtils.currentMonthFirstDateStr(currentDate);
Integer currentPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(currentMonthFirstDate).getPkId();
Integer currentPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(currentMonthFirstDate).getPkId();
String currentTableName = TableNameConstants.CU_MEMBER_ASSESS + DateUtils.getYear(currentMonthFirstDate);
// 清空数据 根据期数清空cu_member_assess cu_member_assess_detail表数据
initCurrentAssess(currentDate, currentTableName, currentPeriod);
@ -131,7 +117,7 @@ public class CuMemberAssessServiceImpl extends ServiceImpl<CuMemberAssessMapper,
baseMapper.updateAssessPeriodExemptBalanceByUsed(currentTableName, currentPeriod);
// 2 需要扣除通过的，需要记录流水
// 记录流水，新增或修改
cuMemberAssessDetailService.updateCuMemberAssessDetailByPeriod(currentTableName, currentPeriod);
iCuMemberAssessDetailService.updateCuMemberAssessDetailByPeriod(currentTableName, currentPeriod);
baseMapper.updateAssessPeriodCheckBalanceByUsed(currentTableName, currentPeriod);
}
}
@ -222,17 +208,17 @@ public class CuMemberAssessServiceImpl extends ServiceImpl<CuMemberAssessMapper,
if (DateUtils.compareDateBefore(date, cuMemberAssessVO.getStartDate()) || DateUtils.compareDateEqual(date, cuMemberAssessVO.getStartDate())) {
//获取当前月第一天
Date date1 = DateUtils.currentMonthFirstDate(date);
period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date1)).getPkId();
} else {
Date date1 = DateUtils.currentMonthFirstDate(cuMemberAssessVO.getStartDate());
period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date1)).getPkId();
}
} else {
year = DateUtils.currentYear(date);
Date date1 = DateUtils.currentMonthFirstDate(date);
period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date1)).getPkId();
}
String tableName = TableNameConstants.CU_MEMBER_ASSESS + year;
@ -256,13 +242,13 @@ public class CuMemberAssessServiceImpl extends ServiceImpl<CuMemberAssessMapper,
@Transactional(rollbackFor = Exception.class)
public void retryCalculationAssess(Date currentDate, Boolean flag) {
String beforeDateStr = DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, currentDate);
Integer beforePeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(beforeDateStr).getPkId();
Integer currentPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, currentDate)).getPkId();
Integer beforePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(beforeDateStr).getPkId();
Integer currentPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, currentDate)).getPkId();
String beforeTableName = TableNameConstants.CU_MEMBER_SETTLE + beforePeriod;
// a)更新结算表会员前2部分会员免考状态 满足首次注册的会员 满足满足首次升级的会员
String tableName = TableNameConstants.CU_MEMBER_ASSESS + DateUtils.currentYear(currentDate);
String currentMonthFirstDateStr = DateUtils.currentMonthFirstDateStr(currentDate);
Integer monthFirstPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(currentMonthFirstDateStr).getPkId();
Integer monthFirstPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(currentMonthFirstDateStr).getPkId();
// 结算日期月份的第一天
Date startDate = DateUtils.beforeMonthFirstDate(currentDate);
// 结算日期后一天
@ -283,7 +269,7 @@ public class CuMemberAssessServiceImpl extends ServiceImpl<CuMemberAssessMapper,
// 查询出考核表免考的数据
List<CuMemberAssess> oldCuMemberAssessList = baseMapper.queryExemptAssessCuMember(tableName, monthFirstPeriod);
// b)查询前一天的会员免考记录，查询结算日会员免考记录
List<CuMemberSettleExt> oldCuMemberSettleExtList = cuMemberTreeService.queryExemptCuMemberSettle(beforeTableName);
List<CuMemberSettleExt> oldCuMemberSettleExtList = iCuMemberTreeService.queryExemptCuMemberSettle(beforeTableName);
// c)比较会员2天免考发生的状态，只需要计算变化的值，去掉没有发生变化的值
List<CuMemberSettleExt> newCuMemberSettleExtList = new ArrayList<>();
if (oldCuMemberAssessList.size() > 0 && oldCuMemberSettleExtList != null && oldCuMemberSettleExtList.size() > 0) {
@ -309,7 +295,7 @@ public class CuMemberAssessServiceImpl extends ServiceImpl<CuMemberAssessMapper,
if (newCuMemberSettleExtList.size() > 0) {
// 处理考核数据
// 记录流水，新增或修改
cuMemberAssessDetailService.insertCuMemberAssessDetailByPeriod(tableName, monthFirstPeriod, newCuMemberSettleExtList);
iCuMemberAssessDetailService.insertCuMemberAssessDetailByPeriod(tableName, monthFirstPeriod, newCuMemberSettleExtList);
List<List<?>> cutCuMemberSettleExtList = cuMemberBonusSettle.handleCutList(newCuMemberSettleExtList);
cutCuMemberSettleExtList.forEach(assessExtList ->
baseMapper.updateAssessPeriodCheckBalanceByTmp(tableName, monthFirstPeriod, assessExtList));
@ -392,7 +378,7 @@ public class CuMemberAssessServiceImpl extends ServiceImpl<CuMemberAssessMapper,
} else {
// 判断奖衔是否发生了变化，发生了变化需要修改目标值 免考的不变更目标值
if (!Objects.equals(cuMemberAssessExt.getPkOriginalAwards(), cuMemberAssessExt.getPkAwards())) {
BdAwards bdAwards = awardsServiceApi.getAwardsOne(cuMemberAssessExt.getPkAwards()).getData();
BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(cuMemberAssessExt.getPkAwards()).getData();
cuMemberAssessExt.setAssessTarget(EAssessmentType.REPURCHASE_ASSESS.getValue() == cuMemberAssessExt.getAssessType() ?
bdAwards.getPurchaseCheck() : bdAwards.getShareCheck());
}
@ -409,18 +395,18 @@ public class CuMemberAssessServiceImpl extends ServiceImpl<CuMemberAssessMapper,
});
// 将历史考核明细删除
if (revokeDetailList.size() > 0) {
cuMemberAssessDetailService.deleteCuMemberAssessDetailByList(revokeDetailList);
iCuMemberAssessDetailService.deleteCuMemberAssessDetailByList(revokeDetailList);
}
}
private void initCurrentAssess(Date currentDate, String currentTableName, Integer currentPeriod) {
// 获取上月最后一天
String beforeLastDate = DateUtils.beforeMonthLastDateStr(currentDate);
CuMemberSettlePeriod cuMemberSettlePeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(beforeLastDate);
CuMemberSettlePeriod cuMemberSettlePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(beforeLastDate);
int period = cuMemberSettlePeriod.getPkId();
String sourceTable = TableNameConstants.CU_MEMBER_SETTLE + period;
// 清空子表、主表数据
cuMemberAssessDetailService.deleteCuMemberAssessDetailByPeriod(currentTableName, currentPeriod);
iCuMemberAssessDetailService.deleteCuMemberAssessDetailByPeriod(currentTableName, currentPeriod);
// 初始化复购考核
String month = DateUtils.getMonth(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, currentDate));
// 结算日期后一天
@ -431,7 +417,7 @@ public class CuMemberAssessServiceImpl extends ServiceImpl<CuMemberAssessMapper,
// 上月第一天，上月最后一天
Date beforeFirstDate = DateUtils.beforeMonthFirstDate(currentDate);
Date currentFirstDate = DateUtils.currentMonthFirstDate(currentDate);
cuMemberAssessDetailService.insertCuMemberAssesDetailByOrder(currentTableName, currentPeriod, beforeFirstDate, currentFirstDate);
iCuMemberAssessDetailService.insertCuMemberAssesDetailByOrder(currentTableName, currentPeriod, beforeFirstDate, currentFirstDate);
}
/**
@ -455,7 +441,7 @@ public class CuMemberAssessServiceImpl extends ServiceImpl<CuMemberAssessMapper,
// 获取结算日上月最后一天，获取期间
Date beforeMonthFirstDate = DateUtils.beforeMonthFirstDate(currentDate);
String beforeMonthFirstDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, beforeMonthFirstDate);
Integer beforePeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(beforeMonthFirstDateStr).getPkId();
Integer beforePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(beforeMonthFirstDateStr).getPkId();
String beforeTableName = TableNameConstants.CU_MEMBER_ASSESS + DateUtils.getYear(beforeMonthFirstDateStr);
Date currentMonthFirstDate = DateUtils.currentMonthFirstDate(currentDate);
// 初始化复购考核的上月结余 // 更新当月结余
@ -491,7 +477,7 @@ public class CuMemberAssessServiceImpl extends ServiceImpl<CuMemberAssessMapper,
@Override
public List<CuMemberAssess> queryCuMemberAssTotal(String startDate, Integer pkCountry) {
int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDate).getPkId();
int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDate).getPkId();
String tableTable = TableNameConstants.CU_MEMBER_ASSESS + DateUtils.getYear(startDate);
return baseMapper.queryCuMemberAssTotal(tableTable, period, pkCountry);
}

74
hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml
View File

@ -73,80 +73,6 @@
<result column="ASSESS_STATUS" property="assessStatus"/>
</resultMap>
<sql id="CuMemberAchieveColumn">
pk_id
NUMBER(20) primary key,
period number(6) not null,
pk_member NUMBER(20) not null,
pk_rate NUMBER(6) not null,
a_balance NUMBER(17,6) default 0 not null,
b_balance NUMBER(17,6) default 0 not null,
a_sum_amount NUMBER(17,6) default 0 not null,
b_sum_amount NUMBER(17,6) default 0 not null,
a_sum_pv NUMBER(17,6) default 0 not null,
b_sum_pv NUMBER(17,6) default 0 not null,
a_new_amount NUMBER(17,6) default 0 not null,
b_new_amount NUMBER(17,6) default 0 not null,
a_new_pv NUMBER(17,6) default 0 not null,
b_new_pv NUMBER(17,6) default 0 not null,
a_sum_real_amount NUMBER(17,6) default 0 not null,
b_sum_real_amount NUMBER(17,6) default 0 not null,
a_sum_real_pv NUMBER(17,6) default 0 not null,
b_sum_real_pv NUMBER(17,6) default 0 not null,
rep_a_balance NUMBER(17,6) default 0 not null,
rep_b_balance NUMBER(17,6) default 0 not null,
rep_a_new_amount NUMBER(17,6) default 0 not null,
rep_b_new_amount NUMBER(17,6) default 0 not null,
rep_a_new_pv NUMBER(17,6) default 0 not null,
rep_b_new_pv NUMBER(17,6) default 0 not null,
rep_a_sum_amount NUMBER(17,6) default 0 not null,
rep_b_sum_amount NUMBER(17,6) default 0 not null,
rep_a_sum_pv NUMBER(17,6) default 0 not null,
rep_b_sum_pv NUMBER(17,6) default 0 not null,
register_amount NUMBER(17,6) default 0 not null,
register_pv NUMBER(17,6) default 0 not null,
register_new_amount NUMBER(17,6) default 0 not null,
register_new_pv NUMBER(17,6) default 0 not null,
upgrade_amount NUMBER(17,6) default 0 not null,
upgrade_pv NUMBER(17,6) default 0 not null,
upgrade_new_amount NUMBER(17,6) default 0 not null,
upgrade_new_pv NUMBER(17,6) default 0 not null,
repurchase_amount NUMBER(17,6) default 0 not null,
repurchase_pv NUMBER(17,6) default 0 not null,
repurchase_new_amount NUMBER(17,6) default 0 not null,
repurchase_new_pv NUMBER(17,6) default 0 not null,
hi_fun_amount NUMBER(17,6) default 0 not null,
hi_fun_pv NUMBER(17,6) default 0 not null,
hi_fun_new_amount NUMBER(17,6) default 0 not null,
hi_fun_new_pv NUMBER(17,6) default 0 not null,
mall_amount NUMBER(17,6) default 0 not null,
mall_pv NUMBER(17,6) default 0 not null,
mall_new_amount NUMBER(17,6) default 0 not null,
mall_new_pv NUMBER(17,6) default 0 not null,
REGISTER_Blo_NEW_PV NUMBER(17,6) default 0 not null,
UPGRADE_Blo_NEW_PV NUMBER(17,6) default 0 not null,
REPURCHASE_Blo_NEW_PV NUMBER(17,6) default 0 not null,
HI_FUN_Blo_NEW_PV NUMBER(17,6) default 0 not null,
MALL_Blo_NEW_PV NUMBER(17,6) default 0 not null,
r_a_balance NUMBER(17,6) default 0 not null,
r_b_balance NUMBER(17,6) default 0 not null,
r_a_sum_amount NUMBER(17,6) default 0 not null,
r_b_sum_amount NUMBER(17,6) default 0 not null,
r_a_sum_pv NUMBER(17,6) default 0 not null,
r_b_sum_pv NUMBER(17,6) default 0 not null,
r_a_sum_real_amount NUMBER(17,6) default 0 not null,
r_b_sum_real_amount NUMBER(17,6) default 0 not null,
r_a_sum_real_pv NUMBER(17,6) default 0 not null,
r_b_sum_real_pv NUMBER(17,6) default 0 not null,
r_rep_a_balance NUMBER(17,6) default 0 not null,
r_rep_b_balance NUMBER(17,6) default 0 not null,
r_rep_a_sum_amount NUMBER(17,6) default 0 not null,
r_rep_b_sum_amount NUMBER(17,6) default 0 not null,
r_rep_a_sum_pv NUMBER(17,6) default 0 not null,
r_rep_b_sum_pv NUMBER(17,6) default 0 not null,
pk_country NUMBER(6) not null
</sql>
<select id="queryCuMemberAchieveByPkMember" resultMap="CuMemberAchieve">
SELECT PK_MEMBER,
PK_RATE,

49
hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberMonthRepurchaseMapper.xml
View File

@ -1,49 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzs.member.achieve.mapper.CuMemberMonthRepurchaseMapper">
<!-- 批量处理 -->
<update id="createMemberMonthBatch">
merge into CU_MEMBER_MONTH_REPURCHASE cmmr
using (select to_char(#{startDate}, 'yyyymm') STATISTICS_TIME,
cm.pk_id PK_MEMBER,
sum(nvl(so.order_achieve, 0)) REP_ACHIEVE
from cu_member cm
left join sa_order so
on so.pk_member = cm.pk_id
and so.del_flag = 0
and so.order_type in (3, 12, 14, 18, 19, 22, 26, 28, 31)
and so.pay_time >= #{startDate}
and #{endDate} >= so.pay_time
and so.order_status = 1
where cm.del_flag = 0
and cm.pk_settle_country = 1
and cm.category = 0
and cm.pk_awards = 1
and so.order_achieve != 0
group by cm.pk_id) tmp
on (tmp.STATISTICS_TIME = cmmr.STATISTICS_TIME and tmp.PK_MEMBER = cmmr.PK_MEMBER)
when matched then
update set cmmr.REP_ACHIEVE = tmp.REP_ACHIEVE
when not matched then
insert
(PK_ID, STATISTICS_TIME, PK_MEMBER, REP_ACHIEVE)
values (CU_MEMBER_MONTH_REPURCHASE_SEQ.Nextval,
tmp.STATISTICS_TIME,
tmp.PK_MEMBER,
tmp.REP_ACHIEVE)
</update>
<!-- 查询会员月复购数据 -->
<select id="listMonthDataLis" resultType="com.hzs.common.domain.member.achieve.CuMemberMonthRepurchase">
select *
from CU_MEMBER_MONTH_REPURCHASE cmmr
where cmmr.del_flag = 0
and cmmr.pk_member = #{pkMember}
<if test="startDate != null">
and cmmr.statistics_time >= to_char(#{startDate}, 'yyyymm')
</if>
order by cmmr.statistics_time desc
</select>
</mapper>

48
hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml
View File

@ -90,7 +90,6 @@
<result column="b_new_box" property="bNewBox"/>
<result column="a_sum_box" property="aSumBox"/>
<result column="b_sum_box" property="bSumBox"/>
<result column="ASSESS_TYPE" property="assessType"/>
<result column="PK_ORDER" property="pkOrder"/>
<result column="LEVEL" property="level"/>
@ -143,6 +142,7 @@
<include refid="CuMemberSettleDetailColumn"></include>,
<include refid="CuMemberBackColumn"></include>
</sql>
<sql id="CuMemberSettleDetailColumn">
pk_rate
NUMBER(6) ,
@ -199,6 +199,7 @@
round NUMBER(6) default 0 not null,
second NUMBER(4) default 1 not null
</sql>
<sql id="CuMemberBackColumn">
r_a_balance
NUMBER(17,6) default 0 not null,
@ -218,6 +219,7 @@
r_rep_a_sum_pv NUMBER(17,6) default 0 not null,
r_rep_b_sum_pv NUMBER(17,6) default 0 not null
</sql>
<sql id="CuMemberTableTrig">
CREATE
OR REPLACE TRIGGER
@ -258,6 +260,7 @@
END IF;
END;
</sql>
<sql id="QueryMemberParent">
<foreach collection="pkMemberList" item="item" open=" " close=" " separator=" union ">
select pk_member,pk_parent,member_code,member_name,pk_awards,account_status,
@ -312,6 +315,7 @@
on a.pk_awards = ba.pk_id
where ba.awards_value >= (select awards_value from bd_awards where pk_id = #{awardsValue}))
</select>
<select id="queryExemptCuMemberSettle" resultMap="CuMemberSettleExt">
select pk_member, 0 assess_type
from ${tableName}
@ -342,12 +346,10 @@
<if test="tableName != null and tableName != ''">
left join ${tableName} t on cm.PK_ID = t.PK_MEMBER
</if>
where cm.PK_ID = #{pkMember}
and cm.DEL_FLAG = 0
</select>
<select id="queryCuMemberTreeParentTable" resultMap="CuMemberSettleExt">
select
<if test="tableName != null and tableName != ''">
@ -407,7 +409,6 @@
cm.PK_SETTLE_COUNTRY,
cm.PK_VERTEX ,cm.NICK_NAME
from CU_MEMBER cm
where 1 = 1
<if test="level != null">
and level &lt; #{level}
@ -438,7 +439,6 @@
where cm.PK_PARENT = #{pkMember}
</select>
<select id="queryCuMemberTreePlaceParentHistoryTable" resultMap="CuMemberSettleExt">
select
<if test="tableName != null and tableName != ''">
@ -463,7 +463,6 @@
#{item}
</foreach>
</if>
start with cm.PK_PLACE_PARENT = #{pkMember}
connect by cm.PK_PLACE_PARENT = prior cm.pk_id
order by cm.Place_Dept ASC
@ -475,7 +474,8 @@
t.REP_A_BALANCE,t.REP_B_BALANCE,t.REP_A_NEW_AMOUNT,t.REP_B_NEW_AMOUNT,t.REP_A_NEW_PV,t.REP_B_NEW_PV,t.REP_A_SUM_AMOUNT,
t.REP_B_SUM_AMOUNT,t.REP_A_SUM_PV,t.REP_B_SUM_PV,t.REGISTER_AMOUNT,t.REGISTER_PV,t.REGISTER_NEW_PV,t.UPGRADE_AMOUNT,t.UPGRADE_PV,
t.UPGRADE_NEW_PV,t.REPURCHASE_AMOUNT,t.REPURCHASE_PV,t.REPURCHASE_NEW_PV,t.HI_FUN_AMOUNT,t.HI_FUN_PV,t.HI_FUN_NEW_PV,t.MALL_AMOUNT,
t.MALL_PV ,t.MALL_NEW_PV,t.MIN_ACHIEVE,t.ROUND,t.SECOND, t.a_new_box, t.b_new_box, t.a_sum_box, t.b_sum_box, level,cm.PK_AWARDS,cm.PK_SETTLE_COUNTRY,
t.MALL_PV ,t.MALL_NEW_PV,t.MIN_ACHIEVE,t.ROUND,t.SECOND, t.a_new_box, t.b_new_box, t.a_sum_box, t.b_sum_box,
level,cm.PK_AWARDS,cm.PK_SETTLE_COUNTRY,
cm.PK_PLACE_PARENT,cm.PK_PARENT ,cm.PLACE_DEPT ,cm.MEMBER_NAME, cm.MEMBER_CODE,cm.PK_ID
PK_MEMBER,cm.PK_COUNTRY,cme.MEMBER_CODE parentMemberCode,
cm.PK_VERTEX ,cm.NICK_NAME
@ -490,14 +490,12 @@
#{item}
</foreach>
</if>
start
with cm.PK_PLACE_PARENT = #{pkMember}
connect by cm.PK_PLACE_PARENT = prior cm.PK_ID
order by cm.PLACE_DEPT
</select>
<select id="selectByTreeMemberListFive" resultMap="CuMemberSettleExt">
select level,cm.PK_AWARDS,cm.PK_SETTLE_COUNTRY,
cm.PK_PLACE_PARENT,cm.PK_PARENT ,cm.PLACE_DEPT ,cm.MEMBER_NAME, cm.MEMBER_CODE,cm.PK_ID
@ -512,7 +510,6 @@
#{item}
</foreach>
</if>
start
with cm.PK_PLACE_PARENT = #{pkMember}
connect by cm.PK_PLACE_PARENT = prior cm.PK_ID
@ -555,11 +552,10 @@
<if test="tableName != null and tableName != ''">
left join ${tableName} t on cm.PK_ID = t.PK_MEMBER
</if>
where cm.PK_ID = #{pkMember}
and cm.DEL_FLAG = 0
</select>
<select id="queryByMemberParentCount" resultType="com.hzs.member.achieve.param.MemberParentCountParam">
select count(cr.pk_id) parentMemberCount,cr.PK_PARENT pkMember from CU_MEMBER cr where cr.PK_PARENT in
@ -584,8 +580,6 @@
left join CU_MEMBER cm on cm.PK_ID = cr.PK_MEMBER
where cm.del_flag = 0 and
cm.PK_PARENT in
<trim suffixOverrides=" OR cm.PK_PARENT IN()"> <!-- 表示删除最后一个条件 -->
<foreach collection="memberIds" item="Id" index="index" open="(" close=")">
<if test="index != 0">
@ -597,11 +591,9 @@
#{Id}
</foreach>
</trim>
group by cm.PK_PARENT
</select>
<select id="queryCuMemberTreePlaceParentHistoryFramework" resultMap="CuMemberSettleExt">
select
t.PK_RATE,t.A_BALANCE,t.B_BALANCE,t.A_SUM_AMOUNT,t.B_SUM_AMOUNT,t.A_SUM_PV,t.B_SUM_PV,t.A_NEW_AMOUNT,
@ -627,7 +619,6 @@
order by cm.Place_Dept ASC
</select>
<select id="queryByMemberParentAndMemberSettleCount"
resultType="com.hzs.member.achieve.param.MemberParentCountParam">
select count(cr.PK_MEMBER) parentMemberCount,cr.PK_PARENT pkMember from ${settleTableName} cr where cr.PK_PARENT
@ -649,7 +640,6 @@
<select id="queryByMemberParentSettleSumPv" resultType="com.hzs.member.achieve.param.MemberParentCountParam">
select sum(cr.REGISTER_PV + cr.UPGRADE_PV + cr.REPURCHASE_PV + cr.HI_FUN_PV + cr.MALL_PV)
parentMemberSumPv,cr.PK_PARENT pkMember from ${tableName} cr
where cr.PK_PARENT in
<foreach collection="memberIds" item="item" open="(" close=")" separator=",">
#{item}
@ -657,4 +647,26 @@
group by cr.PK_PARENT
</select>
<!-- 查询会员显示业绩 -->
<select id="queryMemberPv" resultType="com.hzs.member.achieve.vo.CuMemberAwardsUnderVO">
select a.*
<if test="monthTable != null and monthTable != ''">
, b.a_sum_pv aMonthPv, b.b_sum_pv bMonthPv
</if>
from (select
cms.pk_member,
cms.a_sum_pv,
cms.b_sum_pv,
cms.a_new_pv + cms.rep_a_new_pv a_new_pv,
cms.b_new_pv + cms.rep_b_new_pv b_new_pv
from ${settleTable} cms
where cms.pk_member = #{pkMember}) a
<if test="monthTable != null and monthTable != ''">
left join (select cmm.pk_member, cmm.a_sum_pv, cmm.b_sum_pv
from ${monthTable} cmm
where cmm.pk_member = #{pkMember}) b
on a.pk_member = b.pk_member
</if>
</select>
</mapper>

36
hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderMapper.java
View File

@ -290,26 +290,6 @@ public interface SaOrderMapper extends BaseMapper<SaOrder> {
List<SaOrder> selectCancelableOrder(@Param("pkCountry") Integer pkCountry, @Param("data") String data, @Param("orderType") Integer orderType);
/**
* 统计用户pv
*
* @param startPayDate 开始支付时间
* @param endPayDate 结束支付时间
* @param memberId 会员id
* @return
*/
BigDecimal selectBySumPv(@Param("startPayDate") Date startPayDate, @Param("endPayDate") Date endPayDate, @Param("memberId") Long memberId);
/**
* 统计用户金额
*
* @param startPayDate 开始支付时间
* @param endPayDate 结束支付时间
* @param memberId 会员id
* @return
*/
BigDecimal selectBySumAmount(@Param("startPayDate") Date startPayDate, @Param("endPayDate") Date endPayDate, @Param("memberId") Long memberId);
/**
* 查询订单类型
*
@ -489,22 +469,6 @@ public interface SaOrderMapper extends BaseMapper<SaOrder> {
@Param("orderTypeList") List<Integer> orderTypeList,
@Param("waresCodeList") List<String> waresCodeList);
/**
* 查询指定订单业绩
*
* @param pkMember 会员编号
* @param orderTypeList 订单类型 -- 非必传
* @param startDate 开始时间 -- 非必传
* @param endDate 结束时间 -- 非必传
* @param pkCountry 所属国家
* @return
*/
SaOrder queryOrderAchieve(@Param("pkMember") Long pkMember,
@Param("orderTypeList") List<Integer> orderTypeList,
@Param("startDate") Date startDate,
@Param("endDate") Date endDate,
@Param("pkCountry") Integer pkCountry);
/**
* 根据主键列表更新订单明细，删除部分退的订单
*

29
hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java
View File

@ -15,7 +15,6 @@ import com.hzs.common.domain.sale.ext.SaOrderExt;
import com.hzs.common.domain.sale.ext.SaOrderItemsExt;
import com.hzs.common.domain.sale.order.SaOrder;
import com.hzs.common.domain.sale.order.SaOrderItems;
import com.hzs.common.util.TransactionUtils;
import com.hzs.sale.order.ISaOrderServiceApi;
import com.hzs.sale.order.dto.*;
import com.hzs.sale.order.param.*;
@ -175,10 +174,6 @@ public class SaOrderServiceProvider implements ISaOrderServiceApi {
/**
* @description: 自助服务-修改收货地址
* @author: zhang jing
* @date: 2023/4/18 17:26
* @param: [saOrder]
* @return: com.hzs.common.core.domain.R<java.lang.Boolean>
**/
@Override
public R<Boolean> updateOrder(SaOrder saOrder) {
@ -207,10 +202,6 @@ public class SaOrderServiceProvider implements ISaOrderServiceApi {
/**
* @description: 根据订单类型查询当天已支付订单信息
* @author: zhang jing
* @date: 2023/5/17 17:12
* @param: [orderType]
* @return: com.hzs.common.core.domain.R<java.util.List < java.lang.Long>>
**/
@Override
public R<List<SaOrder>> querySaOrderByOrderType(String payTime) {
@ -252,7 +243,6 @@ public class SaOrderServiceProvider implements ISaOrderServiceApi {
return R.ok(saOrderService.selectDirectPushAchieve(BeanUtil.copyProperties(orderGoals, OrderGoalsParam.class)));
}
/**
* 查询推荐人数(个人目标)
*
@ -264,7 +254,6 @@ public class SaOrderServiceProvider implements ISaOrderServiceApi {
return R.ok(saOrderService.selectRecommendNumber(BeanUtil.copyProperties(orderGoals, OrderGoalsParam.class)));
}
/**
* 查询创客空间(个人目标)
*
@ -276,7 +265,6 @@ public class SaOrderServiceProvider implements ISaOrderServiceApi {
return R.ok(saOrderService.selectMakerSpace(BeanUtil.copyProperties(orderGoals, OrderGoalsParam.class)));
}
/**
* 查询超级工作室(个人目标)
*
@ -300,10 +288,6 @@ public class SaOrderServiceProvider implements ISaOrderServiceApi {
/**
* @description: 自助服务-修改收货地址订单列表
* @author: zhang jing
* @date: 2023/11/15 17:24
* @param: [param, memberId, pkCountry]
* @return: com.hzs.common.core.domain.R<java.util.List < com.hzs.common.domain.sale.ext.SaOrderExt>>
**/
@Override
public R<List<SaOrderExt>> selfAddressOrderList(String orderCode, Integer editType, Long memberId, Integer pkCountry) {
@ -315,10 +299,6 @@ public class SaOrderServiceProvider implements ISaOrderServiceApi {
/**
* @description: 查询邮费
* @author: zhang jing
* @date: 2023/11/16 11:05
* @param: [orderParamDto]
* @return: com.hzs.common.core.domain.R<com.hzs.sale.order.dto.OrderParamDTO>
**/
@Override
public R<OrderParamDTO> queryPostageByParam(OrderParamDTO orderParamDto) {
@ -382,13 +362,4 @@ public class SaOrderServiceProvider implements ISaOrderServiceApi {
return singleItemStatVoList.stream().map(a -> BeanUtil.copyProperties(a, SingleItemStatDTO.class)).collect(Collectors.toList());
}
@Override
public R<SaOrder> queryOrderAchieve(Long pkMember, List<Integer> orderTypeList, Date startDate, Date endDate, Integer pkCountry) {
try {
return R.ok(saOrderService.queryOrderAchieve(pkMember, orderTypeList, startDate, endDate, pkCountry));
} catch (Exception e) {
return R.fail(e.getMessage());
}
}
}

33
hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java
View File

@ -757,26 +757,6 @@ public interface ISaOrderService extends IService<SaOrder> {
*/
void closeOrder();
/**
* 统计用户pv
*
* @param startPayDate 开始支付时间
* @param endPayDate 结束支付时间
* @param memberId 会员id
* @return
*/
BigDecimal selectBySumPv(Date startPayDate, Date endPayDate, Long memberId);
/**
* 统计用户金额
*
* @param startPayDate 开始支付时间
* @param endPayDate 结束支付时间
* @param memberId 会员id
* @return
*/
BigDecimal selectBySumAmount(Date startPayDate, Date endPayDate, Long memberId);
/**
* 查询订单类型
*
@ -936,17 +916,4 @@ public interface ISaOrderService extends IService<SaOrder> {
*/
List<SingleItemStatVo> singleItemStat(SingleItemStatParam singleItemStatParam);
/**
* 查询指定订单业绩
*
* @param pkMember 会员编号
* @param orderTypeList 订单类型 -- 非必传
* @param startDate 开始时间 -- 非必传
* @param endDate 结束时间 -- 非必传
* @param pkCountry 所属国家
* @return
*/
SaOrder queryOrderAchieve(Long pkMember, List<Integer> orderTypeList,
Date startDate, Date endDate, Integer pkCountry);
}

31
hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
View File

@ -2515,32 +2515,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
}
}
/**
* 统计用户pv
*
* @param startPayDate 开始支付时间
* @param endPayDate 结束支付时间
* @param memberId 会员id
* @return
*/
@Override
public BigDecimal selectBySumPv(Date startPayDate, Date endPayDate, Long memberId) {
return baseMapper.selectBySumPv(startPayDate, endPayDate, memberId);
}
/**
* 统计用户金额
*
* @param startPayDate 开始支付时间
* @param endPayDate 结束支付时间
* @param memberId 会员id
* @return
*/
@Override
public BigDecimal selectBySumAmount(Date startPayDate, Date endPayDate, Long memberId) {
return baseMapper.selectBySumAmount(startPayDate, endPayDate, memberId);
}
/**
* @description: 查询当天已支付订单信息
* @author: zhang jing
@ -2987,11 +2961,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
return baseMapper.singleItemStat(singleItemStatParam);
}
@Override
public SaOrder queryOrderAchieve(Long pkMember, List<Integer> orderTypeList, Date startDate, Date endDate, Integer pkCountry) {
return baseMapper.queryOrderAchieve(pkMember, orderTypeList, startDate, endDate, pkCountry);
}
/**
* 注册、升级处理乐学法宝券
*

42
hzs-business/hzs-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml
View File

@ -1243,26 +1243,6 @@
and ORDER_TYPE = #{orderType}
</select>
<select id="selectBySumPv" resultType="decimal">
select nvl(sum(so.ORDER_ACHIEVE), 0)
from SA_ORDER so
where so.PK_MEMBER = #{memberId}
and so.PAY_TIME &gt;= #{startPayDate}
and so.PAY_TIME &lt;= #{endPayDate}
and so.ORDER_STATUS = '1'
and so.DEL_FLAG = '0'
</select>
<select id="selectBySumAmount" resultType="decimal">
select nvl(sum(so.ORDER_AMOUNT), 0)
from SA_ORDER so
where so.PK_MEMBER = #{memberId}
and so.PAY_TIME &gt;= #{startPayDate}
and so.PAY_TIME &lt;= #{endPayDate}
and so.ORDER_STATUS = '1'
and so.DEL_FLAG = '0'
</select>
<!-- 自助服务可申请订单列表 -->
<select id="selfOrderList" resultType="com.hzs.common.domain.sale.ext.SaOrderExt">
@ -2062,26 +2042,4 @@
order by pay_time
</select>
<!-- 查询指定订单业绩 -->
<select id="queryOrderAchieve" resultType="com.hzs.common.domain.sale.order.SaOrder">
select nvl(sum(so.order_achieve), 0) order_achieve
from sa_order so
where so.del_flag = 0
and so.order_status = 1
and so.pk_country = #{pkCountry}
and so.pk_member = #{pkMember}
<if test="orderTypeList != null and orderTypeList.size > 0">
and so.order_type in
<foreach collection="orderTypeList" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="startDate != null">
and so.pay_time >= #{startDate}
</if>
<if test="endDate != null">
and #{endDate} >= so.pay_time
</if>
</select>
</mapper>

54
hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberMonthRepurchase.java
View File

@ -1,54 +0,0 @@
package com.hzs.common.domain.member.achieve;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import com.hzs.common.core.web.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* 会员每月复购业绩（S0使用）
*
* @author jiangchao
* @since 2024-09-19
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@KeySequence("CU_MEMBER_MONTH_REPURCHASE_SEQ")
@TableName("CU_MEMBER_MONTH_REPURCHASE")
public class CuMemberMonthRepurchase extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@TableId("PK_ID")
private Long pkId;
/**
* 统计时间（年月）
*/
@TableField("STATISTICS_TIME")
private String statisticsTime;
/**
* 会员ID
*/
@TableField("PK_MEMBER")
private Long pkMember;
/**
* 复购业绩
*/
@TableField("REP_ACHIEVE")
private BigDecimal repAchieve;
}

22
hzs-third/src/main/java/com/hzs/third/job/MemberJob.java
View File

@ -4,7 +4,6 @@ import com.hzs.common.core.constant.CountryConstants;
import com.hzs.common.core.constant.MagicNumberConstants;
import com.hzs.common.core.domain.R;
import com.hzs.common.core.utils.DateUtils;
import com.hzs.member.achieve.IMemberAchieveServiceApi;
import com.hzs.member.base.IMemberServiceApi;
import com.hzs.member.statis.ICuBonusStatisServiceApi;
import com.hzs.member.statis.ICuBonusVertexStatisServiceApi;
@ -18,14 +17,6 @@ import org.springframework.stereotype.Component;
import java.time.temporal.ChronoUnit;
import java.util.Date;
/**
* @BelongsProject: hzs_cloud
* @BelongsPackage: com.hzs.third.job
* @Author: yh
* @CreateTime: 2023-04-27 09:31
* @Description:
* @Version: 1.0
*/
@ConditionalOnProperty(name = "xxl-job.start", havingValue = "true")
@Component
@Slf4j
@ -39,8 +30,6 @@ public class MemberJob {
ICuBonusVertexStatisServiceApi iCuBonusVertexStatisServiceApi;
@DubboReference
IBdBarCodeServiceApi iBdBarCodeServiceApi;
@DubboReference
IMemberAchieveServiceApi iMemberAchieveServiceApi;
/**
* 定时统计奖金拨比
@ -154,15 +143,4 @@ public class MemberJob {
iBdBarCodeServiceApi.updatWarehouseLog();
}
/**
* 处理会员月复购业绩统计
*/
@XxlJob("handleMemberMonthRepurchaseJob")
public void handleMemberMonthRepurchaseJob() {
R<?> resultR = iMemberAchieveServiceApi.handleMemberMonthRepurchase(null);
if (!resultR.isSuccess()) {
log.error("处理会员月复购业绩统计异常: {}", resultR.getMsg());
}
}
}