From 5a8bb0c1dde052c6c95d545f53ae27d42338529d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 22 Sep 2022 17:57:35 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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 509288d..738bc5c 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
@@ -167,8 +167,10 @@
apiLeaderInfoVo.setDetailAddress(mallTeamLeader.getDetailAddress());
apiLeaderInfoVo.setAddressArea(mallTeamLeader.getAddressArea());
MallElectronicFence mallElectronicFence = mallElectronicFenceMapper.selectByTeamLeaderCode(mallTeamLeader.getUniqueCode());
- String longLatStr = mallElectronicFence.getLonglatiarr();
- apiLeaderInfoVo.setLonglatiarr(longLatStr);
+ if(ObjectUtil.isNotEmpty(mallElectronicFence)){
+ String longLatStr = mallElectronicFence.getLonglatiarr();
+ apiLeaderInfoVo.setLonglatiarr(longLatStr);
+ }
return new FebsResponse().success().data(apiLeaderInfoVo);
}
@@ -177,7 +179,17 @@
MallMember member = LoginUserUtil.getLoginUser();
IPage<MallOrderInfo> page = new Page<>(apiLeaderOrderListDto.getPageNum(), apiLeaderOrderListDto.getPageSize());
apiLeaderOrderListDto.setMemberId(member.getId());
- IPage<MallOrderInfo> mallOrderInfos = this.baseMapper.selectApiLeaderOrderListInPage(page, apiLeaderOrderListDto);
+// IPage<MallOrderInfo> mallOrderInfos = this.baseMapper.selectApiLeaderOrderListInPage(page, apiLeaderOrderListDto);
+ IPage<MallOrderInfo> mallOrderInfos = this.baseMapper.selectNewApiLeaderOrderListInPage(page, apiLeaderOrderListDto);
+ if(CollUtil.isNotEmpty(mallOrderInfos.getRecords())){
+ for(MallOrderInfo mallOrderInfo : mallOrderInfos.getRecords()){
+ Long orderInfoId = mallOrderInfo.getId();
+ List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderInfoId);
+ if(CollUtil.isNotEmpty(mallOrderItemList)){
+ mallOrderInfo.setItems(mallOrderItemList);
+ }
+ }
+ }
return MallOrderInfoConversion.INSTANCE.entitysToVos(mallOrderInfos.getRecords());
}
@@ -293,7 +305,9 @@
apiLeaderInfoVo.setDetailAddress(mallTeamLeader.getDetailAddress());
apiLeaderInfoVo.setAddressArea(mallTeamLeader.getAddressArea());
MallElectronicFence mallElectronicFence = mallElectronicFenceMapper.selectByTeamLeaderCode(mallTeamLeader.getUniqueCode());
- apiLeaderInfoVo.setLonglatiarr(mallElectronicFence.getLonglatiarr());
+ if(ObjectUtil.isNotEmpty(mallElectronicFence)){
+ apiLeaderInfoVo.setLonglatiarr(mallElectronicFence.getLonglatiarr());
+ }
apiLeaderInfoVo.setLongitude(mallTeamLeader.getLongitude());
apiLeaderInfoVo.setLatitude(mallTeamLeader.getLatitude());
}
--
Gitblit v1.9.1