From 02184fd86a8ef854d087d5c919151bbdf092efef Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Thu, 16 Jun 2022 15:28:58 +0800 Subject: [PATCH] fix --- src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 346 ++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 291 insertions(+), 55 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 a47d48c..c170ad3 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 @@ -8,6 +8,7 @@ import cc.mrbird.febs.mall.entity.*; import cc.mrbird.febs.mall.mapper.*; import cc.mrbird.febs.mall.service.IApiMallMemberWalletService; +import cc.mrbird.febs.mall.service.IMallAchieveService; import cc.mrbird.febs.mall.service.IMallMoneyFlowService; import cc.mrbird.febs.mall.service.IMemberProfitService; import cn.hutool.core.collection.CollUtil; @@ -16,6 +17,8 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -23,8 +26,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; -import java.util.Date; -import java.util.List; +import java.util.*; /** * @author wzy @@ -42,6 +44,8 @@ private final IApiMallMemberWalletService walletService; private final IMallMoneyFlowService moneyFlowService; private final DataDictionaryCustomMapper dataDictionaryCustomMapper; + private final MallMoneyFlowMapper mallMoneyFlowMapper; + private final IMallAchieveService mallAchieveService; @Override @Transactional(rollbackFor = Exception.class) @@ -53,14 +57,21 @@ } Date profitDate = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1); - BigDecimal totalIncome = mallOrderInfoMapper.selectTotalAmountForDate(profitDate, null); + // 套餐业绩 + BigDecimal tcIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "D", 2); + // 普通商品业绩 + BigDecimal normalIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "D", 1); + BigDecimal totalIncome = tcIncome.add(normalIncome); + if (totalIncome.compareTo(BigDecimal.ZERO) == 0) { return; } DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.STATIC_BONUS.getType(), DataDictionaryEnum.STATIC_BONUS.getCode()); - BigDecimal perProfit = totalIncome.divide(new BigDecimal(dic.getValue()), 2, RoundingMode.HALF_UP).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP); + BigDecimal perProfit = totalIncome.multiply(new BigDecimal(dic.getValue()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP)); + Map<Long, List<Map<String, Object>>> map = new HashMap<>(); + Map<Long, BigDecimal> goodsProp = new HashMap<>(); for (MallMember member : members) { List<MallGoods> goodsList = mallGoodsMapper.selectOrderGoodsList(member.getId(), profitDate); @@ -69,20 +80,51 @@ } for (MallGoods goods : goodsList) { - BigDecimal goodsProfit = goods.getStaticProp().multiply(perProfit); - - try { - walletService.reduce(goodsProfit, member.getId(), "score"); - } catch (Exception e) { - log.info("静态分红异常:{}, {}", goodsProfit, member.getId()); - break; + if (goods.getIsNormal() == 1) { + continue; } - walletService.add(goodsProfit, member.getId(), "commission"); - moneyFlowService.addMoneyFlow(member.getId(), goodsProfit, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), goods.getOrderNo(), FlowTypeEnum.COMMISSION.getValue()); - moneyFlowService.addMoneyFlow(member.getId(), goodsProfit.negate(), MoneyFlowTypeEnum.STATIC_BONUS.getValue(), goods.getOrderNo(), FlowTypeEnum.SCORE.getValue()); + List<Map<String, Object>> list = map.get(goods.getId()); + if (CollUtil.isEmpty(list)) { + list = new ArrayList<>(); + } + + Map<String, Object> listItem = new HashMap<>(); + listItem.put("memberId", member.getId()); + listItem.put("orderNo", goods.getOrderNo()); + list.add(listItem); + + map.put(goods.getId(), list); + goodsProp.put(goods.getId(), goods.getStaticProp()); } } + + if (!map.isEmpty()) { + for (Map.Entry<Long, List<Map<String, Object>>> entry : map.entrySet()) { + List<Map<String, Object>> list = entry.getValue(); + BigDecimal staticProfit = goodsProp.get(entry.getKey()).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP).multiply(perProfit); + BigDecimal preStaticProfit = staticProfit.divide(new BigDecimal(list.size()), 2, RoundingMode.HALF_UP); + + for (Map<String, Object> item : list) { + Long memberId = (Long) item.get("memberId"); + String orderNo = (String) item.get("orderNo"); + + int reduce = walletService.reduce(preStaticProfit, memberId, "score"); + if (reduce == 2) { + break; + } + + 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()); + } + } + } + } + + @Override + public void dynamicProfit(Long orderId) { + dynamicProfit(orderId, 2); } /** @@ -92,7 +134,8 @@ * @param orderId */ @Override - public void dynamicProfit(Long orderId) { + @Transactional(rollbackFor = Exception.class) + public void dynamicProfit(Long orderId, Integer isNormal) { log.info("######直推奖励, 订单ID:{}######", orderId); MallOrderInfo orderInfo = mallOrderInfoMapper.selectById(orderId); if (orderInfo.getOrderType() == 2) { @@ -105,71 +148,113 @@ if (StrUtil.isBlank(member.getReferrerId())) { return; } - DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.DYNAMIC_BONUS.getType(), DataDictionaryEnum.DYNAMIC_BONUS.getCode()); - DataDictionaryCustom indrectDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.INDRECT_BONUS.getType(), DataDictionaryEnum.INDRECT_BONUS.getCode()); - String parent = member.getReferrerId(); + // 直推奖励字典 + DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.DYNAMIC_BONUS.getType(), DataDictionaryEnum.DYNAMIC_BONUS.getCode()); + + // 直接父级 + MallMember parent = mallMemberMapper.selectInfoByInviteId(member.getReferrerId()); + List<MallOrderItem> items = mallOrderInfoMapper.getMallOrderItemByOrderId(orderId); for (MallOrderItem item : items) { // 减去成本后算收益 BigDecimal amount = item.getPrice().subtract(item.getCostPrice()).multiply(BigDecimal.valueOf(item.getCnt())); + if (amount.compareTo(BigDecimal.ZERO) < 1) { + continue; + } - BigDecimal dynamicProfit = amount.divide(new BigDecimal(dic.getValue()), 2, RoundingMode.HALF_UP); + // 判断套餐或者普通商品,结算对应商品的动态分红 + if (!Objects.equals(item.getIsNormal(), isNormal)) { + continue; + } - List<String> parents = StrUtil.split(member.getReferrerIds(), ','); + // =======直推返利== start ===== + // 直接奖励收益 + BigDecimal dynamicProfit = amount.multiply(new BigDecimal(dic.getValue()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP)); + + if (dynamicProfit.compareTo(BigDecimal.ZERO) < 1) { + continue; + } + + int reduce = walletService.reduce(dynamicProfit, parent.getId(), "score"); + if (reduce == 2) { + continue; + } + + walletService.add(dynamicProfit, parent.getId(), "commission"); + + moneyFlowService.addMoneyFlow(parent.getId(), dynamicProfit, MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.COMMISSION.getValue()); + moneyFlowService.addMoneyFlow(parent.getId(), dynamicProfit.negate(), MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue()); + // =======直推返利== end ===== + + // =======隔代奖== start ===== + if (StrUtil.isBlank(parent.getReferrerId())) { + continue; + } + + List<String> parents = StrUtil.split(parent.getReferrerIds(), ','); List<MallMember> members = mallMemberMapper.selectByInviteIds(parents); if (CollUtil.isEmpty(members)) { return; } - // 隔代比例 - BigDecimal indrectDicProp = new BigDecimal(indrectDic.getValue()); - - // 隔代推荐奖 - BigDecimal direct = dynamicProfit.divide(indrectDicProp, 2, RoundingMode.HALF_UP); + BigDecimal direct = dynamicProfit; for (MallMember parentMember : members) { - if (parent.equals(parentMember.getInviteId())) { + if (parent.getInviteId().equals(parentMember.getInviteId())) { continue; } - try { - walletService.reduce(direct, parentMember.getId(), "score"); - } catch (Exception e) { - log.info("隔代推荐奖异常:{}, {}", direct, parentMember.getId()); + // 直推数量 + Integer directCnt = mallMemberMapper.selectOwnCntByInviteId(member.getReferrerId()); + List<DataDictionaryCustom> dataDices = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.INDIRECT_BONUS_SETTING.getType()); + + directCnt = directCnt == null ? 0 :directCnt; + + // 隔代比例 + BigDecimal indrectDicProp = BigDecimal.ZERO; + for (DataDictionaryCustom dataDic : dataDices) { + JSONObject jsonObject = JSONObject.parseObject(dataDic.getValue()); + if (directCnt >= jsonObject.getInteger("pushCnt")) { + indrectDicProp = jsonObject.getBigDecimal("prop"); + } + } + + // 隔代推荐奖 收益 + direct = direct.divide(indrectDicProp, 2, RoundingMode.HALF_UP); + + // direct 收益小于1,则跳出 + if (direct.compareTo(BigDecimal.ONE) < 1) { continue; } + + int reduceResult = walletService.reduce(direct, parentMember.getId(), "score"); + if (reduceResult == 2) { + continue; + } + walletService.add(direct, parentMember.getId(), "commission"); - moneyFlowService.addMoneyFlow(parentMember.getId(), direct, MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.COMMISSION.getValue()); moneyFlowService.addMoneyFlow(parentMember.getId(), direct.negate(), MoneyFlowTypeEnum.RECOMMEND_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue()); - - if (direct.compareTo(BigDecimal.ONE) < 1) { - break; - } - direct = direct.divide(indrectDicProp, 2, RoundingMode.HALF_UP); } + // =======隔代奖== end ===== - try { - walletService.reduce(dynamicProfit, member.getId(), "score"); - } catch (Exception e) { - log.info("直推奖励异常:{}, {}", dynamicProfit, member.getId()); - continue; - } - walletService.add(dynamicProfit, member.getId(), "commission"); - - moneyFlowService.addMoneyFlow(member.getId(), dynamicProfit, MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.COMMISSION.getValue()); - moneyFlowService.addMoneyFlow(member.getId(), dynamicProfit.negate(), MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue()); + item.setHasSettle(1); + mallOrderItemMapper.updateById(item); } } @Override + @Transactional(rollbackFor = Exception.class) public void agentProfit(Date profitDate) { - log.info("#####==代理分红==#####"); + log.info("#####==代理分红==start==#####"); if (profitDate == null) { profitDate = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1); } - BigDecimal totalIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "D"); - + // 套餐业绩 + BigDecimal tcIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "D", 2); + // 普通商品业绩 + BigDecimal normalIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "D", 1); + BigDecimal totalIncome = tcIncome.add(normalIncome); DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.AGENT_BONUS.getType(), DataDictionaryEnum.AGENT_BONUS.getCode()); BigDecimal profit = totalIncome.divide(new BigDecimal(dic.getValue()), 2, RoundingMode.HALF_UP); @@ -191,25 +276,176 @@ BigDecimal profitProp = jsonObject.getBigDecimal("profitProp"); BigDecimal income = preProfit.multiply(profitProp); - try { - walletService.reduce(income, agentMember.getId(), "score"); - } catch (Exception e) { - log.info("直推奖励异常:{}, {}", income, agentMember.getId()); + int reduce = walletService.reduce(income, agentMember.getId(), "score"); + if (reduce == 2) { continue; } + walletService.add(income, agentMember.getId(), "commission"); moneyFlowService.addMoneyFlow(agentMember.getId(), income, MoneyFlowTypeEnum.AGENT_BONUS.getValue(), null, FlowTypeEnum.COMMISSION.getValue()); moneyFlowService.addMoneyFlow(agentMember.getId(), income.negate(), MoneyFlowTypeEnum.AGENT_BONUS.getValue(), null, FlowTypeEnum.SCORE.getValue()); } + + log.info("#####==代理分红==end==#####"); } @Override public void rankProfit() { log.info("######==排名分红==####"); + Page<MallMember> page = new Page<>(1, 5); + MallMember query = new MallMember(); + query.setQuery("2"); + Date profitDate = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1); + query.setCreatedTime(profitDate); + IPage<MallMember> rankListInPage = mallMemberMapper.selectRankListInPage(page, query); + + List<MallMember> rankList = rankListInPage.getRecords(); + if (CollUtil.isEmpty(rankList)) { + return; + } + + // 套餐业绩 + BigDecimal tcIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "M", 2); + // 普通商品业绩 + BigDecimal normalIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "M", 1); + BigDecimal totalIncome = tcIncome.add(normalIncome); + + List<DataDictionaryCustom> rankAward = dataDictionaryCustomMapper.selectDicByType("RANK_AWARD"); + DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.RANK_BONUS.getType(), DataDictionaryEnum.RANK_BONUS.getCode()); + + + BigDecimal rankBonusTotal = totalIncome.multiply(new BigDecimal(dic.getValue()).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP)); + BigDecimal preBonus = rankBonusTotal.divide(BigDecimal.valueOf(100),2 , RoundingMode.HALF_UP); + + int i = 0; + for (MallMember member : rankList) { + DataDictionaryCustom rank = rankAward.get(i); + i++; + BigDecimal bonus = preBonus.multiply(new BigDecimal(rank.getValue())); + int reduce = walletService.reduce(bonus, member.getId(), "score"); + if (reduce == 2) { + continue; + } + + walletService.add(bonus, member.getId(), "commission"); + + moneyFlowService.addMoneyFlow(member.getId(), bonus, MoneyFlowTypeEnum.RANK_BONUS.getValue(), null, FlowTypeEnum.COMMISSION.getValue()); + moneyFlowService.addMoneyFlow(member.getId(), bonus.negate(), MoneyFlowTypeEnum.RANK_BONUS.getValue(), null, FlowTypeEnum.SCORE.getValue()); + } } - public static void main(String[] args) { - System.out.println(DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1)); + /** + * 拿推荐人的收益(代理,直推,排名)的10%加权平分给下面直推 + */ + @Override + public void thankfulProfit() { + log.info("######==感恩奖==start==####"); + List<MallMember> mallMembers = mallMemberMapper.selectMemberListHasChild(); + if (CollUtil.isEmpty(mallMembers)) { + return; + } + + DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.THANKFUL_BONUS.getType(), DataDictionaryEnum.THANKFUL_BONUS.getCode()); + // 感恩奖比例 + BigDecimal prop = new BigDecimal(dic.getValue()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP); + + Date date = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1); + for (MallMember mallMember : mallMembers) { + BigDecimal income = mallMoneyFlowMapper.selectThankfulCommission(date, mallMember.getId()); + List<MallMember> children = mallMemberMapper.selectMemberDirectForHasLevel(mallMember.getInviteId()); + if (CollUtil.isEmpty(children)) { + continue; + } + + BigDecimal reduceProfit = income.multiply(prop); + if (reduceProfit.compareTo(BigDecimal.ZERO) < 1) { + continue; + } + + int reduce = walletService.reduce(reduceProfit, mallMember.getId(), "commission"); + if (reduce == 2) { + continue; + } + + moneyFlowService.addMoneyFlow(mallMember.getId(), reduceProfit.negate(), MoneyFlowTypeEnum.THANKFUL.getValue(), null, FlowTypeEnum.COMMISSION.getValue()); + for (MallMember child : children) { + BigDecimal preProfit = income.multiply(prop).divide(BigDecimal.valueOf(children.size()), 2, RoundingMode.HALF_DOWN); + if (preProfit.compareTo(BigDecimal.ZERO) < 1) { + continue; + } + + int reduce1 = walletService.reduce(preProfit, child.getId(), "score"); + if (reduce1 == 2) { + continue; + } + + walletService.add(preProfit, child.getId(), "commission"); + moneyFlowService.addMoneyFlow(child.getId(), preProfit, MoneyFlowTypeEnum.THANKFUL.getValue(), null, mallMember.getId(), FlowTypeEnum.COMMISSION.getValue()); + moneyFlowService.addMoneyFlow(child.getId(), preProfit.negate(), MoneyFlowTypeEnum.THANKFUL.getValue(), null, mallMember.getId(), FlowTypeEnum.SCORE.getValue()); + } + } + log.info("######==感恩奖==end==####"); + } + + @Override + public void storeAndDirectorProfit(Date profitDate) { + log.info("#####==店补/董事==start==######"); + if (profitDate == null) { + profitDate = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1); + } + // 套餐业绩 + BigDecimal tcIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "D", 2); + // 普通商品业绩 + BigDecimal normalIncome = mallOrderInfoMapper.selectTotalAmountUnCostForDate(profitDate, null, "D", 1); + BigDecimal totalIncome = tcIncome.add(normalIncome); + + // 董事 + DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.DIRECTOR_BONUS.getType(), DataDictionaryEnum.DIRECTOR_BONUS.getCode()); + List<MallMember> directors = mallMemberMapper.selectDirectorsOrStoreMaster(1); + if (CollUtil.isNotEmpty(directors)) { + BigDecimal total = totalIncome.multiply(new BigDecimal(dic.getValue()).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP)); + BigDecimal pre = total.divide(new BigDecimal(directors.size()), 2, RoundingMode.HALF_UP); + + for (MallMember director : directors) { + if (pre.compareTo(BigDecimal.ZERO) < 1) { + continue; + } + + int reduce = walletService.reduce(pre, director.getId(), "score"); + if (reduce == 2) { + continue; + } + + walletService.add(pre, director.getId(), "commission"); + moneyFlowService.addMoneyFlow(director.getId(), pre, MoneyFlowTypeEnum.DIRECTOR_BONUS.getValue(), null, FlowTypeEnum.COMMISSION.getValue()); + moneyFlowService.addMoneyFlow(director.getId(), pre.negate(), MoneyFlowTypeEnum.DIRECTOR_BONUS.getValue(), null, FlowTypeEnum.SCORE.getValue()); + } + } + + // 店补 + dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.COMMUNITY_BONUS.getType(), DataDictionaryEnum.COMMUNITY_BONUS.getCode()); + List<MallMember> storeMasters = mallMemberMapper.selectDirectorsOrStoreMaster(2); + if (CollUtil.isNotEmpty(storeMasters)) { + BigDecimal total = totalIncome.multiply(new BigDecimal(dic.getValue()).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP)); + BigDecimal pre = total.divide(new BigDecimal(storeMasters.size()), 2, RoundingMode.HALF_UP); + + for (MallMember storeMaster : storeMasters) { + if (pre.compareTo(BigDecimal.ZERO) < 1) { + continue; + } + + int reduce = walletService.reduce(pre, storeMaster.getId(), "score"); + if (reduce == 2) { + continue; + } + + walletService.add(pre, storeMaster.getId(), "commission"); + moneyFlowService.addMoneyFlow(storeMaster.getId(), pre, MoneyFlowTypeEnum.COMMUNITY_BONUS.getValue(), null, FlowTypeEnum.COMMISSION.getValue()); + moneyFlowService.addMoneyFlow(storeMaster.getId(), pre.negate(), MoneyFlowTypeEnum.COMMUNITY_BONUS.getValue(), null, FlowTypeEnum.SCORE.getValue()); + } + } + + log.info("#####==店补/董事==end==######"); } } -- Gitblit v1.9.1