From af4db570d7a54047a0423dfbe50956c3136ef886 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 20 Aug 2018 11:06:41 +0800 Subject: [PATCH] =?UTF-8?q?[app=E9=85=8D=E7=BD=AE][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20type=20=E5=AD=97=E6=AE=B5=201=20b=E7=AB=AF?= =?UTF-8?q?=202=20c=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/domain/po/WxAppinfo.java | 20 ++++++++++++++----- .../main/resources/mapper/WxAppinfoMapper.xml | 10 ++++++++-- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxAppinfo.java b/mallinkService/src/main/java/com/simple/domain/po/WxAppinfo.java index f34597801..892bcaaf2 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxAppinfo.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxAppinfo.java @@ -1,12 +1,11 @@ package com.simple.domain.po; -import javax.persistence.*; -import java.util.*; -import java.math.*; -import javax.persistence.Transient; -import java.util.List; import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.Date; +import java.util.List; @Table(name = "wx_appinfo") public class WxAppinfo implements Serializable { @@ -78,6 +77,9 @@ public class WxAppinfo implements Serializable { public String getTenantId() { return tenantId; } + @io.swagger.annotations.ApiModelProperty(value="1B端2C端",name="type") + private Integer type; + public void setTenantId(String _tenantId) { tenantId = _tenantId; } @@ -142,7 +144,13 @@ public class WxAppinfo implements Serializable { payId = _payId; } + public Integer getType() { + return type; + } + public void setType(Integer type) { + this.type = type; + } public static enum Field { @@ -158,6 +166,8 @@ public class WxAppinfo implements Serializable { ,LastTokenTime_ASC("`lastTokenTime` ASC"),LastTokenTime_DESC("`lastTokenTime` DESC") ,ExpiresIn_ASC("`expiresIn` ASC"),ExpiresIn_DESC("`expiresIn` DESC") ,PayId_ASC("`payId` ASC"),PayId_DESC("`payId` DESC") + ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") + ; private String value; Field(String value){ diff --git a/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml b/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml index 8a82fba36..e93efdad4 100644 --- a/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml @@ -14,10 +14,12 @@ + + - `id`,`tenant_id`,`app_id`,`name`,`secret`,`token`,`aes_key`,`msg_data_format`,`access_token`,`last_token_time`,`expires_in`,`pay_id` + `id`,`tenant_id`,`app_id`,`name`,`secret`,`token`,`aes_key`,`msg_data_format`,`access_token`,`last_token_time`,`expires_in`,`pay_id`,`type` @@ -81,7 +83,11 @@ and `pay_id` = #{payId} - + + + and `type` = #{type} + + and id in