From df864d1d636751424fd642d3bdd33c53cf63500d Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Mon, 07 Jul 2025 17:51:09 +0800 Subject: [PATCH] feat(mall): 为活动订单项添加积分和成长值奖 - 在活动添加和编辑页面增加积分和成长值输入字段 - 更新活动实体类,添加 scoreCnt 和 growthCnt 字段 - 修改活动订单项处理逻辑,增加积分和成长值奖励的计算和发放 - 优化活动订单项状态检查逻辑,移除冗余代码 --- src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java index e097d74..7393804 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java @@ -7,6 +7,7 @@ import cc.mrbird.febs.common.enumerates.ScoreFlowTypeEnum; import cc.mrbird.febs.common.exception.FebsException; import cc.mrbird.febs.common.utils.LoginUserUtil; +import cc.mrbird.febs.common.utils.MallUtils; import cc.mrbird.febs.mall.dto.ScoreSettingDto; import cc.mrbird.febs.mall.dto.signActivity.ApiSignDataDto; import cc.mrbird.febs.mall.dto.signActivity.ApiSignListDto; @@ -90,11 +91,11 @@ long between = DateUtil.between(startTime, endTime, DateUnit.DAY); List<ApiGetRunDateVo> apiGetRunDateVos = generateDateList(startTime, between); + List<Integer> typeList = Arrays.asList(ScoreFlowTypeEnum.SIGN_SCORE.getValue(), ScoreFlowTypeEnum.SIGN_EXPERIENCE.getValue()); List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowService.getBaseMapper().selectList( new LambdaQueryWrapper<MallMoneyFlow>() .eq(MallMoneyFlow::getMemberId, memberId) - .eq(MallMoneyFlow::getFlowType, FlowTypeEnum.PRIZE_SCORE.getValue()) - .eq(MallMoneyFlow::getType, MoneyFlowTypeEnum.SCORE_SIGN.getValue()) + .in(MallMoneyFlow::getType, typeList) .ge(MallMoneyFlow::getCreatedTime, startTime) .le(MallMoneyFlow::getCreatedTime, endTime) ); @@ -295,7 +296,7 @@ member.getId(), amount, ScoreFlowTypeEnum.SIGN_EXPERIENCE.getValue(), - mallScoreSignRecord.getId().toString(), + MallUtils.getOrderNum("s"), FlowTypeEnum.SCORE.getValue(), StrUtil.format(ScoreFlowTypeEnum.SIGN_EXPERIENCE.getDesc(),amount), 2); @@ -306,7 +307,7 @@ member.getId(), amount, ScoreFlowTypeEnum.SIGN_SCORE.getValue(), - mallScoreSignRecord.getId().toString(), + MallUtils.getOrderNum("s"), FlowTypeEnum.PRIZE_SCORE.getValue(), StrUtil.format(ScoreFlowTypeEnum.SIGN_SCORE.getDesc(),amount), 2); -- Gitblit v1.9.1