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

@@ -1467,7 +1467,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         }
         //商品采购订单
         MusicGroupPaymentCalenderAddress address = null;
-        if(calender.getPaymentType() == GOODS_PURCHASE){
+        if(calender.getStatus() == OPEN && calender.getPaymentType() == GOODS_PURCHASE){
             //TODO 商品采购订单是否已经发货
             address = musicGroupPaymentCalenderAddressService.lambdaQuery().eq(MusicGroupPaymentCalenderAddress::getCalenderId, id).one();
             if(address != null){