Merge branch 'zx_saas_vip_activity' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -1965,14 +1965,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
         VipGroupSalarySettlementTypeDto vipOfflineSalarySettlement = null;
         VipGroupSalarySettlementTypeDto giveVipOfflineSalarySettlement = null;
-        BigDecimal onlineClassesUnitPrice = vipGroup.getOnlineClassesUnitPrice();
-        if (Objects.isNull(onlineClassesUnitPrice)) {
-            throw new BizException("课程单价异常");
-        }
-        BigDecimal offlineClassesUnitPrice = vipGroup.getOfflineClassesUnitPrice();
-        if (Objects.isNull(offlineClassesUnitPrice)) {
-            throw new BizException("课程单价异常");
-        }
         BigDecimal discount = new BigDecimal(100);
         if (vipGroup.getVipGroupActivityId() != null) {
             VipGroupActivity vipGroupActivity = vipGroupActivityDao.get(vipGroup.getVipGroupActivityId());
@@ -1983,8 +1975,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             }
             vipOfflineSalarySettlement = vipGroupSalarySettlementDto.getOfflineSalarySettlement();
             giveVipOfflineSalarySettlement = vipGroupSalarySettlementDto.getGiveVipOfflineSalarySettlement();
-            onlineClassesUnitPrice = onlineClassesUnitPrice.multiply(discount).divide(new BigDecimal(100), 0, ROUND_UP);
-            offlineClassesUnitPrice = offlineClassesUnitPrice.multiply(discount).divide(new BigDecimal(100), 0, ROUND_UP);
 
             //是否是赠送课程
             ActivityUserMapper activityUserMapper = activityUserMapperService.findVipUserMapper(vipGroup.getId(), "VIP", null);
@@ -1998,6 +1988,14 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
         }
 
+        BigDecimal onlineClassesUnitPrice = vipGroup.getOnlineClassesUnitPrice();
+        if (Objects.isNull(onlineClassesUnitPrice)) {
+            throw new BizException("课程单价异常");
+        }
+        BigDecimal offlineClassesUnitPrice = vipGroup.getOfflineClassesUnitPrice();
+        if (Objects.isNull(offlineClassesUnitPrice)) {
+            throw new BizException("课程单价异常");
+        }
         BigDecimal offlineClassNum = new BigDecimal(vipGroup.getOfflineClassesNum());
         BigDecimal onlineClassNum = new BigDecimal(vipGroup.getOnlineClassesNum());
         BigDecimal onlineVipGroupCharge = onlineClassesUnitPrice.multiply(onlineClassNum);