| @@ -57,6 +57,10 @@ public class WxAuthorizerInfo implements Serializable { | |||||
| private Integer templateStatus; | private Integer templateStatus; | ||||
| @io.swagger.annotations.ApiModelProperty(value="微信小程序模板设置时间",name="templateTime") | @io.swagger.annotations.ApiModelProperty(value="微信小程序模板设置时间",name="templateTime") | ||||
| private Date templateTime; | private Date templateTime; | ||||
| @io.swagger.annotations.ApiModelProperty(value="小程序每月审核撤回次数",name="auditBackNum") | |||||
| private Integer auditBackNum; | |||||
| @io.swagger.annotations.ApiModelProperty(value="微信小程序审核最后撤回时间",name="auditBackTime") | |||||
| private Date auditBackTime; | |||||
| @io.swagger.annotations.ApiModelProperty(value="当前版本",name="currentVersion") | @io.swagger.annotations.ApiModelProperty(value="当前版本",name="currentVersion") | ||||
| private String currentVersion; | private String currentVersion; | ||||
| @io.swagger.annotations.ApiModelProperty(value="当前版本描述",name="currentDesc") | @io.swagger.annotations.ApiModelProperty(value="当前版本描述",name="currentDesc") | ||||
| @@ -96,6 +100,8 @@ public class WxAuthorizerInfo implements Serializable { | |||||
| ,WebDomainTime_ASC("`webdomain_time` ASC"),WebDomainTime_DESC("`webdomain_time` DESC") | ,WebDomainTime_ASC("`webdomain_time` ASC"),WebDomainTime_DESC("`webdomain_time` DESC") | ||||
| ,TemplateStatus_ASC("`template_status` ASC"),TemplateStatus_DESC("`template_status` DESC") | ,TemplateStatus_ASC("`template_status` ASC"),TemplateStatus_DESC("`template_status` DESC") | ||||
| ,TemplateTime_ASC("`template_time` ASC"),TemplateTime_DESC("`template_time` DESC") | ,TemplateTime_ASC("`template_time` ASC"),TemplateTime_DESC("`template_time` DESC") | ||||
| ,AuditBackNum_ASC("`audit_back_num` ASC"),AuditBackNum_DESC("`audit_back_num` DESC") | |||||
| ,AuditBackTime_ASC("`audit_back_time` ASC"),AuditBackTime_DESC("`audit_back_time` DESC") | |||||
| ,CurrentVersion_ASC("`current_version` ASC"),CurrentVersion_DESC("`current_version` DESC") | ,CurrentVersion_ASC("`current_version` ASC"),CurrentVersion_DESC("`current_version` DESC") | ||||
| ,CurrentDesc_ASC("`current_desc` ASC"),CurrentDesc_DESC("`current_desc` DESC") | ,CurrentDesc_ASC("`current_desc` ASC"),CurrentDesc_DESC("`current_desc` DESC") | ||||
| ,ReleaseTime_ASC("`release_time` ASC"),ReleaseTime_DESC("`release_time` DESC") | ,ReleaseTime_ASC("`release_time` ASC"),ReleaseTime_DESC("`release_time` DESC") | ||||
| @@ -39,6 +39,8 @@ public class WxWeappAuditStatus implements Serializable { | |||||
| private Integer auditStatus; | private Integer auditStatus; | ||||
| @io.swagger.annotations.ApiModelProperty(value="审核错误码",name="auditErrCode") | @io.swagger.annotations.ApiModelProperty(value="审核错误码",name="auditErrCode") | ||||
| private String auditErrCode; | private String auditErrCode; | ||||
| @io.swagger.annotations.ApiModelProperty(value="审核失败的小程序截图示例",name="screenShot") | |||||
| private String screenShot; | |||||
| @io.swagger.annotations.ApiModelProperty(value="审核时间",name="auditTime") | @io.swagger.annotations.ApiModelProperty(value="审核时间",name="auditTime") | ||||
| private Date auditTime; | private Date auditTime; | ||||
| @@ -20,26 +20,19 @@ public class WxWeappBasicSet implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| /**小程序类型(1-B端 2-C端)*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") | @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") | ||||
| private Integer type; | private Integer type; | ||||
| /**部署类型(1:dev,2:test,3:prod)*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="部署类型(1:dev,2:test,3:prod)",name="deploy") | @io.swagger.annotations.ApiModelProperty(value="部署类型(1:dev,2:test,3:prod)",name="deploy") | ||||
| private Integer deploy; | private Integer deploy; | ||||
| /**服务器域名*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="服务器域名",name="domainUrl") | @io.swagger.annotations.ApiModelProperty(value="服务器域名",name="domainUrl") | ||||
| private String domainUrl; | private String domainUrl; | ||||
| /**小程序基础版本*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="小程序基础版本",name="version") | @io.swagger.annotations.ApiModelProperty(value="小程序基础版本",name="version") | ||||
| private String version; | private String version; | ||||
| /**模板库信息*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="模板库信息",name="templateInfo") | @io.swagger.annotations.ApiModelProperty(value="模板库信息",name="templateInfo") | ||||
| private String templateInfo; | private String templateInfo; | ||||
| /**创建时间*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /**更新时间*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| @@ -20,23 +20,19 @@ public class WxWeappExtSet implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| /**小程序ID*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") | @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") | ||||
| private String appId; | private String appId; | ||||
| /**小程序类型(1-B端 2-C端)*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") | @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") | ||||
| private Integer type; | private Integer type; | ||||
| /**小程序扩展信息*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="小程序扩展信息",name="extJson") | @io.swagger.annotations.ApiModelProperty(value="小程序扩展信息",name="extJson") | ||||
| private String extJson; | private String extJson; | ||||
| /**提交审核列表*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="提交审核列表",name="releaseJson") | @io.swagger.annotations.ApiModelProperty(value="提交审核列表",name="releaseJson") | ||||
| private String releaseJson; | private String releaseJson; | ||||
| /**创建时间*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="停车(0:不支持,1:etcp)",name="carSupport") | |||||
| private Integer carSupport; | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /**更新时间*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| @@ -49,6 +45,7 @@ public class WxWeappExtSet implements Serializable { | |||||
| ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") | ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") | ||||
| ,ExtJson_ASC("`ext_json` ASC"),ExtJson_DESC("`ext_json` DESC") | ,ExtJson_ASC("`ext_json` ASC"),ExtJson_DESC("`ext_json` DESC") | ||||
| ,ReleaseJson_ASC("`release_json` ASC"),ReleaseJson_DESC("`release_json` DESC") | ,ReleaseJson_ASC("`release_json` ASC"),ReleaseJson_DESC("`release_json` DESC") | ||||
| ,CarSupport_ASC("`car_support` ASC"),CarSupport_DESC("`car_support` DESC") | |||||
| ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") | ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") | ||||
| ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") | ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") | ||||
| ; | ; | ||||
| @@ -147,6 +147,18 @@ | |||||
| where `authorizer_appid` = #{authorizerAppid} | where `authorizer_appid` = #{authorizerAppid} | ||||
| </update> | </update> | ||||
| <update id="updateAuthBackInfo" parameterType="com.iformall.domain.po.WxAuthorizerInfo"> | |||||
| update wx_authorizer_info | |||||
| set `auth_back_num` = `auth_back_num` + 1, `auth_back_time` = #{authBackTime} | |||||
| where `authorizer_appid` = #{authorizerAppid} | |||||
| </update> | |||||
| <update id="removeOpenAppId" parameterType="com.iformall.domain.po.WxAuthorizerInfo"> | |||||
| update wx_authorizer_info | |||||
| set `open_appid` = null, `bind_open_time` = null | |||||
| where `authorizer_appid` = #{authorizerAppid} | |||||
| </update> | |||||
| <select id="findMp" parameterType="com.iformall.domain.po.WxAuthorizerInfo" resultMap="BaseResultMap"> | <select id="findMp" parameterType="com.iformall.domain.po.WxAuthorizerInfo" resultMap="BaseResultMap"> | ||||
| select | select | ||||
| <include refid="allColumns"/> | <include refid="allColumns"/> | ||||
| @@ -155,6 +167,20 @@ | |||||
| and `type` = 3 and `tenant_id` = #{tenantId} | and `type` = 3 and `tenant_id` = #{tenantId} | ||||
| </select> | </select> | ||||
| <select id="findWeChatMp" parameterType="com.iformall.domain.po.WxAuthorizerInfo" resultMap="BaseResultMap"> | |||||
| select | |||||
| <include refid="allColumns"/> | |||||
| from wx_authorizer_info | |||||
| where `authorizer_appid` = #{authorizerAppid} | |||||
| </select> | |||||
| <select id="findByAppid" parameterType="string" resultMap="BaseResultMap"> | |||||
| select | |||||
| <include refid="allColumns"/> | |||||
| from wx_authorizer_info | |||||
| where `authorizer_appid` = #{value} | |||||
| </select> | |||||
| <resultMap id="VBaseResultMap" type="com.iformall.domain.vo.WxWeappInfo"> | <resultMap id="VBaseResultMap" type="com.iformall.domain.vo.WxWeappInfo"> | ||||
| <id column="id" jdbcType="BIGINT" property="id"/> | <id column="id" jdbcType="BIGINT" property="id"/> | ||||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/> | <result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/> | ||||
| @@ -265,14 +291,6 @@ | |||||
| <include refid="dynamicVWhereConditions"/> | <include refid="dynamicVWhereConditions"/> | ||||
| </select> | </select> | ||||
| <select id="findVo" parameterType="com.iformall.domain.vo.WxWeappInfo" resultMap="VBaseResultMap"> | |||||
| select | |||||
| <include refid="allVColumns"/> | |||||
| from wx_authorizer_info ai | |||||
| left join wx_appinfo a on ai.`authorizer_appid` = a.app_id | |||||
| where ai.`authorizer_appid` = #{authorizerAppid} | |||||
| </select> | |||||
| <select id="findWeappList" resultMap="VBaseResultMap"> | <select id="findWeappList" resultMap="VBaseResultMap"> | ||||
| select | select | ||||
| <include refid="allVColumns"/> | <include refid="allVColumns"/> | ||||
| @@ -70,11 +70,11 @@ | |||||
| </if> | </if> | ||||
| <if test=" null != openId "> | <if test=" null != openId "> | ||||
| and `open_id` like concat('%', #{openId},'%') | |||||
| and `open_id` = #{openId} | |||||
| </if> | </if> | ||||
| <if test=" null != unionId "> | <if test=" null != unionId "> | ||||
| and `union_id` like concat('%', #{unionId},'%') | |||||
| and `union_id` = #{unionId} | |||||
| </if> | </if> | ||||
| <if test=" null != nickName "> | <if test=" null != nickName "> | ||||
| @@ -7,12 +7,13 @@ | |||||
| <result column="type" jdbcType="INTEGER" property="type"/> | <result column="type" jdbcType="INTEGER" property="type"/> | ||||
| <result column="ext_json" jdbcType="VARCHAR" property="extJson"/> | <result column="ext_json" jdbcType="VARCHAR" property="extJson"/> | ||||
| <result column="release_json" jdbcType="VARCHAR" property="releaseJson"/> | <result column="release_json" jdbcType="VARCHAR" property="releaseJson"/> | ||||
| <result column="car_support" jdbcType="TINYINT" property="carSupport"/> | |||||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | ||||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | ||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`app_id`,`type`,`ext_json`,`release_json`,`create_date`,`update_date` | |||||
| `id`,`app_id`,`type`,`ext_json`,`release_json`,`car_support`,`create_date`,`update_date` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -26,6 +27,9 @@ | |||||
| <if test=" null != type "> | <if test=" null != type "> | ||||
| and `type` = #{type} | and `type` = #{type} | ||||
| </if> | </if> | ||||
| <if test=" null != carSupport "> | |||||
| and `car_support` = #{carSupport} | |||||
| </if> | |||||
| <if test=" null != createDate "> | <if test=" null != createDate "> | ||||
| and `create_date` = #{createDate} | and `create_date` = #{createDate} | ||||
| </if> | </if> | ||||
| @@ -8,8 +8,8 @@ | |||||
| <result column="type" jdbcType="INTEGER" property="type"/> | <result column="type" jdbcType="INTEGER" property="type"/> | ||||
| <result column="user_version" jdbcType="VARCHAR" property="userVersion"/> | <result column="user_version" jdbcType="VARCHAR" property="userVersion"/> | ||||
| <result column="version_desc" jdbcType="VARCHAR" property="versionDesc"/> | <result column="version_desc" jdbcType="VARCHAR" property="versionDesc"/> | ||||
| <result column="release_status" jdbcType="VARCHAR" property="releaseStatus"/> | |||||
| <result column="release_err_code" jdbcType="INTEGER" property="releaseErrCode"/> | |||||
| <result column="release_status" jdbcType="INTEGER" property="releaseStatus"/> | |||||
| <result column="release_err_code" jdbcType="VARCHAR" property="releaseErrCode"/> | |||||
| <result column="release_time" jdbcType="TIMESTAMP" property="releaseTime"/> | <result column="release_time" jdbcType="TIMESTAMP" property="releaseTime"/> | ||||
| </resultMap> | </resultMap> | ||||
| @@ -98,7 +98,7 @@ | |||||
| and c.`id` = #{id} | and c.`id` = #{id} | ||||
| </if> | </if> | ||||
| <if test=" null != tenantId "> | <if test=" null != tenantId "> | ||||
| and `tenant_id` = #{tenantId} | |||||
| and c.`tenant_id` = #{tenantId} | |||||
| </if> | </if> | ||||
| <if test=" null != appId "> | <if test=" null != appId "> | ||||
| and c.`app_id` = #{appId} | and c.`app_id` = #{appId} | ||||
| @@ -116,7 +116,7 @@ | |||||
| and c.`release_time` = #{releaseTime} | and c.`release_time` = #{releaseTime} | ||||
| </if> | </if> | ||||
| <if test=" null != name "> | <if test=" null != name "> | ||||
| and a.`name` like concat('%', #{name},'%') | |||||
| and a.`name` = #{name} | |||||
| </if> | </if> | ||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||
| and id in | and id in | ||||