Merge branch 'feature/1219_opt' of http://git.dayaedu.com/yonge/cooleshow into test

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherHomeController.java

@@ -166,20 +166,15 @@ public class TeacherHomeController extends BaseController {
         }
         List<TeacherIndexWrapper.StudentPracticeSummaryExportDto> list =
                 JSON.parseArray(JSON.toJSONString(teacherHomeStudent), TeacherIndexWrapper.StudentPracticeSummaryExportDto.class);
-        DateFormat dateFormat1 = new SimpleDateFormat("yyMMddHHmmss");
         Date date = new Date();
-        StringBuffer sb = new StringBuffer("/tmp/klx/studentPractice/");
-        sb.append(dateFormat1.format(date)).append("/练习记录")
+        StringBuffer sb = new StringBuffer("/tmp");
+        sb.append("/练习记录")
                 .append(studentSearch.getStartTime()).append("~")
                 .append(studentSearch.getEndTime()).append("_")
                 .append(studentSearch.getTeacherId()).append("_")
                 .append(System.currentTimeMillis()).append(".xlsx");
         String filePath = sb.toString();
         File srcFile = new File(filePath);
-        File directory = new File(filePath).getParentFile();
-        if (!directory.exists()) {
-            directory.mkdirs(); // 创建目录
-        }
         EasyExcel.write(filePath,TeacherIndexWrapper.StudentPracticeSummaryExportDto.class).sheet("学员练习统计").doWrite(list);
         //上传到oss
         DateFormat dateFormatOss = new SimpleDateFormat("yyyy/MM/dd");

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

@@ -560,8 +560,11 @@
 			left join music_sheet cg ON cg.id_ = ttar.biz_id_
 		</if>
 		where uo.status_ = 'PAID' AND ttar.in_or_out_ = 'IN'
-		AND DATE_FORMAT(uo.create_time_,'%Y-%m-%d') BETWEEN #{param.startTime} AND #{param.endTime} AND ttar.teacher_id_ = #{param.teacherId}
-		AND ttar.biz_type_ = #{param.type}
+		AND DATE_FORMAT(uo.create_time_,'%Y-%m-%d') BETWEEN #{param.startTime} AND #{param.endTime}
+		AND ttar.biz_type_ = #{param.type} AND ttar.teacher_id_ = #{param.teacherId}
+		<if test="param.type != 'MUSIC' and param.type != 'VIDEO'">
+			AND cg.status_ != 'CANCEL'
+		</if>
 		UNION ALL
 		select uo.user_id_ userId,COUNT(ucar.id_) bizQuantity,SUM(ucar.trans_amount_) amount,
 		       uo.create_time_ orderTime,
@@ -587,8 +590,11 @@
 			left join music_sheet cg ON cg.id_ = ucar.biz_id_
 		</if>
 		where uo.status_ = 'PAID' AND ucar.in_or_out_ = 'IN'
-		AND DATE_FORMAT(uo.create_time_,'%Y-%m-%d') BETWEEN #{param.startTime} AND #{param.endTime} AND ucar.account_id_ = #{param.teacherId}
-		AND ucar.biz_type_ = #{param.type}
+		AND DATE_FORMAT(uo.create_time_,'%Y-%m-%d') BETWEEN #{param.startTime} AND #{param.endTime}
+		AND ucar.biz_type_ = #{param.type} AND ucar.account_id_ = #{param.teacherId}
+		<if test="param.type != 'MUSIC' and param.type != 'VIDEO'">
+			AND cg.status_ != 'CANCEL'
+		</if>
 		group by ucar.order_no_
 		order by orderTime desc
 	</select>
@@ -597,14 +603,14 @@
 			select SUM(ttar.trans_amount_) amount
 			from tenant_teacher_account_record ttar
 			left join user_order uo ON uo.order_no_ = ttar.order_no_
-			where uo.status_ = 'PAID' AND ttar.in_or_out_ = 'IN'
+			where uo.status_ = 'PAID' AND ttar.in_or_out_ = 'IN' AND ttar.post_status_ != 'CANCEL'
 			  AND DATE_FORMAT(uo.create_time_,'%Y-%m-%d') BETWEEN #{param.startTime} AND #{param.endTime} AND ttar.teacher_id_ = #{param.teacherId}
 			  AND ttar.biz_type_ = #{param.type}
 			UNION ALL
 			select SUM(ucar.trans_amount_) amount
 			from user_cash_account_record ucar
 			left join user_order uo ON uo.order_no_ = ucar.order_no_
-			where uo.status_ = 'PAID' AND ucar.in_or_out_ = 'IN'
+			where uo.status_ = 'PAID' AND ucar.in_or_out_ = 'IN' AND ucar.post_status_ != 'CANCEL'
 			  AND DATE_FORMAT(uo.create_time_,'%Y-%m-%d') BETWEEN #{param.startTime} AND #{param.endTime} AND ucar.account_id_ = #{param.teacherId}
 			  AND ucar.biz_type_ = #{param.type}
 			) a

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

@@ -157,7 +157,7 @@
                DATE_FORMAT(uod.create_time_,#{groupBy}) 'date' from user_order_detail uod
         left join user_order uo ON uo.order_no_ = uod.order_no_
         left join course_group cg On cg.id_ = uod.biz_id_
-        where cg.teacher_id_ = #{param.teacherId} AND uo.status_ = 'PAID'
+        where cg.teacher_id_ = #{param.teacherId} AND uo.status_ = 'PAID' AND cg.status_ != 'CANCEL'
         AND DATE_FORMAT(uod.create_time_, '%Y-%m-%d') BETWEEN #{param.startTime} AND #{param.endTime}
         <if test="param.type != null and param.type != ''">
             and uod.good_type_ = #{param.type}