From d457a2a3021e0b9987f47bfe5d449b9de049b8ef Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 17 Jun 2019 11:33:09 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0][=E4=BF=AE=E6=94=B9]:=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/po/WxAuthorizerInfo.java | 6 ++++ .../domain/po/WxWeappAuditStatus.java | 2 ++ .../iformall/domain/po/WxWeappBasicSet.java | 9 +---- .../com/iformall/domain/po/WxWeappExtSet.java | 11 +++--- .../mapper/WxAuthorizerInfoMapper.xml | 34 ++++++++++++++----- .../main/resources/mapper/WxCUserMapper.xml | 4 +-- .../resources/mapper/WxWeappExtSetMapper.xml | 6 +++- .../mapper/WxWeappReleaseStatusMapper.xml | 8 ++--- 8 files changed, 50 insertions(+), 30 deletions(-) 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 01a03e870..a918c0546 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java @@ -57,6 +57,10 @@ public class WxAuthorizerInfo implements Serializable { private Integer templateStatus; @io.swagger.annotations.ApiModelProperty(value="微信小程序模板设置时间",name="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") private String currentVersion; @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") ,TemplateStatus_ASC("`template_status` ASC"),TemplateStatus_DESC("`template_status` 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") ,CurrentDesc_ASC("`current_desc` ASC"),CurrentDesc_DESC("`current_desc` DESC") ,ReleaseTime_ASC("`release_time` ASC"),ReleaseTime_DESC("`release_time` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java index 3fab9ff8f..37fedde95 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java @@ -39,6 +39,8 @@ public class WxWeappAuditStatus implements Serializable { private Integer auditStatus; @io.swagger.annotations.ApiModelProperty(value="审核错误码",name="auditErrCode") private String auditErrCode; + @io.swagger.annotations.ApiModelProperty(value="审核失败的小程序截图示例",name="screenShot") + private String screenShot; @io.swagger.annotations.ApiModelProperty(value="审核时间",name="auditTime") private Date auditTime; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappBasicSet.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappBasicSet.java index 6cb98885e..6f8e53330 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappBasicSet.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappBasicSet.java @@ -20,26 +20,19 @@ public class WxWeappBasicSet implements Serializable { protected List ids; @Transient protected String sortColumns; - - /**小程序类型(1-B端 2-C端)*/ + @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") private Integer type; - /**部署类型(1:dev,2:test,3:prod)*/ @io.swagger.annotations.ApiModelProperty(value="部署类型(1:dev,2:test,3:prod)",name="deploy") private Integer deploy; - /**服务器域名*/ @io.swagger.annotations.ApiModelProperty(value="服务器域名",name="domainUrl") private String domainUrl; - /**小程序基础版本*/ @io.swagger.annotations.ApiModelProperty(value="小程序基础版本",name="version") private String version; - /**模板库信息*/ @io.swagger.annotations.ApiModelProperty(value="模板库信息",name="templateInfo") private String templateInfo; - /**创建时间*/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; - /**更新时间*/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; 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 5372cb16e..f2ae99c70 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java @@ -20,23 +20,19 @@ public class WxWeappExtSet implements Serializable { protected List ids; @Transient protected String sortColumns; - - /**小程序ID*/ + @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") private String appId; - /**小程序类型(1-B端 2-C端)*/ @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") private Integer type; - /**小程序扩展信息*/ @io.swagger.annotations.ApiModelProperty(value="小程序扩展信息",name="extJson") private String extJson; - /**提交审核列表*/ @io.swagger.annotations.ApiModelProperty(value="提交审核列表",name="releaseJson") private String releaseJson; - /**创建时间*/ + @io.swagger.annotations.ApiModelProperty(value="停车(0:不支持,1:etcp)",name="carSupport") + private Integer carSupport; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; - /**更新时间*/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; @@ -49,6 +45,7 @@ public class WxWeappExtSet implements Serializable { ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") ,ExtJson_ASC("`ext_json` ASC"),ExtJson_DESC("`ext_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") ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") ; diff --git a/mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml index 9f98496e0..c5516133c 100644 --- a/mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml @@ -147,6 +147,18 @@ where `authorizer_appid` = #{authorizerAppid} + + update wx_authorizer_info + set `auth_back_num` = `auth_back_num` + 1, `auth_back_time` = #{authBackTime} + where `authorizer_appid` = #{authorizerAppid} + + + + update wx_authorizer_info + set `open_appid` = null, `bind_open_time` = null + where `authorizer_appid` = #{authorizerAppid} + + + + + + @@ -265,14 +291,6 @@ - -