Commit 7499e1f7 authored by wangyihao's avatar wangyihao

店铺表 新增字段 店铺管理员ID 店铺管理员名称

parent 859045c4
...@@ -28,7 +28,7 @@ public class Store extends Entity<String> { ...@@ -28,7 +28,7 @@ public class Store extends Entity<String> {
//省份 //省份
private String province; private String province;
//祖籍 //祖籍
private String ancestral; private String administratorsId;
//区县 //区县
private String county; private String county;
//位置 //位置
...@@ -89,6 +89,8 @@ public class Store extends Entity<String> { ...@@ -89,6 +89,8 @@ public class Store extends Entity<String> {
private Integer isDeleted; private Integer isDeleted;
//是否启用(0不启用1 启用) //是否启用(0不启用1 启用)
private Integer isAvailable; private Integer isAvailable;
//店铺管理员名称
private String administratorsName;
/*Auto generated properties end*/ /*Auto generated properties end*/
...@@ -101,6 +103,14 @@ public class Store extends Entity<String> { ...@@ -101,6 +103,14 @@ public class Store extends Entity<String> {
/*Auto generated methods start*/ /*Auto generated methods start*/
public String getAdministratorsName() {
return administratorsName;
}
public void setAdministratorsName(String administratorsName) {
this.administratorsName = administratorsName;
}
public Integer getIsDeleted() { public Integer getIsDeleted() {
return isDeleted; return isDeleted;
} }
...@@ -178,12 +188,12 @@ public class Store extends Entity<String> { ...@@ -178,12 +188,12 @@ public class Store extends Entity<String> {
this.province = province; this.province = province;
} }
public String getAncestral(){ public String getAdministratorsId(){
return ancestral; return administratorsId;
} }
public void setAncestral(String ancestral){ public void setAdministratorsId(String administratorsId){
this.ancestral = ancestral; this.administratorsId = administratorsId;
} }
public String getCounty(){ public String getCounty(){
...@@ -424,7 +434,7 @@ public class Store extends Entity<String> { ...@@ -424,7 +434,7 @@ public class Store extends Entity<String> {
public String toString() { public String toString() {
return "Store [storeId=" + storeId + ", storeName=" + storeName + ", contactNumber=" + contactNumber return "Store [storeId=" + storeId + ", storeName=" + storeName + ", contactNumber=" + contactNumber
+ ", contacts=" + contacts + ", qq=" + qq + ", wechat=" + wechat + ", province=" + province + ", contacts=" + contacts + ", qq=" + qq + ", wechat=" + wechat + ", province=" + province
+ ", ancestral=" + ancestral + ", county=" + county + ", storePosition=" + storePosition + ", administratorsId=" + administratorsId + ", county=" + county + ", storePosition=" + storePosition
+ ", storeBusinessTimeStart=" + storeBusinessTimeStart + ", storeBusinessTimeEnd=" + ", storeBusinessTimeStart=" + storeBusinessTimeStart + ", storeBusinessTimeEnd="
+ storeBusinessTimeEnd + ", consumeInterval=" + consumeInterval + ", storeDetails=" + storeDetails + storeBusinessTimeEnd + ", consumeInterval=" + consumeInterval + ", storeDetails=" + storeDetails
+ ", qrCode=" + qrCode + ", storeHomePic=" + storeHomePic + ", storePic=" + storePic + ", isAuditing=" + ", qrCode=" + qrCode + ", storeHomePic=" + storeHomePic + ", storePic=" + storePic + ", isAuditing="
...@@ -435,6 +445,6 @@ public class Store extends Entity<String> { ...@@ -435,6 +445,6 @@ public class Store extends Entity<String> {
+ ", createTimeEnd=" + createTimeEnd + ", updateTime=" + updateTime + ", updateTimeStart=" + ", createTimeEnd=" + createTimeEnd + ", updateTime=" + updateTime + ", updateTimeStart="
+ updateTimeStart + ", updateTimeEnd=" + updateTimeEnd + ", operatorId=" + operatorId + updateTimeStart + ", updateTimeEnd=" + updateTimeEnd + ", operatorId=" + operatorId
+ ", operatorType=" + operatorType + ", serialNumber=" + serialNumber + ", isDeleted=" + isDeleted + ", operatorType=" + operatorType + ", serialNumber=" + serialNumber + ", isDeleted=" + isDeleted
+ ", isAvailable=" + isAvailable + "]"; + ", isAvailable=" + isAvailable + ", administratorsName=" + administratorsName + "]";
} }
} }
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<result column="QQ" property="qq" javaType="java.lang.String" jdbcType="VARCHAR"/> <result column="QQ" property="qq" javaType="java.lang.String" jdbcType="VARCHAR"/>
<result column="WECHAT" property="wechat" javaType="java.lang.String" jdbcType="VARCHAR"/> <result column="WECHAT" property="wechat" javaType="java.lang.String" jdbcType="VARCHAR"/>
<result column="PROVINCE" property="province" javaType="java.lang.String" jdbcType="VARCHAR"/> <result column="PROVINCE" property="province" javaType="java.lang.String" jdbcType="VARCHAR"/>
<result column="ANCESTRAL" property="ancestral" javaType="java.lang.String" jdbcType="VARCHAR"/> <result column="ADMINISTRATORS_ID" property="administratorsId" javaType="java.lang.String" jdbcType="VARCHAR"/>
<result column="COUNTY" property="county" javaType="java.lang.String" jdbcType="VARCHAR"/> <result column="COUNTY" property="county" javaType="java.lang.String" jdbcType="VARCHAR"/>
<result column="STORE_POSITION" property="storePosition" javaType="java.lang.String" jdbcType="VARCHAR"/> <result column="STORE_POSITION" property="storePosition" javaType="java.lang.String" jdbcType="VARCHAR"/>
<result column="STORE_BUSINESS_TIME_START" property="storeBusinessTimeStart" javaType="java.lang.String" jdbcType="VARCHAR"/> <result column="STORE_BUSINESS_TIME_START" property="storeBusinessTimeStart" javaType="java.lang.String" jdbcType="VARCHAR"/>
...@@ -33,25 +33,26 @@ ...@@ -33,25 +33,26 @@
<result column="SERIAL_NUMBER" property="serialNumber" javaType="java.lang.Integer" jdbcType="INTEGER"/> <result column="SERIAL_NUMBER" property="serialNumber" javaType="java.lang.Integer" jdbcType="INTEGER"/>
<result column="IS_DELETED" property="isDeleted" javaType="java.lang.Integer" jdbcType="TINYINT"/> <result column="IS_DELETED" property="isDeleted" javaType="java.lang.Integer" jdbcType="TINYINT"/>
<result column="IS_AVAILABLE" property="isAvailable" javaType="java.lang.Integer" jdbcType="TINYINT"/> <result column="IS_AVAILABLE" property="isAvailable" javaType="java.lang.Integer" jdbcType="TINYINT"/>
<result column="ADMINISTRATORS_NAME" property="administratorsName" javaType="java.lang.String" jdbcType="VARCHAR"/>
</resultMap> </resultMap>
<!-- 全部字段,一般用于明细查询 --> <!-- 全部字段,一般用于明细查询 -->
<sql id="AllColumnlist"> <sql id="AllColumnlist">
STORE_ID,STORE_NAME,CONTACT_NUMBER,CONTACTS,QQ,WECHAT,PROVINCE, STORE_ID,STORE_NAME,CONTACT_NUMBER,CONTACTS,QQ,WECHAT,PROVINCE,
ANCESTRAL,COUNTY,STORE_POSITION,STORE_BUSINESS_TIME_START,STORE_BUSINESS_TIME_END,CONSUME_INTERVAL, ADMINISTRATORS_ID,COUNTY,STORE_POSITION,STORE_BUSINESS_TIME_START,STORE_BUSINESS_TIME_END,CONSUME_INTERVAL,
STORE_DETAILS,QR_CODE,STORE_HOME_PIC,STORE_PIC,IS_AUDITING,IS_SHOPPING, STORE_DETAILS,QR_CODE,STORE_HOME_PIC,STORE_PIC,IS_AUDITING,IS_SHOPPING,
UPLOAD_TIME,MATURE_TIME,CLICKS,IS_RECOMMEND,CREATE_TIME,UPDATE_TIME, UPLOAD_TIME,MATURE_TIME,CLICKS,IS_RECOMMEND,CREATE_TIME,UPDATE_TIME,
OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE,ADMINISTRATORS_NAME
</sql> </sql>
<!-- 常见字段,一般用于列表查询,可能不包含备注之类的字段 --> <!-- 常见字段,一般用于列表查询,可能不包含备注之类的字段 -->
<sql id="CommonColumnlist"> <sql id="CommonColumnlist">
STORE_ID,STORE_NAME,CONTACT_NUMBER,CONTACTS,QQ,WECHAT,PROVINCE, STORE_ID,STORE_NAME,CONTACT_NUMBER,CONTACTS,QQ,WECHAT,PROVINCE,
ANCESTRAL,COUNTY,STORE_POSITION,STORE_BUSINESS_TIME_START,STORE_BUSINESS_TIME_END,CONSUME_INTERVAL, ADMINISTRATORS_ID,COUNTY,STORE_POSITION,STORE_BUSINESS_TIME_START,STORE_BUSINESS_TIME_END,CONSUME_INTERVAL,
STORE_DETAILS,QR_CODE,STORE_HOME_PIC,STORE_PIC,IS_AUDITING,IS_SHOPPING, STORE_DETAILS,QR_CODE,STORE_HOME_PIC,STORE_PIC,IS_AUDITING,IS_SHOPPING,
UPLOAD_TIME,MATURE_TIME,CLICKS,IS_RECOMMEND,CREATE_TIME,UPDATE_TIME, UPLOAD_TIME,MATURE_TIME,CLICKS,IS_RECOMMEND,CREATE_TIME,UPDATE_TIME,
OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE,ADMINISTRATORS_NAME
</sql> </sql>
<insert id="add" parameterType="Store" useGeneratedKeys="true" keyProperty="storeId"> <insert id="add" parameterType="Store" useGeneratedKeys="true" keyProperty="storeId">
...@@ -65,7 +66,7 @@ OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE ...@@ -65,7 +66,7 @@ OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE
QQ, QQ,
WECHAT, WECHAT,
PROVINCE, PROVINCE,
ANCESTRAL, ADMINISTRATORS_ID,
COUNTY, COUNTY,
STORE_POSITION, STORE_POSITION,
STORE_BUSINESS_TIME_START, STORE_BUSINESS_TIME_START,
...@@ -87,7 +88,8 @@ OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE ...@@ -87,7 +88,8 @@ OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE
OPERATOR_TYPE, OPERATOR_TYPE,
SERIAL_NUMBER, SERIAL_NUMBER,
IS_DELETED, IS_DELETED,
IS_AVAILABLE IS_AVAILABLE,
ADMINISTRATORS_NAME
) values ( ) values (
<if test="storeId!=null"> <if test="storeId!=null">
#{storeId,jdbcType = VARCHAR}, #{storeId,jdbcType = VARCHAR},
...@@ -98,7 +100,7 @@ OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE ...@@ -98,7 +100,7 @@ OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE
#{qq,jdbcType = VARCHAR}, #{qq,jdbcType = VARCHAR},
#{wechat,jdbcType = VARCHAR}, #{wechat,jdbcType = VARCHAR},
#{province,jdbcType = VARCHAR}, #{province,jdbcType = VARCHAR},
#{ancestral,jdbcType = VARCHAR}, #{administratorsId,jdbcType = VARCHAR},
#{county,jdbcType = VARCHAR}, #{county,jdbcType = VARCHAR},
#{storePosition,jdbcType = VARCHAR}, #{storePosition,jdbcType = VARCHAR},
#{storeBusinessTimeStart,jdbcType = VARCHAR}, #{storeBusinessTimeStart,jdbcType = VARCHAR},
...@@ -120,7 +122,8 @@ OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE ...@@ -120,7 +122,8 @@ OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE
#{operatorType,jdbcType = TINYINT}, #{operatorType,jdbcType = TINYINT},
#{serialNumber,jdbcType = INTEGER}, #{serialNumber,jdbcType = INTEGER},
#{isDeleted,jdbcType = TINYINT}, #{isDeleted,jdbcType = TINYINT},
#{isAvailable,jdbcType = TINYINT} #{isAvailable,jdbcType = TINYINT},
#{administratorsName,jdbcType = VARCHAR}
) )
</insert> </insert>
...@@ -145,8 +148,8 @@ OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE ...@@ -145,8 +148,8 @@ OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE
<if test="province!=null and province!=''"> <if test="province!=null and province!=''">
PROVINCE=#{province,jdbcType = VARCHAR}, PROVINCE=#{province,jdbcType = VARCHAR},
</if> </if>
<if test="ancestral!=null and ancestral!=''"> <if test="administratorsId!=null and administratorsId!=''">
ANCESTRAL=#{ancestral,jdbcType = VARCHAR}, ADMINISTRATORS_ID=#{administratorsId,jdbcType = VARCHAR},
</if> </if>
<if test="county!=null and county!=''"> <if test="county!=null and county!=''">
COUNTY=#{county,jdbcType = VARCHAR}, COUNTY=#{county,jdbcType = VARCHAR},
...@@ -214,6 +217,9 @@ OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE ...@@ -214,6 +217,9 @@ OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE
<if test="isAvailable!=null "> <if test="isAvailable!=null ">
IS_AVAILABLE=#{isAvailable,jdbcType = TINYINT}, IS_AVAILABLE=#{isAvailable,jdbcType = TINYINT},
</if> </if>
<if test="administratorsName!=null and administratorsName!=''">
ADMINISTRATORS_NAME=#{administratorsName,jdbcType = VARCHAR},
</if>
</set> </set>
<where> <where>
AND STORE_ID=#{storeId} AND STORE_ID=#{storeId}
...@@ -288,8 +294,8 @@ OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE ...@@ -288,8 +294,8 @@ OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE
<if test="q.province!=null and q.province!=''"> <if test="q.province!=null and q.province!=''">
AND PROVINCE=#{q.province} AND PROVINCE=#{q.province}
</if> </if>
<if test="q.ancestral!=null and q.ancestral!=''"> <if test="q.administratorsId!=null and q.administratorsId!=''">
AND ANCESTRAL=#{q.ancestral} AND ADMINISTRATORS_ID=#{q.administratorsId}
</if> </if>
<if test="q.county!=null and q.county!=''"> <if test="q.county!=null and q.county!=''">
AND COUNTY=#{q.county} AND COUNTY=#{q.county}
...@@ -381,6 +387,9 @@ OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE ...@@ -381,6 +387,9 @@ OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE
<if test="q.isAvailable!=null "> <if test="q.isAvailable!=null ">
AND IS_AVAILABLE=#{q.isAvailable} AND IS_AVAILABLE=#{q.isAvailable}
</if> </if>
<if test="q.administratorsName!=null and q.administratorsName!=''">
AND ADMINISTRATORS_NAME=#{q.administratorsName}
</if>
</if> </if>
</sql> </sql>
...@@ -410,8 +419,8 @@ OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE ...@@ -410,8 +419,8 @@ OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE
<if test="q.province!=null and q.province!=''"> <if test="q.province!=null and q.province!=''">
AND PROVINCE=#{q.province} AND PROVINCE=#{q.province}
</if> </if>
<if test="q.ancestral!=null and q.ancestral!=''"> <if test="q.administratorsId!=null and q.administratorsId!=''">
AND ANCESTRAL=#{q.ancestral} AND ADMINISTRATORS_ID=#{q.administratorsId}
</if> </if>
<if test="q.county!=null and q.county!=''"> <if test="q.county!=null and q.county!=''">
AND COUNTY LIKE '%${q.county}%' AND COUNTY LIKE '%${q.county}%'
...@@ -503,6 +512,9 @@ OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE ...@@ -503,6 +512,9 @@ OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE
<if test="q.isAvailable!=null "> <if test="q.isAvailable!=null ">
AND IS_AVAILABLE=#{q.isAvailable} AND IS_AVAILABLE=#{q.isAvailable}
</if> </if>
<if test="q.administratorsName!=null and q.administratorsName!=''">
AND ADMINISTRATORS_NAME=#{q.administratorsName}
</if>
</if> </if>
</sql> </sql>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment