Merge branch '课表导出增加合作单位' into master_saas

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java
#	mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

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

@@ -23,7 +23,7 @@ import java.util.Set;
 public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
 
     MusicGroup getLocked(String id);
-    
+
     /**
      * 查询乐团基本信息
      * @param id
@@ -451,16 +451,16 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @return
      */
     List<MusicMemberDto> queryMusicMemberList(Map<String, Object> params);
-    
-	int updateIsShowRecordOfStudent(@Param("musicGroupId") String musicGroupId, @Param("isShowRecordOfStudent") Boolean isShowRecordOfStudent);
-
-	/**
-	 * @describe 查询乐团相关学员数量
-	 * @author Joburgess
-	 * @date 2021/8/12 0012
-	 * @param params:
-	 * @return java.util.List<java.lang.String>
-	 */
+
+    int updateIsShowRecordOfStudent(@Param("musicGroupId") String musicGroupId, @Param("isShowRecordOfStudent") Boolean isShowRecordOfStudent);
+
+    /**
+     * @describe 查询乐团相关学员数量
+     * @author Joburgess
+     * @date 2021/8/12 0012
+     * @param params:
+     * @return java.util.List<java.lang.String>
+     */
     List<TeacherMusicStudentOverViewDto> queryTeacherMusicStudentOverView(@Param("musicGroupIds") List<String> musicGroupIds);
 
     /**
@@ -471,40 +471,40 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
     List<Map<Integer, String>> queryNormalGroupName(@Param("studentIds") List<Integer> studentIds);
 
     /**
-    * @description: 乐团剩余时长未排课
+     * @description: 乐团剩余时长未排课
      * @param organIds
      * @param tenantId
-    * @return java.util.List<java.lang.String>
-    * @author zx
-    * @date 2022/3/3 15:15 
-    */
+     * @return java.util.List<java.lang.String>
+     * @author zx
+     * @date 2022/3/3 15:15
+     */
     List<String> queryHasSubCourseTimes(@Param("organIds") String organIds, @Param("tenantId") Integer tenantId);
 
     /**
-    * @description: 获取课程时间消耗异常的学员数
+     * @description: 获取课程时间消耗异常的学员数
      * @param params
-    * @return int
-    * @author zx
-    * @date 2022/3/4 11:22
-    */
+     * @return int
+     * @author zx
+     * @date 2022/3/4 11:22
+     */
     Integer countHasFreeCourseTimes(Map<String, Object> params);
 
     /**
-    * @description: 获取课程时间消耗异常的学员
+     * @description: 获取课程时间消耗异常的学员
      * @param params
-    * @return java.util.List<com.ym.mec.biz.dal.dto.HasFreeCourseTimesDto>
-    * @author zx
-    * @date 2022/3/4 11:40
-    */
+     * @return java.util.List<com.ym.mec.biz.dal.dto.HasFreeCourseTimesDto>
+     * @author zx
+     * @date 2022/3/4 11:40
+     */
     List<HasFreeCourseTimesDto> queryHasFreeCourseTimes(Map<String, Object> params);
 
     /**
-    * @description: 获取首页退学学员数量
+     * @description: 获取首页退学学员数量
      * @param queryInfo
-    * @return java.lang.Integer
-    * @author zx
-    * @date 2022/3/17 16:20
-    */
+     * @return java.lang.Integer
+     * @author zx
+     * @date 2022/3/17 16:20
+     */
     Integer countQuitNum(@Param("queryInfo") IndexDataQueryInfo queryInfo);
 
     //乐团统计数据导出

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

@@ -45,7 +45,7 @@ public class CourseScheduleEndDto extends CourseSchedule {
     private String settlementTime;
 
     private PracticeGroup practiceGroup;
-    
+
     private String isComplaints;
 
     private boolean beMerged;

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

@@ -84,8 +84,8 @@ public class ExportServiceImpl implements ExportService {
     private CourseScheduleService courseScheduleService;
     @Autowired
     private StudentService studentService;
-	@Autowired
-	private TenantConfigService tenantConfigService;
+    @Autowired
+    private TenantConfigService tenantConfigService;
     @Autowired
     private CourseScheduleStudentPaymentDao courseScheduleStudentPaymentDao;
     @Autowired
@@ -1615,7 +1615,7 @@ public class ExportServiceImpl implements ExportService {
             List<CooperationOrgan> cooperationOrgans = cooperationOrganDao.getCooperationOrganByIds(cooperationOrganIds);
             cooperationOrganMap = cooperationOrgans.stream().collect(Collectors.toMap(CooperationOrgan::getId, CooperationOrgan::getName));
         }
-        
+
         //获取机构费率
         Integer tenantId = (Integer) params.get("tenantId");
         TenantConfig tenantConfig = tenantConfigService.queryByTenantId(tenantId);
@@ -2168,8 +2168,8 @@ public class ExportServiceImpl implements ExportService {
             } else if (row.getGroupType().equals(GroupType.SPORADIC)) {
                 //考级报名
                 if (row.getType().equals(OrderTypeEnum.DEGREE_REGISTRATION)) {
-                	
-                	if(StringUtils.isNotBlank(row.getMemo())){
+
+                    if(StringUtils.isNotBlank(row.getMemo())){
                         String[] feeTypes = row.getMemo().split("；");
                         List<String> feeTypeList = Arrays.asList(feeTypes);
                         for (String feeTypeStr : feeTypeList) {
@@ -2189,7 +2189,7 @@ public class ExportServiceImpl implements ExportService {
                                 row.setTheoryCourseFee(typeFee);
                             }
                         }
-                	}
+                    }
                     row.setDegreeFee(row.getActualAmount().subtract(row.getVipCourseFee()).subtract(row.getPracticeCourseFee()).subtract(row.getTheoryCourseFee()));
                 } else {
                     if (row.getChargeType() != null && SporadicChargeTypeEnum.LEVEL.getCode().equals(row.getChargeType())) {
@@ -2322,7 +2322,7 @@ public class ExportServiceImpl implements ExportService {
             List<CooperationOrgan> cooperationOrgans = cooperationOrganDao.getCooperationOrganByIds(cooperationOrganIds);
             cooperationOrganMap = cooperationOrgans.stream().collect(Collectors.toMap(CooperationOrgan::getId, CooperationOrgan::getName));
         }
-        
+
         //获取机构费率
         Integer tenantId = (Integer) params.get("tenantId");
         TenantConfig tenantConfig = tenantConfigService.queryByTenantId(tenantId);
@@ -2347,10 +2347,10 @@ public class ExportServiceImpl implements ExportService {
         if(musicGroupIds != null && musicGroupIds.size() > 0){
             musicGroupNameMap = MapUtil.convertIntegerMap(musicGroupDao.queryMusicGroupNameMap(musicGroupIds));
         }
-        
+
         Map<String,BigDecimal> serviceChargeMap = new HashMap<String, BigDecimal>();
         Map<String,Integer> orderCountMap = new HashMap<String, Integer>();
-        
+
         for (StudentPaymentOrderExportDto row : studentPaymentOrderExportDtos) {
             if (row.getActualAmount() == null) {
                 row.setActualAmount(BigDecimal.ZERO);
@@ -2369,7 +2369,7 @@ public class ExportServiceImpl implements ExportService {
             BigDecimal totalFee = BigDecimal.ZERO;
             if (row.getPaymentChannel() != null && row.getPaymentChannel().equals("ADAPAY")) {
                 FeeFlagNumDto countFeeFlagNum = studentPaymentRouteOrderDao.getCountFeeFlagNum(row.getOrderNo());
-                
+
                 Integer times = orderCountMap.get(row.getOrderNo());
 				if (times == null) {
 					times = 1;
@@ -2377,9 +2377,9 @@ public class ExportServiceImpl implements ExportService {
 					++times;
 				}
             	orderCountMap.put(row.getOrderNo(), times);
-            	
+
             	currentFee = row.getServiceFee();
-                
+
             	//兼容2022年之前的数据
 				if (currentFee == null || (currentFee.floatValue() == 0 && row.getCreateTime().before(DateUtil.stringToDate("2022-01-01 00:00:00")))) {
 					transferFee = serviceChargeMap.get(row.getOrderNo());

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

@@ -637,7 +637,6 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
             activityUserMapper.setUserId(studentPaymentOrder.getUserId());
             activityUserMapper.setActivityId(activity.getId());
             activityUserMapper.setActualPrice(BigDecimal.ZERO);
-            activityUserMapper.setGivePracticeFlag(1);
             activityUserMapper.setReturnFee(false);
             //如果是买的商品1那么赠送陪练课和训练营
             if(Objects.equals(studentPaymentOrder.getClassGroupId(),1)){
@@ -663,17 +662,19 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
             studentPaymentOrderDetail.setUpdateTime(nowDate);
             studentPaymentOrderDetailDao.insert(studentPaymentOrderDetail);
 
-            Map<Integer, String> phoneMaps = MapUtil.convertMybatisMap(teacherDao.queryPhoneByIds(userId.toString()));
-            String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
-            StringBuffer pushUrl = new StringBuffer(baseApiUrl).append("/#/artistRegistration");
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.GOOD_HABITS_TRAINING_CAMP_EXPERIENCE_QUALIFICATION_SMS,phoneMaps,
-                    null,0,"",null, HttpUtil.getSortUrl(pushUrl.toString()));
-
-            StringBuffer notifyUrl = new StringBuffer("8?").append(baseApiUrl).append("/#/artistRegistration");
-            Map<Integer, String> userIdMaps = new HashMap<>(1);
-            userIdMaps.put(userId, userId.toString());
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.GOOD_HABITS_TRAINING_CAMP_EXPERIENCE_QUALIFICATION_PUSH,userIdMaps,
-                    null,0,notifyUrl.toString(),"STUDENT");
+            if(Objects.equals(studentPaymentOrder.getClassGroupId(),1)) {
+                Map<Integer, String> phoneMaps = MapUtil.convertMybatisMap(teacherDao.queryPhoneByIds(userId.toString()));
+                String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
+                StringBuffer pushUrl = new StringBuffer(baseApiUrl).append("/#/artistRegistration");
+                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.GOOD_HABITS_TRAINING_CAMP_EXPERIENCE_QUALIFICATION_SMS, phoneMaps,
+                        null, 0, "", null, HttpUtil.getSortUrl(pushUrl.toString()));
+
+                StringBuffer notifyUrl = new StringBuffer("8?").append(baseApiUrl).append("/#/artistRegistration");
+                Map<Integer, String> userIdMaps = new HashMap<>(1);
+                userIdMaps.put(userId, userId.toString());
+                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.GOOD_HABITS_TRAINING_CAMP_EXPERIENCE_QUALIFICATION_PUSH, userIdMaps,
+                        null, 0, notifyUrl.toString(), "STUDENT");
+            }
         }
         // 插入交易明细
         sysUserCashAccountDetailService.saveSysUserCashAccountDetail(studentPaymentOrder, "直播购买云教练");

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

@@ -37,12 +37,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ImGroupNotice" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO im_group_notice (id_,im_group_id_,title_,content_,is_top_,is_sent_to_new_member_,create_time_,update_time_,del_flag_,operator_id_,tenant_id_) VALUES(#{id},#{imGroupId},#{title},#{content},#{isTop},#{isSentToNewMember},#{createTime},#{updateTime},#{delFlag},#{operatorId},#{tenantId})
+		INSERT INTO im_group_notice (im_group_id_,title_,content_,is_top_,is_sent_to_new_member_,create_time_,update_time_,del_flag_,operator_id_,tenant_id_)
+		VALUES(#{imGroupId},#{title},#{content},#{isTop},#{isSentToNewMember},NOW(),NOW(),#{delFlag},#{operatorId},#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -60,24 +56,16 @@
 		<if test="isSentToNewMember != null">
 		is_sent_to_new_member_ = #{isSentToNewMember},
 		</if>
-		<if test="id != null">
-		id_ = #{id},
-		</if>
 		<if test="imGroupId != null">
 		im_group_id_ = #{imGroupId},
 		</if>
 		<if test="title != null">
 		title_ = #{title},
 		</if>
-		<if test="updateTime != null">
-		update_time_ = #{updateTime},
-		</if>
 		<if test="content != null">
 		content_ = #{content},
 		</if>
-		<if test="createTime != null">
-		create_time_ = #{createTime},
-		</if>
+		update_time_ = NOW()
 		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
 	

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

@@ -50,7 +50,7 @@
         <result column="tenant_id_" property="tenantId"/>
         <result column="is_give_accessories_" property="isGiveAccessories"/>
     </resultMap>
-    
+
     <resultMap type="com.ym.mec.biz.dal.dto.MusicGroupBasicDto" id="MusicGroupBasicDto" extends="MusicGroup">
     	<result column="organ_name_" property="organName"/>
         <result column="school_name_" property="schoolName"/>
@@ -77,7 +77,7 @@
         WHERE id_ = #{id} for
         update
     </select>
-    
+
     <select id="queryBasicInfo" resultMap="MusicGroupBasicDto">
         SELECT mg.*,o.name_ organ_name_,s.name_ school_name_ ,co.name_ cooperation_organ_name_,ct.name_ charge_type_name_,
         u1.real_name_ edu_teacher_name_,u2.real_name_ teans_teacher_name_,u2.phone_ teans_teacher_phone_,
@@ -241,7 +241,7 @@
         </set>
         WHERE id_ = #{id}
     </update>
-    
+
     <update id="batchUpdateEdu">
         UPDATE music_group
         SET educational_teacher_id_ = #{educationUserId}
@@ -968,7 +968,7 @@
             </if>
         </where>
     </sql>
-    
+
     <update id="updateIsShowRecordOfStudent" parameterType="map">
     	update music_group set is_show_record_of_student_ = #{isShowRecordOfStudent},update_time_ = now() where id_ = #{musicGroupId}
     </update>
@@ -1156,7 +1156,7 @@
 
     <select id="findMusicByCourseIds" resultMap="MusicGroupBasicDto">
         select
-               t.id_,b.organ_id_ as cooperation_organ_id_,b.name_ as cooperation_organ_name_
+        t.id_,b.organ_id_ as cooperation_organ_id_,b.name_ as cooperation_organ_name_
         from course_schedule t
         left join music_group a on t.music_group_id_ = a.id_
         left join cooperation_organ b on a.cooperation_organ_id_ = b.id_

mec-web/src/main/java/com/ym/mec/web/controller/education/ImGroupNoticeController.java

@@ -37,6 +37,7 @@ public class ImGroupNoticeController extends BaseController {
         if(sysUser == null){
             return failed("获取用户信息失败");
         }
+        imGroupNotice.setOperatorId(sysUser.getId().longValue());
         return succeed(imGroupNoticeService.insert(imGroupNotice));
     }