Merge branch 'doubleEleven2020'

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

@@ -71,9 +71,9 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
         SysUser sysUser = sysUserFeignService.queryUserById(userId);
         SporadicChargeInfo info = sporadicChargeInfoDao.get(Integer.parseInt(studentPaymentOrder.getMusicGroupId()));
 
-        Map<Integer, String> map = new HashMap();
+        Map<Integer, String> map = new HashMap<>();
         map.put(userId, sysUser.getPhone());
-        Map<Integer, String> yimei = new HashMap();
+        Map<Integer, String> yimei = new HashMap<>();
         map.put(userId, userId.toString());
         if (studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS) {
             try {
@@ -86,7 +86,7 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
             if (info.getChargeType().getCode() == 6 || info.getChargeType().getCode() == 12) {
                 //第二单起每买一单增加一次抽奖机会
                 int times = studentPaymentOrderDao.getUserOrderNumByType(userId, OrderTypeEnum.DOUBLE_ELEVEN2020);
-                Integer num = studentPaymentOrder.getClassGroupId() == null ? 1 : studentPaymentOrder.getClassGroupId();
+                int num = studentPaymentOrder.getClassGroupId() == null ? 1 : studentPaymentOrder.getClassGroupId();
                 if (times <= 1) {
                     num--;
                 }