1.云教练激活添加校验已取消的记录

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CloudTeacherOrderDao.java

@@ -123,4 +123,6 @@ public interface CloudTeacherOrderDao extends BaseDAO<Long, CloudTeacherOrder> {
     int cancelInactiveCloudTeacher(@Param("idList") List<Long> idList, @Param("cancelReason") String cancelReason,
                                    @Param("operator") Integer operator, @Param("operateTime") Date operateTime,
                                    @Param("tenantId") Integer tenantId);
+
+    List<CloudTeacherOrder> queryCloudTeacherOrderByIds(@Param("ids") List<Integer> ids);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CloudTeacherOrder.java

@@ -78,10 +78,10 @@ public class CloudTeacherOrder {
     private Long operator;
 
     @ApiModelProperty(value = "操作时间")
-    private Long operateTime;
+    private Date operateTime;
 
     @ApiModelProperty(value = "取消原因")
-    private Long cancelReason;
+    private String cancelReason;
 
     private StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();
 

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

@@ -187,6 +187,10 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
             throw new Exception("存在已经支付完成的学生，请重新选择");
         }
         Integer tenantId = null;
+        List<CloudTeacherOrder> cloudTeacherOrders = cloudTeacherOrderDao.queryCloudTeacherOrderByIds(ids);
+        if (cloudTeacherOrders.stream().filter(next -> next.getStatus() == 4).collect(Collectors.toSet()).size() > 0) {
+            throw new Exception("存在已取消的学生，请重新选择");
+        }
         BigDecimal sumAmount = new BigDecimal(0);
         for (CloudTeacherStudent cts : cloudTeacherStudents) {
             if (cts.getAmount() == null) {

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

@@ -558,4 +558,12 @@
         </foreach>
         and status_ = 1 and tenant_id_ = #{tenantId}
     </update>
+
+    <select id="queryCloudTeacherOrderByIds" resultMap="CloudTeacherOrder">
+        select t.* from cloud_teacher_order t
+        where t.id_ in
+            <foreach collection="ids" item="item" close=")" open="(" separator=",">
+                #{item}
+            </foreach>
+    </select>
 </mapper>