diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java index 53c78dd55..31990d3bc 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java @@ -7,10 +7,13 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumGroupSupport; +import com.iformall.enums.EnumYesOrNo; import com.iformall.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -117,6 +120,26 @@ public class WxMallController extends BaseController { return new ResultData(Result.SUCCESS, "查询成功", mall); } + @RedisCache + @ApiOperation("商场信息") + @GetMapping("/subMall") + public ResultData getSubMall(Integer isAll) { + List mallList = new ArrayList<>(); + WxMall mall = wxMallService.getByTenantInfo(getTenantInfo()); + if (mall == null) { + return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); + } + if(EnumYesOrNo.YES.getCode().equals(isAll)){ + mallList.add(mall); + } + if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) && + StringUtils.isBlank(mall.getParentTenantId())) { + List subMall = wxMallService.getSubByParentTenantId(mall.getTenantId()); + mallList.addAll(subMall); + } + return new ResultData(Result.SUCCESS, "查询成功", mallList); + } + @ApiOperation("成长值相关信息") @GetMapping("/scoreLevelInfo") public ResultData getScoreLevelInfo() {