系统收费

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

@@ -36,7 +36,27 @@ public class MemberRankOrganizationFeeMapper {
 	
 	/**  */
 	private java.util.Date updateTime;
-	
+
+	private String rankName;
+
+	private String organName;
+
+	public String getRankName() {
+		return rankName;
+	}
+
+	public void setRankName(String rankName) {
+		this.rankName = rankName;
+	}
+
+	public String getOrganName() {
+		return organName;
+	}
+
+	public void setOrganName(String organName) {
+		this.organName = organName;
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/MemberRankOrganizationFeeMapperService.java

@@ -5,4 +5,5 @@ import com.ym.mec.common.service.BaseService;
 
 public interface MemberRankOrganizationFeeMapperService extends BaseService<Integer,MemberRankOrganizationFeeMapper>{
 
+    void add(MemberRankOrganizationFeeMapper memberRankOrganizationFeeMapper);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MemberRankOrganizationFeeMapperServiceImpl.java

@@ -19,4 +19,8 @@ public class MemberRankOrganizationFeeMapperServiceImpl extends BaseServiceImpl<
 		return memberRankOrganizationFeeMapperDao;
 	}
 
+    @Override
+    public void add(MemberRankOrganizationFeeMapper memberRankOrganizationFeeMapper) {
+
+    }
 }

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

@@ -17,8 +17,17 @@
 		<result column="operator_id_" property="operatorId" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+		<result column="rank_name_" property="rankName" />
+		<result column="organ_name_" property="organName" />
 	</resultMap>
-	
+
+	<select id="get" resultMap="MemberRankOrganizationFeeMapper" >
+		SELECT mrofm.*,o.name_ organ_name_,mrs.name_ rank_name_
+		FROM member_rank_organization_fee_mapper mrofm
+		LEFT JOIN member_rank_setting mrs ON  mrofm.member_rank_setting_id_ = mrs.id_
+		LEFT JOIN organization o ON o.id_ = mrofm.organ_id_
+		WHERE id_ = #{id}
+	</select>
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MemberRankOrganizationFeeMapper">
@@ -62,12 +71,24 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MemberRankOrganizationFeeMapper" parameterType="map">
-		SELECT * FROM member_rank_organization_fee_mapper
+		SELECT mrofm.*,o.name_ organ_name_,mrs.name_ rank_name_ FROM member_rank_organization_fee_mapper mrofm
+		LEFT JOIN member_rank_setting mrs ON  mrofm.member_rank_setting_id_ = mrs.id_
+		LEFT JOIN organization o ON o.id_ = mrofm.organ_id_
+		<where>
+			<if test="organId != null and organId != ''">
+				AND FIND_IN_SET(mrofm.organ_id_,#{organId})
+			</if>
+		</where>
 		<include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM member_rank_organization_fee_mapper
+		<where>
+			<if test="organId != null and organId != ''">
+				AND FIND_IN_SET(mrofm.organ_id_,#{organId})
+			</if>
+		</where>
 	</select>
 </mapper>

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

@@ -11,6 +11,10 @@
 		<result column="member_privileges_id_" property="memberPrivilegesId" />
 	</resultMap>
 
+	<select id="get" resultMap="MemberRankPrivileges" >
+		SELECT * FROM member_rank_privileges WHERE id_ = #{id}
+	</select>
+
 	<delete id="deleteByRankSettingId">
 		DELETE FROM member_rank_privileges WHERE member_rank_id_ = #{memberRankSettingId}
 	</delete>

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

@@ -16,7 +16,10 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
-	
+
+	<select id="get" resultMap="MemberRankSetting" >
+		SELECT * FROM member_rank_setting WHERE id_ = #{id}
+	</select>
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MemberRankSetting">

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

@@ -1,17 +1,25 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.biz.dal.page.MemberPrivilegesItemQueryInfo;
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.MemberRankOrganizationFeeMapper;
 import com.ym.mec.biz.dal.page.MemberRankFeeQueryInfo;
 import com.ym.mec.biz.service.MemberRankOrganizationFeeMapperService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.exception.BizException;
 import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
+import java.util.List;
+
 @RequestMapping("memberRankOrganizationFeeMapper")
 @Api(tags = "会员收费设置服务")
 @RestController
@@ -19,21 +27,17 @@ public class MemberRankOrganizationFeeMapperController extends BaseController {
 
     @Autowired
     private MemberRankOrganizationFeeMapperService memberRankOrganizationFeeMapperService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private EmployeeDao employeeDao;
 
     @ApiOperation(value = "新增")
     @PostMapping("/add")
     @PreAuthorize("@pcs.hasPermissions('memberRankOrganizationFeeMapper/add')")
     @AuditLogAnnotation(operateName = "新增系统功能类型")
     public Object add(@RequestBody MemberRankOrganizationFeeMapper memberRankOrganizationFeeMapper) {
-        memberRankOrganizationFeeMapperService.insert(memberRankOrganizationFeeMapper);
-        return succeed();
-    }
-
-    @ApiOperation(value = "删除")
-    @PostMapping("/del")
-    @PreAuthorize("@pcs.hasPermissions('memberPrivilegesItem/del')")
-    public Object del(Integer id) {
-        memberPrivilegesItemService.recursiveDel(id);
+        memberRankOrganizationFeeMapperService.add(memberRankOrganizationFeeMapper);
         return succeed();
     }
 
@@ -45,10 +49,32 @@ public class MemberRankOrganizationFeeMapperController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation(value = "修改")
+    @PostMapping("/get")
+    @PreAuthorize("@pcs.hasPermissions('memberRankOrganizationFeeMapper/get')")
+    public Object get(Integer id) {
+        return succeed(memberRankOrganizationFeeMapperService.get(id));
+    }
+
     @ApiOperation(value = "分页查询")
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('memberRankOrganizationFeeMapper/queryPage')")
     public Object queryPage(MemberRankFeeQueryInfo queryInfo) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            throw new BizException("用户信息获取失败");
+        }
+        Employee employee = employeeDao.get(sysUser.getId());
+        if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+            queryInfo.setOrganId(employee.getOrganIdList());
+        }else if(StringUtils.isEmpty(employee.getOrganIdList())){
+            throw new BizException("用户所在分部异常");
+        }else {
+            List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+            if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                throw new BizException("非法请求");
+            }
+        }
         return succeed(memberRankOrganizationFeeMapperService.queryPage(queryInfo));
     }
 }