From a2eed0420b75e33dc173061ffafe7c5e06e3b257 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 28 Sep 2021 21:37:39 +0800 Subject: [PATCH] fix --- src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java | 2 +- src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 19 ++++++++++++------- src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java | 2 +- src/main/resources/mapper/modules/MallMemberMapper.xml | 2 +- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java index 0ae07e3..d884b6a 100644 --- a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java +++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java @@ -50,7 +50,7 @@ List<MallMember> selectAllChildAgentListByInviteId(@Param("inviteId")String inviteId); - List<MallMember> selectMemberParentAgentList(@Param("list") List<String> inviteIds); + List<MallMember> selectMemberParentAgentList(@Param("list") List<String> inviteIds, @Param("refererId") String refererId); IPage<AdminAgentLevelVo> getAgentLevelListInPage(Page<AdminAgentLevelVo> page, @Param("record")AgentLevelDto agentLevelDto); diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java index 2f2993f..5de459d 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java @@ -156,16 +156,21 @@ */ private void directReturnMoney(MallMember member, MallOrderInfo orderInfo) { MallMember parent = memberMapper.selectInfoByInviteId(member.getReferrerId()); - if (AgentLevelEnum.FIRST_LEVEL.name().equals(parent.getLevel()) || AgentLevelEnum.ZERO_LEVEL.name().equals(parent.getLevel())) { + if (AgentLevelEnum.ZERO_LEVEL.name().equals(parent.getLevel())) { return; } - AgentInfo agentInfo = getAgentInfo(parent.getLevel()); - if (agentInfo == null) { - return; - } + BigDecimal returnMoney; + if (AgentLevelEnum.FIRST_LEVEL.name().equals(parent.getLevel())) { + returnMoney = BigDecimal.valueOf(0.3).multiply(orderInfo.getAmount()); + } else { + AgentInfo agentInfo = getAgentInfo(parent.getLevel()); + if (agentInfo == null) { + return; + } - BigDecimal returnMoney = agentInfo.getDirectIncome().divide(BigDecimal.valueOf(100), 2,RoundingMode.DOWN).multiply(orderInfo.getAmount()); + returnMoney = agentInfo.getDirectIncome().divide(BigDecimal.valueOf(100), 2,RoundingMode.DOWN).multiply(orderInfo.getAmount()); + } memberWalletService.addBalance(returnMoney, parent.getId()); memberService.addMoneyFlow(parent.getId(), returnMoney, MoneyFlowTypeEnum.BONUS.getValue(), orderInfo.getOrderNo(), null, null, orderInfo.getMemberId(), null); @@ -177,7 +182,7 @@ */ public void teamReturnMoney(MallMember member, MallOrderInfo orderInfo) { List<String> inviteIds = StrUtil.split(member.getReferrerIds(), ','); - List<MallMember> agentList = memberMapper.selectMemberParentAgentList(inviteIds); + List<MallMember> agentList = memberMapper.selectMemberParentAgentList(inviteIds, member.getReferrerId()); if (CollUtil.isEmpty(agentList)) { return; } diff --git a/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java b/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java index fd287fe..a5035d3 100644 --- a/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java +++ b/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java @@ -50,7 +50,7 @@ } } - @RabbitListener(queues = QueueConstants.AGENT_RETURN_MONEY) +// @RabbitListener(queues = QueueConstants.AGENT_RETURN_MONEY) public void agentReturnMoney(String orderId) { log.info("收到返利消息:{}", orderId); try{ diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml index 4549420..cc2fdca 100644 --- a/src/main/resources/mapper/modules/MallMemberMapper.xml +++ b/src/main/resources/mapper/modules/MallMemberMapper.xml @@ -158,7 +158,7 @@ <select id="selectMemberParentAgentList" resultType="cc.mrbird.febs.mall.entity.MallMember"> select * from mall_member - where level not in ('ZERO_LEVEL', 'FIRST_LEVEL') and invite_id IN + where level not in ('ZERO_LEVEL', 'FIRST_LEVEL') and invteId!=#{refererId} and invite_id IN <foreach collection = "list" item = "item" separator="," open = "(" close = ")" > #{item} </foreach > -- Gitblit v1.9.1