From 055500cf63ac054635d128ab0648a315d7b0a6b2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 27 Sep 2021 19:23:04 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java | 2 ++
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 11 ++++++++---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 1 -
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 10 ++++++++++
4 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java
index ed0386e..3a29899 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java
@@ -40,4 +40,6 @@
List<MallOrderInfo> selectOrderInfoByStatus(@Param("status") Integer status);
Integer selectCntDirectOrTeam(@Param("type") Integer type, @Param("inviteId") String inviteId);
+
+ Integer selectCntDirect(@Param("inviteId") String inviteId);
}
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 47820ca..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;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 91b7378..1625edf 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -182,7 +182,6 @@
orderInfo.setPayOrderNo(payResultStr);
orderInfo.setPayMethod("支付宝支付");
-
break;
case "3":
payResultStr = balancePay(orderInfo, payOrderDto.getTradePwd());
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 42d9562..e6d38f4 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -159,4 +159,14 @@
</if>
</where>
</select>
+
+ <select id="selectCntDirect" resultType="java.lang.Integer">
+ select count(1) from (
+ select a.invite_id, count(1)
+ from mall_member a
+ inner join mall_order_info b on a.ID=b.member_id
+ where a.referrer_id=#{inviteId} and a.status in (2,3,4)
+ group by a.invite_id
+ ) a
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1