Commit d7ca81d8 by 陶光胜

门店控件修复

parent c223d805
...@@ -233,28 +233,13 @@ public class GoDownComponent { ...@@ -233,28 +233,13 @@ public class GoDownComponent {
gicMall(page, channel, enterpriseId, level); gicMall(page, channel, enterpriseId, level);
} }
if(StoreChannelEnum.WMMALL.getChannel().equals(channel)){ if(StoreChannelEnum.WMMALL.getChannel().equals(channel)){
List<WmStoreDTO> wmStoreList = wmStoreApiService.listWmStore(enterpriseId, null).getResult();
if(CollectionUtils.isNotEmpty(wmStoreList)){
page.getResult().stream().forEach(b -> { page.getResult().stream().forEach(b -> {
BaseDTO baseSalesDTO = (BaseDTO) b; BaseDTO baseSalesDTO = (BaseDTO) b;
baseSalesDTO.setLevel(level); baseSalesDTO.setLevel(level);
for(WmStoreDTO dto : wmStoreList){
if(baseSalesDTO instanceof BaseSalesDTO){
if(baseSalesDTO.getId().equals(dto.getWmMallStoreId()+"")){
baseSalesDTO.setName(dto.getWmMainAccount());
baseSalesDTO.setChannel(channel);
}
}else {
if(baseSalesDTO.getAreaId().equals(dto.getWmMallStoreId()+"")){
baseSalesDTO.setAreaName(dto.getWmMainAccount());
baseSalesDTO.setChannel(channel); baseSalesDTO.setChannel(channel);
} baseSalesDTO.setHasChildren(level == 1 ? 1 : 0);
}
}
}); });
} }
}
if(StoreChannelEnum.OFFLINE.getChannel().equals(channel)){ if(StoreChannelEnum.OFFLINE.getChannel().equals(channel)){
List<ClerkDTO> clerkDtoS = new ArrayList<>(); List<ClerkDTO> clerkDtoS = new ArrayList<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment