系统收费

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

@@ -0,0 +1,19 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.biz.dal.entity.MemberPrivilegesItem;
+
+import java.util.List;
+
+public interface MemberPrivilegesItemDao extends BaseDAO<Integer, MemberPrivilegesItem> {
+
+
+    /**
+     * 获取所有功能列表
+     * @param parentId
+     * @return
+     */
+    List<MemberPrivilegesItem> findList(Integer parentId);
+
+    void batchDel(List<Integer> collect);
+}

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

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.biz.dal.entity.MemberRankOrganizationFeeMapper;
+
+public interface MemberRankOrganizationFeeMapperDao extends BaseDAO<Integer, MemberRankOrganizationFeeMapper> {
+
+	
+}

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

@@ -0,0 +1,17 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.MemberRankPrivileges;
+import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface MemberRankPrivilegesDao extends BaseDAO<Integer, MemberRankPrivileges>{
+
+
+    void batchInsert(@Param("memberRankSettingId") Integer memberRankSettingId, @Param("memberPrivilegesItemIdList") List<Integer> memberPrivilegesItemIdList);
+
+    List<MemberRankPrivileges> findByRankSettingId(Integer memberRankSettingId);
+
+    void deleteByRankSettingId(Integer memberRankSettingId);
+}

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

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.biz.dal.entity.MemberRankSetting;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface MemberRankSettingDao extends BaseDAO<Integer, MemberRankSetting> {
+
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MemberFeeDto.java

@@ -0,0 +1,26 @@
+package com.ym.mec.biz.dal.dto;
+
+import java.math.BigDecimal;
+
+public class MemberFeeDto {
+
+    private BigDecimal currentAmount;
+
+    private BigDecimal originalAmount;
+
+    public BigDecimal getCurrentAmount() {
+        return currentAmount;
+    }
+
+    public void setCurrentAmount(BigDecimal currentAmount) {
+        this.currentAmount = currentAmount;
+    }
+
+    public BigDecimal getOriginalAmount() {
+        return originalAmount;
+    }
+
+    public void setOriginalAmount(BigDecimal originalAmount) {
+        this.originalAmount = originalAmount;
+    }
+}

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

@@ -0,0 +1,148 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import java.util.List;
+
+/**
+ * 对应数据库表(member_privileges_item):
+ */
+public class MemberPrivilegesItem {
+
+	/**  */
+	private Integer id;
+	
+	/** 名称 */
+	private String name;
+	
+	/** 描述 */
+	private String desc;
+	
+	/** 编码 */
+	private String code;
+	
+	/**  */
+	private Integer parentId = 0;
+	
+	/** 按日收费，json格式，包含原价、现价 */
+	private String dayFee;
+	
+	/** 按月收费，json格式，包含原价、现价 */
+	private String monthFee;
+	
+	/** 按半年收费，json格式，包含原价、现价 */
+	private String halfYearFee;
+	
+	/** 按年收费，json格式，包含原价、现价 */
+	private String yearFee;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+
+	private List<MemberPrivilegesItem> memberPrivilegesItems;
+
+	public List<MemberPrivilegesItem> getMemberPrivilegesItems() {
+		return memberPrivilegesItems;
+	}
+
+	public void setMemberPrivilegesItems(List<MemberPrivilegesItem> memberPrivilegesItems) {
+		this.memberPrivilegesItems = memberPrivilegesItems;
+	}
+
+	public void setId(Integer id){
+		this.id = id;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public void setName(String name){
+		this.name = name;
+	}
+	
+	public String getName(){
+		return this.name;
+	}
+			
+	public void setDesc(String desc){
+		this.desc = desc;
+	}
+	
+	public String getDesc(){
+		return this.desc;
+	}
+			
+	public void setCode(String code){
+		this.code = code;
+	}
+	
+	public String getCode(){
+		return this.code;
+	}
+			
+	public void setParentId(Integer parentId){
+		this.parentId = parentId;
+	}
+	
+	public Integer getParentId(){
+		return this.parentId;
+	}
+			
+	public void setDayFee(String dayFee){
+		this.dayFee = dayFee;
+	}
+	
+	public String getDayFee(){
+		return this.dayFee;
+	}
+			
+	public void setMonthFee(String monthFee){
+		this.monthFee = monthFee;
+	}
+	
+	public String getMonthFee(){
+		return this.monthFee;
+	}
+			
+	public void setHalfYearFee(String halfYearFee){
+		this.halfYearFee = halfYearFee;
+	}
+	
+	public String getHalfYearFee(){
+		return this.halfYearFee;
+	}
+			
+	public void setYearFee(String yearFee){
+		this.yearFee = yearFee;
+	}
+	
+	public String getYearFee(){
+		return this.yearFee;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -0,0 +1,125 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(member_rank_organization_fee_mapper):
+ */
+public class MemberRankOrganizationFeeMapper {
+
+	/**  */
+	private Integer id;
+	
+	/**  */
+	private Integer organId;
+	
+	/**  */
+	private Integer memberRankSettingId;
+	
+	/**  */
+	private String dayFee;
+	
+	/**  */
+	private String monthFee;
+	
+	/**  */
+	private String halfYearFee;
+	
+	/**  */
+	private String yearFee;
+	
+	/**  */
+	private Integer operatorId;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	public void setId(Integer id){
+		this.id = id;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public void setOrganId(Integer organId){
+		this.organId = organId;
+	}
+	
+	public Integer getOrganId(){
+		return this.organId;
+	}
+			
+	public void setMemberRankSettingId(Integer memberRankSettingId){
+		this.memberRankSettingId = memberRankSettingId;
+	}
+	
+	public Integer getMemberRankSettingId(){
+		return this.memberRankSettingId;
+	}
+			
+	public void setDayFee(String dayFee){
+		this.dayFee = dayFee;
+	}
+	
+	public String getDayFee(){
+		return this.dayFee;
+	}
+			
+	public void setMonthFee(String monthFee){
+		this.monthFee = monthFee;
+	}
+	
+	public String getMonthFee(){
+		return this.monthFee;
+	}
+			
+	public void setHalfYearFee(String halfYearFee){
+		this.halfYearFee = halfYearFee;
+	}
+	
+	public String getHalfYearFee(){
+		return this.halfYearFee;
+	}
+			
+	public void setYearFee(String yearFee){
+		this.yearFee = yearFee;
+	}
+	
+	public String getYearFee(){
+		return this.yearFee;
+	}
+			
+	public void setOperatorId(Integer operatorId){
+		this.operatorId = operatorId;
+	}
+	
+	public Integer getOperatorId(){
+		return this.operatorId;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -0,0 +1,37 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(member_rank_privileges):
+ */
+public class MemberRankPrivileges {
+
+	/** 会员等级编号 */
+	private Integer memberRankId;
+	
+	/** 会员特权编号 */
+	private Integer memberPrivilegesId;
+	
+	public void setMemberRankId(Integer memberRankId){
+		this.memberRankId = memberRankId;
+	}
+	
+	public Integer getMemberRankId(){
+		return this.memberRankId;
+	}
+			
+	public void setMemberPrivilegesId(Integer memberPrivilegesId){
+		this.memberPrivilegesId = memberPrivilegesId;
+	}
+	
+	public Integer getMemberPrivilegesId(){
+		return this.memberPrivilegesId;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -0,0 +1,126 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import java.util.List;
+
+/**
+ * 对应数据库表(member_rank_setting):
+ */
+public class MemberRankSetting {
+
+	/**  */
+	private Integer id;
+	
+	/**  */
+	private String name;
+	
+	/**  */
+	private String intro;
+	
+	/**  */
+	private String icon;
+
+	/**  */
+	private Boolean trialFlag;
+
+	/**  */
+	private Integer trialDate;
+
+	/**  */
+	private List<Integer> memberPrivilegesItemIdList;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+
+	private List<MemberRankPrivileges> memberRankPrivileges;
+
+	public Boolean getTrialFlag() {
+		return trialFlag;
+	}
+
+	public void setTrialFlag(Boolean trialFlag) {
+		this.trialFlag = trialFlag;
+	}
+
+	public Integer getTrialDate() {
+		return trialDate;
+	}
+
+	public void setTrialDate(Integer trialDate) {
+		this.trialDate = trialDate;
+	}
+
+	public List<MemberRankPrivileges> getMemberRankPrivileges() {
+		return memberRankPrivileges;
+	}
+
+	public void setMemberRankPrivileges(List<MemberRankPrivileges> memberRankPrivileges) {
+		this.memberRankPrivileges = memberRankPrivileges;
+	}
+
+	public void setId(Integer id){
+		this.id = id;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public void setName(String name){
+		this.name = name;
+	}
+	
+	public String getName(){
+		return this.name;
+	}
+			
+	public void setIntro(String intro){
+		this.intro = intro;
+	}
+	
+	public String getIntro(){
+		return this.intro;
+	}
+			
+	public void setIcon(String icon){
+		this.icon = icon;
+	}
+	
+	public String getIcon(){
+		return this.icon;
+	}
+
+	public List<Integer> getMemberPrivilegesItemIdList() {
+		return memberPrivilegesItemIdList;
+	}
+
+	public void setMemberPrivilegesItemIdList(List<Integer> memberPrivilegesItemIdList) {
+		this.memberPrivilegesItemIdList = memberPrivilegesItemIdList;
+	}
+
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/MemberPrivilegesItemQueryInfo.java

@@ -0,0 +1,17 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+public class MemberPrivilegesItemQueryInfo extends QueryInfo {
+    @ApiModelProperty(value = "父节点编号，默认0",required = false)
+    private Integer parentId = 0;
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/MemberRankFeeQueryInfo.java

@@ -0,0 +1,15 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+
+public class MemberRankFeeQueryInfo extends QueryInfo {
+    private String organId;
+
+    public String getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(String organId) {
+        this.organId = organId;
+    }
+}

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

@@ -0,0 +1,13 @@
+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.common.page.PageInfo;
+import com.ym.mec.common.service.BaseService;
+
+public interface MemberPrivilegesItemService extends BaseService<Integer, MemberPrivilegesItem> {
+
+    void recursiveDel(Integer id);
+
+    PageInfo<MemberPrivilegesItem> queryItemPage(MemberPrivilegesItemQueryInfo queryInfo);
+}

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

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.MemberRankOrganizationFeeMapper;
+import com.ym.mec.common.service.BaseService;
+
+public interface MemberRankOrganizationFeeMapperService extends BaseService<Integer,MemberRankOrganizationFeeMapper>{
+
+}

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

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.MemberRankPrivileges;
+import com.ym.mec.common.service.BaseService;
+
+public interface MemberRankPrivilegesService extends BaseService<Integer,MemberRankPrivileges>{
+
+}

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

@@ -0,0 +1,13 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.MemberRankSetting;
+import com.ym.mec.common.service.BaseService;
+
+public interface MemberRankSettingService extends BaseService<Integer, MemberRankSetting> {
+
+    void add(MemberRankSetting memberRankSetting);
+
+    MemberRankSetting getDetail(Integer memberRankSettingId);
+
+    void updateSetting(MemberRankSetting memberRankSetting);
+}

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

@@ -0,0 +1,67 @@
+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.service.MemberPrivilegesItemService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class MemberPrivilegesItemServiceImpl extends BaseServiceImpl<Integer, MemberPrivilegesItem>  implements MemberPrivilegesItemService {
+	
+	@Autowired
+	private MemberPrivilegesItemDao memberPrivilegesItemDao;
+
+	@Override
+	public BaseDAO<Integer, MemberPrivilegesItem> getDAO() {
+		return memberPrivilegesItemDao;
+	}
+
+	private MemberPrivilegesItem getTree(MemberPrivilegesItem item){
+		List<MemberPrivilegesItem> privilegesItems = memberPrivilegesItemDao.findList(item.getId());
+		if(privilegesItems != null && privilegesItems.size() > 0) {
+			item.setMemberPrivilegesItems(privilegesItems);
+			for (MemberPrivilegesItem privilegesItem : privilegesItems) {
+				getTree(privilegesItem);
+			}
+		}
+		return item;
+	}
+
+    @Override
+	@Transactional(rollbackFor = Exception.class)
+    public void recursiveDel(Integer parentId) {
+		List<MemberPrivilegesItem> memberPrivilegesItems = memberPrivilegesItemDao.findList(parentId);
+		for (MemberPrivilegesItem item : memberPrivilegesItems) {
+			item = getTree(item);
+		}
+		List<Integer> collect = memberPrivilegesItems.stream().map(e -> e.getId()).collect(Collectors.toList());
+		if(collect == null || collect.size() <= 0){
+			memberPrivilegesItemDao.delete(parentId);
+			return;
+		}
+		collect.add(parentId);
+		memberPrivilegesItemDao.batchDel(collect);
+    }
+
+	@Override
+	public PageInfo<MemberPrivilegesItem> queryItemPage(MemberPrivilegesItemQueryInfo queryInfo) {
+		PageInfo<MemberPrivilegesItem> memberPrivilegesItemPageInfo = this.queryPage(queryInfo);
+		List<MemberPrivilegesItem> rows = memberPrivilegesItemPageInfo.getRows();
+		if(rows == null || rows.size() == 0){
+			return memberPrivilegesItemPageInfo;
+		}
+		for (MemberPrivilegesItem item : rows) {
+			item = getTree(item);
+		}
+		return memberPrivilegesItemPageInfo;
+	}
+}

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

@@ -0,0 +1,22 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.biz.dal.dao.MemberRankOrganizationFeeMapperDao;
+import com.ym.mec.biz.dal.entity.MemberRankOrganizationFeeMapper;
+import com.ym.mec.biz.service.MemberRankOrganizationFeeMapperService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MemberRankOrganizationFeeMapperServiceImpl extends BaseServiceImpl<Integer, MemberRankOrganizationFeeMapper>  implements MemberRankOrganizationFeeMapperService {
+
+	@Autowired
+	private MemberRankOrganizationFeeMapperDao memberRankOrganizationFeeMapperDao;
+
+	@Override
+	public BaseDAO<Integer, MemberRankOrganizationFeeMapper> getDAO() {
+		return memberRankOrganizationFeeMapperDao;
+	}
+
+}

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

@@ -0,0 +1,22 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.biz.dal.dao.MemberRankPrivilegesDao;
+import com.ym.mec.biz.dal.entity.MemberRankPrivileges;
+import com.ym.mec.biz.service.MemberRankPrivilegesService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MemberRankPrivilegesServiceImpl extends BaseServiceImpl<Integer, MemberRankPrivileges>  implements MemberRankPrivilegesService {
+
+	@Autowired
+	private MemberRankPrivilegesDao memberRankPrivilegesDao;
+
+	@Override
+	public BaseDAO<Integer, MemberRankPrivileges> getDAO() {
+		return memberRankPrivilegesDao;
+	}
+
+}

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

@@ -0,0 +1,55 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.biz.dal.dao.MemberRankPrivilegesDao;
+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.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, MemberRankSetting>  implements MemberRankSettingService {
+
+	@Autowired
+	private MemberRankSettingDao memberRankSettingDao;
+	@Autowired
+	private MemberRankPrivilegesDao memberRankPrivilegesDao;
+
+	@Override
+	public BaseDAO<Integer, MemberRankSetting> getDAO() {
+		return memberRankSettingDao;
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void add(MemberRankSetting memberRankSetting) {
+		memberRankSettingDao.insert(memberRankSetting);
+		List<Integer> memberPrivilegesItemIdList = memberRankSetting.getMemberPrivilegesItemIdList();
+		if(memberPrivilegesItemIdList != null && memberPrivilegesItemIdList.size() > 0){
+			memberRankPrivilegesDao.batchInsert(memberRankSetting.getId(),memberPrivilegesItemIdList);
+		}
+	}
+
+    @Override
+    public MemberRankSetting getDetail(Integer memberRankSettingId) {
+		MemberRankSetting memberRankSetting = memberRankSettingDao.get(memberRankSettingId);
+		memberRankSetting.setMemberRankPrivileges(memberRankPrivilegesDao.findByRankSettingId(memberRankSettingId));
+		return memberRankSetting;
+    }
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void updateSetting(MemberRankSetting memberRankSetting) {
+		memberRankSettingDao.update(memberRankSetting);
+		memberRankPrivilegesDao.deleteByRankSettingId(memberRankSetting.getId());
+		List<Integer> memberPrivilegesItemIdList = memberRankSetting.getMemberPrivilegesItemIdList();
+		if(memberPrivilegesItemIdList != null && memberPrivilegesItemIdList.size() > 0){
+			memberRankPrivilegesDao.batchInsert(memberRankSetting.getId(),memberPrivilegesItemIdList);
+		}
+	}
+}

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

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.biz.dal.dao.MemberPrivilegesItemDao">
+	
+	<resultMap type="com.ym.mec.biz.dal.entity.MemberPrivilegesItem" id="MemberPrivilegesItem">
+		<result column="id_" property="id" />
+		<result column="name_" property="name" />
+		<result column="desc_" property="desc" />
+		<result column="code_" property="code" />
+		<result column="parent_id_" property="parentId" />
+		<result column="day_fee_" property="dayFee" />
+		<result column="month_fee_" property="monthFee" />
+		<result column="half_year_fee_" property="halfYearFee" />
+		<result column="year_fee_" property="yearFee" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="MemberPrivilegesItem" >
+		SELECT * FROM member_privileges_item WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="MemberPrivilegesItem">
+		SELECT * FROM member_privileges_item 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_,day_fee_,month_fee_,half_year_fee_,year_fee_,create_time_,update_time_)
+		 VALUES(#{name},#{desc},#{code},#{parentId},#{dayFee},#{monthFee},#{halfYearFee},#{yearFee},NOW(),NOW())
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.MemberPrivilegesItem">
+		UPDATE member_privileges_item <set>
+		<if test="parentId != null">
+		parent_id_ = #{parentId},
+		</if>
+		<if test="monthFee != null">
+		month_fee_ = #{monthFee},
+		</if>
+		<if test="code != null">
+		code_ = #{code},
+		</if>
+		<if test="yearFee != null">
+		year_fee_ = #{yearFee},
+		</if>
+		<if test="dayFee != null">
+		day_fee_ = #{dayFee},
+		</if>
+		<if test="desc != null">
+		desc_ = #{desc},
+		</if>
+		<if test="name != null">
+		name_ = #{name},
+		</if>
+		<if test="halfYearFee != null">
+		half_year_fee_ = #{halfYearFee},
+		</if>
+		update_time_ = NOW()
+		</set> WHERE id_ = #{id}
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM member_privileges_item WHERE id_ = #{id} 
+	</delete>
+	<delete id="batchDel">
+		DELETE FROM member_privileges_item WHERE id_ IN
+		<foreach collection="collect" separator="," item="item" open="(" close=")">
+			#{item}
+		</foreach>
+	</delete>
+
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="MemberPrivilegesItem" parameterType="map">
+		SELECT * FROM member_privileges_item
+		<where>
+			<if test="parentId != null">
+				AND parent_id_ = #{parentId}
+			</if>
+		</where>
+		ORDER BY id_
+		<include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM member_privileges_item
+		<where>
+			<if test="parentId != null">
+				AND parent_id_ = #{parentId}
+			</if>
+		</where>
+	</select>
+	<select id="findList" resultMap="MemberPrivilegesItem">
+		SELECT * FROM member_privileges_item
+		<where>
+			<if test="parentId != null">
+				AND parent_id_ = #{parentId}
+			</if>
+		</where>
+		ORDER BY id_ DESC
+	</select>
+</mapper>

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

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.biz.dal.dao.MemberRankOrganizationFeeMapperDao">
+	
+	<resultMap type="com.ym.mec.biz.dal.entity.MemberRankOrganizationFeeMapper" id="MemberRankOrganizationFeeMapper">
+		<result column="id_" property="id" />
+		<result column="organ_id_" property="organId" />
+		<result column="member_rank_setting_id_" property="memberRankSettingId" />
+		<result column="day_fee_" property="dayFee" />
+		<result column="month_fee_" property="monthFee" />
+		<result column="half_year_fee_" property="halfYearFee" />
+		<result column="year_fee_" property="yearFee" />
+		<result column="operator_id_" property="operatorId" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+	
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="MemberRankOrganizationFeeMapper">
+		SELECT * FROM member_rank_organization_fee_mapper
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MemberRankOrganizationFeeMapper" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		INSERT INTO member_rank_organization_fee_mapper (organ_id_,member_rank_setting_id_,day_fee_,
+		                                                 month_fee_,half_year_fee_,year_fee_,operator_id_,create_time_,update_time_)
+		VALUES(#{organId},#{memberRankSettingId},#{dayFee},#{monthFee},#{halfYearFee},
+		       #{yearFee},#{operatorId},NOW(),NOW())
+	</insert>
+
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.MemberRankOrganizationFeeMapper">
+		UPDATE member_rank_organization_fee_mapper <set>
+		<if test="organId != null">
+			organ_id_ = #{organId},
+		</if>
+		<if test="memberRankSettingId != null">
+			member_rank_setting_id_ = #{memberRankSettingId},
+		</if>
+		<if test="dayFee != null">
+			day_fee_ = #{dayFee},
+		</if>
+		<if test="monthFee != null">
+			month_fee_ = #{monthFee},
+		</if>
+		<if test="halfYearFee != null">
+			half_year_fee_ = #{halfYearFee},
+		</if>
+		<if test="yearFee != null">
+			year_fee_ = #{yearFee},
+		</if>
+		<if test="operatorId != null">
+			operator_id_ = #{operatorId},
+		</if>
+		update_time_ = NOW()
+	</set> WHERE id_ = #{id}
+	</update>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="MemberRankOrganizationFeeMapper" parameterType="map">
+		SELECT * FROM member_rank_organization_fee_mapper
+		<include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM member_rank_organization_fee_mapper
+	</select>
+</mapper>

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

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.biz.dal.dao.MemberRankPrivilegesDao">
+	
+	<resultMap type="com.ym.mec.biz.dal.entity.MemberRankPrivileges" id="MemberRankPrivileges">
+		<result column="member_rank_id_" property="memberRankId" />
+		<result column="member_privileges_id_" property="memberPrivilegesId" />
+	</resultMap>
+
+	<delete id="deleteByRankSettingId">
+		DELETE FROM member_rank_privileges WHERE member_rank_id_ = #{memberRankSettingId}
+	</delete>
+
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="MemberRankPrivileges">
+		SELECT * FROM member_rank_privileges
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MemberRankPrivileges" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		INSERT INTO member_rank_privileges (member_rank_id_,member_privileges_id_)
+		VALUES(#{memberRankId},#{memberPrivilegesId})
+	</insert>
+	<insert id="batchInsert">
+		INSERT INTO member_rank_privileges (member_rank_id_,member_privileges_id_) VALUES
+		<foreach collection="memberPrivilegesItemIdList" item="item" separator=",">
+			(#{memberRankSettingId}, #{item})
+		</foreach>
+	</insert>
+
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.MemberRankPrivileges">
+		UPDATE member_rank_privileges <set>
+		<if test="memberRankId != null">
+			member_rank_id_ = #{memberRankId},
+		</if>
+		<if test="memberPrivilegesId != null">
+			member_privileges_id_ = #{memberPrivilegesId},
+		</if>
+	</set> WHERE id_ = #{id}
+	</update>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="MemberRankPrivileges" parameterType="map">
+		SELECT * FROM member_rank_privileges
+		<include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM member_rank_privileges
+	</select>
+	<select id="findByRankSettingId" resultMap="MemberRankPrivileges">
+		SELECT * FROM member_rank_privileges WHERE member_rank_id_ = #{memberRankSettingId}
+	</select>
+</mapper>

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

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.biz.dal.dao.MemberRankSettingDao">
+	
+	<resultMap type="com.ym.mec.biz.dal.entity.MemberRankSetting" id="MemberRankSetting">
+		<result column="id_" property="id" />
+		<result column="name_" property="name" />
+		<result column="intro_" property="intro" />
+		<result column="icon_" property="icon" />
+		<result column="trial_flag_" property="trialFlag" />
+		<result column="trial_date_" property="trialDate" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+	
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="MemberRankSetting">
+		SELECT * FROM member_rank_setting
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<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_,trial_flag_,trial_date_,create_time_,update_time_)
+		VALUES(#{name},#{intro},#{icon},#{trialFlag},#{trialDate},NOW(),NOW())
+	</insert>
+
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.MemberRankSetting">
+		UPDATE member_rank_setting
+		<set>
+		<if test="trialFlag != null">
+			trial_flag_ = #{trialFlag},
+		</if>
+		<if test="trialDate != null">
+			trial_date_ = #{trialDate},
+		</if>
+		<if test="name != null">
+			name_ = #{name},
+		</if>
+		<if test="intro != null">
+			intro_ = #{intro},
+		</if>
+		<if test="icon != null">
+			icon_ = #{icon},
+		</if>
+		update_time_ = NOW()
+	</set>WHERE id_ = #{id}
+	</update>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="MemberRankSetting" parameterType="map">
+		SELECT * FROM member_rank_setting <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM member_rank_setting
+	</select>
+</mapper>

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

@@ -0,0 +1,53 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.biz.dal.page.MemberPrivilegesItemQueryInfo;
+import com.ym.mec.biz.dal.entity.MemberPrivilegesItem;
+import com.ym.mec.biz.service.MemberPrivilegesItemService;
+import com.ym.mec.common.controller.BaseController;
+import com.yonge.log.model.AuditLogAnnotation;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+@RequestMapping("memberPrivilegesItem")
+@Api(tags = "功能字典服务")
+@RestController
+public class MemberPrivilegesItemController extends BaseController {
+
+    @Autowired
+    private MemberPrivilegesItemService memberPrivilegesItemService;
+
+    @ApiOperation(value = "新增")
+    @PostMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('memberPrivilegesItem/add')")
+    @AuditLogAnnotation(operateName = "新增系统功能类型")
+    public Object add(@RequestBody MemberPrivilegesItem memberPrivilegesItem) {
+        memberPrivilegesItemService.insert(memberPrivilegesItem);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/del")
+    @PreAuthorize("@pcs.hasPermissions('memberPrivilegesItem/del')")
+    public Object del(Integer id) {
+        memberPrivilegesItemService.recursiveDel(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('memberPrivilegesItem/update')")
+    public Object update(@RequestBody MemberPrivilegesItem memberPrivilegesItem) {
+        memberPrivilegesItemService.update(memberPrivilegesItem);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('chargeType/queryPage')")
+    public Object queryPage(MemberPrivilegesItemQueryInfo queryInfo) {
+        return succeed(memberPrivilegesItemService.queryItemPage(queryInfo));
+    }
+}

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

@@ -0,0 +1,54 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.biz.dal.page.MemberPrivilegesItemQueryInfo;
+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.yonge.log.model.AuditLogAnnotation;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+@RequestMapping("memberRankOrganizationFeeMapper")
+@Api(tags = "会员收费设置服务")
+@RestController
+public class MemberRankOrganizationFeeMapperController extends BaseController {
+
+    @Autowired
+    private MemberRankOrganizationFeeMapperService memberRankOrganizationFeeMapperService;
+
+    @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);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('memberRankOrganizationFeeMapper/update')")
+    public Object update(@RequestBody MemberRankOrganizationFeeMapper memberRankOrganizationFeeMapper) {
+        memberRankOrganizationFeeMapperService.update(memberRankOrganizationFeeMapper);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('memberRankOrganizationFeeMapper/queryPage')")
+    public Object queryPage(MemberRankFeeQueryInfo queryInfo) {
+        return succeed(memberRankOrganizationFeeMapperService.queryPage(queryInfo));
+    }
+}

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

@@ -0,0 +1,53 @@
+package com.ym.mec.web.controller;
+
+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.page.QueryInfo;
+import com.yonge.log.model.AuditLogAnnotation;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+@RequestMapping("memberRankSetting")
+@Api(tags = "会员等级服务")
+@RestController
+public class MemberRankSettingController extends BaseController {
+
+    @Autowired
+    private MemberRankSettingService memberRankSettingService;
+
+    @ApiOperation(value = "新增")
+    @PostMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('memberRankSetting/add')")
+    @AuditLogAnnotation(operateName = "新增会员等级")
+    public Object add(@RequestBody MemberRankSetting memberRankSetting) {
+        memberRankSettingService.add(memberRankSetting);
+        return succeed();
+    }
+
+    @ApiOperation(value = "获取详情")
+    @GetMapping("/get")
+    @PreAuthorize("@pcs.hasPermissions('memberRankSetting/get')")
+    @AuditLogAnnotation(operateName = "会员等级详情")
+    public Object get(Integer memberRankSettingId) {
+        return succeed(memberRankSettingService.getDetail(memberRankSettingId));
+    }
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('memberRankSetting/update')")
+    public Object update(@RequestBody MemberRankSetting memberRankSetting) {
+        memberRankSettingService.updateSetting(memberRankSetting);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('memberRankSetting/queryPage')")
+    public Object queryPage(QueryInfo queryInfo) {
+        return succeed(memberRankSettingService.queryPage(queryInfo));
+    }
+}