feat:关心包、加油包

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

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+
 import java.util.Objects;
 
 public class BasicUserDto {
@@ -24,6 +26,28 @@ public class BasicUserDto {
 
     private String phone;
 
+    @ApiModelProperty(value = "关心包：0：默认不可用；1：可用；2：已使用;")
+    private Integer carePackage;
+
+    @ApiModelProperty(value = "加油包：0：默认不可用；1：可用；2：已使用;")
+    private Integer comeOnPackage;
+
+    public Integer getCarePackage() {
+        return carePackage;
+    }
+
+    public void setCarePackage(Integer carePackage) {
+        this.carePackage = carePackage;
+    }
+
+    public Integer getComeOnPackage() {
+        return comeOnPackage;
+    }
+
+    public void setComeOnPackage(Integer comeOnPackage) {
+        this.comeOnPackage = comeOnPackage;
+    }
+
     public String getUserType() {
         return userType;
     }

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

@@ -83,6 +83,28 @@ public class StudentManageListDto {
     
     private boolean isSignedContract;
 
+    @ApiModelProperty(value = "关心包：0：默认不可用；1：可用；2：已使用;")
+    private Integer carePackage;
+
+    @ApiModelProperty(value = "加油包：0：默认不可用；1：可用；2：已使用;")
+    private Integer comeOnPackage;
+
+    public Integer getCarePackage() {
+        return carePackage;
+    }
+
+    public void setCarePackage(Integer carePackage) {
+        this.carePackage = carePackage;
+    }
+
+    public Integer getComeOnPackage() {
+        return comeOnPackage;
+    }
+
+    public void setComeOnPackage(Integer comeOnPackage) {
+        this.comeOnPackage = comeOnPackage;
+    }
+
     public Integer getIsNewUser() {
         return isNewUser;
     }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.auth.api.entity.SysUser;
@@ -41,6 +42,12 @@ public class Student extends SysUser {
 
 	private Boolean isNewUser;
 
+	@ApiModelProperty(value = "关心包：0：默认不可用；1：可用；2：已使用;")
+	private Integer carePackage;
+
+	@ApiModelProperty(value = "加油包：0：默认不可用；1：可用；2：已使用;")
+	private Integer comeOnPackage;
+
 	public Student(Integer userId, String subjectIdList) {
 		this.userId = userId;
 		this.subjectIdList = subjectIdList;
@@ -133,6 +140,23 @@ public class Student extends SysUser {
 	public void setTeacherId(Integer teacherId) {
 		this.teacherId = teacherId;
 	}
+
+	public Integer getCarePackage() {
+		return carePackage;
+	}
+
+	public void setCarePackage(Integer carePackage) {
+		this.carePackage = carePackage;
+	}
+
+	public Integer getComeOnPackage() {
+		return comeOnPackage;
+	}
+
+	public void setComeOnPackage(Integer comeOnPackage) {
+		this.comeOnPackage = comeOnPackage;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/PracticeGroupType.java

@@ -6,7 +6,9 @@ public enum PracticeGroupType implements BaseEnum<String, PracticeGroupType> {
 
 	FREE("FREE","免费"),
 	CHARGE("CHARGE","收费"),
-	TRIAL("TRIAL","试听");
+	TRIAL("TRIAL","试听"),
+	CARE_PACKAGE("CARE_PACKAGE", "关心包"),
+	COME_ON_PACKAGE("COME_ON_PACKAGE", "加油包");
 
 	private String code;
 

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

@@ -615,6 +615,10 @@ public class StudentManageServiceImpl implements StudentManageService {
         student.setOperatingTempTag(0);
         student.setServiceTag(student.getServiceTag() == 0 ? 2 : 1);
         student.setTeacherId(student.getTeacherId());
+        if(Objects.nonNull(student.getCarePackage())||Objects.nonNull(student.getComeOnPackage())){
+            Student oldStudent = studentDao.get(userId);
+
+        }
         studentService.upSet(student);
         if (new Integer(2).equals(student.getServiceTag())) {
             LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();

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

@@ -296,6 +296,8 @@
         <result column="music_group_name_" property="musicGroupName"/>
         <result column="subject_id_" property="subjectId"/>
         <result column="phone_" property="phone"/>
+        <result column="care_package_" property="carePackage"/>
+        <result column="come_on_package_" property="comeOnPackage"/>
     </resultMap>
 
     <select id="queryUserGroups" resultMap="com.ym.mec.biz.dal.dao.ClassGroupDao.imGroupModel">

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

@@ -64,6 +64,8 @@
         <result property="subjectIdList" column="subject_id_list_"/>
         <result property="isNewUser" column="is_new_user_"/>
         <result property="isSignedContract" column="is_signed_contract_"/>
+        <result column="care_package_" property="carePackage"/>
+        <result column="come_on_package_" property="comeOnPackage"/>
     </resultMap>
 
     <sql id="queryCondition">
@@ -151,7 +153,7 @@
 
     <select id="findStudentsByOrganId" resultMap="studentManageListDto">
         SELECT o.`name_` organ_name_,s.`user_id_` ,su.`username_` ,su.`phone_` parents_phone_,su.`real_name_` ,su.`gender_` , su.organ_id_,
-		tu.`real_name_` teacher_name_,IF(s.service_tag_=2,0,s.service_tag_) service_tag_ ,s.`operating_tag_` , suca.`course_balance_` ,
+		tu.`real_name_` teacher_name_,IF(s.service_tag_=2,0,s.service_tag_) service_tag_ ,s.`operating_tag_` , s.care_package_, s.come_on_package_, suca.`course_balance_` ,
 		sub.`name_` music_group_subject_ ,su.birthdate_,s.subject_id_list_,s.teacher_id_,
 		case when su.password_ is null then false else true end isActive_,s.is_new_user_,case when count(sut.user_id_) > 0 then 1 else 0 end is_signed_contract_
 		FROM `student` s LEFT JOIN `sys_user` su on s.`user_id_` = su.`id_`

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

@@ -17,6 +17,8 @@
         <result column="is_new_user_" property="isNewUser"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="care_package_" property="carePackage"/>
+        <result column="come_on_package_" property="comeOnPackage"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -95,6 +97,12 @@
             <if test="isNewUser != null">
                 is_new_user_=#{isNewUser},
             </if>
+            <if test="carePackage != null">
+                care_package_=#{carePackage},
+            </if>
+            <if test="comeOnPackage != null">
+                come_on_package_=#{comeOnPackage},
+            </if>
                 update_time_ = NOW()
         </set>
         WHERE user_id_ = #{userId}
@@ -164,9 +172,13 @@
                 <if test="item.updateTime != null">
                     update_time_ = #{item.updateTime},
                 </if>
-                <if test="item.updateTime == null">
-                    update_time_ = NOW()
+                <if test="item.carePackage != null">
+                    care_package_=#{item.carePackage},
                 </if>
+                <if test="item.comeOnPackage != null">
+                    come_on_package_=#{item.comeOnPackage},
+                </if>
+                update_time_ = NOW()
             </set>
             WHERE user_id_ = #{item.userId}
         </foreach>

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

@@ -141,8 +141,9 @@
     </update>
 
     <select id="getStudents" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
-        SELECT username_ ,id_ user_id_,avatar_ head_url_,gender_,phone_
-        FROM sys_user
+        SELECT su.username_ ,su.id_ user_id_,su.avatar_ head_url_,su.gender_,su.phone_,s.care_package_,s.come_on_package_
+        FROM sys_user su
+        LEFT JOIN student s ON su.id_=s.user_id_
         WHERE FIND_IN_SET(organ_id_,#{organIdList})
         AND user_type_ LIKE '%STUDENT%'
         <if test="search">
@@ -314,4 +315,4 @@
         SELECT pg.educational_teacher_id_ FROM practice_group pg
         WHERE pg.student_id_ = #{studentId}) sid
     </select>
-</mapper>
+</mapper>