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

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

@@ -291,7 +291,9 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
             // 不是进行中，只能创建一次缴费
             if (musicGroup.getStatus() != MusicGroupStatusEnum.PROGRESS && musicGroupPaymentCalender.getPaymentType() != GOODS_PURCHASE) {
                 List<MusicGroupPaymentCalender> list = musicGroupPaymentCalenderDao.findByMusicGroupId(musicGroupId);
-                if (list.size() > 0) {
+                //排除商品采购
+                List<MusicGroupPaymentCalender> collect = list.stream().filter(e -> e.getPaymentType() != GOODS_PURCHASE).collect(Collectors.toList());
+                if (collect.size() > 0) {
                     throw new BizException("创建失败，已经存在缴费信息");
                 }
             }

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

@@ -659,6 +659,9 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
         String skuIds = goodsSubService.lambdaQuery().in(GoodsSub::getGoodsId, goodies.stream().map(Goods::getId).collect(Collectors.toList())).list()
                 .stream().map(e->e.getSku().toString()).collect(Collectors.joining(","));
         paramDto.setSkuStockIds(skuIds);
+        paramDto.setPageSize(1000);
+        paramDto.setPageNum(1);
+        paramDto.setJson(JSON.toJSONString(paramDto));
         PageInfo<PmsProductDto> productList = mallFeignService.getProductList(paramDto);
         if (org.springframework.util.CollectionUtils.isEmpty(productList.getRows())) {
             throw new BizException("商城商品不存在");