From ed4bc6be19581f6ff6785c0881eb2e5470b29312 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Sat, 17 May 2025 10:38:51 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=8B=A8=E6=AF=94=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4=EF=BC=9B=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E7=9B=AE=E6=A0=87=E7=9B=B8=E5=85=B3=E5=86=85?= =?UTF-8?q?=E5=AE=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/account/IMemberJobServiceApi.java | 28 +- .../system/config/IBdBarCodeServiceApi.java | 29 -- .../provider/IMemberJobServiceProvider.java | 60 +--- .../mapper/CuPersonalGoalsClassifyMapper.java | 6 - .../mapper/CuPersonalGoalsDetailMapper.java | 8 - .../mapper/CuPersonalGoalsMeetingMapper.java | 6 - .../CuPersonalGoalsMonthRecordMapper.java | 9 +- .../CuPersonalGoalsWeekRecordMapper.java | 7 - .../ICuPersonalGoalsClassifyService.java | 7 +- .../ICuPersonalGoalsDetailService.java | 10 +- .../ICuPersonalGoalsMeetingService.java | 6 - .../ICuPersonalGoalsMonthRecordService.java | 9 +- .../service/ICuPersonalGoalsService.java | 15 - .../ICuPersonalGoalsWeekRecordService.java | 7 - .../CuPersonalGoalsClassifyServiceImpl.java | 17 +- .../CuPersonalGoalsDetailServiceImpl.java | 13 +- .../CuPersonalGoalsMeetingServiceImpl.java | 13 +- ...CuPersonalGoalsMonthRecordServiceImpl.java | 10 +- .../impl/CuPersonalGoalsServiceImpl.java | 314 +----------------- .../CuPersonalGoalsWeekRecordServiceImpl.java | 6 - .../goals/vo/CuPersonalGoalsDetailVO.java | 6 +- .../manager/CuBonusStatisController.java | 6 +- .../ICuBonusStatisServiceProvider.java | 8 +- .../impl/CuBonusStatisServiceImpl.java | 15 +- .../impl/CuBonusVertexStatisServiceImpl.java | 31 +- .../goals/CuPersonalGoalsClassifyMapper.xml | 25 -- .../goals/CuPersonalGoalsDetailMapper.xml | 11 - .../goals/CuPersonalGoalsMeetingMapper.xml | 32 -- .../CuPersonalGoalsMonthRecordMapper.xml | 64 ++-- .../goals/CuPersonalGoalsWeekRecordMapper.xml | 62 ++-- .../member/statis/CuBonusStatisMapper.xml | 44 +-- .../statis/CuBonusVertexStatisMapper.xml | 57 ++-- .../system/config/mapper/BdBarCodeMapper.java | 12 - .../system/config/param/BdBarCodeParam.java | 86 ----- .../provider/BdBarCodeServiceProvider.java | 39 --- .../config/service/IBdBarCodeService.java | 34 +- .../service/impl/BdBarCodeServiceImpl.java | 57 +--- .../mapper/system/config/BdBarCodeMapper.xml | 20 -- .../domain/member/goals/CuPersonalGoals.java | 6 - .../member/goals/CuPersonalGoalsClassify.java | 5 - .../member/goals/CuPersonalGoalsDetail.java | 7 +- .../member/goals/CuPersonalGoalsMeeting.java | 7 +- .../goals/CuPersonalGoalsMonthRecord.java | 5 - .../goals/CuPersonalGoalsWeekRecord.java | 6 - .../member/statis/CuBonusVertexStatis.java | 7 - .../domain/system/config/BdBarCode.java | 8 - .../java/com/hzs/third/job/CuMemberJob.java | 25 +- .../java/com/hzs/third/job/MemberJob.java | 12 - 48 files changed, 164 insertions(+), 1113 deletions(-) delete mode 100644 bd-api/bd-api-system/src/main/java/com/hzs/system/config/IBdBarCodeServiceApi.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/config/param/BdBarCodeParam.java delete mode 100644 bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/BdBarCodeServiceProvider.java diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java index 6f74a69c..f7831622 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java @@ -7,48 +7,29 @@ import java.util.Date; /** * 会员模块定时任务 - * - * @Description: - * @Author: ljc - * @Time: 2023/4/12 10:38 - * @Classname: IMemberJobServiceApi - * @Package_name: com.hzs.member.account */ public interface IMemberJobServiceApi { + /** * 定时插入账户详情数据 * * @return */ - R insertAccountDetail(); - + R insertAccountDetail(); /** * 自动提现 * * @return */ - R automaticWithdrawal(); - + R automaticWithdrawal(); /** * 每月月初定时删除上上个月的数据 * * @return Integer */ - R deleteAccountDetailByMonth(); - - - /** - * 插入个人目标周历史记录表 - */ - R saveGoalsWeekRecord(); - - - /** - * 插入个人目标月历史记录表(每月月初执行) - */ - R saveGoalsMonthRecord(); + R deleteAccountDetailByMonth(); /** * 查询充值金额总和 @@ -58,4 +39,5 @@ public interface IMemberJobServiceApi { * @return R */ R selectRechargeTotalAmount(Date startDate, Date endDate); + } diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IBdBarCodeServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IBdBarCodeServiceApi.java deleted file mode 100644 index 60bfe927..00000000 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IBdBarCodeServiceApi.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hzs.system.config; - -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.system.config.BdAwards; -import com.hzs.common.domain.system.config.ext.BdAwardsExt; - -import java.util.List; -import java.util.Map; - -/** - * @description: 根据国家查询奖衔配置列表api - * @author: zhang jing - * @date: 2022/9/29 15:31 - * @param: - * @return: - **/ -public interface IBdBarCodeServiceApi { - - /** - * @description: 定时初始化条形码配置 - * @author: zhang jing - * @date: 2024/5/8 11:19 - * @param: [] - * @return: com.hzs.common.core.domain.R - **/ - R updatWarehouseLog(); - - -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberJobServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberJobServiceProvider.java index 115eef1f..84f68b10 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberJobServiceProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberJobServiceProvider.java @@ -6,7 +6,6 @@ import com.hzs.member.account.IMemberJobServiceApi; import com.hzs.member.account.service.ICuMemberAccountDetailService; import com.hzs.member.account.service.ICuMemberRechargeService; import com.hzs.member.account.service.ICuMemberWithdrawService; -import com.hzs.member.goals.service.ICuPersonalGoalsService; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; @@ -15,34 +14,22 @@ import java.util.Date; /** * 会员模块定时任务服务提供 - * - * @Description: - * @Author: ljc - * @Time: 2023/4/12 10:40 - * @Classname: IMemberJobServiceProvider - * @Package_name: com.hzs.member.account.provider */ - @Slf4j @DubboService public class IMemberJobServiceProvider implements IMemberJobServiceApi { @Autowired - private ICuMemberAccountDetailService memberAccountDetailService; - + private ICuMemberAccountDetailService iCuMemberAccountDetailService; @Autowired - private ICuMemberWithdrawService memberWithdrawService; - + private ICuMemberWithdrawService iCuMemberWithdrawService; @Autowired - private ICuPersonalGoalsService cuPersonalGoalsService; - - @Autowired - private ICuMemberRechargeService memberRechargeService; + private ICuMemberRechargeService iCuMemberRechargeService; @Override - public R insertAccountDetail() { + public R insertAccountDetail() { try { - memberAccountDetailService.insertAccountDetail(); + iCuMemberAccountDetailService.insertAccountDetail(); } catch (Exception e) { log.info("定时插入账户详情数据失败：", e); return R.fail(e.getMessage()); @@ -50,11 +37,10 @@ public class IMemberJobServiceProvider implements IMemberJobServiceApi { return R.ok(); } - @Override - public R automaticWithdrawal() { + public R automaticWithdrawal() { try { - memberWithdrawService.autoWithdraw(); + iCuMemberWithdrawService.autoWithdraw(); } catch (Exception e) { log.info("自动提现报错：", e); return R.fail(e.getMessage()); @@ -63,9 +49,9 @@ public class IMemberJobServiceProvider implements IMemberJobServiceApi { } @Override - public R deleteAccountDetailByMonth() { + public R deleteAccountDetailByMonth() { try { - memberAccountDetailService.deleteAccountDetailByMonth(); + iCuMemberAccountDetailService.deleteAccountDetailByMonth(); } catch (Exception e) { log.info("定时删除账户详情数据失败：", e); return R.fail(e.getMessage()); @@ -73,35 +59,9 @@ public class IMemberJobServiceProvider implements IMemberJobServiceApi { return R.ok(); } - - @Override - public R saveGoalsWeekRecord() { - try { - cuPersonalGoalsService.saveGoalsWeekRecord(); - } catch (Exception e) { - log.info("插入个人目标周历史记录表失败：", e); - return R.fail(e.getMessage()); - } - return R.ok(); - } - - - @Override - public R saveGoalsMonthRecord() { - try { - cuPersonalGoalsService.saveGoalsMonthRecord(); - } catch (Exception e) { - log.info("插入个人目标月历史记录表失败：", e); - return R.fail(e.getMessage()); - } - return R.ok(); - } - - @Override public R selectRechargeTotalAmount(Date startDate, Date endDate) { - return R.ok(memberRechargeService.selectRechargeTotalAmount(startDate, endDate)); + return R.ok(iCuMemberRechargeService.selectRechargeTotalAmount(startDate, endDate)); } - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsClassifyMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsClassifyMapper.java index dca68446..9452b9c4 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsClassifyMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsClassifyMapper.java @@ -1,16 +1,10 @@ package com.hzs.member.goals.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.goals.CuPersonalGoalsClassify; /** - *

* 个人目标分类 Mapper 接口 - *

- * - * @author hzs - * @since 2023-05-17 */ public interface CuPersonalGoalsClassifyMapper extends BaseMapper { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsDetailMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsDetailMapper.java index 2b31f056..f3c1b2e1 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsDetailMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsDetailMapper.java @@ -1,20 +1,12 @@ package com.hzs.member.goals.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.goals.CuPersonalGoalsDetail; import com.hzs.member.goals.vo.CuPersonalGoalsRowDetailVO; import org.apache.ibatis.annotations.Param; -import java.util.List; - /** - *

* 个人目标详情 Mapper 接口 - *

- * - * @author hzs - * @since 2023-05-16 */ public interface CuPersonalGoalsDetailMapper extends BaseMapper { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsMeetingMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsMeetingMapper.java index feeeceb6..80b66d25 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsMeetingMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsMeetingMapper.java @@ -1,16 +1,10 @@ package com.hzs.member.goals.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.goals.CuPersonalGoalsMeeting; /** - *

* 个人目标会议信息 Mapper 接口 - *

- * - * @author hzs - * @since 2023-05-16 */ public interface CuPersonalGoalsMeetingMapper extends BaseMapper { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsMonthRecordMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsMonthRecordMapper.java index 0f921c50..d84b5f01 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsMonthRecordMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsMonthRecordMapper.java @@ -1,6 +1,5 @@ package com.hzs.member.goals.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.goals.CuPersonalGoalsMonthRecord; import com.hzs.member.goals.param.CuPersonalGoalsParam; @@ -11,14 +10,10 @@ import com.hzs.member.goals.vo.CuPersonalGoalsRowDetailVO; import java.util.List; /** - *

* Mapper 接口 - *

- * - * @author hzs - * @since 2023-05-19 */ public interface CuPersonalGoalsMonthRecordMapper extends BaseMapper { + /** * 查询季目标 * @@ -27,7 +22,6 @@ public interface CuPersonalGoalsMonthRecordMapper extends BaseMapper selectGoalsMonth(CuPersonalGoalsParam cuPersonalGoalsVOParam); - /** * 查询季、年目标实际达成值 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsWeekRecordMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsWeekRecordMapper.java index 1ae9865e..99c8a68f 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsWeekRecordMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/mapper/CuPersonalGoalsWeekRecordMapper.java @@ -1,20 +1,13 @@ package com.hzs.member.goals.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.goals.CuPersonalGoalsWeekRecord; import com.hzs.member.goals.param.CuPersonalGoalsParam; import com.hzs.member.goals.vo.CuPersonalGoalsClassifyVO; import com.hzs.member.goals.vo.CuPersonalGoalsRowDetailVO; - /** - *

* 个人目标历史记录表 Mapper 接口 - *

- * - * @author hzs - * @since 2023-05-19 */ public interface CuPersonalGoalsWeekRecordMapper extends BaseMapper { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsClassifyService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsClassifyService.java index b39c8f1e..c12801ff 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsClassifyService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsClassifyService.java @@ -1,20 +1,15 @@ package com.hzs.member.goals.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.goals.CuPersonalGoalsClassify; import java.util.List; /** - *

* 个人目标分类 服务类 - *

- * - * @author hzs - * @since 2023-05-17 */ public interface ICuPersonalGoalsClassifyService extends IService { + /** * 根据目标基础ID查询分类信息 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsDetailService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsDetailService.java index d5ef8c10..490089a9 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsDetailService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsDetailService.java @@ -1,6 +1,5 @@ package com.hzs.member.goals.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.goals.CuPersonalGoalsDetail; import com.hzs.member.goals.vo.CuPersonalGoalsRowDetailVO; @@ -8,14 +7,10 @@ import com.hzs.member.goals.vo.CuPersonalGoalsRowDetailVO; import java.util.List; /** - *

* 个人目标详情 服务类 - *

- * - * @author hzs - * @since 2023-05-16 */ public interface ICuPersonalGoalsDetailService extends IService { + /** * 根据分类ID查询详情 * @@ -24,11 +19,10 @@ public interface ICuPersonalGoalsDetailService extends IService selectDetailByClassifyId(Long pkClassify); - /** * 根据分类ID查询行显示详情 * - * @param pkClassify 分类ID + * @param pkClassify 分类ID * @param classifyType 分类类型 * @return List */ diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsMeetingService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsMeetingService.java index 0a8cea1e..708df49a 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsMeetingService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsMeetingService.java @@ -1,18 +1,12 @@ package com.hzs.member.goals.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.goals.CuPersonalGoalsMeeting; import java.util.List; /** - *

* 个人目标会议信息 服务类 - *

- * - * @author hzs - * @since 2023-05-16 */ public interface ICuPersonalGoalsMeetingService extends IService { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsMonthRecordService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsMonthRecordService.java index ca40eac1..c7430812 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsMonthRecordService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsMonthRecordService.java @@ -1,23 +1,16 @@ package com.hzs.member.goals.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.goals.CuPersonalGoalsMonthRecord; import com.hzs.member.goals.param.CuPersonalGoalsParam; import com.hzs.member.goals.vo.CuPersonalGoalsClassifyVO; -import com.hzs.member.goals.vo.CuPersonalGoalsDetailVO; import com.hzs.member.goals.vo.CuPersonalGoalsMonthDetailVO; import com.hzs.member.goals.vo.CuPersonalGoalsRowDetailVO; import java.util.List; /** - *

- * 服务类 - *

- * - * @author hzs - * @since 2023-05-19 + * 服务类 */ public interface ICuPersonalGoalsMonthRecordService extends IService { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsService.java index 6ed9b09b..4c32b2d5 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsService.java @@ -1,6 +1,5 @@ package com.hzs.member.goals.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.goals.CuPersonalGoals; import com.hzs.member.goals.param.CuPersonalGoalsParam; @@ -10,12 +9,7 @@ import com.hzs.member.goals.vo.CuPersonalGoalsVO; import java.util.List; /** - *

* 个人目标 服务类 - *

- * - * @author hzs - * @since 2023-05-16 */ public interface ICuPersonalGoalsService extends IService { @@ -61,13 +55,4 @@ public interface ICuPersonalGoalsService extends IService { */ CuPersonalGoalsVO showGoalsDetail(CuPersonalGoalsParam goalsParam); - /** - * 插入个人目标周历史记录表 - */ - void saveGoalsWeekRecord(); - - /** - * 插入个人目标月历史记录表(每月月初执行) - */ - void saveGoalsMonthRecord(); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsWeekRecordService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsWeekRecordService.java index 93affb06..faf647ad 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsWeekRecordService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/ICuPersonalGoalsWeekRecordService.java @@ -1,6 +1,5 @@ package com.hzs.member.goals.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.goals.CuPersonalGoalsWeekRecord; import com.hzs.member.goals.param.CuPersonalGoalsParam; @@ -8,12 +7,7 @@ import com.hzs.member.goals.vo.CuPersonalGoalsClassifyVO; import com.hzs.member.goals.vo.CuPersonalGoalsRowDetailVO; /** - *

* 个人目标历史记录表 服务类 - *

- * - * @author hzs - * @since 2023-05-19 */ public interface ICuPersonalGoalsWeekRecordService extends IService { @@ -25,7 +19,6 @@ public interface ICuPersonalGoalsWeekRecordService extends IService * 个人目标分类 服务实现类 - *

- * - * @author hzs - * @since 2023-05-17 */ @Service public class CuPersonalGoalsClassifyServiceImpl extends ServiceImpl implements ICuPersonalGoalsClassifyService { - @Override public List selectGoalsClassify(Long pkGoals, Integer goalClassify) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_GOALS", pkGoals); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CuPersonalGoalsClassify::getPkGoals, pkGoals); if (null != goalClassify) { - queryWrapper.eq("goal_classify", goalClassify); + queryWrapper.eq(CuPersonalGoalsClassify::getGoalClassify, goalClassify); } return baseMapper.selectList(queryWrapper); } + } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsDetailServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsDetailServiceImpl.java index 92594b41..82a48c30 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsDetailServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsDetailServiceImpl.java @@ -1,7 +1,6 @@ package com.hzs.member.goals.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.domain.member.goals.CuPersonalGoalsDetail; import com.hzs.member.goals.mapper.CuPersonalGoalsDetailMapper; @@ -12,24 +11,18 @@ import org.springframework.stereotype.Service; import java.util.List; /** - *

* 个人目标详情 服务实现类 - *

- * - * @author hzs - * @since 2023-05-16 */ @Service public class CuPersonalGoalsDetailServiceImpl extends ServiceImpl implements ICuPersonalGoalsDetailService { @Override public List selectDetailByClassifyId(Long pkClassify) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_CLASSIFY", pkClassify); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CuPersonalGoalsDetail::getPkClassify, pkClassify); return baseMapper.selectList(queryWrapper); } - @Override public CuPersonalGoalsRowDetailVO selectRowDetailByClassifyId(Long pkClassify, Integer classifyType) { return baseMapper.selectRowDetailByClassifyId(pkClassify, classifyType); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsMeetingServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsMeetingServiceImpl.java index b546943f..794a0f07 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsMeetingServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsMeetingServiceImpl.java @@ -1,7 +1,6 @@ package com.hzs.member.goals.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.domain.member.goals.CuPersonalGoalsMeeting; import com.hzs.member.goals.mapper.CuPersonalGoalsMeetingMapper; @@ -11,21 +10,15 @@ import org.springframework.stereotype.Service; import java.util.List; /** - *

* 个人目标会议信息 服务实现类 - *

- * - * @author hzs - * @since 2023-05-16 */ @Service public class CuPersonalGoalsMeetingServiceImpl extends ServiceImpl implements ICuPersonalGoalsMeetingService { - @Override public List selectMeetingByClassifyId(Long pkClassify) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_CLASSIFY", pkClassify); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CuPersonalGoalsMeeting::getPkClassify, pkClassify); return baseMapper.selectList(queryWrapper); } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsMonthRecordServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsMonthRecordServiceImpl.java index 31badbdf..71fd1d50 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsMonthRecordServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsMonthRecordServiceImpl.java @@ -1,6 +1,5 @@ package com.hzs.member.goals.service.impl; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.domain.member.goals.CuPersonalGoalsMonthRecord; import com.hzs.member.goals.mapper.CuPersonalGoalsMonthRecordMapper; @@ -14,12 +13,7 @@ import org.springframework.stereotype.Service; import java.util.List; /** - *

* 服务实现类 - *

- * - * @author hzs - * @since 2023-05-19 */ @Service public class CuPersonalGoalsMonthRecordServiceImpl extends ServiceImpl implements ICuPersonalGoalsMonthRecordService { @@ -29,16 +23,14 @@ public class CuPersonalGoalsMonthRecordServiceImpl extends ServiceImpl selectGoalsMonth(CuPersonalGoalsParam cuPersonalGoalsVOParam) { return baseMapper.selectGoalsMonth(cuPersonalGoalsVOParam); } @Override - public CuPersonalGoalsClassifyVO selectGoalsSeasonCount(CuPersonalGoalsParam cuPersonalGoalsVOParam){ + public CuPersonalGoalsClassifyVO selectGoalsSeasonCount(CuPersonalGoalsParam cuPersonalGoalsVOParam) { return baseMapper.selectGoalsSeasonCount(cuPersonalGoalsVOParam); } - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsServiceImpl.java index 9e46074e..d26e9e40 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsServiceImpl.java @@ -1,12 +1,10 @@ package com.hzs.member.goals.service.impl; - import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.core.constant.CountryConstants; -import com.hzs.common.core.constant.MagicNumberConstants; import com.hzs.common.core.constant.MemberFieldConstants; import com.hzs.common.core.enums.EGoalClassify; import com.hzs.common.core.enums.EGoalType; @@ -40,43 +38,28 @@ import java.util.Map; import java.util.stream.Collectors; /** - *

* 个人目标 服务实现类 - *

- * - * @author hzs - * @since 2023-05-16 */ @Service public class CuPersonalGoalsServiceImpl extends ServiceImpl implements ICuPersonalGoalsService { - @Autowired private ICuPersonalGoalsClassifyService iCuPersonalGoalsClassifyService; - @Autowired private ICuPersonalGoalsDetailService iCuPersonalGoalsDetailService; - @Autowired private ICuPersonalGoalsMeetingService iCuPersonalGoalsMeetingService; - - @Autowired - private ICuPersonalGoalsWeekRecordService iCuPersonalGoalsRecordService; - @Autowired private ICuPersonalGoalsMonthRecordService iCuPersonalGoalsMonthRecordService; - @Autowired private ICuPersonalGoalsWeekRecordService iCuPersonalGoalsWeekRecordService; @DubboReference - private ISaOrderServiceApi iSaOrderServiceApi; - + ISaOrderServiceApi iSaOrderServiceApi; @DubboReference - private IAreaServiceApi iAreaServiceApi; - + IAreaServiceApi iAreaServiceApi; @DubboReference - private ICurrencyServiceApi iCurrencyServiceApi; + ICurrencyServiceApi iCurrencyServiceApi; @Override @Transactional(rollbackFor = Exception.class) @@ -163,7 +146,6 @@ public class CuPersonalGoalsServiceImpl extends ServiceImpl showGoalsList(CuPersonalGoalsParam goalsParam) { List cuPersonalGoalsListVOList = baseMapper.showGoalsList(goalsParam); @@ -182,13 +164,11 @@ public class CuPersonalGoalsServiceImpl extends ServiceImpl showGoalsListByRatio(CuPersonalGoalsParam goalsParam) { return baseMapper.showGoalsListByRatio(goalsParam); } - private void setRatio(CuPersonalGoalsListVO goalsListVO, CuPersonalGoalsClassifyVO goalsClassifyVO) { if (null != goalsClassifyVO) { BigDecimal totalAchieve = goalsListVO.getTotalAchieve(); @@ -241,7 +221,6 @@ public class CuPersonalGoalsServiceImpl extends ServiceImpl yearRationRation = getYearRation(monthDetailVOList, realYearGoals, classifyVO); classifyVO.setMonthDetailVOList(yearRationRation); } - } /** @@ -430,8 +406,6 @@ public class CuPersonalGoalsServiceImpl extends ServiceImpl detail.getCycleKey().equals(CycleKey)).findFirst().get(); monthDetailVO.setRightCycleKey(MemberFieldConstants.RIGHT_PERIOD_VALUE + i); BigDecimal rightAchieve = goalsDetail.getCycleValue(); monthDetailVO.setRightAchieve(rightAchieve); @@ -462,7 +436,6 @@ public class CuPersonalGoalsServiceImpl extends ServiceImpl cuPersonalGoalsList = baseMapper.selectGoals(EGoalType.SEASON.getValue()); - if (CollUtil.isNotEmpty(cuPersonalGoalsList)) { - for (CuPersonalGoals cuPersonalGoals : cuPersonalGoalsList) { - orderGoalsDTO = OrderGoalsDTO.builder().pkMember(cuPersonalGoals.getPkMember()) - .pkCountry(cuPersonalGoals.getPkCountry()) - .startDate(firstMonthDay.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) - .endDate(firstDayOfNextMonth.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) - .build(); - callMonthService(orderGoalsDTO); - } - } - } - - - /** - * 调用dubbo服务查询月数据 - * - * @param orderGoals 订单目标参数 - * @return Boolean - */ - private Boolean callMonthService(OrderGoalsDTO orderGoals) { - CuPersonalGoalsMonthRecord personalGoalsRecord; - List personalGoalsRecordList = new ArrayList<>(); - Integer pkCountry = orderGoals.getPkCountry(); - Long pkMember = orderGoals.getPkMember(); - //查询团队业绩（伞下推荐） - BigDecimal recommendAchieve = iSaOrderServiceApi.selectRecommendAchieve(orderGoals).getData(); - personalGoalsRecord = getCuPersonalGoalsMonthRecord(EGoalClassify.TEAM.getValue(), recommendAchieve, null, pkCountry, pkMember); - personalGoalsRecord.setTotalAchieve(recommendAchieve); - personalGoalsRecordList.add(personalGoalsRecord); - //查询安置业绩 - orderGoals.setPlaceDept(1); - BigDecimal leftPlaceAchieve = iSaOrderServiceApi.selectPlaceAchieve(orderGoals).getData(); - orderGoals.setPlaceDept(2); - BigDecimal rightPlaceAchieve = iSaOrderServiceApi.selectPlaceAchieve(orderGoals).getData(); - personalGoalsRecord = getCuPersonalGoalsMonthRecord(EGoalClassify.PLACEMENT.getValue(), leftPlaceAchieve, rightPlaceAchieve, pkCountry, pkMember); - personalGoalsRecordList.add(personalGoalsRecord); - //查询团队业绩（个人直推） - BigDecimal directPushAchieve = iSaOrderServiceApi.selectDirectPushAchieve(orderGoals).getData(); - personalGoalsRecord = getCuPersonalGoalsMonthRecord(EGoalClassify.RECOMMEND.getValue(), recommendAchieve, null, pkCountry, pkMember); - personalGoalsRecord.setTotalAchieve(directPushAchieve); - personalGoalsRecordList.add(personalGoalsRecord); - //查询推荐人数 - Integer recommendNumber = iSaOrderServiceApi.selectRecommendNumber(orderGoals).getData(); - personalGoalsRecord = getCuPersonalGoalsMonthRecord(EGoalClassify.RECOMMEND_NUMBER.getValue(), new BigDecimal(recommendNumber.toString()), null, pkCountry, pkMember); - personalGoalsRecordList.add(personalGoalsRecord); - //创客空间 - Integer makerSpace = iSaOrderServiceApi.selectMakerSpace(orderGoals).getData(); - personalGoalsRecord = getCuPersonalGoalsMonthRecord(EGoalClassify.MAKER_SPACE.getValue(), new BigDecimal(makerSpace.toString()), null, pkCountry, pkMember); - personalGoalsRecordList.add(personalGoalsRecord); - //超级工作室 - BigDecimal superStudio = iSaOrderServiceApi.selectSuperStudio(orderGoals).getData(); - personalGoalsRecord = getCuPersonalGoalsMonthRecord(EGoalClassify.SUPER_TUDIO.getValue(), superStudio, null, pkCountry, pkMember); - personalGoalsRecordList.add(personalGoalsRecord); - return iCuPersonalGoalsMonthRecordService.saveBatch(personalGoalsRecordList); - } - - /** - * 个人目标月历史记录表 - * - * @param goalClassify 目标分类 2：安置 3：推荐 4：推荐人数 7：创客空间 8：超级工作室 - * @param totalAchieve 总业绩（左区总业绩） 单位万 - * @param rightAchieve 右区总业绩 单位万 - * @return CuPersonalGoalsRecord - */ - private CuPersonalGoalsMonthRecord getCuPersonalGoalsMonthRecord(Integer goalClassify, BigDecimal totalAchieve, BigDecimal rightAchieve, Integer pkCountry, Long pkMember) { - //当月 - String month = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM")); - CuPersonalGoalsMonthRecord monthRecord = CuPersonalGoalsMonthRecord.builder().month(month).goalClassify(goalClassify).totalAchieve(totalAchieve).rightAchieve(rightAchieve).build(); - monthRecord.setPkCountry(pkCountry); - monthRecord.setPkMember(pkMember); - monthRecord.setPkCreator(MagicNumberConstants.PK_ADMIN); - return monthRecord; - } - - - /** - * 插入个人目标周历史记录表 - */ - @Transactional(rollbackFor = Exception.class) - @Override - public void saveGoalsWeekRecord() { - OrderGoalsDTO orderGoalsDTO; - LocalDate localDate = LocalDate.now(); - //当前月份第一天 - LocalDate firstMonthDay = localDate.with(TemporalAdjusters.firstDayOfMonth()); - // 获取下个月第一天 - LocalDate firstDayOfNextMonth = localDate.with(TemporalAdjusters.firstDayOfNextMonth()); - //第一周的周末 - LocalDate firstMonth = firstMonthDay.plusWeeks(1); - //第二周的周末 - LocalDate secondMonth = firstMonthDay.plusWeeks(2); - //第三周的周末 - LocalDate thirdMonth = firstMonthDay.plusWeeks(3); - //月度个人目标基础信息 - List cuPersonalGoalsList = baseMapper.selectGoals(EGoalType.MONTH.getValue()); - if (CollUtil.isNotEmpty(cuPersonalGoalsList)) { - for (CuPersonalGoals cuPersonalGoals : cuPersonalGoalsList) { - if (localDate.isEqual(firstMonthDay)) { - orderGoalsDTO = OrderGoalsDTO.builder().pkMember(cuPersonalGoals.getPkMember()) - .pkCountry(cuPersonalGoals.getPkCountry()) - .startDate(firstMonthDay.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) - .endDate(firstMonth.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) - .build(); - callWeekService(orderGoalsDTO, 1); - } - if (localDate.isEqual(firstMonth)) { - orderGoalsDTO = OrderGoalsDTO.builder().pkMember(cuPersonalGoals.getPkMember()) - .pkCountry(cuPersonalGoals.getPkCountry()) - .startDate(firstMonth.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) - .endDate(secondMonth.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) - .build(); - callWeekService(orderGoalsDTO, 2); - } - - if (localDate.isEqual(secondMonth)) { - orderGoalsDTO = OrderGoalsDTO.builder().pkMember(cuPersonalGoals.getPkMember()) - .pkCountry(cuPersonalGoals.getPkCountry()) - .startDate(secondMonth.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) - .endDate(thirdMonth.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) - .build(); - callWeekService(orderGoalsDTO, 3); - } - if (localDate.isEqual(thirdMonth)) { - orderGoalsDTO = OrderGoalsDTO.builder().pkMember(cuPersonalGoals.getPkMember()) - .pkCountry(cuPersonalGoals.getPkCountry()) - .startDate(thirdMonth.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) - .endDate(firstDayOfNextMonth.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) - .build(); - callWeekService(orderGoalsDTO, 4); - } - } - } - } - - - /** - * 调用dubbo服务查询周数据 - * - * @param orderGoals 订单目标参数 - * @param weekNumber 周数 - * @return Boolean - */ - private Boolean callWeekService(OrderGoalsDTO orderGoals, Integer weekNumber) { - String startDate = orderGoals.getStartDate(); - String endDate = orderGoals.getEndDate(); - - CuPersonalGoalsWeekRecord personalGoalsRecord; - List personalGoalsRecordList = new ArrayList<>(); - Integer pkCountry = orderGoals.getPkCountry(); - Long pkMember = orderGoals.getPkMember(); - //当月 - String month = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM")); - //查询团队业绩（伞下） - BigDecimal recommendAchieve = iSaOrderServiceApi.selectRecommendAchieve(orderGoals).getData(); - personalGoalsRecord = getCuPersonalGoalsRecord(weekNumber, startDate, endDate, month, pkMember); - personalGoalsRecord.setGoalClassify(EGoalClassify.TEAM.getValue()); - personalGoalsRecord.setTotalAchieve(recommendAchieve); - personalGoalsRecord.setPkCountry(pkCountry); - personalGoalsRecord.setPkCreator(MagicNumberConstants.PK_ADMIN); - personalGoalsRecordList.add(personalGoalsRecord); - - //查询安置业绩 - orderGoals.setPlaceDept(1); - BigDecimal leftPlaceAchieve = iSaOrderServiceApi.selectPlaceAchieve(orderGoals).getData(); - orderGoals.setPlaceDept(2); - BigDecimal rightPlaceAchieve = iSaOrderServiceApi.selectPlaceAchieve(orderGoals).getData(); - personalGoalsRecord = getCuPersonalGoalsRecord(weekNumber, startDate, endDate, month, pkMember); - personalGoalsRecord.setGoalClassify(EGoalClassify.PLACEMENT.getValue()); - personalGoalsRecord.setTotalAchieve(leftPlaceAchieve); - personalGoalsRecord.setRightAchieve(rightPlaceAchieve); - personalGoalsRecord.setPkCountry(pkCountry); - personalGoalsRecord.setPkCreator(MagicNumberConstants.PK_ADMIN); - personalGoalsRecordList.add(personalGoalsRecord); - - //查询团队业绩（个人直推） - BigDecimal directPushAchieve = iSaOrderServiceApi.selectDirectPushAchieve(orderGoals).getData(); - personalGoalsRecord = getCuPersonalGoalsRecord(weekNumber, startDate, endDate, month, pkMember); - personalGoalsRecord.setGoalClassify(EGoalClassify.RECOMMEND.getValue()); - personalGoalsRecord.setTotalAchieve(directPushAchieve); - personalGoalsRecord.setPkCountry(pkCountry); - personalGoalsRecord.setPkCreator(MagicNumberConstants.PK_ADMIN); - personalGoalsRecordList.add(personalGoalsRecord); - //查询推荐人数 - Integer recommendNumber = iSaOrderServiceApi.selectRecommendNumber(orderGoals).getData(); - personalGoalsRecord = getCuPersonalGoalsRecord(weekNumber, startDate, endDate, month, pkMember); - personalGoalsRecord.setGoalClassify(EGoalClassify.RECOMMEND_NUMBER.getValue()); - personalGoalsRecord.setTotalAchieve(new BigDecimal(recommendNumber.toString())); - personalGoalsRecord.setPkCountry(pkCountry); - personalGoalsRecord.setPkCreator(MagicNumberConstants.PK_ADMIN); - personalGoalsRecordList.add(personalGoalsRecord); - //创客空间 - Integer makerSpace = iSaOrderServiceApi.selectMakerSpace(orderGoals).getData(); - personalGoalsRecord = getCuPersonalGoalsRecord(weekNumber, startDate, endDate, month, pkMember); - personalGoalsRecord.setGoalClassify(EGoalClassify.MAKER_SPACE.getValue()); - personalGoalsRecord.setTotalAchieve(new BigDecimal(makerSpace.toString())); - personalGoalsRecord.setPkCountry(pkCountry); - personalGoalsRecord.setPkCreator(MagicNumberConstants.PK_ADMIN); - personalGoalsRecordList.add(personalGoalsRecord); - //超级工作室 - BigDecimal superStudio = iSaOrderServiceApi.selectSuperStudio(orderGoals).getData(); - personalGoalsRecord = getCuPersonalGoalsRecord(weekNumber, startDate, endDate, month, pkMember); - personalGoalsRecord.setGoalClassify(EGoalClassify.SUPER_TUDIO.getValue()); - personalGoalsRecord.setTotalAchieve(superStudio); - personalGoalsRecord.setPkCountry(pkCountry); - personalGoalsRecord.setPkCreator(MagicNumberConstants.PK_ADMIN); - personalGoalsRecordList.add(personalGoalsRecord); - return iCuPersonalGoalsRecordService.saveBatch(personalGoalsRecordList); - } - - /** - * 个人目标历史周记录表 - * - * @param weekNumber 周数 - * @param startDate 开始时间 - * @param endDat 结束时间 - * @param month 月份 - * @return CuPersonalGoalsRecord - */ - private CuPersonalGoalsWeekRecord getCuPersonalGoalsRecord(Integer weekNumber, String startDate, String endDat, String month, Long pkMember) { - return CuPersonalGoalsWeekRecord.builder().month(month).startDate(startDate).endDate(endDat).weekNumber(weekNumber).pkMember(pkMember).build(); - } - - public static void main(String[] args) { - - LocalDate localDate = LocalDate.now(); - //当前月份第一天 - LocalDate firstMonthDay = localDate.with(TemporalAdjusters.firstDayOfMonth()); - // 获取下个月第一天 - LocalDate firstDayOfNextMonth = localDate.with(TemporalAdjusters.firstDayOfNextMonth()); - //第一周的周末 - LocalDate firstMonth = firstMonthDay.plusWeeks(1); - //第二周的周末 - LocalDate secondMonth = firstMonthDay.plusWeeks(2); - //第三周的周末 - LocalDate thirdMonth = firstMonthDay.plusWeeks(3); - if (localDate.isEqual(secondMonth)) { - System.out.println("---------------------"); - } - - } - - /** - * 递归调用当前时间所在周的时间 - * - * @param firstMonthDay 月初第一天 - * @return LocalDate - */ - private LocalDate getWeekend(LocalDate firstMonthDay) { - LocalDate localDate = LocalDate.now(); - LocalDate week = firstMonthDay.plusWeeks(1); - if (localDate.isBefore(week)) { - return week; - } - return getWeekend(week); - } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsWeekRecordServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsWeekRecordServiceImpl.java index 57987d44..4a712991 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsWeekRecordServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/service/impl/CuPersonalGoalsWeekRecordServiceImpl.java @@ -1,6 +1,5 @@ package com.hzs.member.goals.service.impl; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.domain.member.goals.CuPersonalGoalsWeekRecord; import com.hzs.member.goals.mapper.CuPersonalGoalsWeekRecordMapper; @@ -11,12 +10,7 @@ import com.hzs.member.goals.vo.CuPersonalGoalsRowDetailVO; import org.springframework.stereotype.Service; /** - *

* 个人目标历史记录表 服务实现类 - *

- * - * @author hzs - * @since 2023-05-19 */ @Service public class CuPersonalGoalsWeekRecordServiceImpl extends ServiceImpl implements ICuPersonalGoalsWeekRecordService { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsDetailVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsDetailVO.java index f711ca53..2de8177f 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsDetailVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/goals/vo/CuPersonalGoalsDetailVO.java @@ -10,17 +10,13 @@ import java.math.BigDecimal; /** * 个人目标详情VO - * @Description: - * @Author: ljc - * @Time: 2023/5/16 19:17 - * @Classname: CuPersonalGoalsDetailVO - * @Package_name: com.hzs.member.goals.vo */ @Data @Builder @AllArgsConstructor @NoArgsConstructor public class CuPersonalGoalsDetailVO implements Serializable { + private static final long serialVersionUID = 2267647230813681922L; /** diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusStatisController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusStatisController.java index 1078d5c7..648d5da7 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusStatisController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusStatisController.java @@ -340,7 +340,6 @@ public class CuBonusStatisController extends BaseController { @Log(module = EOperationModule.BONUS_DIAL_RATIO, business = EOperationBusiness.BONUS_DIAL_RATIO_LIST, method = EOperationMethod.SELECT) public AjaxResult subtotal(CuBonusStatisVO cuBonusStatisVO) { int pkCountry = SecurityUtils.getPkCountry(); - R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); @@ -368,7 +367,8 @@ public class CuBonusStatisController extends BaseController { final List pkTeamCodeList = pkTeamCodeStr.stream().map(Integer::valueOf).collect(Collectors.toList()); cuBonusStatisVO.setPkTeamCodeList(pkTeamCodeList); } - //查询奖金扣项配置参数 0.8 + + // 查询奖金扣项配置参数 0.8 List bonus = iCuBonusStatisService.bonusDeductlist(cuBonusStatisVO); if (CollectionUtil.isNotEmpty(bonus)) { cuBonusStatisVO.setBackRatio(BigDecimal.ONE.subtract(bonus.get(0).getBackRatio())); @@ -386,7 +386,7 @@ public class CuBonusStatisController extends BaseController { startPage(); CuBonusStatisVO subtotal = iCuBonusStatisService.queryCuBonusSumStatis(cuBonusStatisVO); - if (subtotal != null && pkCountry == CountryConstants.CHINA_COUNTRY) { + if (subtotal != null) { if (subtotal.getIntroduceBonusSum().compareTo(BigDecimal.ZERO) > 0) { subtotal.setIntroduceBonusSum(subtotal.getIntroduceBonusSum().multiply(currency.getData().getInExchangeRate())); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/provider/ICuBonusStatisServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/provider/ICuBonusStatisServiceProvider.java index 7bb167be..317d5729 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/provider/ICuBonusStatisServiceProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/provider/ICuBonusStatisServiceProvider.java @@ -8,7 +8,7 @@ import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; /** - * @description: 奖金拨比统计Dubbo 服务 + * 奖金拨比统计Dubbo 服务 **/ @Slf4j @DubboService @@ -17,17 +17,11 @@ public class ICuBonusStatisServiceProvider implements ICuBonusStatisServiceApi { @Autowired private ICuBonusStatisService iCuBonusStatisService; - /** - * @description: 统计历史奖金拨比 - **/ @Override public R statsHistoryBonus(String startDate, String endDate) { return R.ok(iCuBonusStatisService.statisHistoryBonus(startDate, endDate)); } - /** - * @description: 删除奖金拨比统计数据 - **/ @Override public R delStats(String startDate, String endDate) { return R.ok(iCuBonusStatisService.delStatis(startDate, endDate)); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java index 93dd57c4..b88b4b88 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java @@ -389,9 +389,6 @@ public class CuBonusStatisServiceImpl extends ServiceImpl soAll = new ArrayList<>(); // 先查中国订单 List orachList = baseMapper.querySaOrderByLessDay(cbs); - // 按支付时间（年月日）把订单进行分组（key:支付时间（年月日），value：订单统计数据列表） - Map> orachListMap = orachList.stream().collect(Collectors.groupingBy(CuBonusStatisVO::getCreationTime)); if (CollectionUtil.isNotEmpty(orachList)) { + // 按支付时间（年月日）把订单进行分组（key:支付时间（年月日），value：订单统计数据列表） + Map> orachListMap = orachList.stream().collect(Collectors.groupingBy(CuBonusStatisVO::getCreationTime)); + if (CollectionUtil.isNotEmpty(vertexlist)) { for (Map.Entry> entry : orachListMap.entrySet()) { for (CuBonusStatisVO ve : entry.getValue()) { @@ -430,10 +428,11 @@ public class CuBonusStatisServiceImpl extends ServiceImpl acAll = new ArrayList<>(); //查询中国统计奖金 List listCn = baseMapper.queryChinaCountryBonus(cbs); - // 按支付时间（年月日）把订单进行分组（key:支付时间（年月日），value：订单统计数据列表） - Map> listCnMap = listCn.stream() - .collect(Collectors.groupingBy(CuBonusStatisVO::getCreationTime)); if (CollectionUtil.isNotEmpty(listCn)) { + // 按支付时间（年月日）把订单进行分组（key:支付时间（年月日），value：订单统计数据列表） + Map> listCnMap = listCn.stream() + .collect(Collectors.groupingBy(CuBonusStatisVO::getCreationTime)); + if (CollectionUtil.isNotEmpty(vertexlist)) { for (CuBonusStatisVO ve : vertexlist) { for (Map.Entry> entry : listCnMap.entrySet()) { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java index 444a65e8..72fe07d2 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java @@ -34,7 +34,7 @@ import java.util.stream.Collectors; public class CuBonusVertexStatisServiceImpl extends ServiceImpl implements ICuBonusVertexStatisService { @Autowired - private ICuMemberSettlePeriodService cuMemberSettlePeriodService; + private ICuMemberSettlePeriodService iCuMemberSettlePeriodService; /** * @description: 通过日期范围，返回范围内每天的日期 @@ -67,7 +67,7 @@ public class CuBonusVertexStatisServiceImpl extends ServiceImpl dates = getDatesInRange(startDate, endDate); for (String date : dates) { - int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date).getPkId(); + int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date).getPkId(); String settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; //累加好的数据存入soAll List soAll = new ArrayList<>(); @@ -84,8 +84,7 @@ public class CuBonusVertexStatisServiceImpl extends ServiceImpl> orachListMap = orachListAll.stream() - .collect(Collectors.groupingBy(CuBonusVertexStatisVO::getCreationTime)); + Map> orachListMap = orachListAll.stream().collect(Collectors.groupingBy(CuBonusVertexStatisVO::getCreationTime)); //查询所有体系 if (CollectionUtil.isNotEmpty(orachListAll)) { if (CollectionUtil.isNotEmpty(vertexList)) { @@ -107,8 +106,7 @@ public class CuBonusVertexStatisServiceImpl extends ServiceImpl listCn = baseMapper.queryVertexChinaCountryBonus(cbs); - Map> listCnMap = listCn.stream() - .collect(Collectors.groupingBy(CuBonusVertexStatisVO::getCreationTime)); + Map> listCnMap = listCn.stream().collect(Collectors.groupingBy(CuBonusVertexStatisVO::getCreationTime)); if (CollectionUtil.isNotEmpty(listCn)) { for (Map.Entry> entry : listCnMap.entrySet()) { CuBonusVertexStatisVO oldSo = new CuBonusVertexStatisVO(); @@ -266,27 +264,6 @@ public class CuBonusVertexStatisServiceImpl extends ServiceImpl - - - - - - - - - - - - - - - - - - DEL_FLAG, - CREATION_TIME, - MODIFIED_TIME, - PK_COUNTRY, - PK_CREATOR, - PK_MODIFIED, - PK_ID, PK_GOALS, GOAL_CLASSIFY, TOTAL_ACHIEVE, RIGHT_ACHIEVE - diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/goals/CuPersonalGoalsDetailMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/goals/CuPersonalGoalsDetailMapper.xml index 23accac7..158f8a01 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/goals/CuPersonalGoalsDetailMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/goals/CuPersonalGoalsDetailMapper.xml @@ -39,15 +39,4 @@ where pk_classify = #{pkClassify} - - - DEL_FLAG, - CREATION_TIME, - MODIFIED_TIME, - PK_COUNTRY, - PK_CREATOR, - PK_MODIFIED, - PK_ID, PK_MODIFIED, CYCLE_KEY, CYCLE_VALUE - - diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/goals/CuPersonalGoalsMeetingMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/goals/CuPersonalGoalsMeetingMapper.xml index ea64d7b8..93c857ec 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/goals/CuPersonalGoalsMeetingMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/goals/CuPersonalGoalsMeetingMapper.xml @@ -2,36 +2,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - DEL_FLAG, - CREATION_TIME, - MODIFIED_TIME, - PK_COUNTRY, - PK_CREATOR, - PK_MODIFIED, - PK_ID, PK_CLASSIFY, MEETING_TYPE, MEETING_NUMBER, MEETING_THEME, MEETING_DATE, PK_PROVINCE, PK_CITY, PK_COUNTY, ADDRESS, REMARKS - - diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/goals/CuPersonalGoalsMonthRecordMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/goals/CuPersonalGoalsMonthRecordMapper.xml index 8f30ff90..cb402dc5 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/goals/CuPersonalGoalsMonthRecordMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/goals/CuPersonalGoalsMonthRecordMapper.xml @@ -17,16 +17,6 @@ - - - DEL_FLAG, - CREATION_TIME, - MODIFIED_TIME, - PK_COUNTRY, - PK_CREATOR, - PK_ID, GOAL_CLASSIFY, TOTAL_ACHIEVE, RIGHT_ACHIEVE, MONTH - - select case r.month - when '2023-01' then 'm1' - when '2023-02' then 'm2' - when '2023-03' then 'm3' - when '2023-04' then 'm4' - when '2023-05' then 'm5' - when '2023-06' then 'm6' - when '2023-07' then 'm7' - when '2023-08' then 'm8' - when '2023-09' then 'm9' - when '2023-10' then 'm10' - when '2023-11' then 'm11' - when '2023-12' then 'm12' - else '' - end cycleKey, - r.total_achieve leftAchieve, - r.right_achieve rightAchieve + when '2023-01' then 'm1' + when '2023-02' then 'm2' + when '2023-03' then 'm3' + when '2023-04' then 'm4' + when '2023-05' then 'm5' + when '2023-06' then 'm6' + when '2023-07' then 'm7' + when '2023-08' then 'm8' + when '2023-09' then 'm9' + when '2023-10' then 'm10' + when '2023-11' then 'm11' + when '2023-12' then 'm12' + else '' + end cycleKey, + r.total_achieve leftAchieve, + r.right_achieve rightAchieve from cu_personal_goals_month_record r where r.del_flag = 0 - and r.pk_country = #{pkCountry} - and r.goal_classify = #{goalClassify} - and r.pk_member = #{pkMember} - and r.month >= to_char(trunc(sysdate, 'year'), 'yyyy-mm') - and r.month < to_char(sysdate, 'yyyy-mm') + and r.pk_country = #{pkCountry} + and r.goal_classify = #{goalClassify} + and r.pk_member = #{pkMember} + and r.month >= to_char(trunc(sysdate, 'year'), 'yyyy-mm') + and r.month < to_char(sysdate, 'yyyy-mm') diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/goals/CuPersonalGoalsWeekRecordMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/goals/CuPersonalGoalsWeekRecordMapper.xml index c0cc211f..92c304d1 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/goals/CuPersonalGoalsWeekRecordMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/goals/CuPersonalGoalsWeekRecordMapper.xml @@ -21,52 +21,40 @@ - - - DEL_FLAG, - CREATION_TIME, - MODIFIED_TIME, - PK_COUNTRY, - PK_CREATOR, - PK_MODIFIED, - PK_ID, GOAL_CLASSIFY, TOTAL_ACHIEVE, RIGHT_ACHIEVE, MONTH, START_DATE, END_DATE, WEEK_NUMBER - - - diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusStatisMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusStatisMapper.xml index 8a6ad8b1..96095188 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusStatisMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusStatisMapper.xml @@ -191,7 +191,7 @@ ORDER BY cbs.CREATION_TIME asc - + - + - + - + - + - + - + - + delete from CU_BONUS_STATIS where 1=1 @@ -736,7 +735,7 @@ - + - + - + - + - + - + - - + - - -