Merge branch 'doubleEleven2020'

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

@@ -294,7 +294,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (chargeInfo.getOpenFlag().equals(1)) {
             throw new BizException("项目已关闭");
         }
-        if(sporadicPayDto.getNum()==null){
+        if (sporadicPayDto.getNum() == null) {
             sporadicPayDto.setNum(1);
         }
         BigDecimal amount = chargeInfo.getAmount().multiply(new BigDecimal(sporadicPayDto.getNum()));
@@ -305,7 +305,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             throw new BizException("订单金额异常");
         }
         if (chargeInfo.getMaxAmount() != null) {
-            if(sporadicPayDto.getIsRepeatPay()){
+            if (sporadicPayDto.getIsRepeatPay()) {
                 List<StudentPaymentOrder> orders = studentPaymentOrderService.getUserOrderByType(sporadicPayDto.getUserId(), OrderTypeEnum.DOUBLE_ELEVEN2020, DealStatusEnum.ING);
                 for (StudentPaymentOrder order : orders) {
                     Map<String, String> notifyMap = new HashMap<>();
@@ -321,15 +321,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             if (chargeInfo.getOpenMaxTerm().equals(YesOrNoEnum.YES) && chargeInfo.getMaxAmount().compareTo(chargeInfo.getPaidAmount().add(amount)) < 0) {
                 throw new Exception("活动人数暂时已满，请稍后再试");
             }
-            List<SporadicChargeInfo> activeInfos = sporadicChargeInfoDao.getOrganActiveInfo(chargeInfo.getOrganId(), 12);
-            for (SporadicChargeInfo activeInfo : activeInfos) {
-                activeInfo.setPaidAmount(activeInfo.getPaidAmount().add(amount));
-                activeInfo.setUpdateTime(new Date());
-                int update = sporadicChargeInfoDao.update(activeInfo);
-                if (update <= 0) {
-                    throw new BizException("活动火爆，请稍后再试");
-                }
-            }
         }
 
         OrderTypeEnum type = OrderTypeEnum.SPORADIC;

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

@@ -84,6 +84,17 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
 
             //福袋活动，增加课程余额
             if (info.getChargeType().getCode() == 6 || info.getChargeType().getCode() == 12) {
+                if (info.getMaxAmount() != null) {
+                    List<SporadicChargeInfo> activeInfos = sporadicChargeInfoDao.getOrganActiveInfo(info.getOrganId(), 12);
+                    for (SporadicChargeInfo activeInfo : activeInfos) {
+                        activeInfo.setPaidAmount(activeInfo.getPaidAmount().add(studentPaymentOrder.getActualAmount()));
+                        activeInfo.setUpdateTime(new Date());
+                        int update = sporadicChargeInfoDao.update(activeInfo);
+                        if (update <= 0) {
+                            throw new BizException("已收金额更新失败，请重试");
+                        }
+                    }
+                }
                 //第二单起每买一单增加一次抽奖机会
                 int times = studentPaymentOrderDao.getUserOrderNumByType(userId, OrderTypeEnum.DOUBLE_ELEVEN2020);
                 int num = studentPaymentOrder.getClassGroupId() == null ? 1 : studentPaymentOrder.getClassGroupId();
@@ -152,17 +163,6 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
             return true;
         }
         if (studentPaymentOrder.getStatus() == DealStatusEnum.CLOSE || studentPaymentOrder.getStatus() == DealStatusEnum.FAILED) {
-            if (info.getMaxAmount() != null && info.getPaidAmount().compareTo(BigDecimal.ZERO) > 0) {
-                List<SporadicChargeInfo> activeInfos = sporadicChargeInfoDao.getOrganActiveInfo(info.getOrganId(), 12);
-                for (SporadicChargeInfo activeInfo : activeInfos) {
-                    activeInfo.setPaidAmount(activeInfo.getPaidAmount().subtract(studentPaymentOrder.getActualAmount()));
-                    activeInfo.setUpdateTime(new Date());
-                    int update = sporadicChargeInfoDao.update(activeInfo);
-                    if (update <= 0) {
-                        throw new BizException("已收金额更新失败，请重试");
-                    }
-                }
-            }
             if (info.getOrganId().equals(42) && info.getChargeType().equals(SporadicChargeTypeEnum.LEVEL)) {
                 degreeRegistrationService.updateStatus(studentPaymentOrder.getUserId(), 0, studentPaymentOrder.getOrderNo());
                 return true;