|
@@ -9,6 +9,7 @@ import com.ym.mec.biz.dal.enums.DealStatusEnum;
|
|
import com.ym.mec.biz.dal.enums.GoodsType;
|
|
import com.ym.mec.biz.dal.enums.GoodsType;
|
|
import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
|
|
import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
|
|
import com.ym.mec.biz.service.*;
|
|
import com.ym.mec.biz.service.*;
|
|
|
|
+import com.ym.mec.common.exception.BizException;
|
|
import com.ym.mec.util.collection.MapUtil;
|
|
import com.ym.mec.util.collection.MapUtil;
|
|
import org.snaker.engine.core.OrderService;
|
|
import org.snaker.engine.core.OrderService;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -121,12 +122,22 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public void addApplyStudentNum(String musicGroupId, Integer subjectId, int num) {
|
|
|
|
- MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanDao.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
|
|
|
|
- int applyNum = musicOneSubjectClassPlan.getApplyStudentNum() == null ? 0 : musicOneSubjectClassPlan.getApplyStudentNum();
|
|
|
|
- musicOneSubjectClassPlan.setApplyStudentNum(applyNum + num);
|
|
|
|
- musicOneSubjectClassPlan.setUpdateTime(new Date());
|
|
|
|
- musicGroupSubjectPlanDao.update(musicOneSubjectClassPlan);
|
|
|
|
|
|
+ public void addApplyStudentNum(String musicGroupId, Integer subjectId, int num) throws Exception {
|
|
|
|
+ boolean flag = false;
|
|
|
|
+ for (int i = 10; i >= 1; i--) {
|
|
|
|
+ MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanDao.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
|
|
|
|
+ int applyNum = musicOneSubjectClassPlan.getApplyStudentNum() == null ? 0 : musicOneSubjectClassPlan.getApplyStudentNum();
|
|
|
|
+ musicOneSubjectClassPlan.setApplyStudentNum(applyNum + num);
|
|
|
|
+ musicOneSubjectClassPlan.setUpdateTime(new Date());
|
|
|
|
+ int updateCount = musicGroupSubjectPlanDao.update(musicOneSubjectClassPlan);
|
|
|
|
+ if (updateCount >= 0) {
|
|
|
|
+ flag = true;
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if (flag == false) {
|
|
|
|
+ throw new BizException("系统繁忙,请重试");
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -150,7 +161,8 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
|
|
|
|
|
|
List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailDao.findUserApplyOrder(studentRegistration.getUserId(), DealStatusEnum.WAIT_PAY);
|
|
List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailDao.findUserApplyOrder(studentRegistration.getUserId(), DealStatusEnum.WAIT_PAY);
|
|
for (StudentPaymentOrderDetail orderDetail : orderDetails) {
|
|
for (StudentPaymentOrderDetail orderDetail : orderDetails) {
|
|
- if (orderDetail == null || orderDetail.getGoodsIdList() == null || orderDetail.getGoodsIdList().isEmpty()) continue;
|
|
|
|
|
|
+ if (orderDetail == null || orderDetail.getGoodsIdList() == null || orderDetail.getGoodsIdList().isEmpty())
|
|
|
|
+ continue;
|
|
MusicGroupSubjectGoodsGroup musicGroupSubjectGoodsGroup = new MusicGroupSubjectGoodsGroup();
|
|
MusicGroupSubjectGoodsGroup musicGroupSubjectGoodsGroup = new MusicGroupSubjectGoodsGroup();
|
|
if (orderDetail.getType().equals(OrderDetailTypeEnum.MUSICAL)) {
|
|
if (orderDetail.getType().equals(OrderDetailTypeEnum.MUSICAL)) {
|
|
musicGroupSubjectGoodsGroup.setName("乐器");
|
|
musicGroupSubjectGoodsGroup.setName("乐器");
|