Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -89,9 +89,8 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 						case DISCOUNT:
 							courseScheduleStudentPayment.setExpectPrice(
 									vipGroupApplyBaseInfoDto.getOnlineClassesUnitPrice().multiply(
-											new BigDecimal(vipGroupActivity.getAttribute1())
-													.divide(new BigDecimal(100), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).setScale(CommonConstants.DECIMAL_FINAL_PLACE,BigDecimal.ROUND_HALF_UP)
-									)
+											new BigDecimal(vipGroupActivity.getAttribute1()))
+											.divide(new BigDecimal(100), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_DOWN)
 							);
 							break;
 						case GIVE_CLASS:
@@ -114,9 +113,8 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 						case DISCOUNT:
 							courseScheduleStudentPayment.setExpectPrice(
 									vipGroupApplyBaseInfoDto.getOfflineClassesUnitPrice().multiply(
-											new BigDecimal(vipGroupActivity.getAttribute1())
-													.divide(new BigDecimal(100), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).setScale(CommonConstants.DECIMAL_FINAL_PLACE,BigDecimal.ROUND_HALF_UP)
-									)
+											new BigDecimal(vipGroupActivity.getAttribute1()))
+											.divide(new BigDecimal(100), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_DOWN)
 							);
 							break;
 						case GIVE_CLASS:

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

@@ -2827,7 +2827,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 	}
 
 	@Override
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
 	public void updateVipGroupStatusToFinished() {
 		List<VipGroup> vipGroupList = vipGroupDao.queryRequiredOverList();
 		if (vipGroupList != null && vipGroupList.size() > 0) {
@@ -2862,7 +2862,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 					}
 					if (now.before(vipGroup.getRegistrationStartTime())) {
 						vipGroup.setStatus(VipGroupStatusEnum.NOT_START);
-					} else if (vipGroup.getRegistrationStartTime().before(now) && vipGroup.getPaymentExpireDate().after(now)) {
+					} else if (vipGroup.getRegistrationStartTime().before(now)
+							&& vipGroup.getPaymentExpireDate().after(now)
+							&& VipGroupStatusEnum.NOT_START.equals(vipGroup.getStatus())) {
 						vipGroup.setStatus(VipGroupStatusEnum.APPLYING);
 					}
 					VipGroup vipGroup1 = new VipGroup();