diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java index 45ae2352c..30810dd07 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -68,6 +68,9 @@ public class WxProjectConfigController extends BaseController { @Autowired WxAuthorizerInfoService wxAuthorizerInfoService; + @Autowired + WxWeappExtSetService wxWeappExtSetService; + @Autowired WxScoreRulesService wxScoreRulesService; @@ -125,7 +128,26 @@ public class WxProjectConfigController extends BaseController { logger.error(e.getMessage(),e); return new ResultData(ErrorCode.SYS_SERVER_ERROR); } + } + @ApiOperation("查询商场集团列表(选择子集团)") + @GetMapping(value = "/mallListbyMall") + @SystemControllerLog(description = "商场基础数据") + public ResultData mallListbyMall(@ModelAttribute WxMall wxMall) { + logger.debug("[" + getIpAddr() + "] WxProjectConfigController::mallListbyMall"); + try { + if(wxMall == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + if(wxMall.getId() == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + List list = wxMallService.listAsSelectMall(wxMall.getId()); + return new ResultData(); + }catch (Exception e){ + logger.error(e.getMessage(),e); + return new ResultData(ErrorCode.SYS_SERVER_ERROR); + } } @ApiOperation("添加修改商场集团") @@ -649,5 +671,35 @@ public class WxProjectConfigController extends BaseController { } } + @ApiOperation("查询ext数据") + @GetMapping(value = "/getExt/{appId}") + @SystemControllerLog(description = "商场基础数据") + public ResultData getExt(@PathVariable String appId) { + logger.debug("[" + getIpAddr() + "] WxProjectConfigController::getExt"); + try { + if(StringUtils.isBlank(appId)){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + WxWeappExtSet byAppId = wxWeappExtSetService.getByAppId(appId); + return new ResultData(byAppId); + }catch (Exception e){ + logger.error(e.getMessage(),e); + return new ResultData(ErrorCode.SYS_SERVER_ERROR); + } + } + + @ApiOperation("添加修改停车场配置") + @PostMapping("/init/appExt") + @SystemControllerLog(description = "商场停车场配置-更新") + public ResultData initPark(@RequestBody WxWeappExtSet wxWeappExtSet) { + logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initPark"); + try { + wxWeappExtSetService.updateById(wxWeappExtSet); + return new ResultData(); + }catch (Exception e){ + logger.error(e.getMessage(),e); + return new ResultData(ErrorCode.SYS_SERVER_ERROR); + } + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java index 868ad1bf0..d4d034862 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java @@ -26,6 +26,8 @@ public class WxWeappExtSet extends BaseEntity { private String releaseJson; @io.swagger.annotations.ApiModelProperty(value="停车(0:不支持,1:etcp)",name="carSupport") private Integer carSupport; + @io.swagger.annotations.ApiModelProperty(value="菜单(0:全有,1:我的/首页, 2:无停车)",name="storeApp") + private Integer storeApp; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java index aae3ca71a..adbd3a92a 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java @@ -19,4 +19,6 @@ public interface WxMallMapper extends CommonMapper { String queryMenusByTenantInfo(WxMall wxMall); void undateSubmall(@Param(value = "parentTenantId")String parentTenantId, @Param(value = "tenantIds")String[] tenantIds); + + List listAsSelectMall(@Param(value = "id")Long id); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxWeappExtSetMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxWeappExtSetMapper.java index accb1f184..a3d31050f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxWeappExtSetMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxWeappExtSetMapper.java @@ -3,14 +3,11 @@ package com.iformall.mapper; import java.util.*; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxWeappExtSet; +import org.apache.ibatis.annotations.Param; public interface WxWeappExtSetMapper extends CommonMapper { List findList(WxWeappExtSet wxWeappReleaseSet); - - - - - + WxWeappExtSet getByAppId(@Param(value = "appid")String appid); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMallService.java b/mallinkService/src/main/java/com/iformall/service/WxMallService.java index 8b98c1ea1..754ef87b0 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMallService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMallService.java @@ -27,6 +27,7 @@ public interface WxMallService { * @return */ PageInfo listAsPage(WxMall record, Integer pageIndex, Integer pageSize); + List findList(WxMall record); /** * 根据Id获得实体 @@ -80,4 +81,6 @@ public interface WxMallService { List getSubByParentTenantId(String parentTenantId); void undateSubmall(String parentTenantId, String[] tenantIds); + + List listAsSelectMall(Long id); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxWeappExtSetService.java b/mallinkService/src/main/java/com/iformall/service/WxWeappExtSetService.java new file mode 100644 index 000000000..cf8fbf5ad --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/WxWeappExtSetService.java @@ -0,0 +1,8 @@ +package com.iformall.service; + +import com.iformall.domain.po.WxWeappExtSet; + +public interface WxWeappExtSetService { + WxWeappExtSet getByAppId(String appid); + void updateById(WxWeappExtSet record); +} 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 e16dc2463..3d7e940fc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java @@ -85,6 +85,10 @@ public class WxMallServiceImpl implements WxMallService { public PageInfo listAsPage(WxMall record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMallMapper.findList(record)); } + @Override + public List findList(WxMall record) { + return wxMallMapper.findList(record); + } @Override public WxMall getById(Long id) { @@ -299,6 +303,11 @@ public class WxMallServiceImpl implements WxMallService { wxMallMapper.undateSubmall(parentTenantId, tenantIds); } + @Override + public List listAsSelectMall(Long id) { + return wxMallMapper.listAsSelectMall(id); + } + private String getRedisKeyByTenantInfo(TenantEntity tenantEntity) { StringBuilder sb = new StringBuilder(); sb.append(Constant.TENANT_KEY_PREV).append(tenantEntity.getTenantId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappExtSetServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappExtSetServiceImpl.java new file mode 100644 index 000000000..e6f3be4d3 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappExtSetServiceImpl.java @@ -0,0 +1,28 @@ +package com.iformall.service.impl; + +import com.iformall.domain.po.WxWeappExtSet; +import com.iformall.mapper.WxWeappExtSetMapper; +import com.iformall.service.WxWeappExtSetService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class WxWeappExtSetServiceImpl implements WxWeappExtSetService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + WxWeappExtSetMapper weappExtSetMapper; + + + @Override + public WxWeappExtSet getByAppId(String appid) { + return weappExtSetMapper.getByAppId(appid); + } + + @Override + public void updateById(WxWeappExtSet record) { + weappExtSetMapper.updateById(record); + } +} diff --git a/mallinkService/src/main/resources/mapper/WxMallMapper.xml b/mallinkService/src/main/resources/mapper/WxMallMapper.xml index d52be642e..f9a82673c 100644 --- a/mallinkService/src/main/resources/mapper/WxMallMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallMapper.xml @@ -49,7 +49,7 @@ - where 1 = 1 + where id > 1 and `id` = #{id} @@ -150,6 +150,15 @@ + + + + + +