From 11ba3f40fb970efabfe64843e0c736d1dfb041d0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 13 Feb 2023 11:13:06 +0800
Subject: [PATCH] 创建订单的判断条件去掉，由新增的接口判断
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 95f2dc5..053e033 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -66,6 +66,7 @@
private final MallRegisterAppealMapper mallRegisterAppealMapper;
private final MallTeamLeaderMapper mallTeamLeaderMapper;
private final SpringContextHolder springContextHolder;
+ private final MallAgentRecordMapper mallAgentRecordMapper;
@Value("${spring.profiles.active}")
@@ -254,13 +255,18 @@
mallMemberVo.setPrizeScore(wallet.getPrizeScore());
mallMemberVo.setTotalCost(mallOrderInfoMapper.selectTotalAmount(id));
- //用户是否是团长
- List<MallTeamLeader> mallTeamLeaders = mallTeamLeaderMapper.selectListByMemberIdAndState(mallMember.getId(), MallTeamLeader.STATE_YES);
- if(CollUtil.isNotEmpty(mallTeamLeaders)){
- mallMemberVo.setIsTeamLeader(1);
- }else{
- mallMemberVo.setIsTeamLeader(2);
+ //代理状态
+ MallAgentRecord mallAgentRecordIng = mallAgentRecordMapper.selectByMemberIdAndState(id, MallAgentRecord.APPLY_ING);
+ MallAgentRecord mallAgentRecordAgree = mallAgentRecordMapper.selectByMemberIdAndState(id, MallAgentRecord.APPLY_AGREE);
+ MallAgentRecord mallAgentRecordDisagree = mallAgentRecordMapper.selectByMemberIdAndState(id, MallAgentRecord.APPLY_DISAGREE);
+ if(ObjectUtil.isNotEmpty(mallAgentRecordIng)){
+ mallMemberVo.setIsAgent(1);
+ }else if(ObjectUtil.isNotEmpty(mallAgentRecordAgree)){
+ mallMemberVo.setIsAgent(2);
+ }else if(ObjectUtil.isNotEmpty(mallAgentRecordDisagree)){
+ mallMemberVo.setIsAgent(3);
}
+
return new FebsResponse().success().data(mallMemberVo);
}
--
Gitblit v1.9.1