Merge remote-tracking branch 'origin/master'

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysRole.java

@@ -26,6 +26,9 @@ public class SysRole {
 	@ApiModelProperty(value = "角色描述",required = false)
 	private String roleDesc;
 	
+	@ApiModelProperty(value = "是否启用",required = false)
+	private Boolean isEnable;
+	
 	/**  */
 	private java.util.Date createTime;
 	
@@ -79,6 +82,14 @@ public class SysRole {
 		return this.roleDesc;
 	}
 			
+	public Boolean getIsEnable() {
+		return isEnable;
+	}
+
+	public void setIsEnable(Boolean isEnable) {
+		this.isEnable = isEnable;
+	}
+
 	public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysRoleMenu.java

@@ -8,6 +8,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
  * 对应数据库表(sys_role_menu):
  */
 public class SysRoleMenu {
+	
+	private Long id;
 
 	/** 角色ID */
 	@ApiModelProperty(value = "角色ID",required = false)
@@ -25,6 +27,14 @@ public class SysRoleMenu {
 	public SysRoleMenu() {
 	}
 
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
 	public void setRoleId(Long roleId){
 		this.roleId = roleId;
 	}

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysRoleMapper.xml

@@ -11,6 +11,7 @@
         <result column="role_name_" property="roleName"/>
         <result column="role_code_" property="roleCode"/>
         <result column="role_desc_" property="roleDesc"/>
+        <result column="is_enable_" property="isEnable"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="del_flag_" property="delFlag"/>
@@ -29,8 +30,8 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.yonge.cooleshow.auth.api.entity.SysRole" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        INSERT INTO sys_role (id_,role_name_,role_code_,role_desc_,create_time_,update_time_)
-        VALUES(#{id},#{roleName},#{roleCode},#{roleDesc},now(),now())
+        INSERT INTO sys_role (id_,role_name_,role_code_,role_desc_,create_time_,update_time_,is_enable_)
+        VALUES(#{id},#{roleName},#{roleCode},#{roleDesc},now(),now(),#{isEnable})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -52,6 +53,9 @@
             <if test="updateTime != null">
                 update_time_ = NOW(),
             </if>
+            <if test="isEnable != null">
+                is_enable_ = #{isEnable},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysRoleMenuMapper.xml

@@ -7,6 +7,7 @@
 <mapper namespace="com.yonge.cooleshow.auth.dal.dao.SysRoleMenuDao">
 	
 	<resultMap type="com.yonge.cooleshow.auth.api.entity.SysRoleMenu" id="SysRoleMenu">
+		<result column="id_" property="id" />
 		<result column="role_id_" property="roleId" />
 		<result column="menu_id_" property="menuId" />
 	</resultMap>

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MemberPriceSettingsController.java

@@ -3,7 +3,10 @@ package com.yonge.cooleshow.admin.controller;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import java.util.Date;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -12,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings;
 import com.yonge.cooleshow.biz.dal.service.MemberPriceSettingsService;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -27,6 +32,9 @@ public class MemberPriceSettingsController extends BaseController {
 	@Autowired
 	private MemberPriceSettingsService memberPriceSettingsService;
 
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+
 	@ApiOperation("分页查询")
 	@GetMapping(value = "/list")
 	@PreAuthorize("@pcs.hasPermissions('memberPriceSettings/list')")
@@ -38,6 +46,12 @@ public class MemberPriceSettingsController extends BaseController {
 	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	@PreAuthorize("@pcs.hasPermissions('memberPriceSettings/update')")
 	public HttpResponseResult<Object> update(@RequestBody MemberPriceSettings memberPriceSettings) {
+		SysUser user = sysUserFeignService.queryUserInfo();
+
+		if (user == null || user.getId() == null) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		memberPriceSettings.setUpdateBy(user.getId()).setUpdateTime(new Date());
 		memberPriceSettingsService.update(memberPriceSettings);
 		return succeed();
 	}

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysConfigMapper.xml

@@ -6,7 +6,7 @@
 	<resultMap type="com.yonge.cooleshow.biz.dal.entity.SysConfig" id="SysConfig">
 		<result column="id_" property="id" />
 		<result column="param_name_" property="paramName" />
-		<result column="paran_value_" property="paranValue" />
+		<result column="param_value_" property="paramValue" />
 		<result column="description_" property="description" />
 		<result column="create_on_" property="createOn" />
 		<result column="modify_on_" property="modifyOn" />
@@ -33,8 +33,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO sys_config
-		(id_,param_name_,paran_value_,description_,create_on_,modify_on_,group_)
-		VALUES(#{id},#{paramName},#{paranValue},#{description},#{createOn},#{modifyOn},#{group})
+		(id_,param_name_,param_value_,description_,create_on_,modify_on_,group_)
+		VALUES(#{id},#{paramName},#{paramValue},#{description},#{createOn},#{modifyOn},#{group})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -44,8 +44,8 @@
 			<if test="modifyOn != null">
 				modify_on_ = #{modifyOn},
 			</if>
-			<if test="paranValue != null">
-				paran_value_ = #{paranValue},
+			<if test="paramValue != null">
+				param_value_ = #{paramValue},
 			</if>
 			<if test="description != null">
 				description_ = #{description},
@@ -63,8 +63,8 @@
 		<foreach collection="configList" item="config" index="index" open="" close="" separator=";">
 			UPDATE sys_config
 			<set>
-				<if test="config.paranValue != null">
-					paran_value_ = #{config.paranValue},
+				<if test="config.paramValue != null">
+					param_value_ = #{config.paramValue},
 				</if>
 				<if test="config.description != null">
 					description_ = #{config.description},
@@ -101,6 +101,6 @@
 		SELECT * FROM sys_config WHERE param_name_ = #{paramName}
 	</select>
     <select id="findConfigValue" resultType="java.lang.String">
-		SELECT paran_value_ FROM sys_config WHERE param_name_ = #{paramName}
+		SELECT param_value_ FROM sys_config WHERE param_name_ = #{paramName}
 	</select>
 </mapper>