Merge remote-tracking branch 'origin/master'

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

@@ -86,6 +86,9 @@ public class TeacherClassGroupDto {
     @ApiModelProperty(value = "是否已有报告")
     private Boolean hasReport=false;
 
+    @ApiModelProperty(value = "购买月数")
+    private Integer buyMonths;
+
     public Date getCourseStartDate() {
         return courseStartDate;
     }
@@ -285,4 +288,12 @@ public class TeacherClassGroupDto {
     public void setHasReport(Boolean hasReport) {
         this.hasReport = hasReport;
     }
+
+    public Integer getBuyMonths() {
+        return buyMonths;
+    }
+
+    public void setBuyMonths(Integer buyMonths) {
+        this.buyMonths = buyMonths;
+    }
 }

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

@@ -1078,7 +1078,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     }else {
                         teacherClassGroupDto.setStudyReportUrl(studyReportUrl + teacherClassGroupDto.getClassGroupId());
                     }
-                }else if(classGroupNoStartClassTimes.intValue()==0 && classGroupTeacherMap.get(teacherClassGroupDto.getClassGroupId().intValue()).equals(user.getId())){
+                }else if(teacherClassGroupDto.getBuyMonths() == null && classGroupNoStartClassTimes.intValue()==0 && classGroupTeacherMap.get(teacherClassGroupDto.getClassGroupId().intValue()).equals(user.getId())){
                    String studyReportUrl = sysConfigDao.findConfigValue(SysConfigService.TEACHER_STUDY_REPORT_URL);
                    teacherClassGroupDto.setStudyReportUrl(studyReportUrl+teacherClassGroupDto.getClassGroupId());
                }

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

@@ -201,7 +201,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             musicGroupService.renewForCallback(order);
         } else if (order.getType().equals(OrderTypeEnum.SPORADIC) || order.getType().equals(OrderTypeEnum.LUCK)) {
             sporadicChargeInfoService.renewForCallback(order);
-        } else if (order.getType().equals(OrderTypeEnum.PRACTICE_GROUP_BUY)) {
+        } else if (order.getType().equals(OrderTypeEnum.PRACTICE_GROUP_BUY) || order.getType().equals(OrderTypeEnum.PRACTICE_GROUP_RENEW)) {
             practiceGroupService.orderCallback(order);
         }
     }
@@ -234,7 +234,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                     musicGroupService.renewForCallback(order);
                 } else if (order.getType().equals(OrderTypeEnum.SPORADIC) || order.getType().equals(OrderTypeEnum.LUCK)) {
                     sporadicChargeInfoService.renewForCallback(order);
-                } else if (order.getType().equals(OrderTypeEnum.PRACTICE_GROUP_BUY)) {
+                } else if (order.getType().equals(OrderTypeEnum.PRACTICE_GROUP_BUY) || order.getType().equals(OrderTypeEnum.PRACTICE_GROUP_RENEW)) {
                     practiceGroupService.orderCallback(order);
                 }
             } catch (Exception e) {

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

@@ -493,6 +493,7 @@
         <result property="type" column="type_"/>
         <result property="courseStartDate" column="courses_start_date_"/>
         <result property="classMode" column="class_mode_"/>
+        <result property="buyMonths" column="buy_months_"/>
     </resultMap>
 
     <select id="findTeacherMusicClassGroup" resultMap="TeacherClassGroupDto">
@@ -537,7 +538,8 @@
             cg.total_class_times_,
             pg.id_ music_group_id_,
             pg.name_ music_group_name_,
-						1 class_mode_
+						1 class_mode_,
+            pg.buy_months_
         FROM
             practice_group pg
             LEFT JOIN class_group cg ON pg.id_=cg.music_group_id_ AND cg.group_type_='PRACTICE'