diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMallController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMallController.java index 4ac38e422..895572980 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMallController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMallController.java @@ -68,6 +68,13 @@ public class WxMallController extends BaseController { return new ResultData(Result.SUCCESS, "查询成功", wxMallService.getById(id)); } + @ApiOperation("根据id查询接口") + @GetMapping("/mallinfoExt") + public ResultData mallinfoExt() { + logger.debug("[" + getIpAddr() + "] WxMallController::mallinfoExt"); + return new ResultData(wxMallService.getByTenantIdExt(getTenantId())); + } + @ApiOperation("查询当前mall的信息") @GetMapping("/mallinfo") public ResultData mallinfo() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java index 8f925d527..5d6e8fa55 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java @@ -85,6 +85,9 @@ public class WxMall implements Serializable { @io.swagger.annotations.ApiModelProperty(value="小程序提示",name="weapNote") private String weapNote; + @Transient + protected List buildings; + public String getTenantId() { return tenantId; } @@ -184,6 +187,14 @@ public class WxMall implements Serializable { this.weapNote = weapNote; } + public List getBuildings() { + return buildings; + } + + public void setBuildings(List buildings) { + this.buildings = buildings; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java index 317f384bd..14478af30 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java @@ -61,6 +61,10 @@ public class WxMallFloor implements Serializable { /*更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; + + @Transient + protected List floors; + public String getTenantId() { return tenantId; } @@ -105,7 +109,6 @@ public class WxMallFloor implements Serializable { } - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/service/WxMallService.java b/mallinkService/src/main/java/com/iformall/service/WxMallService.java index 0552c6b8b..5a1727307 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMallService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMallService.java @@ -43,9 +43,8 @@ public interface WxMallService { * @param id */ WxMall getByTenantId(String id); - - + WxMall getByTenantIdExt(String id); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java index edaaba2df..a3158c77c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java @@ -3,7 +3,12 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxMall; +import com.iformall.domain.po.WxMallBuilding; +import com.iformall.domain.po.WxMallFloor; +import com.iformall.mapper.WxMallBuildingMapper; +import com.iformall.mapper.WxMallFloorMapper; import com.iformall.mapper.WxMallMapper; +import com.iformall.service.WxMallBuildingService; import com.iformall.service.WxMallService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,6 +16,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; +import java.util.List; +import java.util.stream.Collectors; + @Service public class WxMallServiceImpl implements WxMallService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -18,6 +26,11 @@ public class WxMallServiceImpl implements WxMallService { @Autowired WxMallMapper wxMallMapper; + @Autowired + WxMallBuildingMapper wxMallBuildingMapper; + + @Autowired + WxMallFloorMapper wxMallFloorMapper; @Override public PageInfo listAsPage(WxMall record, Integer pageIndex, Integer pageSize) { @@ -54,9 +67,38 @@ public class WxMallServiceImpl implements WxMallService { wxMall.setTenantId(id); return wxMallMapper.findList(wxMall).get(0); } - - - - - + + @Override + public WxMall getByTenantIdExt(String id) { + WxMall wxMallParam = new WxMall(); + wxMallParam.setTenantId(id); + WxMall wxMall = wxMallMapper.findList(wxMallParam).get(0); + + WxMallBuilding wxMallBuilding = new WxMallBuilding(); + wxMallBuilding.setTenantId(id); + List buildings = wxMallBuildingMapper.findList(wxMallBuilding); + List wxMallBuildings = buildings.stream().map(b -> { + WxMallBuilding tempb = new WxMallBuilding(); + tempb.setId(b.getId()); + tempb.setName(b.getName()); + return tempb; + }).collect(Collectors.toList()); + + for(WxMallBuilding building:wxMallBuildings){ + WxMallFloor wxMallFloor = new WxMallFloor(); + wxMallFloor.setBuildingId(building.getId()); + List wxMallFloors = wxMallFloorMapper.findList(wxMallFloor).stream().map(f -> { + WxMallFloor tempf = new WxMallFloor(); + tempf.setId(f.getId()); + tempf.setFloorName(f.getFloorName()); + return tempf; + }).collect(Collectors.toList()); + building.setFloors(wxMallFloors); + + } + wxMall.setBuildings(wxMallBuildings); + return wxMall; + } + + }