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/system/controller/LoginController.java | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/system/controller/LoginController.java b/src/main/java/cc/mrbird/febs/system/controller/LoginController.java index 81f7b7f..3f65232 100644 --- a/src/main/java/cc/mrbird/febs/system/controller/LoginController.java +++ b/src/main/java/cc/mrbird/febs/system/controller/LoginController.java @@ -100,8 +100,8 @@ //支付统计 data.put("wechatPay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.WECHAT.getName(), OrderStatusEnum.FINISH.getValue())); - data.put("alipayPay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.ALIPAY.getName(), OrderStatusEnum.FINISH.getValue())); - data.put("scorePay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.SCORE.getName(), OrderStatusEnum.FINISH.getValue())); +// data.put("alipayPay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.ALIPAY.getName(), OrderStatusEnum.FINISH.getValue())); +// data.put("scorePay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.SCORE.getName(), OrderStatusEnum.FINISH.getValue())); data.put("balancePay",mallOrderInfoMapper.selectSumAmountByPayMethodAndStatue(OrderPayMethodEnum.BALANCE.getName(), OrderStatusEnum.FINISH.getValue())); @@ -112,13 +112,13 @@ //会员数据 data.put("totalMember",mallMemberMapper.selectCount(new QueryWrapper<>()) ); - QueryWrapper<MallMember> formalMember = new QueryWrapper<>(); - formalMember.ne("level", AgentLevelEnum.ZERO_LEVEL.name()); - data.put("formalMember",mallMemberMapper.selectCount(formalMember)); +// QueryWrapper<MallMember> formalMember = new QueryWrapper<>(); +// formalMember.ne("level", AgentLevelEnum.ZERO_LEVEL.name()); +// data.put("formalMember",mallMemberMapper.selectCount(formalMember)); - QueryWrapper<MallMember> informalMember = new QueryWrapper<>(); - informalMember.eq("level", AgentLevelEnum.ZERO_LEVEL.name()); - data.put("informalMember",mallMemberMapper.selectCount(informalMember)); +// QueryWrapper<MallMember> informalMember = new QueryWrapper<>(); +// informalMember.eq("level", AgentLevelEnum.ZERO_LEVEL.name()); +// data.put("informalMember",mallMemberMapper.selectCount(informalMember)); QueryWrapper<MallMember> todayMember = new QueryWrapper<>(); todayMember.like("CREATED_TIME", DateUtil.today()); -- Gitblit v1.9.1