系统收费

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MemberPrivilegesItemDao.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.biz.dal.entity.MemberPrivilegesItem;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -13,9 +14,7 @@ public interface MemberPrivilegesItemDao extends BaseDAO<Integer, MemberPrivileg
      * @param parentId
      * @return
      */
-    List<MemberPrivilegesItem> findList(Integer parentId);
+    List<MemberPrivilegesItem> findList(@Param("parentId") Integer parentId);
 
     void batchDel(List<Integer> collect);
-
-    void updateFeeAsNull(Integer id);
 }

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

@@ -24,8 +24,6 @@ public class MemberPrivilegesItem {
 	/**  */
 	private Integer parentId = 0;
 
-	private Integer memberFeeSettingId;
-	
 	/**  */
 	private java.util.Date createTime;
 	
@@ -34,14 +32,6 @@ public class MemberPrivilegesItem {
 
 	private List<MemberPrivilegesItem> memberPrivilegesItems;
 
-	public Integer getMemberFeeSettingId() {
-		return memberFeeSettingId;
-	}
-
-	public void setMemberFeeSettingId(Integer memberFeeSettingId) {
-		this.memberFeeSettingId = memberFeeSettingId;
-	}
-
 	public List<MemberPrivilegesItem> getMemberPrivilegesItems() {
 		return memberPrivilegesItems;
 	}

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

@@ -31,6 +31,16 @@ public class MemberRankOrganizationFeeMapper {
 
 	private Integer memberFeeSettingId;
 
+	private MemberFeeSetting memberFeeSetting;
+
+	public MemberFeeSetting getMemberFeeSetting() {
+		return memberFeeSetting;
+	}
+
+	public void setMemberFeeSetting(MemberFeeSetting memberFeeSetting) {
+		this.memberFeeSetting = memberFeeSetting;
+	}
+
 	public Integer getMemberFeeSettingId() {
 		return memberFeeSettingId;
 	}

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

@@ -1,15 +1,17 @@
 package com.ym.mec.biz.service;
 
-import com.ym.mec.biz.dal.page.MemberPrivilegesItemQueryInfo;
 import com.ym.mec.biz.dal.entity.MemberPrivilegesItem;
+import com.ym.mec.biz.dal.page.MemberPrivilegesItemQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.List;
+
 public interface MemberPrivilegesItemService extends BaseService<Integer, MemberPrivilegesItem> {
 
     void recursiveDel(Integer id);
 
     PageInfo<MemberPrivilegesItem> queryItemPage(MemberPrivilegesItemQueryInfo queryInfo);
 
-    void add(MemberPrivilegesItem memberPrivilegesItem);
+    List<MemberPrivilegesItem> findAllItem(MemberPrivilegesItemQueryInfo queryInfo);
 }

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

@@ -7,5 +7,5 @@ public interface MemberRankOrganizationFeeMapperService extends BaseService<Inte
 
     void add(MemberRankOrganizationFeeMapper memberRankOrganizationFeeMapper);
 
-    Object getMemberDefaultFee(Integer rankId);
+    void updateFee(MemberRankOrganizationFeeMapper memberRankOrganizationFeeMapper);
 }

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

@@ -1,8 +1,8 @@
 package com.ym.mec.biz.service.impl;
 
-import com.ym.mec.biz.dal.page.MemberPrivilegesItemQueryInfo;
 import com.ym.mec.biz.dal.dao.MemberPrivilegesItemDao;
 import com.ym.mec.biz.dal.entity.MemberPrivilegesItem;
+import com.ym.mec.biz.dal.page.MemberPrivilegesItemQueryInfo;
 import com.ym.mec.biz.service.MemberPrivilegesItemService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.page.PageInfo;
@@ -65,13 +65,15 @@ public class MemberPrivilegesItemServiceImpl extends BaseServiceImpl<Integer, Me
 		return memberPrivilegesItemPageInfo;
 	}
 
-    @Override
-	@Transactional(rollbackFor = Exception.class)
-    public void add(MemberPrivilegesItem memberPrivilegesItem) {
-		memberPrivilegesItemDao.insert(memberPrivilegesItem);
-        //将父级金额设置为空
-		if(memberPrivilegesItem.getParentId() != null){
-			memberPrivilegesItemDao.updateFeeAsNull(memberPrivilegesItem.getParentId());
+	@Override
+	public List<MemberPrivilegesItem> findAllItem(MemberPrivilegesItemQueryInfo queryInfo) {
+		List<MemberPrivilegesItem> rows = memberPrivilegesItemDao.findList(queryInfo.getParentId());
+		if(rows == null || rows.size() == 0){
+			return rows;
 		}
-    }
+		for (MemberPrivilegesItem item : rows) {
+			item = getTree(item);
+		}
+		return rows;
+	}
 }

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

@@ -1,19 +1,16 @@
 package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.MemberRankOrganizationFeeMapperDao;
-import com.ym.mec.biz.dal.entity.MemberPrivilegesItem;
+import com.ym.mec.biz.dal.entity.MemberFeeSetting;
 import com.ym.mec.biz.dal.entity.MemberRankOrganizationFeeMapper;
-import com.ym.mec.biz.service.MemberPrivilegesItemService;
+import com.ym.mec.biz.service.MemberFeeSettingService;
 import com.ym.mec.biz.service.MemberRankOrganizationFeeMapperService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class MemberRankOrganizationFeeMapperServiceImpl extends BaseServiceImpl<Integer, MemberRankOrganizationFeeMapper>  implements MemberRankOrganizationFeeMapperService {
@@ -21,7 +18,7 @@ public class MemberRankOrganizationFeeMapperServiceImpl extends BaseServiceImpl<
 	@Autowired
 	private MemberRankOrganizationFeeMapperDao memberRankOrganizationFeeMapperDao;
 	@Autowired
-	private MemberPrivilegesItemService memberPrivilegesItemService;
+	private MemberFeeSettingService memberFeeSettingService;
 
 	@Override
 	public BaseDAO<Integer, MemberRankOrganizationFeeMapper> getDAO() {
@@ -29,29 +26,35 @@ public class MemberRankOrganizationFeeMapperServiceImpl extends BaseServiceImpl<
 	}
 
     @Override
+	@Transactional(rollbackFor = Exception.class)
     public void add(MemberRankOrganizationFeeMapper memberRankOrganizationFeeMapper) {
 		//一个分部只能关联一个会员
 		MemberRankOrganizationFeeMapper feeMapper = memberRankOrganizationFeeMapperDao.findByOrganIdAndRankId(memberRankOrganizationFeeMapper.getOrganId(),memberRankOrganizationFeeMapper.getMemberRankSettingId());
 		if(feeMapper != null){
 			throw new BizException("操作失败: 该分部会员收费标准已存在");
 		}
+		MemberFeeSetting memberFeeSetting = memberRankOrganizationFeeMapper.getMemberFeeSetting();
+		if(memberFeeSetting == null){
+			throw new BizException("操作失败: 请设置收费标准");
+		}
+		memberFeeSettingService.insert(memberFeeSetting);
+		memberRankOrganizationFeeMapper.setMemberFeeSettingId(memberFeeSetting.getId());
 		memberRankOrganizationFeeMapperDao.insert(memberRankOrganizationFeeMapper);
     }
 
 	@Override
-	public Object getMemberDefaultFee(Integer rankId) {
-//		MemberPrivilegesItem privilegesItem = memberPrivilegesItemService.get(rankId);
-//		获取当前会员最后一级特权项
-//		Map<String,Object> param = new HashMap<>(1);
-//		param.put("organId",organId);
-//		List<MemberRankOrganizationFeeMapper> all = memberRankOrganizationFeeMapperDao.findAll(param);
-//		if(all != null && all.size() > 0){
-//
-//			获取会员默认收费
-//			all.forEach(e->{
-//
-//			});
-//		}
-		return null;
+	@Transactional(rollbackFor = Exception.class)
+	public void updateFee(MemberRankOrganizationFeeMapper memberRankOrganizationFeeMapper) {
+		MemberRankOrganizationFeeMapper feeMapper = memberRankOrganizationFeeMapperDao.get(memberRankOrganizationFeeMapper.getId());
+		if(feeMapper == null){
+			throw new BizException("修改失败: 收费标准不存在");
+		}
+		MemberFeeSetting memberFeeSetting = memberRankOrganizationFeeMapper.getMemberFeeSetting();
+		if(memberFeeSetting == null){
+			throw new BizException("修改失败: 请设置收费标准");
+		}
+		memberFeeSetting.setId(feeMapper.getMemberFeeSettingId());
+		memberFeeSettingService.update(memberFeeSetting);
+		memberRankOrganizationFeeMapperDao.update(memberRankOrganizationFeeMapper);
 	}
 }

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

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.dao.MemberRankSettingDao;
 import com.ym.mec.biz.dal.entity.MemberRankSetting;
 import com.ym.mec.biz.service.MemberRankSettingService;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,9 +31,10 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 	public void add(MemberRankSetting memberRankSetting) {
 		memberRankSettingDao.insert(memberRankSetting);
 		List<Integer> memberPrivilegesItemIdList = memberRankSetting.getMemberPrivilegesItemIdList();
-		if(memberPrivilegesItemIdList != null && memberPrivilegesItemIdList.size() > 0){
-			memberRankPrivilegesDao.batchInsert(memberRankSetting.getId(),memberPrivilegesItemIdList);
+		if(memberPrivilegesItemIdList == null || memberPrivilegesItemIdList.size() == 0){
+			throw new BizException("操作失败：请配置会员权益");
 		}
+		memberRankPrivilegesDao.batchInsert(memberRankSetting.getId(),memberPrivilegesItemIdList);
 	}
 
     @Override

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

@@ -12,7 +12,6 @@
 		<result column="desc_" property="desc" />
 		<result column="code_" property="code" />
 		<result column="parent_id_" property="parentId" />
-		<result column="member_fee_setting_id_" property="memberFeeSettingId" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
@@ -24,13 +23,19 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="MemberPrivilegesItem">
-		SELECT * FROM member_privileges_item ORDER BY id_
+		SELECT * FROM member_privileges_item
+		<where>
+			<if test="parentId != null">
+				parent_id_ = #{parentId}
+			</if>
+		</where>
+		ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MemberPrivilegesItem" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO member_privileges_item (name_,desc_,code_,parent_id_,member_fee_setting_id_,create_time_,update_time_)
-		 VALUES(#{name},#{desc},#{code},#{parentId},#{memberFeeSettingId},NOW(),NOW())
+		INSERT INTO member_privileges_item (name_,desc_,code_,parent_id_,create_time_,update_time_)
+		 VALUES(#{name},#{desc},#{code},#{parentId},NOW(),NOW())
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -39,9 +44,6 @@
 		<if test="parentId != null">
 			parent_id_ = #{parentId},
 		</if>
-		<if test="memberFeeSettingId != null">
-			member_fee_setting_id_ = #{memberFeeSettingId},
-		</if>
 		<if test="code != null">
 			code_ = #{code},
 		</if>
@@ -54,10 +56,6 @@
 			update_time_ = NOW()
 		</set> WHERE id_ = #{id}
 	</update>
-    <update id="updateFeeAsNull">
-		UPDATE member_privileges_item SET day_fee_ = NULL,month_fee_ = NULL,half_year_fee_ = NULL,
-		                                  year_fee_ = NULL,update_time_ = NOW() WHERE id_ = #{id}
-	</update>
 
     <!-- 根据主键删除一条记录 -->
 	<delete id="delete" >

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

@@ -16,6 +16,16 @@
 		<result column="update_time_" property="updateTime" />
 		<result column="rank_name_" property="rankName" />
 		<result column="organ_name_" property="organName" />
+		<association property="memberFeeSetting" javaType="com.ym.mec.biz.dal.entity.MemberFeeSetting">
+			<result property="currentDayFee" column="current_day_fee_"/>
+			<result property="originalDayFee" column="original_day_fee_"/>
+			<result property="currentMonthFee" column="current_month_fee_"/>
+			<result property="originalMonthFee" column="original_month_fee_"/>
+			<result property="currentHalfYearFee" column="current_half_year_fee_"/>
+			<result property="originalHalfYearFee" column="original_half_year_fee_"/>
+			<result property="currentYearFee" column="current_year_fee_"/>
+			<result property="originalYearFee" column="original_year_fee_"/>
+		</association>
 	</resultMap>
 
 	<select id="get" resultMap="MemberRankOrganizationFeeMapper" >
@@ -30,8 +40,8 @@
 	<select id="findAll" resultMap="MemberRankOrganizationFeeMapper">
 		SELECT * FROM member_rank_organization_fee_mapper
 		<where>
-			<if test="organId != null">
-				AND organ_id_ = #{organId}
+			<if test="organId != null and organId != ''">
+				AND FIND_IN_SET(mrofm.organ_id_,#{organId})
 			</if>
 		</where>
 	</select>
@@ -62,21 +72,31 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MemberRankOrganizationFeeMapper" parameterType="map">
-		SELECT mrofm.*,o.name_ organ_name_,mrs.name_ rank_name_ FROM member_rank_organization_fee_mapper mrofm
+		SELECT mrofm.*,o.name_ organ_name_,mrs.name_ rank_name_,mfs.*
+		FROM member_rank_organization_fee_mapper mrofm
 		LEFT JOIN member_rank_setting mrs ON  mrofm.member_rank_setting_id_ = mrs.id_
+		LEFT JOIN member_fee_setting mfs ON mfs.id_ = mrofm.member_fee_setting_id_
 		LEFT JOIN organization o ON o.id_ = mrofm.organ_id_
 		<where>
+			<if test="search != null and search != ''">
+				AND mrs.name_ LIKE CONCAT('%',#{search},'%')
+			</if>
 			<if test="organId != null and organId != ''">
 				AND FIND_IN_SET(mrofm.organ_id_,#{organId})
 			</if>
 		</where>
+		ORDER BY mrofm.id_
 		<include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM member_rank_organization_fee_mapper
+		SELECT COUNT(mrofm.id_) FROM member_rank_organization_fee_mapper mrofm
+		LEFT JOIN member_rank_setting mrs ON  mrofm.member_rank_setting_id_ = mrs.id_
 		<where>
+			<if test="search != null and search != ''">
+				AND mrs.name_ LIKE CONCAT('%',#{search},'%')
+			</if>
 			<if test="organId != null and organId != ''">
 				AND FIND_IN_SET(mrofm.organ_id_,#{organId})
 			</if>

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

@@ -24,7 +24,7 @@ public class MemberPrivilegesItemController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('memberPrivilegesItem/add')")
     @AuditLogAnnotation(operateName = "新增系统功能类型")
     public Object add(@RequestBody MemberPrivilegesItem memberPrivilegesItem) {
-        memberPrivilegesItemService.add(memberPrivilegesItem);
+        memberPrivilegesItemService.insert(memberPrivilegesItem);
         return succeed();
     }
 
@@ -46,8 +46,15 @@ public class MemberPrivilegesItemController extends BaseController {
 
     @ApiOperation(value = "分页查询")
     @GetMapping("/queryPage")
-    @PreAuthorize("@pcs.hasPermissions('chargeType/queryPage')")
+    @PreAuthorize("@pcs.hasPermissions('memberPrivilegesItem/queryPage')")
     public Object queryPage(MemberPrivilegesItemQueryInfo queryInfo) {
         return succeed(memberPrivilegesItemService.queryItemPage(queryInfo));
     }
+
+    @ApiOperation(value = "查询所有")
+    @GetMapping("/findAll")
+    @PreAuthorize("@pcs.hasPermissions('memberPrivilegesItem/findAll')")
+    public Object findAll(MemberPrivilegesItemQueryInfo queryInfo) {
+        return succeed(memberPrivilegesItemService.findAllItem(queryInfo));
+    }
 }

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

@@ -48,28 +48,36 @@ public class MemberRankOrganizationFeeMapperController extends BaseController {
     @PostMapping("/update")
     @PreAuthorize("@pcs.hasPermissions('memberRankOrganizationFeeMapper/update')")
     public Object update(@RequestBody MemberRankOrganizationFeeMapper memberRankOrganizationFeeMapper) {
-        memberRankOrganizationFeeMapperService.update(memberRankOrganizationFeeMapper);
+        memberRankOrganizationFeeMapperService.updateFee(memberRankOrganizationFeeMapper);
         return succeed();
     }
 
-    @ApiOperation(value = "修改")
+    @ApiOperation(value = "查询")
     @PostMapping("/get")
     @PreAuthorize("@pcs.hasPermissions('memberRankOrganizationFeeMapper/get')")
     public Object get(Integer id) {
         return succeed(memberRankOrganizationFeeMapperService.get(id));
     }
 
-    @ApiOperation(value = "获取分部活动列表以及活动默认收费金额")
-    @GetMapping("/getMemberDefaultFee")
-    @PreAuthorize("@pcs.hasPermissions('memberRankOrganizationFeeMapper/getMemberDefaultFee')")
-    public Object getMemberDefaultFee(Integer rankId) {
-        return succeed(memberRankOrganizationFeeMapperService.getMemberDefaultFee(rankId));
-    }
-
     @ApiOperation(value = "获取所有的收费标准")
     @GetMapping("/findAll")
     @PreAuthorize("@pcs.hasPermissions('memberRankOrganizationFeeMapper/findAll')")
     public Object getMemberDefaultFee(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("非法请求");
+            }
+        }
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
         return succeed(memberRankOrganizationFeeMapperService.findAll(params));