Merge branch 'musicGroup_reg_feature_5_8'

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

@@ -110,12 +110,16 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
             cloudTeacher.setStartTime(startTime);
             cloudTeacher.setEndTime(endTime);
             cloudTeacher.setUpdateTime(nowDate);
-            cloudTeacherDao.update(cloudTeacher);
+            if (cloudTeacherDao.update(cloudTeacher) <= 0) {
+                throw new BizException("云教练有效期更新失败");
+            }
         }
         cloudTeacherOrder.setStartTime(endBaseTime);
         cloudTeacherOrder.setEndTime(endTime);
         cloudTeacherOrder.setStatus(2);
-        cloudTeacherOrderDao.update(cloudTeacherOrder);
+        if (cloudTeacherOrderDao.update(cloudTeacherOrder) <= 0) {
+            throw new BizException("云教练生效处理失败");
+        }
         return cloudTeacher;
     }
 

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

@@ -17,7 +17,7 @@
         <result column="end_time_" property="endTime"/>
         <result column="order_id_" property="orderId"/>
         <result column="remark_" property="remark"/>
-        <result column="remark_" property="remark"/>
+        <result column="version_" property="version"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="music_group_id_" property="musicGroupId"/>
@@ -84,9 +84,10 @@
             <if test="createTime != null">
                 create_time_ = #{createTime},
             </if>
+            version_ = version_+1,
             update_time_ = NOW(),
         </set>
-        where id_ = #{id}
+        where id_ = #{id} AND version_ = #{version}
     </update>
 
     <!-- 全查询 -->