Merge branch 'musicGroup_reg_feature_5_8'

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

@@ -84,6 +84,12 @@ public class CloudTeacherOrder {
     private String remark = "";
 
     /**
+     * 备注
+     */
+    @ApiModelProperty(value = "版本")
+    private Integer version = 0;
+
+    /**
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间")

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

@@ -130,6 +130,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean quitCloudTeacherOrder(CloudTeacherOrder cloudOrder, BigDecimal refundAmount) {
         Date nowDate = new Date();
         if (cloudOrder.getStatus().equals(3)) {
@@ -138,6 +139,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         if (cloudOrder.getStatus().equals(2) && cloudOrder.getEndTime().compareTo(nowDate) <= 0) {
             throw new BizException("云教练已过服务期，不可退费");
         }
+        Integer oldStatus = cloudOrder.getStatus();
         cloudOrder.setStatus(3);
         cloudOrder.setRefundAmount(refundAmount);
         cloudOrder.setUpdateTime(nowDate);
@@ -145,7 +147,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
             throw new BizException("云教练退费处理失败，请重试");
         }
 
-        if (cloudOrder.getStatus().equals(1)) {
+        if (oldStatus.equals(1)) {
             return true;
         }
         int days = DateUtil.daysBetween(DateUtil.trunc(nowDate), cloudOrder.getEndTime());

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

@@ -1839,7 +1839,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                     }
                 }
                 amount = amount.add(maintenanceFee);
-                if (studentMaintenance != null) {
+                if (maintenanceFee.compareTo(BigDecimal.ZERO) > 0 && studentMaintenance != null) {
                     studentMaintenance.setDelFlag(1);
                     studentInstrumentDao.update(studentMaintenance);
                 }
@@ -1858,7 +1858,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                     }
                 }
                 amount = amount.add(cloudTeacherAmount);
-                if (studentCloudTeacherOrder != null) {
+                if (cloudTeacherAmount.compareTo(BigDecimal.ZERO) > 0 && studentCloudTeacherOrder != null) {
                     cloudTeacherOrderService.quitCloudTeacherOrder(studentCloudTeacherOrder, cloudTeacherAmount);
                 }
             }
@@ -2063,7 +2063,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 }
             }
             amount = amount.add(maintenanceFee);
-            if (studentMaintenance != null) {
+            if (maintenanceFee.compareTo(BigDecimal.ZERO) > 0 && studentMaintenance != null) {
                 studentMaintenance.setDelFlag(1);
                 studentInstrumentDao.update(studentMaintenance);
             }
@@ -2082,7 +2082,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 }
             }
             amount = amount.add(cloudTeacherAmount);
-            if (studentCloudTeacherOrder != null) {
+            if (cloudTeacherAmount.compareTo(BigDecimal.ZERO) > 0 && studentCloudTeacherOrder != null) {
                 cloudTeacherOrderService.quitCloudTeacherOrder(studentCloudTeacherOrder, cloudTeacherAmount);
             }
         }

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

@@ -17,6 +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="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="music_group_id_" property="musicGroupId"/>