diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java index 145d8e0..fa598c9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java @@ -76,5 +76,8 @@ public class WxAuthorizerInfo extends BaseEntity { private String accessToken; @io.swagger.annotations.ApiModelProperty(value="accessToken过期时间",name="accessTokenExpire") private Date accessTokenExpire; + + @io.swagger.annotations.ApiModelProperty(value="app平台 EnumAppPlat ",name="plat") + private Integer plat; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumAppPlat.java b/mallinkService/src/main/java/com/iformall/enums/EnumAppPlat.java new file mode 100644 index 0000000..482888a --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumAppPlat.java @@ -0,0 +1,38 @@ +package com.iformall.enums; + +/** + * app平台 + * @author alascor + */ +public enum EnumAppPlat { + WX(1,"微信"),ALI(2,"阿里"),TOUTIAO(3,"头条"); + + EnumAppPlat(Integer code, String name) { + this.code = code; + this.name = name; + } + + private Integer code; + private String name; + public Integer getCode() { + return code; + } + public void setCode(Integer code) { + this.code = code; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + public static EnumAppPlat getByCode(Integer code) { + for (EnumAppPlat e : EnumAppPlat.values()) { + if (e.getCode().intValue() == code.intValue()) { + return e; + } + } + return null; + } +} diff --git a/mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml index a745220..d4e5849 100644 --- a/mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml @@ -31,6 +31,8 @@ + + @@ -39,7 +41,7 @@ `privacy_setting_status`, `current_version`,`current_desc`,`release_time`, `open_appid`,`bind_open_time`,`refresh_token`, - `access_token`,`access_token_expire` + `access_token`,`access_token_expire`,`plat` @@ -119,6 +121,9 @@ and `bind_open_time` = #{bindOpenTime} + + and `plat` = #{plat} + and id in @@ -214,6 +219,7 @@ + @@ -226,7 +232,7 @@ ai.`template_status`,ai.`template_time`, ai.`privacy_setting_status`, ai.`current_version` as `current_version`,ai.`current_desc`,ai.`release_time`, - ai.`open_appid`,ai.`bind_open_time`, + ai.`open_appid`,ai.`bind_open_time`,ai.`plat`, a.`name` as `name` @@ -286,6 +292,9 @@ and ai.`open_appid` = #{openAppid} + + and ai.`plat` = #{plat} + and ai.id in diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index 1bd88f8..f06011d 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java @@ -98,6 +98,7 @@ public class WxWeappInfoController extends BaseController { weappInfo.setName(null); } } + weappInfo.setPlat(EnumAppPlat.WX.getCode()); weappInfo.setSortColumns(BaseEntity.SortField.TenantId_ASC,BaseEntity.SortField.Type_ASC,BaseEntity.SortField.Name_ASC); final PageInfo page = authorizerInfoService.listVoAsPage(weappInfo, pageNum, pageSize); return new ResultData(page);