修改字段

2code/server/store-system/src/main/java/cn/com/fqy/controller/mapi/WebShopController.java

@@ -46,7 +46,6 @@ public class WebShopController {
 	public ResultInfo<List<Store>> getStoreList(Store store) {	
 		ResultInfo<List<Store>> resultInfo = new ResultInfo<List<Store>>();
 		store.setIsDeleted(0);	//未删除
-		store.setIsAvailable(1);	//店铺启用状态
 		store.setIsShopping(1); 	//店铺展示状态
 		Query q = new Query(store);
 		PageFinder<Store> pageResult = storeService.getStorePagedList(q);

2code/server/store-system/src/main/java/cn/com/fqy/core/model/Store.java

@@ -88,7 +88,7 @@ public class Store extends Entity<String> {
 	//是否删除(0未删除1删除)
 	private Integer isDeleted;
 	//是否启用（0不启用1 启用）
-	private Integer isAvailable;
+	private Integer userId;
 	//店铺管理员名称
 	private String administratorsName;
 	//市名称
@@ -169,12 +169,14 @@ public class Store extends Entity<String> {
 		this.isDeleted = isDeleted;
 	}
 
-	public Integer getIsAvailable() {
-		return isAvailable;
+	
+
+	public Integer getUserId() {
+		return userId;
 	}
 
-	public void setIsAvailable(Integer isAvailable) {
-		this.isAvailable = isAvailable;
+	public void setUserId(Integer userId) {
+		this.userId = userId;
 	}
 
 	@Override
@@ -495,8 +497,8 @@ public class Store extends Entity<String> {
 				+ ", createTimeEnd=" + createTimeEnd + ", updateTime=" + updateTime + ", updateTimeStart="
 				+ updateTimeStart + ", updateTimeEnd=" + updateTimeEnd + ", operatorId=" + operatorId
 				+ ", operatorType=" + operatorType + ", serialNumber=" + serialNumber + ", isDeleted=" + isDeleted
-				+ ", isAvailable=" + isAvailable + ", administratorsName=" + administratorsName + ", cityName="
-				+ cityName + ", cityId=" + cityId + ", provinceId=" + provinceId + ", countyId=" + countyId + ", brief="
-				+ brief + "]";
+				+ ", userId=" + userId + ", administratorsName=" + administratorsName + ", cityName=" + cityName
+				+ ", cityId=" + cityId + ", provinceId=" + provinceId + ", countyId=" + countyId + ", brief=" + brief
+				+ "]";
 	}
 }

2code/server/store-system/src/main/java/cn/com/fqy/core/model/Worker.java

@@ -68,8 +68,8 @@ public class Worker extends Entity<String> {
 	private Integer clicks;
 	//是否推荐
 	private Integer isRecommend;
-	//现居住地
-	private String workerPlaceOfAddress;
+	//系统用户ID
+	private String userId;
 	//创建时间
 	private Date createTime;
 	//创建时间 时间范围起（查询用）
@@ -351,12 +351,12 @@ public class Worker extends Entity<String> {
 		this.isRecommend = isRecommend;
 	}
 	
-	public String getWorkerPlaceOfAddress(){
-		return workerPlaceOfAddress;
+	public String getUserId() {
+		return userId;
 	}
 
-	public void setWorkerPlaceOfAddress(String workerPlaceOfAddress){
-		this.workerPlaceOfAddress = workerPlaceOfAddress;
+	public void setUserId(String userId) {
+		this.userId = userId;
 	}
 
 	public Date getCreateTime(){
@@ -452,10 +452,10 @@ public class Worker extends Entity<String> {
 				+ isAuditing + ", isShopping=" + isShopping + ", uploadTime=" + uploadTime + ", uploadTimeStart="
 				+ uploadTimeStart + ", uploadTimeEnd=" + uploadTimeEnd + ", matureTime=" + matureTime
 				+ ", matureTimeStart=" + matureTimeStart + ", matureTimeEnd=" + matureTimeEnd + ", clicks=" + clicks
-				+ ", isRecommend=" + isRecommend + ", workerPlaceOfAddress=" + workerPlaceOfAddress + ", createTime="
-				+ createTime + ", createTimeStart=" + createTimeStart + ", createTimeEnd=" + createTimeEnd
-				+ ", updateTime=" + updateTime + ", updateTimeStart=" + updateTimeStart + ", updateTimeEnd="
-				+ updateTimeEnd + ", operatorId=" + operatorId + ", operatorType=" + operatorType + ", serialNumber="
-				+ serialNumber + ", isDeleted=" + isDeleted + ", storeName=" + storeName + ", brief=" + brief + "]";
+				+ ", isRecommend=" + isRecommend + ", userId=" + userId + ", createTime=" + createTime
+				+ ", createTimeStart=" + createTimeStart + ", createTimeEnd=" + createTimeEnd + ", updateTime="
+				+ updateTime + ", updateTimeStart=" + updateTimeStart + ", updateTimeEnd=" + updateTimeEnd
+				+ ", operatorId=" + operatorId + ", operatorType=" + operatorType + ", serialNumber=" + serialNumber
+				+ ", isDeleted=" + isDeleted + ", storeName=" + storeName + ", brief=" + brief + "]";
 	}
 }

2code/server/store-system/src/main/java/cn/com/fqy/core/service/impl/StoreServiceImpl.java

@@ -292,9 +292,6 @@ public class StoreServiceImpl implements StoreService {
 			if(obj.getIsShopping() == null) {
 				obj.setIsShopping(0);
 			}
-			if(obj.getIsAvailable() == null) {
-				obj.setIsAvailable(0);
-			}
 			if(obj.getIsRecommend() == null) {
 				obj.setIsRecommend(0);
 			}

2code/server/store-system/src/main/java/cn/com/fqy/core/service/impl/SysUserServiceImpl.java

@@ -156,6 +156,19 @@ public class SysUserServiceImpl implements SysUserService {
 			// 调用Dao执行更新操作，并判断更新语句执行结果
 			int count = sysUserDao.update(sysUser);
 			if (count == 1) {
+				SysUser su = sysUserDao.get(userId);
+				if(null != su) {
+					Administrators admin= new Administrators();
+					admin.setAdministratorsId(su.getAdministratorsId());
+					admin.setSystemId(null);
+					int count1=administratorsDao.update(admin);
+					if(count1 == 1) {
+						resultInfo.setCode(Constant.SUCCESS);
+					}else {
+						resultInfo.setCode(Constant.FAIL);
+						resultInfo.setMsg("未释放店铺管理员！");
+					}
+				}
 				resultInfo.setCode(Constant.SUCCESS);
 			} else {
 				resultInfo.setCode(Constant.FAIL);

2code/server/store-system/src/main/resources/mybatis/mapper/AdministratorsMapper.xml

@@ -99,7 +99,7 @@ POWER,SYSTEM_ID,CREATE_TIME,UPDATE_TIME,OPERATOR_ID,OPERATOR_TYPE,ADMINISTRATORS
 		<if test="power!=null and power!=''">
 			POWER=#{power,jdbcType = VARCHAR},
 		</if>
-		<if test="systemId!=null and systemId!=''">
+		<if test="systemId!=''">
 			SYSTEM_ID=#{systemId,jdbcType = VARCHAR},
 		</if>
 		<if test="createTime!=null ">

2code/server/store-system/src/main/resources/mybatis/mapper/StoreMapper.xml

@@ -32,7 +32,7 @@
 	<result column="OPERATOR_TYPE" property="operatorType" javaType="java.lang.Integer" jdbcType="TINYINT"/>
 	<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_AVAILABLE" property="isAvailable" javaType="java.lang.Integer" jdbcType="TINYINT"/>
+	<result column="USER_ID" property="userId" javaType="java.lang.String" jdbcType="VARCHAR"/>
 	<result column="ADMINISTRATORS_NAME" property="administratorsName" javaType="java.lang.String" jdbcType="VARCHAR"/>
 	<result column="CITY_NAME" property="cityName" javaType="java.lang.String" jdbcType="VARCHAR"/>
 	<result column="CITY_ID" property="cityId" javaType="java.lang.String" jdbcType="VARCHAR"/>
@@ -48,7 +48,7 @@ STORE_ID,STORE_NAME,CONTACT_NUMBER,CONTACTS,QQ,WECHAT,PROVINCE,
 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,
 UPLOAD_TIME,MATURE_TIME,CLICKS,IS_RECOMMEND,CREATE_TIME,UPDATE_TIME,
-OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE,ADMINISTRATORS_NAME,
+OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,USER_ID,ADMINISTRATORS_NAME,
 CITY_NAME,CITY_ID,PROVINCE_ID,COUNTY_ID,BRIEF
 </sql>
 
@@ -58,7 +58,7 @@ STORE_ID,STORE_NAME,CONTACT_NUMBER,CONTACTS,QQ,WECHAT,PROVINCE,
 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,
 UPLOAD_TIME,MATURE_TIME,CLICKS,IS_RECOMMEND,CREATE_TIME,UPDATE_TIME,
-OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,IS_AVAILABLE,ADMINISTRATORS_NAME,
+OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,USER_ID,ADMINISTRATORS_NAME,
 CITY_NAME,CITY_ID,PROVINCE_ID,COUNTY_ID,BRIEF
 </sql>
 
@@ -95,7 +95,7 @@ CITY_NAME,CITY_ID,PROVINCE_ID,COUNTY_ID,BRIEF
 		OPERATOR_TYPE,
 		SERIAL_NUMBER,
 		IS_DELETED,
-		IS_AVAILABLE,
+		USER_ID,
 		ADMINISTRATORS_NAME,
 		CITY_NAME,
 		CITY_ID,
@@ -134,7 +134,7 @@ CITY_NAME,CITY_ID,PROVINCE_ID,COUNTY_ID,BRIEF
 		#{operatorType,jdbcType = TINYINT},
 		#{serialNumber,jdbcType = INTEGER},
 		#{isDeleted,jdbcType = TINYINT},
-		#{isAvailable,jdbcType = TINYINT},
+		#{userId,jdbcType = VARCHAR},
 		#{administratorsName,jdbcType = VARCHAR},
 		#{cityName,jdbcType = VARCHAR},
 		#{cityId,jdbcType = VARCHAR},
@@ -231,8 +231,8 @@ CITY_NAME,CITY_ID,PROVINCE_ID,COUNTY_ID,BRIEF
 		<if test="isDeleted!=null ">
 			IS_DELETED=#{isDeleted,jdbcType = TINYINT},
 		</if>
-		<if test="isAvailable!=null ">
-			IS_AVAILABLE=#{isAvailable,jdbcType = TINYINT},
+		<if test="userId!=null and userId !=''">
+			USER_ID=#{userId,jdbcType = VARCHAR},
 		</if>
 		<if test="administratorsName!=null and administratorsName!=''">
 			ADMINISTRATORS_NAME=#{administratorsName,jdbcType = VARCHAR},
@@ -417,8 +417,8 @@ CITY_NAME,CITY_ID,PROVINCE_ID,COUNTY_ID,BRIEF
 		<if test="q.isDeleted!=null ">
 			AND IS_DELETED=#{q.isDeleted}
 		</if>
-		<if test="q.isAvailable!=null ">
-			AND IS_AVAILABLE=#{q.isAvailable}
+		<if test="q.userId!=null and userId !=''">
+			AND USER_ID=#{q.userId}
 		</if>
 		<if test="q.administratorsName!=null and q.administratorsName!=''">
 			AND ADMINISTRATORS_NAME=#{q.administratorsName}
@@ -557,8 +557,8 @@ CITY_NAME,CITY_ID,PROVINCE_ID,COUNTY_ID,BRIEF
 		<if test="q.isDeleted!=null ">
 			AND IS_DELETED=#{q.isDeleted}
 		</if>
-		<if test="q.isAvailable!=null ">
-			AND IS_AVAILABLE=#{q.isAvailable}
+		<if test="q.userId!=null ">
+			AND USER_ID=#{q.userId}
 		</if>
 		<if test="q.administratorsName!=null and q.administratorsName!=''">
 			AND ADMINISTRATORS_NAME=#{q.administratorsName}

2code/server/store-system/src/main/resources/mybatis/mapper/WorkerMapper.xml

@@ -26,7 +26,7 @@
 	<result column="MATURE_TIME" property="matureTime" javaType="java.util.Date" jdbcType="TIMESTAMP"/>
 	<result column="CLICKS" property="clicks" javaType="java.lang.Integer" jdbcType="INTEGER"/>
 	<result column="IS_RECOMMEND" property="isRecommend" javaType="java.lang.Integer" jdbcType="TINYINT"/>
-	<result column="WORKER_PLACE_OF_ADDRESS" property="workerPlaceOfAddress" javaType="java.lang.String" jdbcType="VARCHAR"/>
+	<result column="USER_ID" property="userId" javaType="java.lang.String" jdbcType="VARCHAR"/>
 	<result column="CREATE_TIME" property="createTime" javaType="java.util.Date" jdbcType="TIMESTAMP"/>
 	<result column="UPDATE_TIME" property="updateTime" javaType="java.util.Date" jdbcType="TIMESTAMP"/>
 	<result column="OPERATOR_ID" property="operatorId" javaType="java.lang.String" jdbcType="VARCHAR"/>
@@ -43,7 +43,7 @@
 WORKER_ID,WORKER_NAME,WORKER_NUMBER,WORKER_SEX,WORKER_AGE,WORKER_BIRTHDAY,WORKER_ANCESTRAL,
 WORKER_HEIGHT,WORKER_WEIGHT,WORKER_BUST,WORKER_WAIST,WORKER_HIPLINE,WORKER_HOME_PIC,
 WORKER_PIC,WORKER_RESUME,STORE_ID,ADMINISTRATORS_ID,IS_AUDITING,IS_SHOPPING,
-UPLOAD_TIME,MATURE_TIME,CLICKS,IS_RECOMMEND,WORKER_PLACE_OF_ADDRESS,CREATE_TIME,
+UPLOAD_TIME,MATURE_TIME,CLICKS,IS_RECOMMEND,USER_ID,CREATE_TIME,
 UPDATE_TIME,OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,STORE_NAME,BRIEF
 </sql>
 
@@ -52,7 +52,7 @@ UPDATE_TIME,OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,STORE_NAME,BRIEF
 WORKER_ID,WORKER_NAME,WORKER_NUMBER,WORKER_SEX,WORKER_AGE,WORKER_BIRTHDAY,WORKER_ANCESTRAL,
 WORKER_HEIGHT,WORKER_WEIGHT,WORKER_BUST,WORKER_WAIST,WORKER_HIPLINE,WORKER_HOME_PIC,
 WORKER_PIC,WORKER_RESUME,STORE_ID,ADMINISTRATORS_ID,IS_AUDITING,IS_SHOPPING,
-UPLOAD_TIME,MATURE_TIME,CLICKS,IS_RECOMMEND,WORKER_PLACE_OF_ADDRESS,CREATE_TIME,
+UPLOAD_TIME,MATURE_TIME,CLICKS,IS_RECOMMEND,USER_ID,CREATE_TIME,
 UPDATE_TIME,OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,STORE_NAME,BRIEF
 </sql>
 
@@ -83,7 +83,7 @@ UPDATE_TIME,OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,STORE_NAME,BRIEF
 		MATURE_TIME,
 		CLICKS,
 		IS_RECOMMEND,
-		WORKER_PLACE_OF_ADDRESS,
+		USER_ID,
 		CREATE_TIME,
 		UPDATE_TIME,
 		OPERATOR_ID,
@@ -118,7 +118,7 @@ UPDATE_TIME,OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,STORE_NAME,BRIEF
 		#{matureTime,jdbcType = TIMESTAMP},
 		#{clicks,jdbcType = INTEGER},
 		#{isRecommend,jdbcType = TINYINT},
-		#{workerPlaceOfAddress,jdbcType = VARCHAR},
+		#{userId,jdbcType = VARCHAR},
 		#{createTime,jdbcType = TIMESTAMP},
 		#{updateTime,jdbcType = TIMESTAMP},
 		#{operatorId,jdbcType = VARCHAR},
@@ -199,8 +199,8 @@ UPDATE_TIME,OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,STORE_NAME,BRIEF
 		<if test="isRecommend!=null ">
 			IS_RECOMMEND=#{isRecommend,jdbcType = TINYINT},
 		</if>
-		<if test="workerPlaceOfAddress!=null and workerPlaceOfAddress!=''">
-			WORKER_PLACE_OF_ADDRESS=#{workerPlaceOfAddress,jdbcType = VARCHAR},
+		<if test="userId!=null and userId!=''">
+			USER_ID=#{userId,jdbcType = VARCHAR},
 		</if>
 		<if test="createTime!=null ">
 			CREATE_TIME=#{createTime,jdbcType = TIMESTAMP},
@@ -371,8 +371,8 @@ UPDATE_TIME,OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,STORE_NAME,BRIEF
 		<if test="q.isRecommend!=null ">
 			AND IS_RECOMMEND=#{q.isRecommend}
 		</if>
-		<if test="q.workerPlaceOfAddress!=null and q.workerPlaceOfAddress!=''">
-			AND WORKER_PLACE_OF_ADDRESS=#{q.workerPlaceOfAddress}
+		<if test="q.userId!=null and q.userId!=''">
+			AND USER_ID=#{q.userId}
 		</if>
 		<if test="q.createTime!=null ">
 			AND CREATE_TIME=#{q.createTime}
@@ -499,8 +499,8 @@ UPDATE_TIME,OPERATOR_ID,OPERATOR_TYPE,SERIAL_NUMBER,IS_DELETED,STORE_NAME,BRIEF
 		<if test="q.isRecommend!=null ">
 			AND IS_RECOMMEND=#{q.isRecommend}
 		</if>
-		<if test="q.workerPlaceOfAddress!=null and q.workerPlaceOfAddress!=''">
-			AND WORKER_PLACE_OF_ADDRESS=#{q.workerPlaceOfAddress}
+		<if test="q.userId!=null and q.userId!=''">
+			AND USER_ID=#{q.userId}
 		</if>
 		<if test="q.createTime!=null ">
 			AND CREATE_TIME=#{q.createTime}