系统收费会员等级修改人

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MemberRankSetting.java

@@ -10,9 +10,15 @@ import java.util.List;
 public class MemberRankSetting {
 
 	/**  */
-	private Integer id;
+	private Integer operator;
 	
 	/**  */
+	private String operatorName;
+
+	/**  */
+	private Integer id;
+
+	/**  */
 	private String name;
 	
 	/**  */
@@ -38,6 +44,22 @@ public class MemberRankSetting {
 	
 	private MemberFeeSetting memberFeeSetting;
 
+	public Integer getOperator() {
+		return operator;
+	}
+
+	public void setOperator(Integer operator) {
+		this.operator = operator;
+	}
+
+	public String getOperatorName() {
+		return operatorName;
+	}
+
+	public void setOperatorName(String operatorName) {
+		this.operatorName = operatorName;
+	}
+
 	public List<MemberRankPrivileges> getMemberRankPrivileges() {
 		return memberRankPrivileges;
 	}

mec-biz/src/main/resources/config/mybatis/MemberRankSettingMapper.xml

@@ -14,6 +14,8 @@
 		<result column="is_default_" property="isDefault" javaType="java.lang.Boolean" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+		<result column="operator_" property="operator" />
+		<result column="operator_name_" property="operatorName" />
 	</resultMap>
 
 	<select id="get" resultMap="MemberRankSetting" >
@@ -27,13 +29,16 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MemberRankSetting" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO member_rank_setting (name_,intro_,icon_,is_default_,create_time_,update_time_)
-		VALUES(#{name},#{intro},#{icon},#{isDefault},NOW(),NOW())
+		INSERT INTO member_rank_setting (name_,intro_,icon_,is_default_,create_time_,update_time_,operator_)
+		VALUES(#{name},#{intro},#{icon},#{isDefault},NOW(),NOW(),#{operator})
 	</insert>
 
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.MemberRankSetting">
 		UPDATE member_rank_setting
 		<set>
+		<if test="operator != null">
+			operator_ = #{operator},
+		</if>
 		<if test="name != null">
 			name_ = #{name},
 		</if>
@@ -52,7 +57,8 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MemberRankSetting" parameterType="map">
-		SELECT * FROM member_rank_setting
+		SELECT mrs.*,su.real_name_ operator_name_ FROM member_rank_setting mrs
+		LEFT JOIN sys_user su ON su.id_ = mrs.operator_
 		<include refid="queryPageSql"/>
 		<include refid="global.limit"/>
 	</select>
@@ -60,14 +66,14 @@
 	<sql id="queryPageSql">
 		<where>
 			<if test="search != null and search != ''">
-				AND (name_ LIKE CONCAT('%',#{search},'%') OR id_ = #{search})
+				AND (mrs.name_ LIKE CONCAT('%',#{search},'%') OR mrs.id_ = #{search})
 			</if>
 		</where>
 	</sql>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM member_rank_setting
+		SELECT COUNT(mrs.*) FROM member_rank_setting mrs
 		<include refid="queryPageSql"/>
 	</select>
 	

mec-web/src/main/java/com/ym/mec/web/controller/MemberRankSettingController.java

@@ -1,8 +1,11 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.MemberRankSetting;
 import com.ym.mec.biz.service.MemberRankSettingService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.QueryInfo;
 import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.Api;
@@ -20,12 +23,19 @@ public class MemberRankSettingController extends BaseController {
 
     @Autowired
     private MemberRankSettingService memberRankSettingService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
 
     @ApiOperation(value = "新增")
     @PostMapping("/add")
     @PreAuthorize("@pcs.hasPermissions('memberRankSetting/add')")
     @AuditLogAnnotation(operateName = "新增会员等级")
     public Object add(@RequestBody MemberRankSetting memberRankSetting) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            throw new BizException("请登录");
+        }
+        memberRankSetting.setOperator(sysUser.getId());
         memberRankSettingService.add(memberRankSetting);
         return succeed();
     }
@@ -42,6 +52,11 @@ public class MemberRankSettingController extends BaseController {
     @PostMapping("/update")
     @PreAuthorize("@pcs.hasPermissions('memberRankSetting/update')")
     public Object update(@RequestBody MemberRankSetting memberRankSetting) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            throw new BizException("请登录");
+        }
+        memberRankSetting.setOperator(sysUser.getId());
         memberRankSettingService.updateSetting(memberRankSetting);
         return succeed();
     }