Merge remote-tracking branch 'origin/system_fee' into system_fee

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

@@ -32,6 +32,8 @@ public class MemberRankOrganizationFeeMapper {
 	private Integer memberFeeSettingId;
 
 	private MemberFeeSetting memberFeeSetting;
+	
+	private MemberRankSetting memberRankSetting;
 
 	public MemberFeeSetting getMemberFeeSetting() {
 		return memberFeeSetting;
@@ -113,6 +115,14 @@ public class MemberRankOrganizationFeeMapper {
 		return this.updateTime;
 	}
 			
+	public MemberRankSetting getMemberRankSetting() {
+		return memberRankSetting;
+	}
+
+	public void setMemberRankSetting(MemberRankSetting memberRankSetting) {
+		this.memberRankSetting = memberRankSetting;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -20,6 +20,8 @@ public class MemberRankSetting {
 	
 	/**  */
 	private String icon;
+	
+	private Boolean isDefault;
 
 	/**  */
 	private List<Integer> memberPrivilegesItemIdList;
@@ -72,6 +74,14 @@ public class MemberRankSetting {
 		return this.icon;
 	}
 
+	public Boolean getIsDefault() {
+		return isDefault;
+	}
+
+	public void setIsDefault(Boolean isDefault) {
+		this.isDefault = isDefault;
+	}
+
 	public List<Integer> getMemberPrivilegesItemIdList() {
 		return memberPrivilegesItemIdList;
 	}

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

@@ -1,6 +1,9 @@
 package com.ym.mec.biz.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.auth.api.entity.SysUser;
@@ -55,6 +58,14 @@ public class Student extends SysUser {
 	private String currentClass;
 
 	private Integer cooperationOrganId;
+	
+	private Integer memberRankSettingId;
+	
+	private Date membershipStartTime;
+	
+	private Date membershipEndTime;
+	
+	private String memberRankImg;
 
 	public Student(Integer userId, String subjectIdList) {
 		this.userId = userId;
@@ -203,4 +214,36 @@ public class Student extends SysUser {
 	public void setCurrentClass(String currentClass) {
 		this.currentClass = currentClass;
 	}
+
+	public Integer getMemberRankSettingId() {
+		return memberRankSettingId;
+	}
+
+	public void setMemberRankSettingId(Integer memberRankSettingId) {
+		this.memberRankSettingId = memberRankSettingId;
+	}
+
+	public Date getMembershipStartTime() {
+		return membershipStartTime;
+	}
+
+	public void setMembershipStartTime(Date membershipStartTime) {
+		this.membershipStartTime = membershipStartTime;
+	}
+
+	public Date getMembershipEndTime() {
+		return membershipEndTime;
+	}
+
+	public void setMembershipEndTime(Date membershipEndTime) {
+		this.membershipEndTime = membershipEndTime;
+	}
+
+	public String getMemberRankImg() {
+		return memberRankImg;
+	}
+
+	public void setMemberRankImg(String memberRankImg) {
+		this.memberRankImg = memberRankImg;
+	}
 }

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

@@ -27,6 +27,15 @@
 			<result property="currentYearFee" column="current_year_fee_"/>
 			<result property="originalYearFee" column="original_year_fee_"/>
 		</association>
+		<association property="memberRankSetting" javaType="com.ym.mec.biz.dal.entity.MemberRankSetting">
+			<result property="id" column="id_"/>
+			<result property="name" column="name_"/>
+			<result property="intro" column="intro_"/>
+			<result property="icon" column="icon_"/>
+			<result property="isDefault" column="is_default_"/>
+			<result property="createTime" column="create_time_"/>
+			<result property="updateTime" column="update_time_"/>
+		</association>
 	</resultMap>
 
 	<select id="get" resultMap="MemberRankOrganizationFeeMapper" >

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

@@ -11,6 +11,7 @@
 		<result column="name_" property="name" />
 		<result column="intro_" property="intro" />
 		<result column="icon_" property="icon" />
+		<result column="is_default_" property="isDefault" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
@@ -26,8 +27,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<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_,create_time_,update_time_)
-		VALUES(#{name},#{intro},#{icon},NOW(),NOW())
+		INSERT INTO member_rank_setting (name_,intro_,icon_,is_default_,create_time_,update_time_)
+		VALUES(#{name},#{intro},#{icon},#{isDefault},NOW(),NOW())
 	</insert>
 
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.MemberRankSetting">
@@ -39,6 +40,9 @@
 		<if test="intro != null">
 			intro_ = #{intro},
 		</if>
+		<if test="isDefault != null">
+			is_default_ = #{isDefault},
+		</if>
 		<if test="icon != null">
 			icon_ = #{icon},
 		</if>

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

@@ -22,6 +22,9 @@
         <result column="current_grade_num_" property="currentGradeNum"/>
         <result column="current_class_" property="currentClass"/>
         <result column="cooperation_organ_id_" property="cooperationOrganId"/>
+        <result column="member_rank_setting_id_" property="memberRankSettingId"/>
+        <result column="membership_start_time_" property="membershipStartTime"/>
+        <result column="membership_end_time_" property="membershipEndTime"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -73,7 +76,7 @@
             operating_tag_,
         </if>
         teacher_id_,create_time_,update_time_,service_tag_update_time_,cooperation_organ_id_,
-        care_package_,come_on_package_)
+        care_package_,come_on_package_,member_rank_setting_id_,membership_start_time_,membership_end_time_)
         VALUES
         (#{userId},#{subjectIdList},
         <if test="serviceTag != null">
@@ -83,7 +86,7 @@
             #{operatingTag},
         </if>
         #{teacherId},NOW(),NOW(),NOW(),#{cooperationOrganId},
-         #{carePackage},#{comeOnPackage})
+         #{carePackage},#{comeOnPackage},#{memberRankSettingId},#{membershipStartTime},#{membershipEndTime})
     </insert>
 
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.Student">
@@ -120,6 +123,15 @@
             <if test="currentClass != null">
                 current_class_=#{currentClass},
             </if>
+            <if test="memberRankSettingId != null">
+                member_rank_setting_id_=#{memberRankSettingId},
+            </if>
+            <if test="membershipStartTime != null">
+                membership_start_time_=#{membershipStartTime},
+            </if>
+            <if test="membershipEndTime != null">
+                membership_end_time_=#{membershipEndTime},
+            </if>
                 cooperation_organ_id_=#{cooperationOrganId},
                 update_time_ = NOW()
         </set>
@@ -199,6 +211,15 @@
                 <if test="item.cooperationOrganId != null">
                     cooperation_organ_id_=#{item.cooperationOrganId},
                 </if>
+	            <if test="item.memberRankSettingId != null">
+	                member_rank_setting_id_=#{item.memberRankSettingId},
+	            </if>
+	            <if test="item.membershipStartTime != null">
+	                membership_start_time_=#{item.membershipStartTime},
+	            </if>
+	            <if test="item.membershipEndTime != null">
+	                membership_end_time_=#{item.membershipEndTime},
+	            </if>
                 update_time_ = NOW()
             </set>
             WHERE user_id_ = #{item.userId}

mec-student/src/main/java/com/ym/mec/student/controller/MemberRankController.java

@@ -0,0 +1,55 @@
+package com.ym.mec.student.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.MemberRankOrganizationFeeMapper;
+import com.ym.mec.biz.service.MemberRankOrganizationFeeMapperService;
+import com.ym.mec.common.controller.BaseController;
+
+@RequestMapping("memberRank")
+@Api(tags = "会员收费设置服务")
+@RestController
+public class MemberRankController extends BaseController {
+
+	@Autowired
+	private MemberRankOrganizationFeeMapperService memberRankOrganizationFeeMapperService;
+
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+
+	@ApiOperation(value = "获取所有的收费标准")
+	@GetMapping("/queryList")
+	public Object getMemberDefaultFee() {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		Map<String, Object> params = new HashMap<String, Object>();
+		params.put("organId", sysUser.getOrganId());
+
+		List<MemberRankOrganizationFeeMapper> result = new ArrayList<MemberRankOrganizationFeeMapper>();
+
+		List<MemberRankOrganizationFeeMapper> list = memberRankOrganizationFeeMapperService.findAll(params);
+		for (MemberRankOrganizationFeeMapper mrofm : list) {
+			if (mrofm.getMemberRankSetting() != null && mrofm.getMemberRankSetting().getIsDefault() == false) {
+				result.add(mrofm);
+			}
+		}
+		return succeed(result);
+	}
+
+}

mec-student/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -1,8 +1,8 @@
 package com.ym.mec.student.controller;
 
-import com.ym.mec.biz.service.*;
-import com.ym.mec.common.entity.HttpResponseResult;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 
 import java.util.Date;
 import java.util.Map;
@@ -22,9 +22,24 @@ import org.springframework.web.multipart.MultipartFile;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.CashAccountDetail;
+import com.ym.mec.biz.dal.entity.MemberRankSetting;
+import com.ym.mec.biz.dal.entity.Student;
 import com.ym.mec.biz.dal.entity.SysSuggestion;
 import com.ym.mec.biz.dal.entity.SysUserBankCard;
+import com.ym.mec.biz.service.ClassGroupService;
+import com.ym.mec.biz.service.ImGroupNoticeService;
+import com.ym.mec.biz.service.MemberRankSettingService;
+import com.ym.mec.biz.service.OrganizationService;
+import com.ym.mec.biz.service.StudentManageService;
+import com.ym.mec.biz.service.StudentService;
+import com.ym.mec.biz.service.SubjectService;
+import com.ym.mec.biz.service.SysSuggestionService;
+import com.ym.mec.biz.service.SysUserBankCardService;
+import com.ym.mec.biz.service.SysUserCashAccountDetailService;
+import com.ym.mec.biz.service.SysUserCashAccountService;
+import com.ym.mec.biz.service.UploadFileService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.entity.UploadReturnBean;
 import com.ym.mec.common.filters.TenantIdThreadLocal;
 import com.ym.mec.common.page.QueryInfo;
@@ -56,6 +71,9 @@ public class StudentManageController extends BaseController {
     private OrganizationService organizationService;
     @Autowired
     private StudentService studentService;
+    
+    @Autowired
+    private MemberRankSettingService memberRankSettingService;
 
     private final static Logger LOGGER = LoggerFactory.getLogger(StudentManageController.class);
 
@@ -94,13 +112,21 @@ public class StudentManageController extends BaseController {
 
     @ApiOperation(value = "获取学员基本信息")
     @GetMapping("student/queryUserInfo")
-    public Object queryUserInfo() {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        return succeed(studentService.get(user.getId()));
-    }
+	public Object queryUserInfo() {
+		SysUser user = sysUserFeignService.queryUserInfo();
+		if (user == null) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		Student student = studentService.get(user.getId());
+		if (student != null) {
+			// 获取会员等级图标
+			MemberRankSetting memberRankSetting = memberRankSettingService.get(student.getMemberRankSettingId());
+			if (memberRankSetting != null) {
+				student.setMemberRankImg(memberRankSetting.getIcon());
+			}
+		}
+		return succeed(student);
+	}
 
     @ApiOperation(value = "根据群编号，获取群组所有成员基本信息")
     @GetMapping("classGroup/findGroupUsers")