Merge remote-tracking branch 'origin/master'

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

@@ -282,4 +282,11 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
      */
     int countGroupOrderWithoutFailed(@Param("groupId") String groupId,
                                        @Param("groupType") GroupType groupType);
+
+    /**
+     * 统计
+     * @param sporadicId
+     * @return
+     */
+    Integer countSporadicOrder(Integer sporadicId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/SporadicChargeInfoService.java

@@ -36,4 +36,10 @@ public interface SporadicChargeInfoService extends BaseService<Integer, Sporadic
      * @param openFlag
      */
     void updateOpenFlag(Integer sporadicId, Integer openFlag);
+
+    /**
+     * 删除
+     * @param id
+     */
+    void del(Integer id);
 }

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

@@ -28,12 +28,14 @@ import com.ym.mec.util.collection.ListUtil;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.json.JsonUtil;
+
 import org.apache.commons.collections.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -76,6 +78,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
     @Autowired
     private SysMessageService sysMessageService;
     @Autowired
+    @Lazy
     private CourseScheduleTeacherSalaryService courseScheduleTeacherSalaryService;
     @Autowired
     private VipGroupDao vipGroupDao;
@@ -106,6 +109,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
     @Autowired
     private PracticeGroupDao practiceGroupDao;
     @Autowired
+    @Lazy
     private VipGroupService vipGroupService;
     @Autowired
     private MusicGroupService musicGroupService;

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

@@ -17,10 +17,12 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
@@ -45,6 +47,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
     @Autowired
     private SysUserCashAccountService sysUserCashAccountService;
     @Autowired
+    @Lazy
     private VipGroupService vipGroupService;
     @Autowired
     private SchoolService schoolService;

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

@@ -199,4 +199,15 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
         sporadicChargeInfo.setUpdateTime(new Date());
         sporadicChargeInfoDao.update(sporadicChargeInfo);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void del(Integer id) {
+        Integer count = studentPaymentOrderDao.countSporadicOrder(id);
+        if(count == null || count == 0){
+            sporadicChargeInfoDao.delete(id);
+        }else {
+            throw new BizException("当前缴费项目存在收费记录，请走关闭流程");
+        }
+    }
 }

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

@@ -631,4 +631,7 @@
         AND spo.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler }
         AND cgsm.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler }
     </select>
+    <select id="countSporadicOrder" resultType="java.lang.Integer">
+        SELECT COUNT(id_) FROM student_payment_order spo WHERE spo.group_type_ = 'SPORADIC' AND spo.music_group_id_ = #{sporadicId}
+    </select>
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/SporadicChargeInfoController.java

@@ -120,6 +120,7 @@ public class SporadicChargeInfoController extends BaseController {
 	@PostMapping("/delete")
 	@PreAuthorize("@pcs.hasPermissions('sporadicChargeInfo/delete')")
 	public Object delete(Integer id) {
-		return succeed(sporadicChargeInfoService.delete(id));
+		sporadicChargeInfoService.del(id);
+		return succeed();
 	}
 }