From 31c11e345297f4f9938c7ea32d3864ed3ab26697 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 28 Sep 2021 12:43:15 +0800 Subject: [PATCH] fix --- src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) 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 1aa0798..42c478f 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 @@ -82,12 +82,17 @@ * @return */ private boolean orderCntFinish(MallMember member, AgentInfo agentInfo) { - Integer cnt = orderInfoMapper.selectCntDirectOrTeam(agentInfo.getOrderType(), member.getInviteId()); + Integer cnt = 0; + if (AgentInfo.ORDER_TYPE_DIRECT.equals(agentInfo.getOrderType())) { + cnt = orderInfoMapper.selectCntDirect(member.getInviteId()); + } else { + cnt = orderInfoMapper.selectCntDirectOrTeam(agentInfo.getOrderType(), member.getInviteId()); + } if (cnt >= agentInfo.getOrderCnt()) { return true; } - log.info("用户{}订单未达标, 当前数量为:{},要求数量:{}, 当前等级为:{}", member.getAccount(), cnt, agentInfo.getOrderCnt(), member.getLevel()); + log.info("用户{}订单未达标, 当前数量为:{},要求数量:{}, 当前等级为:{}", member.getPhone(), cnt, agentInfo.getOrderCnt(), member.getLevel()); return false; } @@ -120,7 +125,7 @@ return true; } - log.info("用户:{}代理数量未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getAccount(), member.getLevel(), i, agentInfo.getLastCnt()); + log.info("用户:{}代理数量未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), i, agentInfo.getLastCnt()); return false; } @@ -229,4 +234,9 @@ return JSONObject.parseObject(dic.getValue(), AgentInfo.class); } + + @Override + public void rankReturnMoney(Long orderId) { + + } } -- Gitblit v1.9.1