yonge пре 6 часа
родитељ
комит
8953e676d5

+ 7 - 0
mec-application/src/main/java/com/ym/mec/web/controller/MusicGroupQuitController.java

@@ -38,6 +38,8 @@ public class MusicGroupQuitController extends BaseController {
     @Autowired
     private StudentRegistrationService studentRegistrationService;
     @Autowired
+    private com.ym.mec.biz.service.impl.MusicGroupMemberRefundService musicGroupMemberRefundService;
+    @Autowired
     private SysUserService sysUserService;
     @Autowired
     private StudentInstrumentDao studentInstrumentDao;
@@ -116,6 +118,11 @@ public class MusicGroupQuitController extends BaseController {
         } else {
         	musicGroupQuit.setReturnFeeDto(JsonUtil.parseObject(musicGroupQuit.getFeeJson(), MusicGroupReturnFeeDto.class));
         }
+        // 待审核金额按当前剩余天数展示;已处理申请保留当时的退款金额。
+        if (musicGroupQuit.getStatus() == ApprovalStatus.PROCESSING) {
+            musicGroupQuit.getReturnFeeDto().setMemberFee(musicGroupMemberRefundService.quote(
+                    musicGroupQuit.getUserId(), musicGroupQuit.getMusicGroupId(), musicGroupQuit.getTenantId()));
+        }
         return succeed(musicGroupQuit);
     }
     

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

@@ -16,6 +16,20 @@ import java.util.Map;
 import java.util.Set;
 
 public interface CloudTeacherOrderDao extends BaseDAO<Long, CloudTeacherOrder> {
+
+    List<CloudTeacherOrder> findQuitMemberOrders(@Param("studentId") Integer studentId,
+            @Param("musicGroupId") String musicGroupId, @Param("tenantId") Integer tenantId,
+            @Param("lock") boolean lock);
+
+    List<CloudTeacherOrder> lockActiveMemberOrders(@Param("studentId") Integer studentId,
+            @Param("tenantId") Integer tenantId);
+
+    int refundForMusicGroupQuit(@Param("order") CloudTeacherOrder order,
+            @Param("refund") BigDecimal refund, @Param("operatorId") Integer operatorId,
+            @Param("reason") String reason);
+
+    int shiftAfterMusicGroupQuit(@Param("order") CloudTeacherOrder order,
+            @Param("startTime") Date startTime, @Param("endTime") Date endTime);
 	
 	/**
 	 * 根据studentPaymentOrder表id查询对象
@@ -101,6 +115,8 @@ public interface CloudTeacherOrderDao extends BaseDAO<Long, CloudTeacherOrder> {
 
     List<CloudTeacherOrder> findByPlatformOrderId(Integer id);
 
+    int activatePendingOrder(CloudTeacherOrder order);
+
     int checkOrdered(@Param("cloudTeacherStudentIds")String join);
     
     List<CloudTeacherOrder> queryByUserIdAndStatus(@Param("userId")Integer userId, @Param("status")Integer status);
@@ -137,4 +153,4 @@ public interface CloudTeacherOrderDao extends BaseDAO<Long, CloudTeacherOrder> {
     List<Integer> getActivationVipIds(Integer userId);
 
     List<CloudTeacherOrder> queryByUserIds(@Param("userIds") List<Integer> userIds, @Param("status") Integer status);
-}
+}

+ 2 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupQuitDao.java

@@ -11,6 +11,8 @@ import java.util.Set;
 
 public interface MusicGroupQuitDao extends BaseDAO<Long, MusicGroupQuit> {
 
+    MusicGroupQuit lockForApprove(@Param("id") Long id);
+
     /**
      * @param musicGroupId: 乐团编号
      * @return int

+ 13 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentMemberTimeDao.java

@@ -2,8 +2,21 @@ package com.ym.mec.biz.dal.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ym.mec.biz.dal.entity.StudentMemberTime;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+import java.util.Date;
+import java.util.List;
 
 public interface StudentMemberTimeDao extends BaseMapper<StudentMemberTime> {
 
+    @Select("SELECT id_ AS id, student_id_ AS studentId, member_rank_id_ AS memberRankId, "
+            + "end_time_ AS endTime FROM student_member_time WHERE student_id_ = #{studentId} ORDER BY id_ FOR UPDATE")
+    List<StudentMemberTime> lockForQuit(@Param("studentId") Integer studentId);
+
+    @Update("UPDATE student_member_time SET end_time_ = #{endTime} WHERE id_ = #{record.id} "
+            + "AND student_id_ = #{record.studentId} AND end_time_ = #{record.endTime}")
+    int deductForQuit(@Param("record") StudentMemberTime record, @Param("endTime") Date endTime);
+
 }
 

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

@@ -210,8 +210,8 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         }
         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("存在已取消的学生,请重新选择");
+        if (cloudTeacherOrders.stream().anyMatch(order -> !Integer.valueOf(1).equals(order.getStatus()))) {
+            throw new Exception("仅可激活待激活的学练宝订单,请刷新后重新选择");
         }
         BigDecimal sumAmount = new BigDecimal(0);
         for (CloudTeacherStudent cts : cloudTeacherStudents) {
@@ -289,6 +289,8 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         if(autoActivationFlag){
             Date date = new Date();
             for (Integer userId : userIds) {
+                // 每个学员新建订单,不能沿用上一笔 insert 回填的主键。
+                cloudTeacherOrder.setId(null);
                 cloudTeacherOrder.setStudentId(userId);
                 this.activationMember(date,cloudTeacherOrder);
             }
@@ -369,7 +371,9 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         if(Objects.isNull(cloudTeacherOrder.getId())){
             cloudTeacherOrderDao.insert(cloudTeacherOrder);
         }else {
-            cloudTeacherOrderDao.update(cloudTeacherOrder);
+            if (cloudTeacherOrderDao.activatePendingOrder(cloudTeacherOrder) != 1) {
+                throw new BizException("学练宝订单状态已变化,请刷新后重试");
+            }
         }
         //保存学员会员时间
         studentMemberTimeService.saveToCloudTeacherOrder(cloudTeacherOrder);

+ 165 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupMemberRefundService.java

@@ -0,0 +1,165 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.biz.dal.dao.CloudTeacherOrderDao;
+import com.ym.mec.biz.dal.dao.StudentDao;
+import com.ym.mec.biz.dal.dao.StudentMemberTimeDao;
+import com.ym.mec.biz.dal.dao.StudentMemberUpdateLogDao;
+import com.ym.mec.biz.dal.entity.CloudTeacherOrder;
+import com.ym.mec.biz.dal.entity.StudentMemberTime;
+import com.ym.mec.biz.dal.entity.StudentMemberUpdateLog;
+import com.ym.mec.biz.dal.enums.PeriodEnum;
+import com.ym.mec.common.exception.BizException;
+import com.ym.mec.util.date.DateUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/** 退团会员退款与时长回收,与退团共用事务;退款流水仍由退团流程生成。 */
+@Service
+public class MusicGroupMemberRefundService {
+    @Autowired private CloudTeacherOrderDao cloudTeacherOrderDao;
+    @Autowired private StudentMemberTimeDao studentMemberTimeDao;
+    @Autowired private StudentMemberUpdateLogDao studentMemberUpdateLogDao;
+    @Autowired private StudentDao studentDao;
+
+    public BigDecimal quote(Integer studentId, String groupId, Integer tenantId) {
+        return total(calculate(cloudTeacherOrderDao.findQuitMemberOrders(studentId, groupId, tenantId, false), new Date()));
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public BigDecimal refund(Integer studentId, String groupId, Integer tenantId, Integer operatorId,
+                             Long quitId, BigDecimal quotedAmount) {
+        // 先锁定全部订单,再锁会员汇总,避免退本团时误删其他团或自行购买的权益。
+        List<CloudTeacherOrder> active = cloudTeacherOrderDao.lockActiveMemberOrders(studentId, tenantId);
+        Date now = new Date();
+        LocalDate today = day(now);
+        List<Refund> refunds = calculate(cloudTeacherOrderDao.findQuitMemberOrders(studentId, groupId, tenantId, true), now);
+        BigDecimal amount = total(refunds);
+        if (quotedAmount == null || quotedAmount.compareTo(amount) != 0) {
+            throw new BizException("会员可退金额已变化,请重新打开退团申请核实后提交");
+        }
+        List<StudentMemberTime> times = studentMemberTimeDao.lockForQuit(studentId);
+        Map<Integer, List<Refund>> byLevel = refunds.stream().filter(r -> r.days > 0)
+                .collect(Collectors.groupingBy(r -> r.order.getLevel()));
+        Set<Long> refundedIds = refunds.stream().map(r -> r.order.getId()).collect(Collectors.toSet());
+        for (Map.Entry<Integer, List<Refund>> entry : byLevel.entrySet()) {
+            Integer level = entry.getKey();
+            List<StudentMemberTime> matches = times.stream().filter(t -> Objects.equals(level, t.getMemberRankId())).collect(Collectors.toList());
+            if (matches.size() != 1 || matches.get(0).getEndTime() == null) {
+                throw new BizException("会员时长记录异常,请核实后再退会员");
+            }
+            StudentMemberTime time = matches.get(0);
+            List<CloudTeacherOrder> timeline = active.stream().filter(o -> Integer.valueOf(2).equals(o.getStatus())
+                    && Objects.equals(level, o.getLevel())).sorted(Comparator.comparing(CloudTeacherOrder::getStartTime,
+                    Comparator.nullsLast(Comparator.naturalOrder()))).collect(Collectors.toList());
+            Date previousEnd = null;
+            for (CloudTeacherOrder order : timeline) {
+                if (order.getStartTime() == null || order.getEndTime() == null) {
+                    throw new BizException("会员订单服务日期缺失,请核实后再退会员");
+                }
+                if (!day(order.getEndTime()).isAfter(today)) continue;
+                if (order.getEndTime().after(time.getEndTime())
+                        || (previousEnd != null && order.getStartTime().before(previousEnd))) {
+                    // 手工扣时未关联订单,不能推断被扣的是哪一笔订单,更不能多退款。
+                    throw new BizException("会员订单与当前时长不一致,请核实历史时长调整后再退会员");
+                }
+                previousEnd = order.getEndTime();
+            }
+            int days = entry.getValue().stream().mapToInt(r -> r.days).sum();
+            Date newEnd = DateUtil.addDays(time.getEndTime(), -days);
+            if (day(newEnd).isBefore(today)) {
+                throw new BizException("会员剩余时长不足,请核实后再退会员");
+            }
+            if (studentMemberTimeDao.deductForQuit(time, newEnd) != 1) {
+                throw new BizException("会员时长已变化,请刷新后重试");
+            }
+            for (CloudTeacherOrder order : timeline) {
+                if (refundedIds.contains(order.getId())) continue;
+                int shift = entry.getValue().stream().filter(r -> !order.getStartTime().before(r.order.getEndTime()))
+                        .mapToInt(r -> r.days).sum();
+                if (shift > 0 && cloudTeacherOrderDao.shiftAfterMusicGroupQuit(order,
+                        DateUtil.addDays(order.getStartTime(), -shift), DateUtil.addDays(order.getEndTime(), -shift)) != 1) {
+                    throw new BizException("会员订单已变化,请刷新后重试");
+                }
+            }
+            StudentMemberUpdateLog log = new StudentMemberUpdateLog();
+            log.setStudentId(studentId);
+            log.setOperatorId(operatorId);
+            log.setLevel(level);
+            log.setType(PeriodEnum.DAY);
+            log.setTime(days);
+            log.setBuyType(3);
+            log.setOldEndTime(time.getEndTime());
+            log.setNewEndTime(newEnd);
+            log.setCreateTime(new Date());
+            log.setMemo("退团申请" + quitId + ",会员订单:" + entry.getValue().stream()
+                    .map(r -> r.order.getId().toString()).collect(Collectors.joining(",")));
+            studentMemberUpdateLogDao.insert(log);
+        }
+        for (Refund refund : refunds) {
+            if (cloudTeacherOrderDao.refundForMusicGroupQuit(refund.order, refund.amount, operatorId,
+                    "退团申请" + quitId + ",乐团" + groupId) != 1) {
+                throw new BizException("会员订单已退或已变化,请刷新后重试");
+            }
+        }
+        if (!byLevel.isEmpty()) studentDao.updateCloudTeacherEndTime(studentId);
+        return amount;
+    }
+
+    static List<Refund> calculate(List<CloudTeacherOrder> orders, Date now) {
+        List<Refund> result = new ArrayList<>();
+        LocalDate today = day(now);
+        for (CloudTeacherOrder order : orders) {
+            if (order.getAmount() == null || order.getAmount().signum() <= 0
+                    || (!Integer.valueOf(1).equals(order.getStatus()) && !Integer.valueOf(2).equals(order.getStatus()))) continue;
+            if (order.getRefundAmount() != null && order.getRefundAmount().signum() > 0) {
+                throw new BizException("会员订单已有退款记录,请核实后再退会员");
+            }
+            if (Integer.valueOf(1).equals(order.getStatus())) {
+                result.add(new Refund(order, 0, order.getAmount().setScale(2, RoundingMode.DOWN)));
+                continue;
+            }
+            if (order.getStartTime() == null || order.getEndTime() == null || order.getLevel() == null) {
+                throw new BizException("会员订单服务日期或版本缺失,请核实后再退会员");
+            }
+            LocalDate start = day(order.getStartTime());
+            LocalDate end = day(order.getEndTime());
+            long totalDays = ChronoUnit.DAYS.between(start, end);
+            if (totalDays <= 0) throw new BizException("会员订单服务日期异常,请核实后再退会员");
+            // 与会员激活相同的自然日边界,结束日不计入服务天数;未开始的订单全额退。
+            long remaining = ChronoUnit.DAYS.between(start.isAfter(today) ? start : today, end);
+            if (remaining <= 0) continue;
+            BigDecimal refund = order.getAmount().multiply(BigDecimal.valueOf(remaining))
+                    .divide(BigDecimal.valueOf(totalDays), 2, RoundingMode.DOWN);
+            result.add(new Refund(order, Math.toIntExact(remaining), refund));
+        }
+        return result;
+    }
+
+    private static LocalDate day(Date date) {
+        return new java.util.Date(date.getTime()).toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+    }
+
+    private static BigDecimal total(List<Refund> refunds) {
+        return refunds.stream().map(r -> r.amount).reduce(BigDecimal.ZERO, BigDecimal::add);
+    }
+
+    static class Refund {
+        final CloudTeacherOrder order;
+        final int days;
+        final BigDecimal amount;
+        Refund(CloudTeacherOrder order, int days, BigDecimal amount) {
+            this.order = order;
+            this.days = days;
+            this.amount = amount;
+        }
+    }
+}

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

@@ -157,6 +157,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     @Autowired
     private StudentRegistrationService studentRegistrationService;
     @Autowired
+    private MusicGroupMemberRefundService musicGroupMemberRefundService;
+    @Autowired
     private SporadicChargeInfoDao sporadicChargeInfoDao;
     @Autowired
     private MusicGroupSubjectGoodsGroupService musicGroupSubjectGoodsGroupService;
@@ -2284,6 +2286,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }*/
 
         musicGroupQuit = new MusicGroupQuit();
+        musicGroupQuit.setOperatorId(operatorId);
         musicGroupQuit.setCreateTime(new Date());
         musicGroupQuit.setJoinDate(studentRegistration.getCreateTime());
         musicGroupQuit.setMusicGroupId(musicGroupId);
@@ -2295,6 +2298,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
         MusicGroupReturnFeeDto returnFeeDto = reqMusicGroupQuit.getReturnFeeDto();
         if (returnFeeDto != null) {
+            if (Boolean.TRUE.equals(returnFeeDto.getIsReturnMemberFee())) {
+                returnFeeDto.setMemberFee(musicGroupMemberRefundService.quote(userId, musicGroupId, musicGroup.getTenantId()));
+            }
             musicGroupQuit.setFeeJson(JsonUtil.toJSONString(returnFeeDto));
             musicGroupQuit.setReturnFeeDto(returnFeeDto);
         }
@@ -2435,10 +2441,13 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         String reason = reqMusicGroupQuit.getReason();
         MusicGroupReturnFeeDto returnFeeDto = reqMusicGroupQuit.getReturnFeeDto();
 
-        MusicGroupQuit musicGroupQuit = musicGroupQuitDao.get(id);
+        MusicGroupQuit musicGroupQuit = musicGroupQuitDao.lockForApprove(id);
         if (musicGroupQuit == null) {
             throw new BizException("数据不存在");
         }
+        if (musicGroupQuit.getStatus() == APPROVED) {
+            throw new BizException("该退团申请已生效,请勿重复操作");
+        }
 
         Date date = new Date();
 
@@ -2517,9 +2526,29 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
         BigDecimal returnTotalFee = BigDecimal.ZERO;
 
+        // 批量审核仅提交申请编号、状态和理由。沿用申请中保存的退费选择。
+        boolean useSavedFees = returnFeeDto == null && StringUtils.isNotBlank(musicGroupQuit.getFeeJson());
+        if (useSavedFees) {
+            returnFeeDto = JsonUtil.parseObject(musicGroupQuit.getFeeJson(), MusicGroupReturnFeeDto.class);
+            if (returnFeeDto == null) {
+                throw new BizException("退团申请的退费明细无法读取,请核实后再审核");
+            }
+        }
         if (returnFeeDto == null) {
             returnFeeDto = new MusicGroupReturnFeeDto();
         }
+        if (Boolean.TRUE.equals(returnFeeDto.getIsReturnMemberFee())) {
+            if (status == APPROVED) {
+                if (useSavedFees) {
+                    returnFeeDto.setMemberFee(musicGroupMemberRefundService.quote(userId, musicGroupId, musicGroup.getTenantId()));
+                }
+                returnFeeDto.setMemberFee(musicGroupMemberRefundService.refund(userId, musicGroupId,
+                        musicGroup.getTenantId(), reqMusicGroupQuit.getOperatorId(), id, returnFeeDto.getMemberFee()));
+            } else if (status == PROCESSING) {
+                returnFeeDto.setMemberFee(musicGroupMemberRefundService.quote(userId, musicGroupId, musicGroup.getTenantId()));
+            }
+            returnTotalFee = returnTotalFee.add(returnFeeDto.getMemberFee());
+        }
         musicGroupQuit.setFeeJson(JsonUtil.toJSONString(returnFeeDto));
         if (returnFeeDto.getIsReturnAccessoriesFee()) {
             returnTotalFee = returnTotalFee.add(returnFeeDto.getAccessoriesFee());

+ 3 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -56,6 +56,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Autowired
     private StudentRegistrationDao studentRegistrationDao;
     @Autowired
+    private MusicGroupMemberRefundService musicGroupMemberRefundService;
+    @Autowired
     private StudentPaymentOrderService studentPaymentOrderService;
     @Autowired
     private StudentPaymentOrderDetailService studentPaymentOrderDetailService;
@@ -410,6 +412,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         //未上课*0995手续费、以上课*0.8
         List<StudentCourseInfoDto> history = courseScheduleDao.findUserCourseInfos(GroupType.MUSIC, musicGroupId, studentId, "history");
         map.put(OrderDetailTypeEnum.COURSE.getCode(), sysUserCashAccountLogService.musicReturnFeeCharges(studentRegistration.getSurplusCourseFee(), history.size()));
+        map.put(CLOUD_TEACHER.getCode(), musicGroupMemberRefundService.quote(studentId, musicGroupId, studentRegistration.getTenantId()));
         return map;
     }
 

+ 3 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantOrderRecordServiceImpl.java

@@ -227,6 +227,9 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
         record.setPayTime(now);
         updateById(record);
         List<CloudTeacherOrder> cloudTeacherOrders = cloudTeacherOrderDao.findByPlatformOrderId(record.getId());
+        if (cloudTeacherOrders.isEmpty()) {
+            return;
+        }
         for (CloudTeacherOrder cto : cloudTeacherOrders) {
             //激活团练宝
             cloudTeacherOrderService.activationMember(now, cto);

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

@@ -53,6 +53,39 @@
         <result column="music_group_id_" property="studentPaymentOrder.musicGroupId"/>
     </resultMap>
 
+    <select id="findQuitMemberOrders" resultMap="CloudTeacherOrder">
+        SELECT cto.* FROM cloud_teacher_order cto
+        INNER JOIN student_payment_order spo ON spo.id_ = cto.order_id_
+            AND spo.user_id_ = cto.student_id_ AND spo.tenant_id_ = cto.tenant_id_
+        WHERE cto.student_id_ = #{studentId} AND cto.tenant_id_ = #{tenantId}
+            AND spo.music_group_id_ = #{musicGroupId} AND spo.status_ = 'SUCCESS'
+            AND (cto.music_group_id_ IS NULL OR cto.music_group_id_ = #{musicGroupId})
+            AND cto.status_ IN (1,2) AND cto.amount_ &gt; 0
+        ORDER BY cto.id_
+        <if test="lock">FOR UPDATE</if>
+    </select>
+
+    <select id="lockActiveMemberOrders" resultMap="CloudTeacherOrder">
+        SELECT * FROM cloud_teacher_order
+        WHERE student_id_ = #{studentId} AND tenant_id_ = #{tenantId} AND status_ IN (1,2)
+        ORDER BY id_ FOR UPDATE
+    </select>
+
+    <update id="refundForMusicGroupQuit">
+        UPDATE cloud_teacher_order SET status_ = 3, refund_amount_ = #{refund},
+            operator_ = #{operatorId}, operate_time_ = NOW(), cancel_reason_ = #{reason},
+            version_ = COALESCE(version_,0) + 1, update_time_ = NOW()
+        WHERE id_ = #{order.id} AND tenant_id_ = #{order.tenantId}
+            AND status_ = #{order.status} AND COALESCE(version_,0) = COALESCE(#{order.version},0)
+    </update>
+
+    <update id="shiftAfterMusicGroupQuit">
+        UPDATE cloud_teacher_order SET start_time_ = #{startTime}, end_time_ = #{endTime},
+            version_ = COALESCE(version_,0) + 1, update_time_ = NOW()
+        WHERE id_ = #{order.id} AND tenant_id_ = #{order.tenantId}
+            AND status_ = 2 AND COALESCE(version_,0) = COALESCE(#{order.version},0)
+    </update>
+
     <select id="get" resultMap="CloudTeacherOrder">
         select * from cloud_teacher_order where id_ = #{id}
     </select>
@@ -126,11 +159,20 @@
     </update>
 
     <select id="findByPlatformOrderId" resultMap="CloudTeacherOrder">
-        select * from cloud_teacher_order cto
+        select cto.* from cloud_teacher_order cto
         left join sys_user su on cto.student_id_ = su.id_
-        where cto.platform_order_id_ = #{platformOrderId} and su.del_flag_ = '0'
+        where cto.platform_order_id_ = #{platformOrderId} and su.del_flag_ = '0' and cto.status_ = 1
+        order by cto.id_ for update
     </select>
 
+    <update id="activatePendingOrder">
+        update cloud_teacher_order
+        set status_ = 2, start_time_ = #{startTime}, end_time_ = #{endTime},
+            version_ = coalesce(version_, 0) + 1, update_time_ = now()
+        where id_ = #{id} and tenant_id_ = #{tenantId} and status_ = 1
+            and coalesce(version_, 0) = coalesce(#{version}, 0)
+    </update>
+
     <resultMap type="com.ym.mec.biz.dal.dto.Mapper" id="mapper">
         <result column="userId" property="key"/>
         <result column="phone" property="value"/>
@@ -140,7 +182,7 @@
         select su.id_ as userId, su.phone_ as phone,mrs.name_ type from cloud_teacher_order cto
         left join member_rank_setting mrs ON mrs.id_ = cto.level_
         left join sys_user su on cto.student_id_ = su.id_
-        where platform_order_id_ = #{platformOrderId} and su.del_flag_ = '0' and cto.send_sms_flag_ = 1
+        where platform_order_id_ = #{platformOrderId} and su.del_flag_ = '0' and cto.send_sms_flag_ = 1 and cto.status_ = 2
     </select>
 
     <update id="updateOrderStatusOK">
@@ -153,7 +195,7 @@
          when type_ = 4 then concat(date_add(CURRENT_DATE(), interval `time_` * 6 month) , ' 00:00:00')
          when type_ = 5 then concat(date_add(CURRENT_DATE(), interval `time_` year) , ' 00:00:00')
         end
-        where platform_order_id_ = #{platformOrderId}
+        where platform_order_id_ = #{platformOrderId} and status_ = 1
     </update>
     <update id="updateOrderId">
         update cloud_teacher_order
@@ -161,7 +203,7 @@
         <if test="sendSmsFlag != null">
             ,send_sms_flag_ = #{sendSmsFlag}
         </if>
-        where id_ = #{cloudTeacherOrderId}
+        where id_ = #{cloudTeacherOrderId} and status_ = 1
     </update>
 
     <!-- 全查询 -->
@@ -656,4 +698,4 @@
     <select id="getActivationVipIds" resultType="java.lang.Integer">
         select distinct member_rank_id_ from student_member_time where student_id_ = #{studentId}  and end_time_ &gt;=now()
     </select>
-</mapper>
+</mapper>

+ 4 - 0
mec-biz/src/main/resources/config/mybatis/MusicGroupQuitMapper.xml

@@ -42,6 +42,10 @@
         WHERE id_ = #{id}
     </select>
 
+    <select id="lockForApprove" resultMap="MusicGroupQuit">
+        SELECT * FROM music_group_quit WHERE id_ = #{id} FOR UPDATE
+    </select>
+
     <!-- 全查询 -->
     <select id="findAll" resultMap="MusicGroupQuit">
         SELECT *