update

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

@@ -146,10 +146,12 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
 
         ClassGroupRelation classGroupRelation = classGroupRelationService.findClassGroupRelation(classGroupId);
 
-        for (String userIdStr : userIdStrSet) {
+        Iterator<String> iterator = userIdStrSet.iterator();
+        while (iterator.hasNext()) {
+        	String userIdStr = iterator.next();
             List<ClassGroupStudentMapper> highClassGroupHasUser = classGroupStudentMapperDao.findHighClassGroupHasUser(classGroup.getMusicGroupId(), Integer.parseInt(userIdStr), classGroup.getType());
             if (highClassGroupHasUser != null && highClassGroupHasUser.size() >= 0) {
-                userIdStrSet.remove(userIdStr);
+            	iterator.remove();
                 continue;
             }
 
@@ -179,7 +181,9 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
             }
             imGroupMemberList.add(new ImGroupMember(userIdStr));
         }
-        classGroupStudentMapperDao.classGroupStudentsInsert(classGroupStudentMappers);
+		if (classGroupStudentMappers.size() > 0) {
+			classGroupStudentMapperDao.classGroupStudentsInsert(classGroupStudentMappers);
+		}
 
         //添加进IM群组
         ImGroupMember[] imGroupMembers = imGroupMemberList.toArray(new ImGroupMember[imGroupMemberList.size()]);

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

@@ -1,23 +1,27 @@
 package com.ym.mec.biz.service.impl;
 
-import com.ym.mec.biz.dal.dao.MusicGroupPurchaseListDao;
-import com.ym.mec.biz.dal.entity.Goods;
-import com.ym.mec.biz.dal.entity.MusicGroupPurchaseList;
-import com.ym.mec.biz.dal.enums.DealStatusEnum;
-import com.ym.mec.biz.service.GoodsService;
-import com.ym.mec.biz.service.MusicGroupPurchaseListService;
-import com.ym.mec.common.exception.BizException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.ym.mec.biz.dal.dao.MusicGroupPurchaseListDao;
 import com.ym.mec.biz.dal.dao.StudentPaymentOrderDetailDao;
+import com.ym.mec.biz.dal.entity.Goods;
+import com.ym.mec.biz.dal.entity.MusicGroupPurchaseList;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
+import com.ym.mec.biz.dal.enums.DealStatusEnum;
+import com.ym.mec.biz.service.GoodsService;
 import com.ym.mec.biz.service.StudentPaymentOrderDetailService;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 
-import java.util.*;
-
 @Service
 public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long, StudentPaymentOrderDetail> implements StudentPaymentOrderDetailService {
 
@@ -44,33 +48,36 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
     }
 
     @Override
-    public List<Goods> getMusicalList(String musicGroupId) {
-        List<StudentPaymentOrderDetail> applyOrder = findApplyOrderSuccess(musicGroupId, DealStatusEnum.SUCCESS);
-        if (applyOrder == null || applyOrder.size() == 0) {
-            return null;
-        }
-        String goodsIdsStr = "";
-        for (StudentPaymentOrderDetail studentPaymentOrderDetail : applyOrder) {
-            if (studentPaymentOrderDetail.getGoodsIdList() != null && !studentPaymentOrderDetail.getGoodsIdList().isEmpty()) {
-                goodsIdsStr += studentPaymentOrderDetail.getGoodsIdList() + ",";
-            }
-        }
-        goodsIdsStr = goodsIdsStr.substring(0, goodsIdsStr.length() - 1);
-
-        String[] goodSIdArr = goodsIdsStr.split(",");
-
-        List<Goods> goodies = goodsService.findGoodsByIds(goodsIdsStr);
-
-        for (Goods goods : goodies) {
-            goods.setSellCount(0);
-            for (String goodsIdStr : goodSIdArr) {
-                if (goods.getId().equals(Integer.parseInt(goodsIdStr))) {
-                    goods.setSellCount(goods.getSellCount() + 1);
-                }
-            }
-        }
-        return goodies;
-    }
+	public List<Goods> getMusicalList(String musicGroupId) {
+		List<StudentPaymentOrderDetail> applyOrder = findApplyOrderSuccess(musicGroupId, DealStatusEnum.SUCCESS);
+		if (applyOrder == null || applyOrder.size() == 0) {
+			return null;
+		}
+		String goodsIdsStr = "";
+		for (StudentPaymentOrderDetail studentPaymentOrderDetail : applyOrder) {
+			if (studentPaymentOrderDetail.getGoodsIdList() != null && !studentPaymentOrderDetail.getGoodsIdList().isEmpty()) {
+				goodsIdsStr += studentPaymentOrderDetail.getGoodsIdList() + ",";
+			}
+		}
+		if (StringUtils.isNotBlank(goodsIdsStr)) {
+			goodsIdsStr = goodsIdsStr.substring(0, goodsIdsStr.length() - 1);
+
+			String[] goodSIdArr = goodsIdsStr.split(",");
+
+			List<Goods> goodies = goodsService.findGoodsByIds(goodsIdsStr);
+
+			for (Goods goods : goodies) {
+				goods.setSellCount(0);
+				for (String goodsIdStr : goodSIdArr) {
+					if (goods.getId().equals(Integer.parseInt(goodsIdStr))) {
+						goods.setSellCount(goods.getSellCount() + 1);
+					}
+				}
+			}
+			return goodies;
+		}
+		return null;
+	}
 
     @Override
     public Boolean verifyMusicalList(String musicGroupId) throws BizException {

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupDefaultClassesUnitPriceController.java

@@ -1,13 +1,11 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesUnitPrice;
-import com.ym.mec.biz.service.VipGroupDefaultClassesUnitPriceService;
-import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
+
+import java.util.Date;
+import java.util.Objects;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,8 +13,11 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Date;
-import java.util.Objects;
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.VipGroupDefaultClassesUnitPrice;
+import com.ym.mec.biz.service.VipGroupDefaultClassesUnitPriceService;
+import com.ym.mec.common.controller.BaseController;
 
 @Api(tags = "vip课默认单价")
 @RequestMapping("vipGroupDefaultClassesUnitPrice")