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

mec-biz/src/main/java/com/ym/mec/biz/service/StudentPaymentOrderDetailService.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service;
 import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.BaseService;
 import org.apache.ibatis.annotations.Param;
 
@@ -39,7 +40,7 @@ public interface StudentPaymentOrderDetailService extends BaseService<Long, Stud
      * @param musicGroupId
      * @return
      */
-    Boolean verifyMusicalList(String musicGroupId);
+    Boolean verifyMusicalList(String musicGroupId) throws BizException;
 
     /**
      * 查询订单商品

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

@@ -6,6 +6,7 @@ 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -72,20 +73,21 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
     }
 
     @Override
-    public Boolean verifyMusicalList(String musicGroupId) {
+    public Boolean verifyMusicalList(String musicGroupId) throws BizException {
         //乐器采购清单是否确认
         Map<String, Object> param = new HashMap<>();
         param.put("musicGroupId", musicGroupId);
         int count = musicGroupPurchaseListDao.queryCount(param);
         if (count > 0) {
-            return true;
+            throw new BizException("采购清单已经确认");
         }
 
         List<Goods> musicalList = getMusicalList(musicGroupId);
         Date date = new Date();
         List<MusicGroupPurchaseList> musicGroupPurchaseLists = new ArrayList<>();
         //发放清单没有时确认特殊处理
-        if (musicalList.size() == 0) {
+        if (musicalList == null || musicalList.size() == 0) {
+            musicalList = new ArrayList<>();
             Goods goods = new Goods();
             goods.setId(0);
             goods.setSellCount(0);