Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_0810

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

@@ -7,9 +7,20 @@ public class NameDto {
 
     private String name;
 
+    @ApiModelProperty(value = "头像",required = false)
+    private String avatar;
+
     @ApiModelProperty(value = "1 单人, 3 群组",required = false)
     private Integer type;
 
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
     public String getId() {
         return id;
     }

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

@@ -1326,7 +1326,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             salary = baseSalary.multiply(classTimeDuty).setScale(2, BigDecimal.ROUND_HALF_UP);
 
             //基础技能提高课
-            /*if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.HIGH)) {
+            if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.HIGH)) {
                 salary = TeachTypeEnum.BISHOP.equals(courseScheduleTeacherSalary.getTeacherRole()) ? teacherDefaultMusicGroupSalary.getMainTeacher30MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher30MinSalary();
                 if (settlementType.equals(SalarySettlementTypeEnum.GRADIENT_SALARY)) {
                     salary = TeachTypeEnum.BISHOP.equals(courseScheduleTeacherSalary.getTeacherRole()) ? teacherDefaultMusicGroupSalary.getMainTeacher90MinSalary() : teacherDefaultMusicGroupSalary.getAssistantTeacher90MinSalary();
@@ -1338,10 +1338,13 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 if(studentNum<=0){
                     studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(courseSchedule.getClassGroupId());
                 }
+                if(studentNum>5){
+                    studentNum=5;
+                }
                 salary = salary.multiply(new BigDecimal(studentNum));
-            }*/
+            }
             //线上小班课
-            if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.HIGH_ONLINE) || courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.HIGH)) {
+            if (courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.HIGH_ONLINE)) {
                 int studentNum = courseScheduleStudentPaymentDao.countCourseOnlyStudentNum(courseSchedule.getId());
                 if(studentNum<=0){
                     studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(courseSchedule.getClassGroupId());

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

@@ -220,11 +220,13 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
     }
 
     //开通成功
+    @Transactional(rollbackFor = Exception.class)
     private void open(TenantOrderRecord record) {
         tenantInfoService.tenantOpenSuccess(record.getTenantId());
     }
 
     //续费成功
+    @Transactional(rollbackFor = Exception.class)
     private void renew(TenantOrderRecord record) {
         //机构产品信息
         TenantProductInfo productInfo = tenantProductInfoService.getOne(new WrapperUtil<TenantProductInfo>()
@@ -438,6 +440,7 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
      * 机构相关支付-回调
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public String callback(HttpServletRequest request) {
         // 验签请参data
         String data = request.getParameter("data");

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

@@ -123,8 +123,12 @@
 		<result property="id" column="id_" />
 		<result property="name" column="name_" />
 		<result property="type" column="type_"/>
+		<result property="avatar" column="avatar_"/>
 	</resultMap>
     <select id="queryNameByIds" resultMap="NameDto">
-		select friend_id_ id_,friend_nickname_ name_,1 type_ from im_user_friend where user_id_ = #{userId} and find_in_set(friend_id_,#{ids})
+		select iuf.friend_id_ id_,iuf.friend_nickname_ name_,1 type_,su.avatar_
+		from im_user_friend iuf
+		left join sys_user su on iuf.friend_id_ = su.id_
+		where iuf.user_id_ = #{userId} and find_in_set(friend_id_,#{ids})
 	</select>
 </mapper>

mec-web/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-    <property name="LOG_HOME" value="/Users/chenxiaoyu/Documents/logs/web-%d{yyyy-MM-dd_HH}-%i.log"/>
+    <property name="LOG_HOME" value="/mdata/logs/web-%d{yyyy-MM-dd_HH}-%i.log"/>
     <property name="CONSOLE_LOG_PATTERN"
               value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n"/>
 
@@ -30,7 +30,7 @@
     <appender name="messagefile"
               class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>/Users/chenxiaoyu/Documents/logs/web-message-%d{yyyy-MM-dd_HH}-%i.log</FileNamePattern>
+            <FileNamePattern>/mdata/logs/web-message-%d{yyyy-MM-dd_HH}-%i.log</FileNamePattern>
             <MaxHistory>90</MaxHistory>
             <TimeBasedFileNamingAndTriggeringPolicy
                     class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
@@ -46,7 +46,7 @@
     <appender name="liveFile"
               class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>/Users/chenxiaoyu/Documents/logs/web-live-%d{yyyy-MM-dd_HH}-%i.log</FileNamePattern>
+            <FileNamePattern>/mdata/logs/web-live-%d{yyyy-MM-dd_HH}-%i.log</FileNamePattern>
             <MaxHistory>90</MaxHistory>
             <TimeBasedFileNamingAndTriggeringPolicy
                     class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">