From eab74d698bb5c840146cc7bd54be2462f3ca4074 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 29 Aug 2022 15:42:44 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
index 5fed9c9..9f9a6e4 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
@@ -156,7 +156,7 @@
OrderStateDto orderStateDto = new OrderStateDto();
orderStateDto.setOrderNo(mallOrderInfo.getOrderNo());
String productNames = getProductNames(mallOrderInfo.getMemberId(), mallOrderInfo.getId());
- orderStateDto.setGoodsName(StrUtil.sub(StrUtil.isEmpty(productNames)?"商品":productNames,0,10)+"...");
+ orderStateDto.setGoodsName(StrUtil.sub(productNames,0,10)+"...");
orderStateDto.setOrderState("已送达");
orderStateDto.setTakeCode(mallOrderInfo.getTakeCode());
String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();
@@ -248,7 +248,14 @@
@Override
public FebsResponse findTeamOrderMarkCnt() {
MallMember loginUser = LoginUserUtil.getLoginUser();
- MallTeamLeader mallTeamLeader = this.baseMapper.selectLeaderByUniqueCode(loginUser.getInviteId());
+ Long memberId = loginUser.getId();
+ MallMember mallMember = mallMemberMapper.selectById(memberId);
+
+ log.info(mallMember.getInviteId());
+ MallTeamLeader mallTeamLeader = this.baseMapper.selectLeaderByUniqueCode(mallMember.getInviteId());
+ if(ObjectUtil.isEmpty(mallTeamLeader)){
+ return new FebsResponse().success();
+ }
String uniqueCode = mallTeamLeader.getUniqueCode();
List<Map<String, Integer>> maps = mallOrderInfoMapper.selectMemberOrderStatusCntByUniquecode(uniqueCode);
Map<Integer, Integer> orderCnt = new HashMap<>();
--
Gitblit v1.9.1