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

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.TenantAssetsInfo;
+import com.ym.mec.biz.dal.entity.VipGroup;
 
 import java.util.List;
 
@@ -19,5 +20,7 @@ public interface TenantAssetsInfoService extends IService<TenantAssetsInfo> {
     void courseRecoverAmount(Integer courseId);
 
     void courseDeductAmount(Integer courseId);
+
+    void groupFrozenAmount(VipGroup vipGroup, List<CourseSchedule> dto);
 }
 

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

@@ -91,7 +91,11 @@ public class MusicGroupPaymentCalenderActivityServiceImpl extends BaseServiceImp
                     e.setOriginalAmount(activity1.getMarketPrice());
                     e.setActivityName(activity1.getName());
                     e.setNum(new BigDecimal(activity1.getMaxCourseNum()));
-                    e.setCategoryName(categoryNameMap.get(Long.parseLong(activity1.getVipGroupCategoryIdList())));
+                    if(StringUtils.isNotEmpty(activity1.getVipGroupCategoryIdList())){
+                        e.setCategoryName(categoryNameMap.get(Long.parseLong(activity1.getVipGroupCategoryIdList())));
+                    }else {
+                        e.setCategoryName("网管课");
+                    }
                 }
             });
         }

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

@@ -176,7 +176,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 
 	@Override
 	public boolean batchSeoMessage(Set<Integer> userIds, MessageTypeEnum messageType,String memo, Object... args) {
-		if(userIds != null){
+		/*if(userIds != null){
 			userIds.removeAll(Collections.singleton(null));
 		}
 		if (userIds == null || userIds.size() == 0) {
@@ -210,7 +210,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			message.setGroup(messageConfig.getGroup());
 			messages.add(message);
 		}
-		sysMessageDao.batchInsert(messages);
+		sysMessageDao.batchInsert(messages);*/
 		return true;
 	}
 

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

@@ -50,8 +50,12 @@ public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer,
 	public void save(SysMusicScoreCategories musicScoreCategories) {
 		String organId = musicScoreCategories.getOrganId();
 		Boolean enable = musicScoreCategories.getEnable();
-		musicScoreCategories.setParentId(0);
-		musicScoreCategories.setOrder(0);
+		if(musicScoreCategories.getParentId() == null){
+			musicScoreCategories.setParentId(0);
+		}
+		if(musicScoreCategories.getOrder() == null){
+			musicScoreCategories.setOrder(0);
+		}
 		sysMusicScoreCategoriesDao.insert(musicScoreCategories);
 		List<SysMusicScoreCategories> sysMusicScoreCategoriesList = musicScoreCategories.getSysMusicScoreCategoriesList();
 		if(sysMusicScoreCategoriesList != null && sysMusicScoreCategoriesList.size() > 0){

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

@@ -48,14 +48,18 @@ public class TenantAssetsInfoServiceImpl extends ServiceImpl<TenantAssetsInfoDao
     private TenantCloudCourseRecordService tenantCloudCourseRecordService;
 
     /**
+     * 课程
      * 扣除冻结的金额
      *
      * @param courseId 课程id
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void courseDeductAmount(Integer courseId){
+    public void courseDeductAmount(Integer courseId) {
         TenantCloudCourseRecord lastRecord = checkLastRecord(courseId);
+        if (Objects.isNull(lastRecord)) {
+            return;
+        }
         //写入流水
         lastRecord.setDeductState(1);
         tenantCloudCourseRecordService.save(lastRecord);
@@ -65,6 +69,7 @@ public class TenantAssetsInfoServiceImpl extends ServiceImpl<TenantAssetsInfoDao
     }
 
     /**
+     * 课程
      * 恢复/取消 冻结的金额
      *
      * @param courseId 课程id
@@ -73,6 +78,9 @@ public class TenantAssetsInfoServiceImpl extends ServiceImpl<TenantAssetsInfoDao
     @Transactional(rollbackFor = Exception.class)
     public void courseRecoverAmount(Integer courseId) {
         TenantCloudCourseRecord lastRecord = checkLastRecord(courseId);
+        if (Objects.isNull(lastRecord)) {
+            return;
+        }
         //写入流水
         lastRecord.setDeductState(2);
         tenantCloudCourseRecordService.save(lastRecord);
@@ -84,8 +92,11 @@ public class TenantAssetsInfoServiceImpl extends ServiceImpl<TenantAssetsInfoDao
 
     private TenantCloudCourseRecord checkLastRecord(Integer courseId) {
         TenantCloudCourseRecord lastRecord = tenantCloudCourseRecordService.queryLastRecord(courseId);
+        if (Objects.isNull(lastRecord)) {
+            return null;
+        }
         //判断是否是冻结的状态
-        if (Objects.nonNull(lastRecord) && lastRecord.getDeductState() != 0) {
+        if (lastRecord.getDeductState() != 0) {
             //只有冻结的才能取消冻结 或者 扣费
             throw new BizException("该课程非线上课!");
         }
@@ -95,7 +106,19 @@ public class TenantAssetsInfoServiceImpl extends ServiceImpl<TenantAssetsInfoDao
     }
 
     /**
-     * 排课扣费计算
+     * 课程组金额冻结
+     *
+     * @param vipGroup 课程组信息
+     * @param dto      课程组中的课程
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void groupFrozenAmount(VipGroup vipGroup, List<CourseSchedule> dto) {
+
+    }
+
+    /**
+     * 冻结课程的总价格
      * 1.线上排课计算出的总价格不能超过账户余额(注意多人同时操作账户余额多扣问题)
      * 2.若符合规则冻结部分账户
      */

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

@@ -16,7 +16,7 @@
         <result column="tenant_id_" property="tenantId"/>
   </resultMap>
   <sql id="Base_Column_List">
-    id_, activity_id_, calender_id_, optional_flag_,actual_amount_ ,original_amount_, create_time_, update_time_,tenant_id_  </sql>
+    id_, activity_id_, calender_id_, optional_flag_,actual_amount_ ,original_amount_, create_time_, update_time_,tenant_id_,activity_name_,category_name_,num_  </sql>
 
   <!-- 根据主键查询一条记录 -->
   <select id="get" resultMap="MusicGroupPaymentCalenderActivity" >
@@ -31,9 +31,9 @@
   <!-- 向数据库增加一条记录 -->
   <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderActivity" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
     INSERT INTO music_group_payment_calender_activity (activity_id_,activity_name_,num_,
-    category_name_,calender_id_,optional_flag_,actual_amount_,original_amount_,create_time_,update_time_,tenant_id_)
+    category_name_,calender_id_,optional_flag_,actual_amount_,original_amount_,create_time_,update_time_,tenant_id_,activity_name_,category_name_,num_)
     VALUES(#{activityId},#{activityName},#{num},#{categoryName},#{calenderId},#{optionalFlag},
-          #{actualAmount},#{originalAmount},NOW(),NOW(),#{tenantId})
+          #{actualAmount},#{originalAmount},NOW(),NOW(),#{tenantId},#{activityName},#{categoryName},#{num})
   </insert>
 
   <!-- 根据主键查询一条记录 -->
@@ -88,11 +88,11 @@
   <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
           parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderActivity">
     insert into music_group_payment_calender_activity(activity_id_, calender_id_, optional_flag_, actual_amount_ ,
-    original_amount_, create_time_, update_time_, tenant_id_)
+    original_amount_, create_time_, update_time_, tenant_id_,activity_name_,category_name_,num_)
     VALUE
     <foreach collection="calenderActivityList" item="entity" separator=",">
       (#{entity.activityId}, #{entity.calenderId}, #{entity.optionalFlag}, #{entity.actualAmount},
-      #{entity.originalAmount}, NOW(), NOW(),#{entity.tenantId})
+      #{entity.originalAmount}, NOW(), NOW(),#{entity.tenantId},#{entity.activityName},#{entity.categoryName},#{entity.num})
     </foreach>
   </insert>
   <delete id="delByCalenderId">

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

@@ -553,7 +553,7 @@
 	<resultMap id="MusicGroupPaymentCalenderDetailDto" type="com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderDetailDto" extends="MusicGroupPaymentCalenderDetail">
 	</resultMap>
 	<select id="queryDetailPage" resultMap="MusicGroupPaymentCalenderDetailDto">
-		SELECT mgpcd.user_id_,su.username_,st.name_ subject_names_,sr.music_group_status_,su.phone_,
+		SELECT mgpcd.id_,mgpcd.user_id_,su.username_,st.name_ subject_names_,sr.music_group_status_,su.phone_,
 		CASE WHEN mgpcd.start_payment_date_ IS NULL THEN mgpc.start_payment_date_ ELSE mgpcd.start_payment_date_ END start_payment_date_mgpc_,
 		CASE WHEN mgpcd.deadline_payment_date_ IS NULL THEN mgpc.deadline_payment_date_ ELSE mgpcd.deadline_payment_date_ END deadline_payment_date_mgpc_,
 		CASE WHEN mgpc.status_ = 'OPEN' OR mgpcd.open_ = 1 THEN 1 ELSE 0 END open_,mgpc.payment_type_,mgpcd.payment_order_id_,mgpcd.payment_status_,mgpcd.pay_time_

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

@@ -14,7 +14,7 @@
 
     <sql id="Base_Column_List">
         id_
-        , tenant_id_, course_id_, deduct_state_, amount_, created_by_, created_time_
+        , tenant_id_,course_id_, deduct_state_, amount_,created_by_, created_time_
     </sql>
 
     <select id="queryPage" parameterType="map" resultType="com.ym.mec.biz.dal.vo.TenantCloudCourseRecordVo">