From 519ccbf3bd32e3f691432562b9e1a887e28bb170 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Mon, 08 Aug 2022 18:05:56 +0800 Subject: [PATCH] 20220808 --- src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 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 65656f4..ae956f2 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 @@ -61,6 +61,9 @@ return; } + /** + * + */ if (profitDate == null) { profitDate = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1); } @@ -68,6 +71,7 @@ // BigDecimal tcIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "D", 2); // 普通商品业绩 // BigDecimal normalIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "D", 1); + //今日总业绩 BigDecimal totalIncome = mallAchieveRecordMapper.selectAchieveTotal("D", profitDate); if (totalIncome.compareTo(BigDecimal.ZERO) == 0) { @@ -113,9 +117,9 @@ BigDecimal preStaticProfit = staticProfit.divide(new BigDecimal(list.size()), 2, RoundingMode.HALF_UP); for (Map<String, Object> item : list) { - Long memberId = (Long) item.get("memberId"); +// Long memberId = (Long) item.get("memberId"); String orderNo = (String) item.get("orderNo"); - + changeAllScoreAndCommission(preStaticProfit,orderNo); // int reduce = walletService.reduce(preStaticProfit, memberId, "score"); // if (reduce == 2) { // break; @@ -124,12 +128,19 @@ // walletService.add(preStaticProfit, memberId, "commission"); // moneyFlowService.addMoneyFlow(memberId, preStaticProfit, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderNo, FlowTypeEnum.COMMISSION.getValue()); // moneyFlowService.addMoneyFlow(memberId, preStaticProfit.negate(), MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderNo, FlowTypeEnum.SCORE.getValue()); - changeScoreAndCommission(memberId, preStaticProfit, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderNo); +// changeScoreAndCommission(memberId, preStaticProfit, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderNo); } } } } + public void changeAllScoreAndCommission(BigDecimal preStaticProfit,String orderNo){ + List<MallMember> members = mallMemberMapper.selectList(null); + for(MallMember mallMember : members){ + changeScoreAndCommission(mallMember.getId(), preStaticProfit, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderNo); + } + } + @Override public void dynamicProfit(Long orderId) { dynamicProfit(orderId, 2); -- Gitblit v1.9.1