diff --git a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/achieve/IMemberAchieveServiceApi.java b/hzs-api/hzs-api-member/src/main/java/com/hzs/member/achieve/IMemberAchieveServiceApi.java index 926e1428..aa48d6ec 100644 --- a/hzs-api/hzs-api-member/src/main/java/com/hzs/member/achieve/IMemberAchieveServiceApi.java +++ b/hzs-api/hzs-api-member/src/main/java/com/hzs/member/achieve/IMemberAchieveServiceApi.java @@ -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 queryCuMemberAchieveByPkMember(CuMember cuMember, Boolean isFirst, Boolean isFirstAchieve); - /** - * 处理会员月复购业绩统计 - * - * @param date 统计时间（传入则会统计传入时间月份，如果不传入则为当前时间减一个月） - * @return - */ - R handleMemberMonthRepurchase(Date date); - } diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java b/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java index 8596efed..6d169af5 100644 --- a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java +++ b/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java @@ -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> - * @Author: sui q - * @Date: 2022/11/2 16:30 */ R> listSaOrderByDay(Date startDate, Date endDate, String orderCode); @@ -39,33 +32,21 @@ public interface ISaOrderServiceApi { * * @param startDate 开始日期 * @param endDate 结束日期 - * @return: R> - * @Author: sui q - * @Date: 2022/11/2 16:30 */ R> queryRepeatSaOrderByDay(Date startDate, Date endDate); /* * @description: 根据主键查询订单,需要查询del_flag=1的，存在先撤单在退货 - * @author: sui q - * @date: 2024/3/26 13:54 - * @param: null null **/ R querySaOrderExtByPkId(Long pkId); /* * @description: 查询订单编号 - * @author: sui q - * @date: 2023/7/31 16:48 - * @param: null null **/ R querySaOrderByDay(Date startDate, Date endDate, String orderCode); /* * @description: 根据发货单查询销售订单 - * @author: sui q - * @date: 2023/11/30 10:58 - * @param: null null **/ R> querySaOrderByDeliverList(List deliverItemExtList); @@ -74,9 +55,6 @@ public interface ISaOrderServiceApi { * * @param startDate 开始日期 * @param endDate 结束日期 - * @return: R> - * @Author: sui q - * @Date: 2022/11/2 16:30 */ R> querySaOrderByDayForCloud(Date startDate, Date endDate); @@ -88,18 +66,12 @@ public interface ISaOrderServiceApi { * @param orderTypeList 订单类型 * @param orderAmount 订单金额 * @param orderAchieve 订单业绩 - * @return: List - * @Author: sui q - * @Date: 2023/1/5 13:57 */ R> querySaOrderByTimeForCouponShare(Date startDate, Date endDate, List orderTypeList, BigDecimal orderAmount, BigDecimal orderAchieve, Integer pkCountry); /* * @description: 计算店铺奖金，查询订单 - * @author: sui q - * @date: 2023/5/8 15:45 - * @param: null null **/ R> querySaOrderByTimeForStore(Date startDate, Date endDate); @@ -117,9 +89,6 @@ public interface ISaOrderServiceApi { * * @param pkMember 会员主键 * @param orderCode 订单编号 - * @return: R - * @Author: sui q - * @Date: 2023/3/15 17:39 */ R querySaOrderByOrderCode(Long pkMember, String orderCode); @@ -137,9 +106,6 @@ public interface ISaOrderServiceApi { * * @param pkMember 订单编号 * @param orderCode 订单编号 - * @return: R - * @Author: sui q - * @Date: 2023/3/22 17:14 */ R 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> **/ R> querySaOrderByOrderType(String payTime); @@ -244,9 +206,6 @@ public interface ISaOrderServiceApi { /* * @description: 查询订单某段时间累计金额，累计业绩 - * @author: sui q - * @date: 2023/7/3 14:50 - * @param: null null **/ R 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> **/ R> 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 **/ R queryPostageByParam(OrderParamDTO orderParam); @@ -310,17 +261,4 @@ public interface ISaOrderServiceApi { */ List singleItemStat(SingleItemStatParamDTO singleItemStatParamDTO); - /** - * 查询指定订单业绩 - * - * @param pkMember 会员编号 - * @param orderTypeList 订单类型 -- 非必传 - * @param startDate 开始时间 -- 非必传 - * @param endDate 结束时间 -- 非必传 - * @param pkCountry 所属国家 - * @return - */ - R queryOrderAchieve(Long pkMember, List orderTypeList, - Date startDate, Date endDate, Integer pkCountry); - } diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberAchieveMapper.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberAchieveMapper.java index 3cda4e74..f77b6f28 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberAchieveMapper.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberAchieveMapper.java @@ -28,9 +28,6 @@ public interface CuMemberAchieveMapper extends BaseMapper { * @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 { 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 { /** * @description: 月度业绩-左右区人数详情(最新) - * @author: zhang jing - * @date: 2023/9/28 11:38 - * @param: [pna] - * @return: java.util.List **/ List placeNewAddAchieveDetails(PlaceNewAddAchieveVO pna); /** * @description: 月度业绩-左右区人数详情(历史) - * @author: zhang jing - * @date: 2023/11/29 11:47 - * @param: [pna] - * @return: java.util.List **/ List placeNewAddAchieveHistoryDetails(PlaceNewAddAchieveVO pna); /** * @description: 月度业绩-左右区业绩详情 - * @author: zhang jing - * @date: 2023/11/30 9:18 - * @param: [pna] - * @return: java.util.List **/ List leftRightAchieveDetails(PlaceNewAddAchieveVO pna); /** * @description: 月度业绩-左右区血缘业绩详情 - * @author: zhang jing - * @date: 2023/11/30 11:25 - * @param: [pna] - * @return: java.util.List **/ List leftRightDirectAchieveDetails(PlaceNewAddAchieveVO pna); /** * @description: 月度业绩-查询血缘业绩详情 - * @author: zhang jing - * @date: 2023/11/30 14:15 - * @param: [pna] - * @return: java.util.List **/ List 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 selectABCoun(PlaceNewAddAchieveVO pna); /** * @description: 查询最新月份左右区人数 - * @author: zhang jing - * @date: 2023/9/10 17:51 - * @param: [pna] - * @return: com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO **/ List 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 **/ List selectParentCounAchieve(ParentAchieveVO pav); /** * @description: 查询本人直推业绩 - * @author: zhang jing - * @date: 2023/5/23 19:29 - * @param: [pav] - * @return: java.util.List **/ List selfParentCounAchieve(ParentAchieveVO pav); /** * @description: 查询前10直推业绩 - * @author: zhang jing - * @date: 2023/5/23 19:31 - * @param: [pav] - * @return: java.util.List **/ List parentCounAchieveTop(ParentAchieveVO pav); /** * @description: 直推业绩前十人伞下等级业绩 - * @author: zhang jing - * @date: 2023/5/31 19:56 - * @param: [pav] - * @return: java.util.List **/ List umbrellaAchieveTop(ParentAchieveVO pav); @@ -298,25 +239,16 @@ public interface CuMemberAchieveMapper extends BaseMapper { /* * @description: 查询月统计数据，按照月倒叙 - * @author: sui q - * @date: 2023/8/29 16:10 - * @param: null null **/ List queryMemberMonthAchieve(@Param("pkMember") Long pkMember, @Param("monthList") List monthList); /* * @description: 查询月统计数据，查询明细，安置伞下 - * @author: sui q - * @date: 2023/9/6 21:12 - * @param: null null **/ List queryPlaceParentMemberMonthAchieve(MonthAchieveParam monthAchieveParam); /* * @description: 查询月统计数据，查询明细，安置伞下 - * @author: sui q - * @date: 2023/9/6 21:12 - * @param: null null **/ List queryParentMemberMonthAchieve(MonthAchieveParam monthAchieveParam); } diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberMonthRepurchaseMapper.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberMonthRepurchaseMapper.java deleted file mode 100644 index 1de30f07..00000000 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberMonthRepurchaseMapper.java +++ /dev/null @@ -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 { - - /** - * 批量处理 - * - * @param startDate 开始时间 - * @param endDate 结束时间 - * @return - */ - int createMemberMonthBatch(@Param("startDate") Date startDate, @Param("endDate") Date endDate); - - /** - * 查询会员月复购数据 - * - * @param pkMember 会员ID - * @param startDate 开始时间 -- 非必传 - * @return - */ - List listMonthDataLis(@Param("pkMember") Long pkMember, @Param("startDate") Date startDate); - -} diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberTreeMapper.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberTreeMapper.java index 7cfaa279..ee554987 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberTreeMapper.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberTreeMapper.java @@ -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 { * * @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 { * 判断是否存在临时表 * * @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 { * 查询历史会员网体信息,查询某一天免考的会员 * * @param tableName 结算表 - * @return: List - * @Author: sui q - * @Date: 2022/11/8 18:44 */ List queryExemptCuMemberSettle(String tableName); @@ -55,9 +46,6 @@ public interface CuMemberTreeMapper extends BaseMapper { * @param awardsValue 验证等级对应的值 * @param placeDept 部门 * @param pkMember 会员 - * @return: List - * @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 { * * @param settleTableName 结算表 * @param pkMember 会员 - * @return: List - * @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 { */ List selectByTreeMemberListFive(@Param("pkMember") Long pkMember, @Param("level") Integer level, @Param("vertexIdList") List vertexIdList); + /** + * 查询会员显示业绩 + * + * @param settleTable + * @param pkMember + * @param monthTable + * @return + */ + CuMemberAwardsUnderVO queryMemberPv(@Param("settleTable") String settleTable, + @Param("pkMember") Long pkMember, + @Param("monthTable") String monthTable); + } diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/provider/MemberAchieveServiceProvider.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/provider/MemberAchieveServiceProvider.java index 3b9411ec..c753e583 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/provider/MemberAchieveServiceProvider.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/provider/MemberAchieveServiceProvider.java @@ -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 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()); - } - } - } diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberAchieveService.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberAchieveService.java index 2049fa0c..a763fb04 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberAchieveService.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberAchieveService.java @@ -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 { * * @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 { * 会员端新增业绩 * * @param cuMemberNewAddAchieveVO 端新增业绩 - * @return List */ List selectNewAddAchieve(CuMemberNewAddAchieveVO cuMemberNewAddAchieveVO); @@ -89,6 +74,15 @@ public interface ICuMemberAchieveService extends IService { */ 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 { /** * @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 { /** * @description: 月度业绩-左右区人数详情(最新) - * @author: zhang jing - * @date: 2023/9/28 11:38 - * @param: [pna] - * @return: java.util.List **/ List placeNewAddAchieveDetails(PlaceNewAddAchieveVO pna); /** * @description: 月度业绩-左右区人数详情(历史) - * @author: zhang jing - * @date: 2023/9/28 11:38 - * @param: [pna] - * @return: java.util.List **/ List placeNewAddAchieveHistoryDetails(PlaceNewAddAchieveVO pna); /** * @description:月度业绩-左右区业绩详情 - * @author: zhang jing - * @date: 2023/11/30 9:17 - * @param: [pna] - * @return: java.util.List **/ List leftRightAchieveDetails(PlaceNewAddAchieveVO pna); /** * @description:月度业绩-左右区血缘业绩详情 - * @author: zhang jing - * @date: 2023/11/30 11:15 - * @param: [pna] - * @return: java.util.List **/ List leftRightDirectAchieveDetails(PlaceNewAddAchieveVO pna); /** * @description:月度业绩-查询血缘业绩详情 - * @author: zhang jing - * @date: 2023/11/30 14:13 - * @param: [pna] - * @return: java.util.List **/ List 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 **/ List parentAchieveLeft(ParentAchieveVO pa); @@ -254,30 +216,20 @@ public interface ICuMemberAchieveService extends IService { List selectRecommendTeamImage(PlacementDataParam param); /* - * @description: 查询月统计数据，按照月倒叙 - * @author: sui q - * @date: 2023/8/29 16:10 - * @param: null null + * 查询月统计数据，按照月倒叙 **/ List queryMemberMonthAchieve(Long pkMember, String month); /* - * @description: 查询月统计数据，查询明细，安置伞下 - * @author: sui q - * @date: 2023/9/6 21:12 - * @param: null null + * 查询月统计数据，查询明细，安置伞下 **/ List queryPlaceParentMemberMonthAchieve(MonthAchieveParam monthAchieveParam); /* - * @description: 查询月统计数据，查询明细，安置伞下 - * @author: sui q - * @date: 2023/9/6 21:12 - * @param: null null + * 查询月统计数据，查询明细，安置伞下 **/ List queryParentMemberMonthAchieve(MonthAchieveParam monthAchieveParam); - /** * 根据实时小区业绩获取奖衔 * @@ -288,6 +240,4 @@ public interface ICuMemberAchieveService extends IService { */ CuMemberAwardsUnderVO getPkAwardBySmallAchieve(Long pkMember, Integer pkCountry, boolean yesterdayFlag); - - CuMemberAwardsUnderVO selectMemberAwardsCopy(Long pkId, Integer pkCountry, Map awardsMap, BigDecimal rate); } diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberMonthRepurchaseService.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberMonthRepurchaseService.java deleted file mode 100644 index f225c8cc..00000000 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberMonthRepurchaseService.java +++ /dev/null @@ -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 { - - /** - * 批量处理 - * - * @param startDate 开始时间 - * @param endDate 结束时间 - * @return - */ - int createMemberMonthBatch(Date startDate, Date endDate); - - /** - * 查询会员月复购数据 - * - * @param pkMember 会员ID - * @param startDate 开始时间 -- 非必传 - * @return - */ - List listMonthDataLis(Long pkMember, Date startDate); - -} diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberSettlePeriodService.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberSettlePeriodService.java index ec1ebd79..9fbb3232 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberSettlePeriodService.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberSettlePeriodService.java @@ -17,18 +17,11 @@ public interface ICuMemberSettlePeriodService extends IService - * @Author: sui q - * @Date: 2023/1/30 17:27 */ List queryCuMemberSettlePeriod(); diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java index 57129bf5..6af166bd 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberTreeService.java @@ -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 { * 判断是否存在临时表 * * @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 { * * @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 { * 查询历史会员网体信息,查询某一天免考的会员 * * @param tableName 结算表 - * @return: List - * @Author: sui q - * @Date: 2022/11/8 18:44 */ List queryExemptCuMemberSettle(String tableName); @@ -55,9 +46,6 @@ public interface ICuMemberTreeService extends IService { * @param placeDept 部门 * @param awardsValue 奖衔对应的值 * @param pkMember 会员 - * @return: List - * @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 { * * @param settleTableName 结算表 * @param pkMember 会员 - * @return: List - * @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 { * @return */ List queryByMemberParentSettleSumPv(@Param("settleTableName") String settleTableName, @Param("memberIds") List memberIds); + + /** + * 查询会员显示业绩 + * + * @param settleTable + * @param pkMember + * @param monthTable + * @return + */ + CuMemberAwardsUnderVO queryMemberPv(String settleTable, Long pkMember, String monthTable); + } diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java index 292010ec..f0bb63d3 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java @@ -424,56 +424,58 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl map, BigDecimal rate) { - //根据实时小区业绩获取奖衔 - CuMemberAwardsUnderVO cuMemberAwardsUnderVO = getPkAwardBySmallAchieve(pkMember, pkCountry, true); - //根据国家获取奖衔配置信息 - List awardsList = cuMemberAwardsUnderVO.getAwardsList(); - //获取当前会员的奖衔 - Integer pkAwards = cuMemberAwardsUnderVO.getPkAwards(); - //升序排序 - awardsList.sort(Comparator.comparing(BdAwards::getAwardsValue)); - Map awardsMap = awardsList.stream().collect(Collectors.toMap(BdAwards::getAwardsValue, o -> o)); - if (pkAwards != null) { - BdAwards bdAwards = map.get(pkAwards); - List 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()); - } else { - BigDecimal targetPv = new BigDecimal("-1"); - cuMemberAwardsUnderVO.setTargetPv(targetPv); - } - //中国转汇率 - 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)); + @Override + 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; } } - return cuMemberAwardsUnderVO; + 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 { + return CuMemberAwardsUnderVO.builder() + .aNewPv(BigDecimal.ZERO) + .bNewPv(BigDecimal.ZERO) + .aMonthPv(BigDecimal.ZERO) + .bMonthPv(BigDecimal.ZERO) + .aSumPv(BigDecimal.ZERO) + .bSumPv(BigDecimal.ZERO) + .build(); + } } /** diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberMonthRepurchaseServiceImpl.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberMonthRepurchaseServiceImpl.java deleted file mode 100644 index 5a3f317e..00000000 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberMonthRepurchaseServiceImpl.java +++ /dev/null @@ -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 implements ICuMemberMonthRepurchaseService { - - @Override - public int createMemberMonthBatch(Date startDate, Date endDate) { - return baseMapper.createMemberMonthBatch(startDate, endDate); - } - - @Override - public List listMonthDataLis(Long pkMember, Date startDate) { - return baseMapper.listMonthDataLis(pkMember, startDate); - } - -} diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java index 0274f337..31388d63 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java @@ -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 weekSettleCountry, List daySettleCountry) { - Map allCountryMap = countryServiceApi.getAllCountryMap().getData(); + Map 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 queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("SETTLE_DATE", DateUtils.parseStringToDate(date)); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CuMemberSettlePeriod::getSettleDate, DateUtils.parseStringToDate(date)); return baseMapper.selectOne(queryWrapper); } @@ -153,9 +154,9 @@ public class CuMemberSettlePeriodServiceImpl extends ServiceImpl queryCuMemberSettlePeriod(Date startDate, Date endDate) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ge("SETTLE_DATE", startDate); - queryWrapper.le("SETTLE_DATE", endDate); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.ge(CuMemberSettlePeriod::getSettleDate, startDate); + queryWrapper.le(CuMemberSettlePeriod::getSettleDate, endDate); List memberSettlePeriodList = baseMapper.selectList(queryWrapper); Map cuMemberSettlePeriodMap = new HashMap<>(); memberSettlePeriodList.forEach(cuMemberSettlePeriod -> @@ -165,9 +166,9 @@ public class CuMemberSettlePeriodServiceImpl extends ServiceImpl queryCuMemberSettlePeriod() { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select("PK_ID,SETTLE_DATE"); - queryWrapper.orderByDesc(SystemFieldConstants.PK_ID); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.select(CuMemberSettlePeriod::getPkId, CuMemberSettlePeriod::getSettleDate); + queryWrapper.orderByDesc(CuMemberSettlePeriod::getPkId); return baseMapper.selectList(queryWrapper); } diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberTreeServiceImpl.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberTreeServiceImpl.java index 8ace7995..861d9a6a 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberTreeServiceImpl.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberTreeServiceImpl.java @@ -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 implements ICuMemberTreeService { @Autowired - private ICuMemberTreeService memberTreeService; + private ICuMemberTreeService iCuMemberTreeService; @Override public Integer queryExistOracleTable(String tableName) { @@ -81,9 +79,7 @@ public class CuMemberTreeServiceImpl extends ServiceImpl queryCuMemberTreeParentTable(String settleTableName, Long pkMember, Integer level, List vertexIdList) { long b = System.currentTimeMillis(); - System.out.println("开始时间：" + b); List memberSettleExtList = baseMapper.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); - System.out.println("结束时间：" + (System.currentTimeMillis() - b)); List ids = memberSettleExtList.stream().map(CuMemberTree::getPkMember).collect(Collectors.toList()); // 查询会员直推人数 List memberParentCountParamList = new ArrayList<>(); @@ -104,9 +100,9 @@ public class CuMemberTreeServiceImpl extends ServiceImpl 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 memberParentPvMap = memberParentCountParamPvList.stream().collect(Collectors.toMap(MemberParentCountParam::getPkMember, MemberParentCountParam::getParentMemberSumPv)); @@ -210,7 +206,7 @@ public class CuMemberTreeServiceImpl extends ServiceImpl memberParentCountParamPvList = memberTreeService.queryByMemberParentSumPv(settleTableName, memberIds); + List memberParentCountParamPvList = iCuMemberTreeService.queryByMemberParentSumPv(settleTableName, memberIds); Map 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 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; + } diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHomePageController.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHomePageController.java index 8eee03e0..a104f290 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHomePageController.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/api/ApiHomePageController.java @@ -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 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 monthDataList = iCuMemberMonthRepurchaseService.listMonthDataLis(pkMember, startDate); - if (CollectionUtil.isNotEmpty(monthDataList)) { - List 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; - } - } diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAssessServiceImpl.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAssessServiceImpl.java index 92b2b7c7..fded2da8 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAssessServiceImpl.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberAssessServiceImpl.java @@ -39,32 +39,18 @@ import java.util.*; @Service public class CuMemberAssessServiceImpl extends ServiceImpl 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 oldCuMemberAssessList = baseMapper.queryExemptAssessCuMember(tableName, monthFirstPeriod); // b)查询前一天的会员免考记录，查询结算日会员免考记录 - List oldCuMemberSettleExtList = cuMemberTreeService.queryExemptCuMemberSettle(beforeTableName); + List oldCuMemberSettleExtList = iCuMemberTreeService.queryExemptCuMemberSettle(beforeTableName); // c)比较会员2天免考发生的状态，只需要计算变化的值，去掉没有发生变化的值 List newCuMemberSettleExtList = new ArrayList<>(); if (oldCuMemberAssessList.size() > 0 && oldCuMemberSettleExtList != null && oldCuMemberSettleExtList.size() > 0) { @@ -309,7 +295,7 @@ public class CuMemberAssessServiceImpl extends ServiceImpl 0) { // 处理考核数据 // 记录流水，新增或修改 - cuMemberAssessDetailService.insertCuMemberAssessDetailByPeriod(tableName, monthFirstPeriod, newCuMemberSettleExtList); + iCuMemberAssessDetailService.insertCuMemberAssessDetailByPeriod(tableName, monthFirstPeriod, newCuMemberSettleExtList); List> cutCuMemberSettleExtList = cuMemberBonusSettle.handleCutList(newCuMemberSettleExtList); cutCuMemberSettleExtList.forEach(assessExtList -> baseMapper.updateAssessPeriodCheckBalanceByTmp(tableName, monthFirstPeriod, assessExtList)); @@ -392,7 +378,7 @@ public class CuMemberAssessServiceImpl extends ServiceImpl 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 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); } diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml b/hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml index a5d858ed..430caae8 100644 --- a/hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml +++ b/hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml @@ -73,80 +73,6 @@ - - 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 - - - select * - from CU_MEMBER_MONTH_REPURCHASE cmmr - where cmmr.del_flag = 0 - and cmmr.pk_member = #{pkMember} - - and cmmr.statistics_time >= to_char(#{startDate}, 'yyyymm') - - order by cmmr.statistics_time desc - - - diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml b/hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml index c388c80c..bb252022 100644 --- a/hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml +++ b/hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml @@ -90,7 +90,6 @@ - @@ -143,6 +142,7 @@ , + pk_rate NUMBER(6) , @@ -199,6 +199,7 @@ round NUMBER(6) default 0 not null, second NUMBER(4) default 1 not null + 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 + CREATE OR REPLACE TRIGGER @@ -258,6 +260,7 @@ END IF; END; + 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 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 #{item} @@ -657,4 +647,26 @@ group by cr.PK_PARENT + + + diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderMapper.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderMapper.java index 6bf03bb7..87db6dc2 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderMapper.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderMapper.java @@ -290,26 +290,6 @@ public interface SaOrderMapper extends BaseMapper { List 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 { @Param("orderTypeList") List orderTypeList, @Param("waresCodeList") List waresCodeList); - /** - * 查询指定订单业绩 - * - * @param pkMember 会员编号 - * @param orderTypeList 订单类型 -- 非必传 - * @param startDate 开始时间 -- 非必传 - * @param endDate 结束时间 -- 非必传 - * @param pkCountry 所属国家 - * @return - */ - SaOrder queryOrderAchieve(@Param("pkMember") Long pkMember, - @Param("orderTypeList") List orderTypeList, - @Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("pkCountry") Integer pkCountry); - /** * 根据主键列表更新订单明细，删除部分退的订单 * diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java index 15bb8a41..9f559ee9 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java @@ -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 **/ @Override public R 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> **/ @Override public R> 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> **/ @Override public R> 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 **/ @Override public R 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 queryOrderAchieve(Long pkMember, List 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()); - } - } - } diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java index e6cbac5e..892d867a 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java @@ -757,26 +757,6 @@ public interface ISaOrderService extends IService { */ 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 { */ List singleItemStat(SingleItemStatParam singleItemStatParam); - /** - * 查询指定订单业绩 - * - * @param pkMember 会员编号 - * @param orderTypeList 订单类型 -- 非必传 - * @param startDate 开始时间 -- 非必传 - * @param endDate 结束时间 -- 非必传 - * @param pkCountry 所属国家 - * @return - */ - SaOrder queryOrderAchieve(Long pkMember, List orderTypeList, - Date startDate, Date endDate, Integer pkCountry); - } diff --git a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index ab4f9ebe..beeb34cf 100644 --- a/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -2515,32 +2515,6 @@ public class SaOrderServiceImpl extends ServiceImpl 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 impl return baseMapper.singleItemStat(singleItemStatParam); } - @Override - public SaOrder queryOrderAchieve(Long pkMember, List orderTypeList, Date startDate, Date endDate, Integer pkCountry) { - return baseMapper.queryOrderAchieve(pkMember, orderTypeList, startDate, endDate, pkCountry); - } - /** * 注册、升级处理乐学法宝券 * diff --git a/hzs-business/hzs-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml b/hzs-business/hzs-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml index cca94d8e..1e92ac07 100644 --- a/hzs-business/hzs-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml +++ b/hzs-business/hzs-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml @@ -1243,26 +1243,6 @@ and ORDER_TYPE = #{orderType} - - - - - - - diff --git a/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberMonthRepurchase.java b/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberMonthRepurchase.java deleted file mode 100644 index 40072926..00000000 --- a/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberMonthRepurchase.java +++ /dev/null @@ -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; - - -} diff --git a/hzs-third/src/main/java/com/hzs/third/job/MemberJob.java b/hzs-third/src/main/java/com/hzs/third/job/MemberJob.java index 2b9ac256..fe008481 100644 --- a/hzs-third/src/main/java/com/hzs/third/job/MemberJob.java +++ b/hzs-third/src/main/java/com/hzs/third/job/MemberJob.java @@ -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()); - } - } - }