Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

audio-analysis/src/main/java/com/yonge/audio/AudioAnalysisServerApplication.java

@@ -22,8 +22,12 @@ import com.yonge.audio.config.LocalFastJsonHttpMessageConverter;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients("com.yonge.cooleshow")
-@MapperScan("com.yonge.cooleshow.biz.dal.dao")
-@ComponentScan(basePackages = {"com.yonge.netty", "com.yonge.cooleshow.auth", "com.yonge.cooleshow.biz", "com.yonge.cooleshow.common", "com.yonge.cooleshow.common.security","com.yonge.toolset.thirdparty" })
+@MapperScan(basePackages = {"com.yonge.cooleshow.biz.dal.dao", "com.yonge.toolset.payment.core.dao"})
+@ComponentScan(basePackages = {
+		"com.yonge.netty",  "com.yonge.cooleshow.auth", "com.yonge.cooleshow.biz",
+		"com.yonge.cooleshow.common", "com.yonge.cooleshow.common.security",
+		"com.yonge.toolset.thirdparty", "com.yonge.toolset.payment"
+})
 @Configuration
 @EnableSwagger2Doc
 public class AudioAnalysisServerApplication {

audio-analysis/src/main/resources/logback-spring.xml

@@ -30,6 +30,14 @@
 	<logger name="com.yonge" level="info" />
 
 	<!--开发环境:打印控制台 -->
+	<springProfile name="local">
+		<root level="dev">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+
+	<!--开发环境:打印控制台 -->
 	<springProfile name="dev">
 		<root level="dev">
 			<appender-ref ref="stdout" />

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseScheduleServiceImpl.java

@@ -102,6 +102,8 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
     private CourseScheduleRecordDao recordDao;
     @Autowired
     private ImGroupService imGroupService;
+    @Autowired
+    private ImUserFriendService imUserFriendService;
 
     @Override
     public CourseScheduleDao getDao() {
@@ -1027,6 +1029,8 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         BigDecimal practiceServiceRate = new BigDecimal(practiceServiceRateStr).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
 
         //写course_schedule_teacher_salary
+        Long teacherId = null;
+        Long studentId = null;
         Date now = new Date();
         List<CourseScheduleTeacherSalary> teacherSalaryList = new ArrayList<>();
         for (CourseScheduleStudentPaymentVo payment : paymentList) {
@@ -1047,10 +1051,22 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
             teacherSalary.setStatus(TeacherSalaryEnum.NOT_START.getCode());
             teacherSalaryList.add(teacherSalary);
             teacherSalary.setCreateTime(now);
+
+            teacherId=payment.getTeacherId();
+            studentId=payment.getUserId();
         }
         courseScheduleTeacherSalaryService.getDao().insertBatch(teacherSalaryList);
         log.info("buyPracticeCourseSuccess ok");
 
+        Set<Long> studentIds=new HashSet();
+        studentIds.add(studentId);
+        try {
+            imUserFriendService.saveUserFriend(teacherId,studentIds);
+            log.info("保存用户通讯录成功,teacherId:{},studentIds:{}",teacherId,studentIds);
+        }catch (Exception e){
+            log.error("保存用户通讯录失败,teacherId:{},studentIds:{},e:{}",teacherId,studentIds,e);
+        }
+
         //消息推送
         try {
             practiceSend(paymentList.get(0).getTeacherId(), orderParam.getUserId(), paymentList.size() + "", orderNo);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MyCourseVo.java

@@ -53,6 +53,28 @@ public class MyCourseVo implements Serializable {
     @ApiModelProperty(value = "签到时间")
     private String signInTime;
 
+    @ApiModelProperty(value = "学生评价 0:未评价 1:已评价")
+    private Integer studentReplied;
+
+    @ApiModelProperty(value = "老师评价 0:未评价 1:已评价")
+    private Integer teacherReplied;
+
+    public Integer getStudentReplied() {
+        return studentReplied;
+    }
+
+    public void setStudentReplied(Integer studentReplied) {
+        this.studentReplied = studentReplied;
+    }
+
+    public Integer getTeacherReplied() {
+        return teacherReplied;
+    }
+
+    public void setTeacherReplied(Integer teacherReplied) {
+        this.teacherReplied = teacherReplied;
+    }
+
     public String getRealName() {
         return realName;
     }

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -183,12 +183,15 @@
             g.subject_id_ AS subjectId,
             sb.name_ AS subjectName,
             p.course_id_ AS courseId,
-            p.course_group_id_ AS courseGoupId
+            p.course_group_id_ AS courseGoupId,
+            (r.student_replied_ IS NOT NULL) AS studentReplied,
+            (r.teacher_replied_ IS NOT NULL) AS teacherReplied
         FROM course_schedule_student_payment p
         LEFT JOIN sys_user u ON p.user_id_ =u.id_
         LEFT JOIN course_schedule cs ON p.course_id_=cs.id_
         LEFT JOIN course_group g ON p.course_group_id_ = g.id_
         LEFT JOIN `subject` sb ON g.subject_id_=sb.id_
+        LEFT JOIN course_schedule_replied r ON cs.id_=r.course_schedule_id_
         WHERE p.course_id_ IN
         (SELECT s.id_ FROM course_schedule s WHERE s.type_='PRACTICE' AND lock_=0 AND s.teacher_id_=#{param.teacherId})
         <if test="param.status !=null and param.status !=''">