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

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

@@ -16,11 +16,10 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiFunction;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import com.ym.mec.biz.service.*;
-import com.ym.mec.common.tenant.TenantContextHolder;
+import javax.annotation.PostConstruct;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +27,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
@@ -65,30 +63,31 @@ import com.ym.mec.biz.dal.entity.MemberRankSetting;
 import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.biz.dal.entity.Student;
 import com.ym.mec.biz.dal.entity.StudentPreRegistration;
-import com.ym.mec.biz.dal.entity.StudentRegistration;
-import com.ym.mec.biz.dal.entity.SysConfig;
 import com.ym.mec.biz.dal.entity.SysUserCashAccount;
 import com.ym.mec.biz.dal.enums.FivePlusGradeEnum;
 import com.ym.mec.biz.dal.enums.GradeTypeEnum;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.PeriodEnum;
 import com.ym.mec.biz.dal.enums.SixPlusGradeEnum;
-import com.ym.mec.biz.dal.enums.StudentMusicGroupStatusEnum;
 import com.ym.mec.biz.dal.page.CloudTeacherActiveQueryInfo;
 import com.ym.mec.biz.dal.page.OrganCloudStudyStudentDataQueryInfo;
 import com.ym.mec.biz.dal.page.StudentQueryInfo;
+import com.ym.mec.biz.service.OrganizationService;
+import com.ym.mec.biz.service.StudentService;
+import com.ym.mec.biz.service.SysConfigService;
+import com.ym.mec.biz.service.SysMessageService;
+import com.ym.mec.biz.service.SysTenantConfigService;
 import com.ym.mec.common.constant.CommonConstants;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 
-import javax.annotation.PostConstruct;
-
 @Service
 public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implements StudentService {
 
@@ -182,12 +181,9 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         student.setSchoolName(studentPreRegistration.getSchool());
         student.setCurrentGradeNum(studentPreRegistration.getCurrentGradeNum());
         student.setCurrentClass(studentPreRegistration.getCurrentClass());
+        student.setTenantId(studentPreRegistration.getTeacherRecommandSubjectId());
         studentDao.insert(student);
         
-        if(user.getOrganId() == 59){
-        	updateMemberRank(userId, PeriodEnum.MONTH, 1, 1);
-        }
-        
         return true;
 	}
 

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

@@ -80,7 +80,7 @@ public class TenantAssetsInfoServiceImpl extends ServiceImpl<TenantAssetsInfoDao
             //计算总上课时间
             BigDecimal courseDate = getCourseDate(record.getClassDate(), record.getStartClassTime(), record.getEndClassTime());
             //课程总价 = 每分钟扣费标准 * 总上课时间
-            BigDecimal coursePrice = minutePrice.multiply(courseDate, new MathContext(2, RoundingMode.HALF_UP));
+            BigDecimal coursePrice = minutePrice.multiply(courseDate, new MathContext(3, RoundingMode.HALF_UP));
             //修改流水
             TenantCloudCourseRecord sourceCord = new TenantCloudCourseRecord();
             sourceCord.setId(record.getId());
@@ -133,7 +133,7 @@ public class TenantAssetsInfoServiceImpl extends ServiceImpl<TenantAssetsInfoDao
             //计算总上课时间
             BigDecimal courseDate = getCourseDate(course.getClassDate(), course.getStartClassTime(), course.getEndClassTime());
             //课程总价 = 每分钟扣费标准 * 总上课时间
-            BigDecimal coursePrice = minutePrice.multiply(courseDate, new MathContext(2, RoundingMode.HALF_UP));
+            BigDecimal coursePrice = minutePrice.multiply(courseDate, new MathContext(3, RoundingMode.HALF_UP));
             //写流水
             insertRecord(course, coursePrice, 1);
             log.info("deductAmount >>>>>> coursePrice {}  tenantId {}", coursePrice, course.getTenantId());

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

@@ -69,11 +69,12 @@
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="ChargeType" parameterType="map">
         SELECT ct.*,s.id_ subject_id_,s.name_ subject_name_
-        FROM (SELECT * FROM charge_type WHERE del_flag_ = 0 <include refid="global.limit"/>) ct
+        FROM charge_type ct
         LEFT JOIN charge_type_subject_mapper ctsm ON ct.id_ = ctsm.charge_type_id_
         LEFT JOIN `subject` s ON ctsm.subject_id_ = s.id_
-        where ct.tenant_id_ = #{tenantId}
+        where ct.tenant_id_ = #{tenantId} and ct.del_flag_ = 0
         ORDER BY ct.update_time_
+        <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->

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

@@ -1331,7 +1331,7 @@
         LEFT JOIN organization o ON o.id_ = su.organ_id_
         LEFT JOIN subject sb ON sb.id_ = s.subject_id_list_
         <where>
-        	su.tenant_id_ = #{tenantid}
+        	su.tenant_id_ = #{tenantId}
             <if test="studentIds != null and studentIds.size > 0">
                 AND s.user_id_ IN
                 <foreach collection="studentIds" separator="," item="studentId" open="(" close=")">
@@ -1355,7 +1355,7 @@
         SELECT count(s.user_id_) FROM student s
         LEFT JOIN sys_user su ON su.id_ = s.user_id_
         <where>
-        	su.tenant_id_ = #{tenantid}
+        	su.tenant_id_ = #{tenantId}
             <if test="studentIds != null and studentIds.size > 0">
                 AND s.user_id_ IN
                 <foreach collection="studentIds" separator="," item="studentId" open="(" close=")">