From 9b51a95fa8bc9b3a86108c6900e17fc55f8db467 Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Mon, 19 May 2025 17:02:07 +0800 Subject: [PATCH] refactor(vip): 优化积分和返佣计算逻辑 --- src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java index c7990b9..642f7f9 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java @@ -27,6 +27,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.util.*; +import java.util.stream.Collectors; /** * @author wzy @@ -46,6 +47,7 @@ private final DataDictionaryCustomMapper dataDictionaryCustomMapper; private final MallMoneyFlowMapper mallMoneyFlowMapper; private final MallAchieveRecordMapper mallAchieveRecordMapper; + private final MallMemberCouponMapper mallMemberCouponMapper; @Override @Transactional(rollbackFor = Exception.class) @@ -281,7 +283,7 @@ } BigDecimal income = profit.multiply(profitProp).divide(BigDecimal.valueOf(agentMemberList.size()), 2, RoundingMode.HALF_UP); - if (income.compareTo(BigDecimal.ZERO) > 0) { + if (income.compareTo(BigDecimal.ZERO) < 1) { continue; } @@ -477,4 +479,19 @@ } log.info("#####==店补/董事==end==######"); } + + @Override + public void getOrderCoupon(Long orderId) { + List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderId); + if(CollUtil.isNotEmpty(mallOrderItemList)){ + List<Long> memberCouponIds = mallOrderItemList.stream().map(MallOrderItem::getMemberCouponId).collect(Collectors.toList()); + if(CollUtil.isNotEmpty(memberCouponIds)){ + for(Long memberCouponId : memberCouponIds){ + MallMemberCoupon mallMemberCoupon = mallMemberCouponMapper.selectById(memberCouponId); + mallMemberCoupon.setState(2); + mallMemberCouponMapper.updateById(mallMemberCoupon); + } + } + } + } } -- Gitblit v1.9.1