Просмотр исходного кода

[user合并][新增]:第三方平台code合并

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
30da7c72b6
15 измененных файлов: 437 добавлений и 355 удалений
  1. +6
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java
  2. +5
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxComponentVerifyTicket.java
  3. +16
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java
  4. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java
  5. +4
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java
  6. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java
  7. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java
  8. +42
    -10
      mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml
  9. +14
    -8
      mallinkService/src/main/resources/mapper/WxComponentVerifyTicketMapper.xml
  10. +53
    -61
      mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml
  11. +68
    -58
      mallinkService/src/main/resources/mapper/WxWeappAuditStatusMapper.xml
  12. +43
    -45
      mallinkService/src/main/resources/mapper/WxWeappBasicSetMapper.xml
  13. +66
    -55
      mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml
  14. +45
    -47
      mallinkService/src/main/resources/mapper/WxWeappExtSetMapper.xml
  15. +67
    -56
      mallinkService/src/main/resources/mapper/WxWeappReleaseStatusMapper.xml

+ 6
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java Просмотреть файл

@@ -63,6 +63,12 @@ public class WxAuthorizerInfo implements Serializable {
private String openAppid;
@io.swagger.annotations.ApiModelProperty(value="绑定开发平台时间",name="bindOpenTime")
private Date bindOpenTime;
@io.swagger.annotations.ApiModelProperty(value="refresh_token",name="refreshToken")
private String refreshToken;
@io.swagger.annotations.ApiModelProperty(value="access_token",name="accessToken")
private String accessToken;
@io.swagger.annotations.ApiModelProperty(value="accessToken过期时间",name="accessTokenExpire")
private Date accessTokenExpire;





+ 5
- 5
mallinkService/src/main/java/com/iformall/domain/po/WxComponentVerifyTicket.java Просмотреть файл

@@ -20,19 +20,19 @@ public class WxComponentVerifyTicket implements Serializable {
protected List<Long> ids;
@Transient
protected String sortColumns;
/**微信第三方componentAppid*/

@io.swagger.annotations.ApiModelProperty(value="微信第三方componentAppid",name="componentAppid")
private String componentAppid;
/**微信第三方component_verify_ticket*/
@io.swagger.annotations.ApiModelProperty(value="微信第三方component_verify_ticket",name="componentVerifyTicket")
private String componentVerifyTicket;
/**创建时间*/
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime")
private Date createTime;
/**失效时间*/
@io.swagger.annotations.ApiModelProperty(value="失效时间",name="deadline")
private Date deadline;
@io.swagger.annotations.ApiModelProperty(value="access_token",name="accessToken")
private String accessToken;
@io.swagger.annotations.ApiModelProperty(value="access_token过期时间",name="accessTokenExpire")
private Date accessTokenExpire;





+ 16
- 4
mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java Просмотреть файл

@@ -48,6 +48,9 @@ public class WxPayAccount implements Serializable {
/**微信服务商号*/
@io.swagger.annotations.ApiModelProperty(value="微信服务商号",name="subMchId")
private String subMchId;

@io.swagger.annotations.ApiModelProperty(value="微信服务商号",name="parentMchId")
private String parentMchId;
/**支付密钥**/
@io.swagger.annotations.ApiModelProperty(value="支付密钥",name="apiKey")
private String apiKey;
@@ -90,7 +93,15 @@ public class WxPayAccount implements Serializable {
this.subMchId = subMchId;
}

public String getApiKey() {
public String getParentMchId() {
return parentMchId;
}

public void setParentMchId(String parentMchId) {
this.parentMchId = parentMchId;
}

public String getApiKey() {
return apiKey;
}
public void setApiKey(String _apiKey) {
@@ -111,9 +122,10 @@ public class WxPayAccount implements Serializable {
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}

public void setType(Integer type) {
this.type = type;
}
public Integer getShare() {
return share;
}


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java Просмотреть файл

@@ -23,6 +23,8 @@ public class WxWeappAuditStatus implements Serializable {
@Transient
protected String sortColumns;

@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId")
private String appId;
@io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type")
@@ -43,6 +45,7 @@ public class WxWeappAuditStatus implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC")
,AppId_ASC("`app_id` ASC"),AppId_DESC("`app_id` DESC")
,Type_ASC("`type` ASC"),Type_DESC("`type` DESC")
,UserVersion_ASC("`user_version` ASC"),UserVersion_DESC("`user_version` DESC")


+ 4
- 6
mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java Просмотреть файл

@@ -23,29 +23,27 @@ public class WxWeappCodeStatus implements Serializable {
@Transient
protected String sortColumns;

/**小程序ID*/
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;
@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")
@io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端 3-公众服务号 4-公众订阅号)",name="type")
private Integer type;
/**用户版本*/
@io.swagger.annotations.ApiModelProperty(value="用户版本",name="userVersion")
private String userVersion;
@io.swagger.annotations.ApiModelProperty(value="用户版本描述",name="versionDesc")
private String versionDesc;
/**code提交状态*/
@io.swagger.annotations.ApiModelProperty(value="code提交状态(0:成功, 1:失败)",name="codeStatus")
private Integer codeStatus;
@io.swagger.annotations.ApiModelProperty(value="code提交错误码",name="codeErrCode")
private String codeErrCode;
/**更新时间*/
@io.swagger.annotations.ApiModelProperty(value="code提交时间",name="codeTime")
private Date codeTime;

public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC")
,AppId_ASC("`app_id` ASC"),AppId_DESC("`app_id` DESC")
,Type_ASC("`type` ASC"),Type_DESC("`type` DESC")
,UserVersion_ASC("`user_version` ASC"),UserVersion_DESC("`user_version` DESC")


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java Просмотреть файл

@@ -23,6 +23,8 @@ public class WxWeappReleaseStatus implements Serializable {
@Transient
protected String sortColumns;

@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;
@io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId")
private String appId;
@io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type")
@@ -41,6 +43,7 @@ public class WxWeappReleaseStatus implements Serializable {
public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC")
,AppId_ASC("`app_id` ASC"),AppId_DESC("`app_id` DESC")
,Type_ASC("`type` ASC"),Type_DESC("`type` DESC")
,UserVersion_ASC("`user_version` ASC"),UserVersion_DESC("`user_version` DESC")


+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java Просмотреть файл

@@ -15,6 +15,8 @@ public interface WxCUserMapper extends CommonMapper<WxCUser, Long> {
WxCUser findByOpenId(WxCUser record);

WxCUser findByUnionId(WxCUser record);

WxCUser findByToken(String token);
long findCount(WxCUserBasicInfoDto dto);


+ 42
- 10
mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml Просмотреть файл

@@ -24,13 +24,17 @@
<result column="release_time" jdbcType="TIMESTAMP" property="releaseTime" />
<result column="open_appid" jdbcType="VARCHAR" property="openAppid" />
<result column="bind_open_time" jdbcType="TIMESTAMP" property="bindOpenTime" />
<result column="refresh_token" jdbcType="VARCHAR" property="refreshToken"/>
<result column="access_token" jdbcType="VARCHAR" property="accessToken"/>
<result column="access_token_expire" jdbcType="TIMESTAMP" property="accessTokenExpire"/>
</resultMap>
<sql id="allColumns">
`id`,`authorizer_appid`,`head_img`,`alias`,`qrcode_url`,`create_time`,`authorization_status`,`auth_time`,
`base_status`, `base_time`, `domain_status`, `domain_time`, `webdomain_status`, `webdomain_time`, `template_status`, `template_time`,
`current_version`,`current_desc`,`release_time`,
`open_appid`,`bind_open_time`
`open_appid`,`bind_open_time`,`refresh_token`,
`access_token`,`access_token_expire`
</sql>

<sql id="dynamicWhereConditions">
@@ -111,7 +115,9 @@
</sql>
<select id="findList" parameterType="com.iformall.domain.po.WxAuthorizerInfo" resultMap="BaseResultMap">
select <include refid="allColumns" /> from wx_authorizer_info
select
<include refid="allColumns"/>
from wx_authorizer_info
<include refid="dynamicWhereConditions" />
</select>

@@ -121,6 +127,18 @@
where `authorizer_appid` = #{authorizerAppid}
</update>

<update id="updateRefreshToken" parameterType="com.iformall.domain.po.WxAuthorizerInfo">
update wx_authorizer_info
set `refresh_token` = #{refreshToken}
where `authorizer_appid` = #{authorizerAppid}
</update>

<update id="updateAccessToken" parameterType="com.iformall.domain.po.WxAuthorizerInfo">
update wx_authorizer_info
set `access_token` = #{accessToken}, `access_token_expire` = #{accessTokenExpire}
where `authorizer_appid` = #{authorizerAppid}
</update>

<resultMap id="VBaseResultMap" type="com.iformall.domain.vo.WxWeappInfo">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="authorizer_appid" jdbcType="VARCHAR" property="authorizerAppid" />
@@ -144,6 +162,7 @@
<result column="release_time" jdbcType="TIMESTAMP" property="releaseTime" />
<result column="open_appid" jdbcType="VARCHAR" property="openAppid" />
<result column="bind_open_time" jdbcType="TIMESTAMP" property="bindOpenTime" />
<result column="tenant_id" jdbcType="INTEGER" property="tenantId"/>
<result column="type" jdbcType="INTEGER" property="type" />
<result column="name" jdbcType="TIMESTAMP" property="name" />
</resultMap>
@@ -157,7 +176,7 @@
ai.`template_status`,ai.`template_time`,
ai.`current_version`,ai.`current_desc`,ai.`release_time`,
ai.`open_appid`,ai.`bind_open_time`,
a.`type`,a.`name`
a.`tenant_id`,a.`type`,a.`name`
</sql>

<sql id="dynamicVWhereConditions">
@@ -220,15 +239,28 @@
</sql>

<select id="findVoList" parameterType="com.iformall.domain.vo.WxWeappInfo" resultMap="VBaseResultMap">
select <include refid="allVColumns" />
select
<include refid="allVColumns"/>
from wx_authorizer_info ai
left join wx_appinfo a on ai.`authorizer_appid` = a.app_id
<include refid="dynamicVWhereConditions" />
</select>

<select id="findWeappList" resultMap="BaseResultMap">
select
<include refid="allVColumns"/>
from wx_authorizer_info ai
left join wx_appinfo a on ai.`authorizer_appid` = a.app_id
where a.type = 1 or a.type = 2
</select>

<select id="findWxMpList" resultMap="BaseResultMap">
select
<include refid="allVColumns"/>
from wx_authorizer_info ai
left join wx_appinfo a on ai.`authorizer_appid` = a.app_id
where a.type = 3 or a.type = 4
</select>


</mapper>

+ 14
- 8
mallinkService/src/main/resources/mapper/WxComponentVerifyTicketMapper.xml Просмотреть файл

@@ -7,6 +7,8 @@
<result column="component_verify_ticket" jdbcType="VARCHAR" property="componentVerifyTicket" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="deadline" jdbcType="TIMESTAMP" property="deadline" />
<result column="access_token" jdbcType="VARCHAR" property="accessToken"/>
<result column="access_token_expire" jdbcType="TIMESTAMP" property="accessTokenExpire"/>
</resultMap>
<sql id="allColumns">
@@ -19,7 +21,7 @@
and `id` = #{id}
</if>
<if test=" null != componentAppid ">
and `component_appid` like concat('%', #{componentAppid},'%')
and `component_appid` = #{componentAppid}
</if>
<if test=" null != componentVerifyTicket ">
and `component_verify_ticket` like concat('%', #{componentVerifyTicket},'%')
@@ -40,13 +42,17 @@
</sql>
<select id="findList" parameterType="com.iformall.domain.po.WxComponentVerifyTicket" resultMap="BaseResultMap">
select <include refid="allColumns" /> from wx_component_verify_ticket
select
<include refid="allColumns"/>
from wx_component_verify_ticket
<include refid="dynamicWhereConditions" />
</select>

<update id="updateAccessToken" parameterType="com.iformall.domain.po.WxComponentVerifyTicket">
update wx_component_verify_ticket
set `access_token` = #{accessToken}, `access_token_expire` = #{accessTokenExpire}
where component_appid = #{componentAppid}
</update>


</mapper>

+ 53
- 61
mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml Просмотреть файл

@@ -1,68 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.iformall.mapper.WxTemplateMsgMapper">
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxTemplateMsg">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId" />
<result column="template_id" jdbcType="VARCHAR" property="templateId" />
<result column="type" jdbcType="INTEGER" property="type" />
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
</resultMap>
<sql id="allColumns">
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxTemplateMsg">
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="template_id" jdbcType="VARCHAR" property="templateId"/>
<result column="type" jdbcType="INTEGER" property="type"/>
<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
</resultMap>
<sql id="allColumns">
`id`,`tenant_id`,`template_id`,`type`,`create_date`,`update_date`
</sql>

<sql id="dynamicWhereConditions">
where 1 = 1
<if test=" null != id ">
and `id` = #{id}
</if>
<if test=" null != tenantId ">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != templateId ">
and `template_id` like concat('%', #{templateId},'%')
</if>
<if test=" null != type ">
and `type` = #{type}
</if>
<if test=" null != createDate ">
and `create_date` = #{createDate}
</if>
<if test=" null != updateDate ">
and `update_date` = #{updateDate}
</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns"> order by ${sortColumns} </if>
</sql>
<select id="findList" parameterType="com.iformall.domain.po.WxTemplateMsg" resultMap="BaseResultMap">
select <include refid="allColumns" /> from wx_template_msg
<include refid="dynamicWhereConditions" />
</select>
<sql id="dynamicWhereConditions">
where 1 = 1

<if test=" null != id ">
and `id` = #{id}
</if>

<if test=" null != tenantId ">
and `tenant_id` = #{tenantId}
</if>

<if test=" null != templateId ">
and `template_id` = #{templateId}
</if>

<if test=" null != type ">
and `type` = #{type}
</if>

<if test=" null != createDate ">
and `create_date` = #{createDate}
</if>

<if test=" null != updateDate ">
and `update_date` = #{updateDate}
</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns">order by ${sortColumns}</if>
</sql>

<select id="findList" parameterType="com.iformall.domain.po.WxTemplateMsg" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from wx_template_msg
<include refid="dynamicWhereConditions"/>
</select>


</mapper>

+ 68
- 58
mallinkService/src/main/resources/mapper/WxWeappAuditStatusMapper.xml Просмотреть файл

@@ -1,33 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.iformall.mapper.WxWeappAuditStatusMapper">
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxWeappAuditStatus">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="app_id" jdbcType="VARCHAR" property="appId" />
<result column="type" jdbcType="INTEGER" property="type" />
<result column="user_version" jdbcType="VARCHAR" property="userVersion" />
<result column="version_desc" jdbcType="VARCHAR" property="versionDesc" />
<result column="auditid" jdbcType="INTEGER" property="auditid" />
<result column="audit_status" jdbcType="INTEGER" property="auditStatus" />
<result column="audit_err_code" jdbcType="VARCHAR" property="auditErrCode" />
<result column="audit_time" jdbcType="TIMESTAMP" property="auditTime" />
</resultMap>
<sql id="allColumns">
`id`,`app_id`,`type`,`user_version`,`version_desc`, `audit_status`,`audit_err_code`,`audit_time`
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxWeappAuditStatus">
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="app_id" jdbcType="VARCHAR" property="appId"/>
<result column="type" jdbcType="INTEGER" property="type"/>
<result column="user_version" jdbcType="VARCHAR" property="userVersion"/>
<result column="version_desc" jdbcType="VARCHAR" property="versionDesc"/>
<result column="auditid" jdbcType="INTEGER" property="auditid"/>
<result column="audit_status" jdbcType="INTEGER" property="auditStatus"/>
<result column="audit_err_code" jdbcType="VARCHAR" property="auditErrCode"/>
<result column="audit_time" jdbcType="TIMESTAMP" property="auditTime"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`app_id`,`type`,`user_version`,`version_desc`, `audit_status`,`audit_err_code`,`audit_time`
</sql>

<sql id="dynamicWhereConditions">
where 1 = 1
<if test=" null != id ">
and `id` = #{id}
</if>
<if test=" null != appId ">
and `app_id` = #{appId}
</if>
<if test=" null != type ">
and `type` = #{type}
</if>
<sql id="dynamicWhereConditions">
where 1 = 1
<if test=" null != id ">
and `id` = #{id}
</if>
<if test=" null != tenantId ">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != appId ">
and `app_id` = #{appId}
</if>
<if test=" null != type ">
and `type` = #{type}
</if>
<if test=" null != userVersion ">
and `user_version` = #{userVersion}
</if>
@@ -37,32 +41,33 @@
<if test=" null != auditStatus ">
and `audit_status` = #{auditStatus}
</if>
<if test=" null != auditTime ">
and `audit_time` = #{auditTime}
</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns"> order by ${sortColumns} </if>
</sql>
<select id="findList" parameterType="com.iformall.domain.po.WxWeappAuditStatus" resultMap="BaseResultMap">
select <include refid="allColumns" />
from wx_weapp_audit_status
<include refid="dynamicWhereConditions" />
</select>
<if test=" null != auditTime ">
and `audit_time` = #{auditTime}
</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns">order by ${sortColumns}</if>
</sql>

<select id="findList" parameterType="com.iformall.domain.po.WxWeappAuditStatus" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from wx_weapp_audit_status
<include refid="dynamicWhereConditions"/>
</select>

<update id="updateStatus" parameterType="com.iformall.domain.po.WxWeappReleaseStatus" >
<update id="updateStatus" parameterType="com.iformall.domain.po.WxWeappReleaseStatus">
update wx_weapp_audit_status
set `user_version` = #{userVersion}, `version_desc` = #{versionDesc},
`audit_status` = #{auditStatus}, `audit_err_code` = #{auditErrCode}, `audit_time` = #{auditTime}
where `app_id` = #{appId} and `type` = #{type}
</update>

<select id="findUserVersions" resultType="hashmap" >
<select id="findUserVersions" resultType="hashmap">
select user_version as version
from wx_weapp_audit_status
where 1=1
@@ -76,19 +81,20 @@
</select>

<resultMap id="VBaseResultMap" type="com.iformall.domain.vo.WxWeappAuditStatusVo">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="app_id" jdbcType="VARCHAR" property="appId" />
<result column="type" jdbcType="INTEGER" property="type" />
<result column="user_version" jdbcType="VARCHAR" property="userVersion" />
<result column="version_desc" jdbcType="VARCHAR" property="versionDesc" />
<result column="audit_status" jdbcType="INTEGER" property="auditStatus" />
<result column="audit_err_code" jdbcType="VARCHAR" property="auditErrCode" />
<result column="audit_time" jdbcType="TIMESTAMP" property="auditTime" />
<result column="name" jdbcType="VARCHAR" property="name" />
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="app_id" jdbcType="VARCHAR" property="appId"/>
<result column="type" jdbcType="INTEGER" property="type"/>
<result column="user_version" jdbcType="VARCHAR" property="userVersion"/>
<result column="version_desc" jdbcType="VARCHAR" property="versionDesc"/>
<result column="audit_status" jdbcType="INTEGER" property="auditStatus"/>
<result column="audit_err_code" jdbcType="VARCHAR" property="auditErrCode"/>
<result column="audit_time" jdbcType="TIMESTAMP" property="auditTime"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
</resultMap>

<sql id="allVoColumns">
c.`id`,c.`app_id`,c.`type`,c.`user_version`,`version_desc`,
c.`id`,c.`tenant_id`,c.`app_id`,c.`type`,c.`user_version`,`version_desc`,
c.`audit_status`,c.`audit_err_code`,c.`audit_time`,
a.`name`
</sql>
@@ -98,6 +104,9 @@
<if test=" null != id ">
and c.`id` = #{id}
</if>
<if test=" null != tenantId ">
and c.`tenant_id` = #{tenantId}
</if>
<if test=" null != appId ">
and c.`app_id` = #{appId}
</if>
@@ -122,14 +131,15 @@
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns"> order by ${sortColumns} </if>
<if test=" null != sortColumns">order by ${sortColumns}</if>
</sql>

<select id="findVoList" parameterType="com.iformall.domain.vo.WxWeappAuditStatusVo" resultMap="VBaseResultMap">
select <include refid="allVoColumns" />
select
<include refid="allVoColumns"/>
from wx_weapp_audit_status c
left join wx_appinfo a on c.`app_id` = a.`app_id`
<include refid="dynamicVoWhereConditions" />
<include refid="dynamicVoWhereConditions"/>
</select>
</mapper>

+ 43
- 45
mallinkService/src/main/resources/mapper/WxWeappBasicSetMapper.xml Просмотреть файл

@@ -1,55 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.iformall.mapper.WxWeappBasicSetMapper">
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxWeappBasicSet">
<id column="id" jdbcType="INTEGER" property="id" />
<result column="type" jdbcType="INTEGER" property="type" />
<result column="deploy" jdbcType="INTEGER" property="deploy" />
<result column="domain_url" jdbcType="VARCHAR" property="domainUrl" />
<result column="version" jdbcType="VARCHAR" property="version" />
<result column="template_info" jdbcType="VARCHAR" property="templateInfo" />
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
</resultMap>
<sql id="allColumns">
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxWeappBasicSet">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="type" jdbcType="INTEGER" property="type"/>
<result column="deploy" jdbcType="INTEGER" property="deploy"/>
<result column="domain_url" jdbcType="VARCHAR" property="domainUrl"/>
<result column="version" jdbcType="VARCHAR" property="version"/>
<result column="template_info" jdbcType="VARCHAR" property="templateInfo"/>
<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
</resultMap>
<sql id="allColumns">
`id`,`type`,`domain_url`,`version`,`template_info`,`create_date`,`update_date`
</sql>

<sql id="dynamicWhereConditions">
where 1 = 1
<if test=" null != id ">
and `id` = #{id}
</if>
<if test=" null != type ">
and `type` = #{type}
</if>
<sql id="dynamicWhereConditions">
where 1 = 1
<if test=" null != id ">
and `id` = #{id}
</if>
<if test=" null != type ">
and `type` = #{type}
</if>
<if test=" null != deploy ">
and `deploy` = #{deploy}
</if>
<if test=" null != createDate ">
and `create_date` = #{createDate}
</if>
<if test=" null != updateDate ">
and `update_date` = #{updateDate}
</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns"> order by ${sortColumns} </if>
</sql>
<select id="findList" parameterType="com.iformall.domain.po.WxWeappBasicSet" resultMap="BaseResultMap">
select <include refid="allColumns" /> from wx_weapp_basic_set
<include refid="dynamicWhereConditions" />
</select>
<if test=" null != createDate ">
and `create_date` = #{createDate}
</if>
<if test=" null != updateDate ">
and `update_date` = #{updateDate}
</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns">order by ${sortColumns}</if>
</sql>

<select id="findList" parameterType="com.iformall.domain.po.WxWeappBasicSet" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from wx_weapp_basic_set
<include refid="dynamicWhereConditions"/>
</select>


</mapper>

+ 66
- 55
mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml Просмотреть файл

@@ -1,63 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.iformall.mapper.WxWeappCodeStatusMapper">
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxWeappCodeStatus">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="app_id" jdbcType="VARCHAR" property="appId" />
<result column="type" jdbcType="INTEGER" property="type" />
<result column="user_version" jdbcType="VARCHAR" property="userVersion" />
<result column="version_desc" jdbcType="VARCHAR" property="versionDesc" />
<result column="code_status" jdbcType="INTEGER" property="codeStatus" />
<result column="code_err_code" jdbcType="VARCHAR" property="codeErrCode" />
<result column="code_time" jdbcType="TIMESTAMP" property="codeTime" />
</resultMap>
<sql id="allColumns">
`id`,`app_id`,`type`,`user_version`,`version_desc`,`code_status`,`code_err_code`,`code_time`
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxWeappCodeStatus">
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="app_id" jdbcType="VARCHAR" property="appId"/>
<result column="type" jdbcType="INTEGER" property="type"/>
<result column="user_version" jdbcType="VARCHAR" property="userVersion"/>
<result column="version_desc" jdbcType="VARCHAR" property="versionDesc"/>
<result column="code_status" jdbcType="INTEGER" property="codeStatus"/>
<result column="code_err_code" jdbcType="VARCHAR" property="codeErrCode"/>
<result column="code_time" jdbcType="TIMESTAMP" property="codeTime"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`app_id`,`type`,`user_version`,`version_desc`,`code_status`,`code_err_code`,`code_time`
</sql>

<sql id="dynamicWhereConditions">
where 1 = 1
<if test=" null != id ">
and `id` = #{id}
</if>
<if test=" null != appId ">
and `app_id` = #{appId}
</if>
<if test=" null != type ">
and `type` = #{type}
</if>
<sql id="dynamicWhereConditions">
where 1 = 1
<if test=" null != id ">
and `id` = #{id}
</if>
<if test=" null != tenantId ">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != appId ">
and `app_id` = #{appId}
</if>
<if test=" null != type ">
and `type` = #{type}
</if>
<if test=" null != userVersion ">
and `user_version` = #{userVersion}
</if>
<if test=" null != codeStatus ">
and `code_status` = #{codeStatus}
</if>
<if test=" null != codeTime ">
and `code_time` = #{codeTime}
</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns"> order by ${sortColumns} </if>
</sql>
<select id="findList" parameterType="com.iformall.domain.po.WxWeappCodeStatus" resultMap="BaseResultMap">
select <include refid="allColumns" /> from wx_weapp_code_status
<include refid="dynamicWhereConditions" />
</select>
<if test=" null != codeTime ">
and `code_time` = #{codeTime}
</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns">order by ${sortColumns}</if>
</sql>

<select id="findList" parameterType="com.iformall.domain.po.WxWeappCodeStatus" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from wx_weapp_code_status
<include refid="dynamicWhereConditions"/>
</select>

<update id="updateStatus" parameterType="com.iformall.domain.po.WxWeappCodeStatus" >
<update id="updateStatus" parameterType="com.iformall.domain.po.WxWeappCodeStatus">
update wx_weapp_code_status
set `user_version` = #{userVersion}, `version_desc`= #{versionDesc},
`code_status` = #{codeStatus}, `code_err_code` = #{codeErrCode}, `code_time` = #{codeTime}
where `app_id` = #{appId} and `type` = #{type}
</update>

<select id="findUserVersions" resultType="hashmap" >
<select id="findUserVersions" resultType="hashmap">
select user_version as version
from wx_weapp_code_status
where 1=1
@@ -68,19 +74,20 @@
</select>

<resultMap id="VBaseResultMap" type="com.iformall.domain.vo.WxWeappCodeStatusVo">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="app_id" jdbcType="VARCHAR" property="appId" />
<result column="type" jdbcType="INTEGER" property="type" />
<result column="user_version" jdbcType="VARCHAR" property="userVersion" />
<result column="version_desc" jdbcType="VARCHAR" property="versionDesc" />
<result column="code_status" jdbcType="INTEGER" property="codeStatus" />
<result column="code_err_code" jdbcType="VARCHAR" property="codeErrCode" />
<result column="code_time" jdbcType="TIMESTAMP" property="codeTime" />
<result column="name" jdbcType="VARCHAR" property="name" />
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="app_id" jdbcType="VARCHAR" property="appId"/>
<result column="type" jdbcType="INTEGER" property="type"/>
<result column="user_version" jdbcType="VARCHAR" property="userVersion"/>
<result column="version_desc" jdbcType="VARCHAR" property="versionDesc"/>
<result column="code_status" jdbcType="INTEGER" property="codeStatus"/>
<result column="code_err_code" jdbcType="VARCHAR" property="codeErrCode"/>
<result column="code_time" jdbcType="TIMESTAMP" property="codeTime"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
</resultMap>

<sql id="allVoColumns">
c.`id`,c.`app_id`,c.`type`,c.`user_version`,c.`version_desc`,c.`code_status`,c.`code_err_code`,c.`code_time`, a.`name`
c.`id`,c.`tenant_id`,c.`app_id`,c.`type`,c.`user_version`,c.`version_desc`,c.`code_status`,c.`code_err_code`,c.`code_time`, a.`name`
</sql>

<sql id="dynamicVoWhereConditions">
@@ -88,6 +95,9 @@
<if test=" null != id ">
and c.`id` = #{id}
</if>
<if test=" null != tenantId ">
and c.`tenant_id` = #{tenantId}
</if>
<if test=" null != appId ">
and c.`app_id` = #{appId}
</if>
@@ -109,13 +119,14 @@
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns"> order by ${sortColumns} </if>
<if test=" null != sortColumns">order by ${sortColumns}</if>
</sql>

<select id="findVoList" parameterType="com.iformall.domain.vo.WxWeappCodeStatusVo" resultMap="VBaseResultMap">
select <include refid="allVoColumns" />
select
<include refid="allVoColumns"/>
from wx_weapp_code_status c
left join wx_appinfo a on c.`app_id` = a.`app_id`
<include refid="dynamicVoWhereConditions" />
<include refid="dynamicVoWhereConditions"/>
</select>
</mapper>

+ 45
- 47
mallinkService/src/main/resources/mapper/WxWeappExtSetMapper.xml Просмотреть файл

@@ -1,54 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.iformall.mapper.WxWeappExtSetMapper">
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxWeappExtSet">
<id column="id" jdbcType="INTEGER" property="id" />
<result column="app_id" jdbcType="VARCHAR" property="appId" />
<result column="type" jdbcType="INTEGER" property="type" />
<result column="ext_json" jdbcType="VARCHAR" property="extJson" />
<result column="release_json" jdbcType="VARCHAR" property="releaseJson" />
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
</resultMap>
<sql id="allColumns">
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxWeappExtSet">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="app_id" jdbcType="VARCHAR" property="appId"/>
<result column="type" jdbcType="INTEGER" property="type"/>
<result column="ext_json" jdbcType="VARCHAR" property="extJson"/>
<result column="release_json" jdbcType="VARCHAR" property="releaseJson"/>
<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
</resultMap>
<sql id="allColumns">
`id`,`app_id`,`type`,`ext_json`,`release_json`,`create_date`,`update_date`
</sql>

<sql id="dynamicWhereConditions">
where 1 = 1
<if test=" null != id ">
and `id` = #{id}
</if>
<if test=" null != appId ">
and `app_id` = #{appId}
</if>
<if test=" null != type ">
and `type` = #{type}
</if>
<if test=" null != createDate ">
and `create_date` = #{createDate}
</if>
<if test=" null != updateDate ">
and `update_date` = #{updateDate}
</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns"> order by ${sortColumns} </if>
</sql>
<select id="findList" parameterType="com.iformall.domain.po.WxWeappExtSet" resultMap="BaseResultMap">
select <include refid="allColumns" /> from wx_weapp_ext_set
<include refid="dynamicWhereConditions" />
</select>
<sql id="dynamicWhereConditions">
where 1 = 1
<if test=" null != id ">
and `id` = #{id}
</if>
<if test=" null != appId ">
and `app_id` = #{appId}
</if>
<if test=" null != type ">
and `type` = #{type}
</if>
<if test=" null != createDate ">
and `create_date` = #{createDate}
</if>
<if test=" null != updateDate ">
and `update_date` = #{updateDate}
</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns">order by ${sortColumns}</if>
</sql>

<select id="findList" parameterType="com.iformall.domain.po.WxWeappExtSet" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from wx_weapp_ext_set
<include refid="dynamicWhereConditions"/>
</select>


</mapper>

+ 67
- 56
mallinkService/src/main/resources/mapper/WxWeappReleaseStatusMapper.xml Просмотреть файл

@@ -1,63 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.iformall.mapper.WxWeappReleaseStatusMapper">
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxWeappReleaseStatus">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="app_id" jdbcType="VARCHAR" property="appId" />
<result column="type" jdbcType="INTEGER" property="type" />
<result column="user_version" jdbcType="VARCHAR" property="userVersion" />
<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_time" jdbcType="TIMESTAMP" property="releaseTime" />
</resultMap>
<sql id="allColumns">
`id`,`app_id`,`type`,`user_version`,`version_desc`,`release_status`,`release_err_code`,`release_time`
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxWeappReleaseStatus">
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="app_id" jdbcType="VARCHAR" property="appId"/>
<result column="type" jdbcType="INTEGER" property="type"/>
<result column="user_version" jdbcType="VARCHAR" property="userVersion"/>
<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_time" jdbcType="TIMESTAMP" property="releaseTime"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`app_id`,`type`,`user_version`,`version_desc`,`release_status`,`release_err_code`,`release_time`
</sql>

<sql id="dynamicWhereConditions">
where 1 = 1
<if test=" null != id ">
and `id` = #{id}
</if>
<if test=" null != appId ">
and `app_id` = #{appId}
</if>
<if test=" null != type ">
and `type` = #{type}
</if>
<sql id="dynamicWhereConditions">
where 1 = 1
<if test=" null != id ">
and `id` = #{id}
</if>
<if test=" null != tenantId ">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != appId ">
and `app_id` = #{appId}
</if>
<if test=" null != type ">
and `type` = #{type}
</if>
<if test=" null != userVersion ">
and `user_version` = #{userVersion}
</if>
<if test=" null != releaseStatus ">
and `release_status` = #{releaseStatus}
</if>
<if test=" null != releaseTime ">
and `release_time` = #{releaseTime}
</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns"> order by ${sortColumns} </if>
</sql>
<select id="findList" parameterType="com.iformall.domain.po.WxWeappReleaseStatus" resultMap="BaseResultMap">
select <include refid="allColumns" /> from wx_weapp_release_status
<include refid="dynamicWhereConditions" />
</select>
<if test=" null != releaseTime ">
and `release_time` = #{releaseTime}
</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns">order by ${sortColumns}</if>
</sql>

<select id="findList" parameterType="com.iformall.domain.po.WxWeappReleaseStatus" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from wx_weapp_release_status
<include refid="dynamicWhereConditions"/>
</select>

<update id="updateStatus" parameterType="com.iformall.domain.po.WxWeappReleaseStatus" >
<update id="updateStatus" parameterType="com.iformall.domain.po.WxWeappReleaseStatus">
update wx_weapp_release_status
set `user_version` = #{userVersion}, `version_desc` = #{versionDesc},
`release_status` = #{releaseStatus}, `release_err_code` = #{releaseErrCode}, `release_time` = #{releaseTime}
where `app_id` = #{appId} and `type` = #{type}
</update>

<select id="findUserVersions" resultType="hashmap" >
<select id="findUserVersions" resultType="hashmap">
select user_version as version
from wx_weapp_release_status
where 1 = 1
@@ -68,19 +74,20 @@
</select>

<resultMap id="VBaseResultMap" type="com.iformall.domain.vo.WxWeappReleaseStatusVo">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="app_id" jdbcType="VARCHAR" property="appId" />
<result column="type" jdbcType="INTEGER" property="type" />
<result column="user_version" jdbcType="VARCHAR" property="userVersion" />
<result column="version_desc" jdbcType="VARCHAR" property="versionDesc" />
<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="name" jdbcType="TIMESTAMP" property="name" />
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="app_id" jdbcType="VARCHAR" property="appId"/>
<result column="type" jdbcType="INTEGER" property="type"/>
<result column="user_version" jdbcType="VARCHAR" property="userVersion"/>
<result column="version_desc" jdbcType="VARCHAR" property="versionDesc"/>
<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="name" jdbcType="TIMESTAMP" property="name"/>
</resultMap>

<sql id="allVoColumns">
c.`id`,c.`app_id`,c.`type`,c.`user_version`,c.`version_desc`,
c.`id`,c.`tenant_id`,c.`app_id`,c.`type`,c.`user_version`,c.`version_desc`,
c.`release_status`,c.`release_err_code`,c.`release_time`,
a.`name`
</sql>
@@ -90,6 +97,9 @@
<if test=" null != id ">
and c.`id` = #{id}
</if>
<if test=" null != tenantId ">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != appId ">
and c.`app_id` = #{appId}
</if>
@@ -114,14 +124,15 @@
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns"> order by ${sortColumns} </if>
<if test=" null != sortColumns">order by ${sortColumns}</if>
</sql>

<select id="findVoList" parameterType="com.iformall.domain.vo.WxWeappReleaseStatusVo" resultMap="VBaseResultMap">
select <include refid="allVoColumns" />
select
<include refid="allVoColumns"/>
from wx_weapp_release_status c
left join wx_appinfo a on c.`app_id` = a.`app_id`
<include refid="dynamicVoWhereConditions" />
<include refid="dynamicVoWhereConditions"/>
</select>
</mapper>

Загрузка…
Отмена
Сохранить