Merge branch 'online1' of http://git.dayaedu.com/yonge/mec into first_leave

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

@@ -135,7 +135,7 @@ public interface GoodsDao extends BaseDAO<Integer, Goods> {
      *
      * @return
      */
-    List<MusicGroupGoodsAndDiscountDto> getMusicGroupGoodsAndDiscount(@Param("subjectId") Integer subjectId, @Param("type") String type);
+    List<MusicGroupGoodsAndDiscountDto> getMusicGroupGoodsAndDiscount(@Param("subjectId") Integer subjectId, @Param("type") String type, @Param("courseViewType") Integer courseViewType);
 
     List<MusicGroupGoodsAndDiscountDto> getMusicGroupGoodsAndDiscountWithSubjects(@Param("subjectIds") String subjectIds, @Param("type") String type);
 

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

@@ -77,25 +77,18 @@ public interface StudentInstrumentDao extends BaseDAO<Long, StudentInstrument> {
     StudentRegistration findStudentMusicGroup(@Param("userId") Integer userId);
 
     /**
-     * 退学生乐保
-     *
-     * @param studentId
-     * @return
-     */
-    int quitMaintenance(@Param("studentId") Integer studentId);
-
-    /**
      * 获取学生在有效期内的乐保数量
      *
      * @param studentIds
      * @return
      */
-    List<StudentInstrument> getStudentsMaintenanceNum(@Param("studentIds") List<Integer> studentIds);
+    List<StudentInstrument> getStudentsMaintenanceNum(@Param("studentIds") List<Integer> studentIds, @Param("musicGroupId") String musicGroupId);
 
     /**
      * 获取学生有效期内的乐保数量
+     *
      * @param studentId
      * @return
      */
-    int getStudentMaintenanceNum(@Param("studentId") Integer studentId);
+    StudentInstrument getStudentMaintenance(@Param("studentId") Integer studentId, @Param("musicGroupId") String musicGroupId);
 }

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

@@ -138,6 +138,9 @@ public class Goods {
 	@ApiModelProperty(value = "乐团是否展示")
 	private YesOrNoEnum musicGroupShow;
 
+	@ApiModelProperty(value = "乐团收费模式")
+	private String courseViewType;
+
 	@ApiModelProperty(value = "乐器置换是否展示")
 	private YesOrNoEnum replacementShow;
 
@@ -147,6 +150,14 @@ public class Goods {
 	@ApiModelProperty(value = "库存预警")
 	private YesOrNoEnum stockWarning;
 
+	public String getCourseViewType() {
+		return courseViewType;
+	}
+
+	public void setCourseViewType(String courseViewType) {
+		this.courseViewType = courseViewType;
+	}
+
 	public YesOrNoEnum getStockWarning() {
 		return stockWarning;
 	}

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

@@ -18,6 +18,9 @@ public class ReplacementInstrumentActivity {
 	/** 合作单位置换活动表编号 */
 	private Integer replacementInstrumentCooperationId;
 
+	/** 活动标题 */
+	private String replacementInstrumentCooperationTitle;
+
 	private Integer topicId;
 
 	/** 合作单位 */
@@ -27,7 +30,7 @@ public class ReplacementInstrumentActivity {
 	private Integer userId;
 
 	/**  */
-	private Integer openFlag = 0;
+	private Integer openFlag;
 	
 	/**  */
 	private String userName;
@@ -70,6 +73,14 @@ public class ReplacementInstrumentActivity {
 	/**  */
 	private java.util.Date updateTime;
 
+	public String getReplacementInstrumentCooperationTitle() {
+		return replacementInstrumentCooperationTitle;
+	}
+
+	public void setReplacementInstrumentCooperationTitle(String replacementInstrumentCooperationTitle) {
+		this.replacementInstrumentCooperationTitle = replacementInstrumentCooperationTitle;
+	}
+
 	public Integer getReplacementInstrumentCooperationId() {
 		return replacementInstrumentCooperationId;
 	}

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

@@ -24,6 +24,9 @@ public class ReplacementInstrumentCooperation {
     @ApiModelProperty(value = "合作单位id")
     private Integer cooperationOrganId;
 
+    @ApiModelProperty(value = "活动标题")
+    private String title;
+
     @ApiModelProperty(value = "问卷编号")
     private Integer topicId;
 
@@ -76,6 +79,14 @@ public class ReplacementInstrumentCooperation {
     @ApiModelProperty(value = "缴费率")
     private BigDecimal payScale = BigDecimal.ZERO;
 
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
     public String getTopicTitle() {
         return topicTitle;
     }

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

@@ -40,6 +40,16 @@ public class GoodsQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "乐器置换是否展示：0否，1是")
     private Integer replacementShow;
 
+    private String courseViewType;
+
+    public String getCourseViewType() {
+        return courseViewType;
+    }
+
+    public void setCourseViewType(String courseViewType) {
+        this.courseViewType = courseViewType;
+    }
+
     public Integer getGroupGoods() {
         return groupGoods;
     }

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

@@ -1,17 +1,13 @@
 package com.ym.mec.biz.service;
 
-import com.ym.mec.biz.dal.dto.GoodsBatchNoDto;
 import com.ym.mec.biz.dal.dto.GoodsSellDto;
 import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.GoodsProcurement;
 import com.ym.mec.biz.dal.entity.SellOrder;
 import com.ym.mec.biz.dal.enums.AccountType;
 import com.ym.mec.common.service.BaseService;
-
 import org.apache.ibatis.annotations.Param;
 import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
 import java.util.List;
 
 public interface GoodsService extends BaseService<Integer, Goods> {

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

@@ -82,5 +82,5 @@ public interface MusicGroupSubjectPlanService extends BaseService<Integer, Music
      * @param chargeTypeId
      * @return
      */
-    List<MusicGroupGoodsAndDiscountDto> getSubjectGoods(Integer subjectId, String type, Integer chargeTypeId);
+    List<MusicGroupGoodsAndDiscountDto> getSubjectGoods(Integer subjectId, String type, Integer chargeTypeId,Integer courseViewType,String musicGroupId);
 }

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

@@ -1421,8 +1421,11 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         List<TeacherAttendance> teacherAttendances = teacherAttendanceDao.findByCourseSchedules(Arrays.asList(courseScheduleId));
         Map<Integer, TeacherAttendance> idTeacherAttendanceMap = teacherAttendances.stream().collect(Collectors.toMap(TeacherAttendance::getTeacherId, t -> t, (t1, t2) -> t1));
         List<SimpleUserDto> usersSimpleInfo = new ArrayList<>();
+        Map<Integer, Teacher> idTeacherMap = new HashMap<>();
         if(!CollectionUtils.isEmpty(teacherIds)){
             usersSimpleInfo = teacherDao.getUsersSimpleInfo(new ArrayList<>(teacherIds));
+            List<Teacher> teachers = teacherDao.findByTeacherIds(new ArrayList<>(teacherIds));
+            idTeacherMap = teachers.stream().collect(Collectors.toMap(Teacher::getId, t->t, (t1, t2)->t1));
         }
         Map<Integer, SimpleUserDto> idUserMap = usersSimpleInfo.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, s -> s));
 
@@ -1444,10 +1447,15 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 t.setSignOutStatus(Objects.nonNull(teacherAttendance.getSignOutStatus())?(YesOrNoEnum.NO.equals(teacherAttendance.getSignOutStatus())?SignOutStatusEnum.UNUSUAL:SignOutStatusEnum.NORMAL):SignOutStatusEnum.NO);
                 t.setSignInLongitudeLatitude(teacherAttendance.getSignInLongitudeLatitude());
                 t.setSignOutLongitudeLatitude(teacherAttendance.getSignOutLongitudeLatitude());
+                t.setComplaintsStatus(teacherAttendance.getComplaintsStatus());
             }
             if(Objects.nonNull(school)){
                 t.setSchoolLongitudeLatitude(school.getLongitudeLatitude());
             }
+            if(idTeacherMap.containsKey(courseScheduleTeacherSalary.getUserId())){
+                Teacher teacher = idTeacherMap.get(courseScheduleTeacherSalary.getUserId());
+                t.setJobNature(teacher.getJobNature());
+            }
             result.add(t);
         }
         return result;

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

@@ -200,6 +200,14 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 		Map<String,String> columns = IniFileUtil.readIniFile(inputStream, TemplateTypeEnum.GOODS.getMsg());
 		List<Goods> goodsList = new ArrayList<>();
 		Map<String, Integer> map = getMap("goods_category","name_","id_",true,String.class,Integer.class);
+		Map<String,String> courseViewTypeMap = new HashMap<>();
+		courseViewTypeMap.put("课程收费","0");
+		courseViewTypeMap.put("系统收费","1");
+		courseViewTypeMap.put("云教练收费","2");
+		courseViewTypeMap.put("课程收费\\系统收费","0,1");
+		courseViewTypeMap.put("课程收费\\云教练收费","0,2");
+		courseViewTypeMap.put("系统收费\\云教练收费","1,2");
+		courseViewTypeMap.put("课程收费\\系统收费\\云教练收费","0,1,2");
 		for (String e : sheetsListMap.keySet()) {
 			List<Map<String, Object>> sheet = sheetsListMap.get(e);
 			valueIsNull: for (Map<String, Object> row : sheet) {
@@ -216,6 +224,17 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 						LOGGER.error("商品导入异常：参数{}不可为空 param:{}",columnValue,objectMap);
 						continue valueIsNull;
 					}
+					if (columnValue.equals("courseViewType")) {
+						if(row.get(s) != null){
+							for (String courseViewType : courseViewTypeMap.keySet()) {
+								if (courseViewType.equals(row.get(s).toString())) {
+									objectMap.put(columnValue, courseViewTypeMap.get(courseViewType));
+									break;
+								}
+							}
+						}
+						continue;
+					}
 					if (columnValue.equals("type")) {
 						for (GoodsType goodsType : GoodsType.values()) {
 							if (goodsType.getDesc().equals(row.get(s).toString())) {

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

@@ -1846,14 +1846,17 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
             //退乐保费用
             if (maintenanceFee != null) {
+                StudentInstrument studentMaintenance = studentInstrumentDao.getStudentMaintenance(userId, musicGroupId);
                 if (maintenanceFee.compareTo(BigDecimal.ZERO) > 0) {
-                    int maintenanceNum = studentInstrumentDao.getStudentMaintenanceNum(userId);
-                    if (maintenanceNum <= 0) {
+                    if (studentMaintenance == null) {
                         throw new BizException("学生没有有效期内的乐保，不能退乐保费用");
                     }
                 }
                 amount = amount.add(maintenanceFee);
-                studentInstrumentDao.quitMaintenance(userId);
+                if (studentMaintenance != null) {
+                    studentMaintenance.setDelFlag(1);
+                    studentInstrumentDao.update(studentMaintenance);
+                }
             }
 
             if (amount.doubleValue() > 0) {
@@ -2047,14 +2050,17 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
         //退乐保费用
         if (maintenanceFee != null) {
+            StudentInstrument studentMaintenance = studentInstrumentDao.getStudentMaintenance(userId, musicGroupId);
             if (maintenanceFee.compareTo(BigDecimal.ZERO) > 0) {
-                int maintenanceNum = studentInstrumentDao.getStudentMaintenanceNum(userId);
-                if (maintenanceNum <= 0) {
+                if (studentMaintenance == null) {
                     throw new BizException("学生没有有效期内的乐保，不能退乐保费用");
                 }
             }
             amount = amount.add(maintenanceFee);
-            studentInstrumentDao.quitMaintenance(userId);
+            if (studentMaintenance != null) {
+                studentMaintenance.setDelFlag(1);
+                studentInstrumentDao.update(studentMaintenance);
+            }
         }
 
         if (amount.doubleValue() > 0) {

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

@@ -233,8 +233,12 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
     }
 
     @Override
-    public List<MusicGroupGoodsAndDiscountDto> getSubjectGoods(Integer subjectId, String type, Integer chargeTypeId) {
-        List<MusicGroupGoodsAndDiscountDto> goodsList = goodsDao.getMusicGroupGoodsAndDiscount(subjectId, type);
+    public List<MusicGroupGoodsAndDiscountDto> getSubjectGoods(Integer subjectId, String type, Integer chargeTypeId,Integer courseViewType,String musicGroupId) {
+        if(StringUtils.isNotEmpty(musicGroupId)){
+            MusicGroup musicGroup = musicGroupService.get(musicGroupId);
+            courseViewType = musicGroup.getCourseViewType().getCode();
+        }
+        List<MusicGroupGoodsAndDiscountDto> goodsList = goodsDao.getMusicGroupGoodsAndDiscount(subjectId, type,courseViewType);
         if (chargeTypeId == null || (type != null && !"INSTRUMENT".equals(type))) {
             return goodsList;
         }

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

@@ -603,6 +603,7 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
             replacementInstrumentActivity.setTopicId(cooperation.getTopicId());
             replacementInstrumentActivity.setReplacementInstrumentCooperationId(cooperationId);
         }
+        replacementInstrumentActivity.setReplacementInstrumentCooperationTitle(cooperation.getTitle());
         replacementInstrumentActivity.setMobileNo(user.getPhone());
         CooperationOrgan cooperationOrgan = cooperationOrganService.get(cooperationOrganId);
         if (cooperationOrgan != null) {

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

@@ -363,7 +363,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 			}
 			List<Integer> subjectIds = new ArrayList<>();
 			for (CourseSchedule courseSchedule : courseSchedules) {
-				if(idClassGroupMap.containsKey(courseSchedule.getClassGroupId())){
+				if(idClassGroupMap.containsKey(courseSchedule.getClassGroupId())&&StringUtils.isNotBlank(idClassGroupMap.get(courseSchedule.getClassGroupId()).getSubjectIdList())){
 					List<Integer> ids = Arrays.stream(idClassGroupMap.get(courseSchedule.getClassGroupId()).getSubjectIdList().split(",")).map(id -> Integer.valueOf(id)).collect(Collectors.toList());
 					subjectIds.addAll(ids);
 				}

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

@@ -366,7 +366,7 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
             studentInstrument = new StudentInstrument();
             studentInstrument.setStudentId(subjectChange.getStudentId());
             studentInstrument.setOrganId(subjectChange.getOrganId());
-            studentInstrument.setOrderId(subjectChange.getOrderId().longValue());
+            studentInstrument.setOrderId(subjectChange.getOriginalOrderId().longValue());
             studentInstrument.setStatus(0);
         }
         studentInstrument.setChangeOrderId(subjectChange.getOrderId().longValue());

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

@@ -505,7 +505,7 @@ public class StudentManageServiceImpl implements StudentManageService {
             List<SubjectChange> waitPayChange = subjectChangeDao.getMusicGroupWaitPay(queryInfo.getMusicGroupId());
             Map<Integer, List<SubjectChange>> studentWaitPayChange = waitPayChange.stream().collect(Collectors.groupingBy(SubjectChange::getStudentId));
             //查询是否有有效期内乐保
-            List<StudentInstrument> studentsMaintenanceNum = studentInstrumentDao.getStudentsMaintenanceNum(collect);
+            List<StudentInstrument> studentsMaintenanceNum = studentInstrumentDao.getStudentsMaintenanceNum(collect,queryInfo.getMusicGroupId());
             Map<Integer, Integer> studentMaintenanceMap = studentsMaintenanceNum.stream().collect(Collectors.toMap(StudentInstrument::getStudentId, StudentInstrument::getGoodsId));
 
             dataList.forEach(e->{

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

@@ -176,7 +176,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             List<SubjectChange> waitPayChange = subjectChangeDao.getMusicGroupWaitPay(queryInfo.getMusicGroupId());
             Map<Integer, List<SubjectChange>> studentWaitPayChange = waitPayChange.stream().collect(Collectors.groupingBy(SubjectChange::getStudentId));
             //查询是否有有效期内乐保
-            List<StudentInstrument> studentsMaintenanceNum = studentInstrumentDao.getStudentsMaintenanceNum(studentIds);
+            List<StudentInstrument> studentsMaintenanceNum = studentInstrumentDao.getStudentsMaintenanceNum(studentIds,queryInfo.getMusicGroupId());
             Map<Integer, Integer> studentMaintenanceMap = studentsMaintenanceNum.stream().collect(Collectors.toMap(StudentInstrument::getStudentId, StudentInstrument::getGoodsId));
             dataList.forEach(e -> {
                 if (StringUtils.isNotBlank(subjectMap.get(e.getActualSubjectId()))) {

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

@@ -3605,22 +3605,13 @@
         GROUP BY cssp.course_schedule_id_,cs.id_  HAVING COUNT(cssp.id_) = 0
     </select>
     <select id="findNoStartMasterCourseNum" resultType="int">
-        SELECT COUNT(a.course_id_) FROM (
-        SELECT new_course_id_ course_id_ FROM course_schedule
-        WHERE new_course_id_ IN (SELECT id_ FROM course_schedule
+        SELECT COUNT(id_) FROM course_schedule
         WHERE class_group_id_ IN
         <foreach collection="classGroupIds" open="(" close=")" separator="," item="item">
             #{item}
         </foreach>
-        AND CONCAT(class_date_,' ',start_class_time_) > NOW())
-        UNION ALL
-        SELECT id_ course_id_ FROM course_schedule
-        WHERE class_group_id_ IN
-        <foreach collection="classGroupIds" open="(" close=")" separator="," item="item">
-            #{item}
-        </foreach>
-        AND new_course_id_ > 0
-        AND CONCAT(class_date_,' ',start_class_time_) > NOW()) a
+        AND new_course_id_ IS NOT NULL
+        AND status_ = 'NOT_START'
     </select>
     <select id="getLock" resultMap="CourseSchedule">
         SELECT * FROM course_schedule WHERE id_ = #{courseId} FOR UPDATE

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

@@ -40,6 +40,7 @@
         <result column="music_group_show_" property="musicGroupShow" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="replacement_show_" property="replacementShow" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="stock_warning_" property="stockWarning" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="course_view_type_" property="courseViewType"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -62,20 +63,20 @@
         INSERT INTO goods
         (goods_category_id_,sn_,name_,brand_,specification_,image_,stock_count_,tax_stock_count_,sell_count_,market_price_,
         discount_price_,group_purchase_price_,brief_,desc_,is_new_,is_top_,status_,memo_,publish_time_,
-        complement_goods_id_list_,update_time_,create_time_,type_,agree_cost_price_,client_show_,educational_show_,music_group_show_,replacement_show_,stock_warning_,stock_type_)
+        complement_goods_id_list_,update_time_,create_time_,type_,agree_cost_price_,client_show_,educational_show_,music_group_show_,replacement_show_,stock_warning_,stock_type_,course_view_type_)
         VALUES(#{goodsCategoryId},#{sn},#{name},#{brand},#{specification},#{image},#{stockCount},#{taxStockCount},#{sellCount},#{marketPrice},
         #{discountPrice},#{groupPurchasePrice},#{brief},#{desc},
         #{isNew,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isTop,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{memo},#{publishTime},#{complementGoodsIdList},now(),now(),#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{agreeCostPrice},
         #{clientShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{educationalShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{musicGroupShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{replacementShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{stockWarning,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{stockType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+        #{stockWarning,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{stockType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{courseViewType})
     </insert>
     <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO goods
         (goods_category_id_,name_,brand_,specification_,image_,market_price_,
         discount_price_,group_purchase_price_,brief_,desc_,update_time_,create_time_,type_,agree_cost_price_,sn_,
-        stock_count_,tax_stock_count_,client_show_,educational_show_,music_group_show_,replacement_show_,stock_warning_,stock_type_)
+        stock_count_,tax_stock_count_,client_show_,educational_show_,music_group_show_,replacement_show_,stock_warning_,stock_type_,course_view_type_)
         VALUES
         <foreach collection="list" separator="," item="goods">
             (#{goods.goodsCategoryId},#{goods.name},#{goods.brand},#{goods.specification},#{goods.image},#{goods.marketPrice},
@@ -86,13 +87,16 @@
         	#{goods.musicGroupShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         	#{goods.replacementShow,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{goods.stockWarning,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            #{goods.stockType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+            #{goods.stockType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{goods.courseViewType})
         </foreach>
     </insert>
     <!-- 根据主键查询一条记录 -->
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.Goods">
         UPDATE goods
         <set>
+            <if test="courseViewType != null">
+                course_view_type_ = #{courseViewType},
+            </if>
             <if test="agreeCostPrice != null">
                 agree_cost_price_ = #{agreeCostPrice},
             </if>
@@ -186,6 +190,9 @@
         <foreach collection="goodsList" item="goods" separator=";">
             UPDATE goods
             <set>
+                <if test="goods.courseViewType != null">
+                    course_view_type_ = #{goods.courseViewType},
+                </if>
                 <if test="goods.agreeCostPrice != null">
                     agree_cost_price_ = #{goods.agreeCostPrice},
                 </if>
@@ -327,6 +334,9 @@
             <if test="musicGroupShow!=null">
                 AND g.music_group_show_=#{musicGroupShow}
             </if>
+            <if test="courseViewType != null">
+                AND FIND_IN_SET(#{courseViewType},g.course_view_type_)
+            </if>
             <if test="replacementShow!=null">
                 AND g.replacement_show_=#{replacementShow}
             </if>
@@ -407,10 +417,13 @@
     <select id="getMusicGroupGoodsAndDiscount" resultMap="MusicGroupGoods">
         SELECT g.* FROM subject_goods_mapper sgm
         LEFT JOIN goods g ON sgm.goods_category_id_ = g.goods_category_id_
-        WHERE sgm.subject_id_ = #{subjectId} AND g.music_group_show_=1 AND g.status_ != 0
+        WHERE sgm.subject_id_ = #{subjectId} AND g.music_group_show_ = 1 AND g.status_ != 0
         <if test="type!=null">
             AND g.type_ = #{type}
         </if>
+        <if test="courseViewType != null">
+            AND FIND_IN_SET(g.course_view_type_,#{courseViewType})
+        </if>
     </select>
 
     <select id="getMusicGroupGoodsAndDiscountWithSubjects" resultMap="MusicGroupGoods">

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

@@ -1056,6 +1056,7 @@
 		LEFT JOIN teacher t ON t.id_ = tcs.user_id_
 		LEFT JOIN sys_user su ON su.id_ = tcs.user_id_
 		WHERE su.lock_flag_ = 0 AND su.del_flag_ = 0 AND t.job_nature_ = 'FULL_TIME' AND t.demission_date_ IS NULL
+		  AND t.is_settlement_salary_ = 1
 		AND DATE_FORMAT(tcs.month_,'%Y-%m') = #{monthStr} AND tcs.low_salary = 1
 		<if test="organIdsStr != null and organIdsStr != ''">
 			AND FIND_IN_SET(tcs.organ_id_,#{organIdsStr})

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

@@ -2,8 +2,6 @@
 <!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.ReplacementInstrumentCooperationDao">
     <resultMap id="ReplacementInstrumentCooperation" type="com.ym.mec.biz.dal.entity.ReplacementInstrumentCooperation">
-        <!--@mbg.generated-->
-        <!--@Table replacement_instrument_cooperation-->
         <result column="id_" property="id"/>
         <result column="organ_id_" property="organId"/>
         <result column="cooperation_organ_id_" property="cooperationOrganId"/>
@@ -13,6 +11,7 @@
         <result column="show_question_" property="showQuestion" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="organName" property="organName"/>
         <result column="cooperationOrganName" property="cooperationOrganName"/>
+        <result column="title_" property="title"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
     </resultMap>
@@ -27,11 +26,11 @@
             useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         <!--@mbg.generated-->
         insert into replacement_instrument_cooperation (organ_id_, cooperation_organ_id_, open_pay_,show_question_,topic_id_, create_time_,
-        update_time_
+        update_time_,title_
         )
         values (#{organId}, #{cooperationOrganId},
         #{openPay,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{showQuestion,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{topicId}, #{createTime}, #{updateTime}
+        #{topicId}, NOW(), NOW(),#{title}
         )
     </insert>
 
@@ -43,6 +42,9 @@
         <!--@mbg.generated-->
         update replacement_instrument_cooperation
         <set>
+            <if test="title != null">
+                title_ = #{title},
+            </if>
             <if test="topicId != null">
                 topic_id_ = #{topicId},
             </if>
@@ -84,7 +86,7 @@
                 AND ric.show_question_ = #{showQuestion,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
             <if test="search != null and search != ''">
-                AND (ric.cooperation_organ_id_ = #{search} OR co.name_ LIKE CONCAT('%',#{search},'%'))
+                AND (ric.cooperation_organ_id_ = #{search} OR co.name_ LIKE CONCAT('%',#{search},'%') OR ric.title_ LIKE CONCAT('%',#{search},'%'))
             </if>
         </where>
     </sql>

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

@@ -269,16 +269,22 @@
         LIMIT 1
     </select>
 
-    <update id="quitMaintenance">
-        UPDATE student_instrument
-        SET del_flag_=1,
-            update_time=NOW()
-        WHERE student_id_ = #{studentId}
-          AND del_flag_ = 0
-    </update>
-
     <select id="getStudentsMaintenanceNum" resultMap="StudentInstrument">
-        SELECT student_id_,COUNT(*) goods_id_ FROM student_instrument WHERE student_id_ IN
+        SELECT student_id_,COUNT(*) goods_id_
+        FROM student_instrument
+        WHERE order_id_ IN (
+        SELECT MAX(id_)
+        FROM student_payment_order
+        WHERE type_ = 'APPLY'
+        AND music_group_id_ = #{musicGroupId}
+        AND status_ = 'SUCCESS'
+        AND user_id_ IN
+        <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
+            #{studentId}
+        </foreach>
+        GROUP BY user_id_
+        )
+        AND student_id_ IN
         <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
             #{studentId}
         </foreach>
@@ -286,12 +292,17 @@
         GROUP BY student_id_
     </select>
 
-    <select id="getStudentMaintenanceNum" resultType="int">
-        SELECT student_id_, COUNT(*)
-        FROM student_instrument
-        WHERE student_id_ = #{studentId}
-          AND del_flag_ = 0
-          AND end_time_ > NOW()
+    <select id="getStudentMaintenance" resultMap="StudentInstrument">
+        SELECT * FROM student_instrument
+        WHERE order_id_ = (
+        SELECT MAX(id_)
+        FROM student_payment_order
+        WHERE type_ = 'APPLY'
+        AND music_group_id_ = #{musicGroupId}
+        AND status_ = 'SUCCESS'
+        AND user_id_ = #{studentId}
+        )
+        AND student_id_ = #{studentId} AND del_flag_ = 0 AND end_time_ > NOW()
     </select>
 
 </mapper>

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

@@ -185,7 +185,7 @@
 			vip_group_activity
 		WHERE
 			FIND_IN_SET( #{categoryId}, vip_group_category_id_list_ )
-			AND (NOW() < end_time_ OR end_time_ IS NULL)
+			AND (end_time_ IS NULL OR NOW() BETWEEN start_time_ AND end_time_)
 			AND del_flag_=0
 			AND INTE_ARRAY(organ_id_,#{organIds})
 	</select>

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

@@ -352,7 +352,7 @@
             AND vg.courses_start_date > NOW()
             AND (select count(1) as num from student_payment_order where vg.id_ = music_group_id_ AND user_id_=#{userId}
             AND status_='SUCCESS') = 0
-            AND vg.organ_id_ = #{organId} AND IF(vg.student_id_list_ IS NULL,1,FIND_IN_SET(#{userId},
+            AND IF(vg.student_id_list_ IS NULL, vg.organ_id_ = #{organId}, FIND_IN_SET(#{userId},
             vg.student_id_list_))
             AND vgc.music_theory_ = 0
             <if test="subjectId!=null">

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -311,7 +311,7 @@ public class RoomServiceImpl implements RoomService {
             roomMember = saveRoomMember(roomId,userId);
         }
         String joinSuccessKey = "joinRoomSuccess"+ roomId + userId;
-        Boolean aBoolean = redisTemplate.opsForValue().setIfAbsent(joinSuccessKey, roomId, 2l, TimeUnit.SECONDS);
+        Boolean aBoolean = redisTemplate.opsForValue().setIfAbsent(joinSuccessKey, roomId, 1l, TimeUnit.SECONDS);
         if(!aBoolean){
             RoleEnum roleEnum = RoleEnum.getEnumByValue(roomMember.getRole());
             if(roleEnum == RoleTeacher && StringUtils.isNotEmpty(deviceNum)){
@@ -450,7 +450,7 @@ public class RoomServiceImpl implements RoomService {
         }
 
         String leaveSuccessKey = "leaveRoomSuccess"+ roomId + userId;
-        Boolean aBoolean = redisTemplate.opsForValue().setIfAbsent(leaveSuccessKey, roomId, 2, TimeUnit.SECONDS);
+        Boolean aBoolean = redisTemplate.opsForValue().setIfAbsent(leaveSuccessKey, roomId, 1l, TimeUnit.SECONDS);
         log.info("leaveRoomSuccess: roomId={}, userId={},deviceNum={},aBoolean={}", roomId,userId,deviceNum,aBoolean);
         if(!aBoolean){
             if (StringUtils.isNotEmpty(deviceNum)){

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

@@ -206,11 +206,13 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"商品编号", "货号", "品牌", "商品名称",
-                    "是否组合商品", "学员是否展示", "教务端是否展示", "乐团是否展示","是否乐器置换", "是否库存预警",
+                    "是否组合商品", "学员是否展示", "教务端是否展示", "乐团是否展示", "乐团收费模式","是否乐器置换", "是否库存预警",
                     "商品类型", "商品分类", "具体型号", "内部库存", "税务库存", "库存类型", "市场价(元)",
                     "零售价(元)", "商品团购价(元)", "商品描述", "商品详情", "是否上下架"}, new String[]{
                     "id", "sn", "brand", "name",
-                    "complementGoodsIdList == null || complementGoodsIdList == '' ? '否':'是'", "clientShow.msg", "educationalShow.msg", "musicGroupShow.msg","replacementShow.msg", "stockWarning.msg",
+                    "complementGoodsIdList == null || complementGoodsIdList == '' ? '否':'是'", "clientShow.msg", "educationalShow.msg", "musicGroupShow.msg",
+                    "courseViewType == null?'':courseViewType == '0'?'系统收费':courseViewType == '0,1'?'系统收费,课程收费':courseViewType == '0,2'?'系统收费,云教练收费':courseViewType == '1,2'?'课程收费,云教练收费':courseViewType == '0,1,2'?'系统收费,课程收费,云教练收费':''",
+                    "replacementShow.msg", "stockWarning.msg",
                     "type.desc", "goodsCategoryName", "specification", "stockCount", "taxStockCount", "stockType.msg", "marketPrice",
                     "discountPrice", "groupPurchasePrice", "brief", "desc", "status.msg"}, rows);
             response.setContentType("application/octet-stream");

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

@@ -78,11 +78,9 @@ public class MusicGroupQuitController extends BaseController {
 
         if (musicGroupQuitPageInfo.getRows() != null && musicGroupQuitPageInfo.getRows().size() > 0) {
             //查询是否有有效期内乐保
-            List<Integer> studentIds = musicGroupQuitPageInfo.getRows().stream().map(MusicGroupQuit::getUserId).collect(Collectors.toList());
-            List<StudentInstrument> studentsMaintenanceNum = studentInstrumentDao.getStudentsMaintenanceNum(studentIds);
-            Map<Integer, Integer> studentMaintenanceMap = studentsMaintenanceNum.stream().collect(Collectors.toMap(StudentInstrument::getStudentId, StudentInstrument::getGoodsId));
             for (MusicGroupQuit row : musicGroupQuitPageInfo.getRows()) {
-                if (studentMaintenanceMap.containsKey(row.getUserId())) {
+                StudentInstrument studentMaintenance = studentInstrumentDao.getStudentMaintenance(row.getUserId(), row.getMusicGroupId());
+                if (studentMaintenance != null) {
                     row.setHasMaintenance(true);
                 }
             }

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

@@ -73,15 +73,17 @@ public class MusicGroupSubjectPlanController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('musicGroupSubjectPlan/getSubjectGoods')")
     @ApiImplicitParams({ @ApiImplicitParam(name = "subjectId", value = "科目编号", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "type", value = "INSTRUMENT 乐器, ACCESSORIES 教辅", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "chargeTypeId", value = "收费模式id", required = true, dataType = "Integer")
+            @ApiImplicitParam(name = "chargeTypeId", value = "收费模式id", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "courseViewType", value = "收费模式", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "musicGroupId")
     })
-    public HttpResponseResult getSubjectGoods(String subjectIds, String type, Integer chargeTypeId) {
+    public HttpResponseResult getSubjectGoods(String subjectIds, String type, Integer chargeTypeId,Integer courseViewType,String musicGroupId) {
         if(StringUtils.isBlank(subjectIds)){
             return succeed();
         }
         Map<String, List<MusicGroupGoodsAndDiscountDto>> result = new HashMap<>();
         for (String subjectIdStr : subjectIds.split(",")) {
-            result.put(subjectIdStr, musicGroupSubjectPlanService.getSubjectGoods(Integer.valueOf(subjectIdStr), type, chargeTypeId));
+            result.put(subjectIdStr, musicGroupSubjectPlanService.getSubjectGoods(Integer.valueOf(subjectIdStr), type, chargeTypeId,courseViewType,musicGroupId));
         }
         return succeed(result);
     }

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

@@ -4,7 +4,6 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.ReplacementInstrumentActivityStatDto;
-import com.ym.mec.biz.dal.dto.StudentInstrumentExportDto;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
@@ -22,19 +21,16 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @RequestMapping("replacementInstrumentActivity")
 @Api(tags = "乐器置换-调查问卷服务")
@@ -52,10 +48,6 @@ public class ReplacementInstrumentActivityController extends BaseController {
     @Autowired
     private ReplacementInstrumentCooperationService replacementInstrumentCooperationService;
     @Autowired
-    private QuestionnaireQuestionDao questionnaireQuestionDao;
-    @Autowired
-    private QuestionnaireUserResultService questionnaireUserResultService;
-    @Autowired
     private SysConfigDao sysConfigDao;
     @Autowired
     private SysMessageService sysMessageService;
@@ -132,6 +124,40 @@ public class ReplacementInstrumentActivityController extends BaseController {
         return succeed(replacementInstrumentActivity);
     }
 
+    @ApiOperation(value = "开启/关闭缴费")
+    @PostMapping("/updateOpenFlag")
+    @PreAuthorize("@pcs.hasPermissions('replacementInstrumentActivity/updateOpenFlag')")
+    public HttpResponseResult<ReplacementInstrumentActivity> updateOpenFlag(Integer Id,Integer openFlag) {
+        ReplacementInstrumentActivity replacementInstrumentActivity = replacementInstrumentActivityDao.getLock(Id);
+        if (!replacementInstrumentActivity.getPayStatus().equals(0)) {
+            return failed("支付中、已支付的乐器置换，不能修改");
+        }
+
+        if(replacementInstrumentActivity.getInstrumentsId() == null){
+            return failed("修改失败：用户没有可置换商品");
+        }
+        if (openFlag == 1) {
+            Goods goods = goodsService.get(replacementInstrumentActivity.getInstrumentsId());
+            Map<Integer, String> userMap = new HashMap<>();
+            Map<Integer, String> userPhoneMap = new HashMap<>();
+            Integer userId = replacementInstrumentActivity.getUserId();
+            String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+            String pushUrl = baseApiUrl + "/#/questionGoodsSale?id=";
+            userMap.put(userId, userId.toString());
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.REPLACEMENT_PAY_PUSH,
+                    userMap, null, 0, "5?" + pushUrl + replacementInstrumentActivity.getId(), "STUDENT", goods.getBrand(), "");
+
+            userPhoneMap.put(userId, replacementInstrumentActivity.getMobileNo());
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.REPLACEMENT_PAY_PUSH,
+                    userPhoneMap, null, 0, null, "STUDENT", goods.getBrand(), HttpUtil.getSortUrl(pushUrl + replacementInstrumentActivity.getId()));
+        }
+
+        replacementInstrumentActivity.setOpenFlag(openFlag);
+        replacementInstrumentActivity.setUpdateTime(new Date());
+        replacementInstrumentActivityService.update(replacementInstrumentActivity);
+        return succeed(replacementInstrumentActivity);
+    }
+
     @ApiOperation(value = "导出")
     @RequestMapping("/export")
     @PreAuthorize("@pcs.hasPermissions('replacementInstrumentActivity/export')")

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

@@ -79,4 +79,16 @@ public class ReplacementInstrumentCooperationController extends BaseController {
     public HttpResponseResult<ReplacementInstrumentCooperation> openPay(Integer id) {
         return succeed(replacementInstrumentCooperationService.openPay(id));
     }
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('replacementInstrumentCooperation/update')")
+    public Object update(Integer id,String title) {
+        ReplacementInstrumentCooperation cooperation = replacementInstrumentCooperationService.get(id);
+        if(cooperation == null){
+            return failed("活动不存在");
+        }
+        cooperation.setTitle(title);
+        return succeed(replacementInstrumentCooperationService.update(cooperation));
+    }
 }

mec-web/src/main/resources/columnMapper.ini

@@ -18,6 +18,7 @@
 是否App展示 = clientShow
 是否在教务端展示 = educationalShow
 是否在乐团展示 = musicGroupShow
+乐团收费类型 = courseViewType
 是否乐器置换 = replacementShow
 库存类型 = stockType
 商品详情 = desc