update

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

@@ -481,6 +481,15 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
 
             if (orderDetailList.size() == 0) {
                 if (subjectChange != null) {
+                    if(deliveryStatus != null){
+    					if (deliveryStatus == 0 && StringUtils.isNotBlank(subjectChange.getDeliveryBatchNo())) {
+    						continue;
+    					}
+    					
+    					if (deliveryStatus == 1 && StringUtils.isBlank(subjectChange.getDeliveryBatchNo())) {
+    						continue;
+    					}
+                	}
                     if (subjectChange.getChangeMusical() != null) {
                         kitGroupPurchaseType = subjectChange.getKitGroupPurchaseType();
                         musicalId = subjectChange.getChangeMusical() + "";
@@ -495,6 +504,15 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                 }
             } else if (isChangeAccessories == false || isChangeMusical == false) {
                 if (subjectChange != null) {
+                    if(deliveryStatus != null){
+    					if (deliveryStatus == 0 && StringUtils.isNotBlank(subjectChange.getDeliveryBatchNo())) {
+    						continue;
+    					}
+    					
+    					if (deliveryStatus == 1 && StringUtils.isBlank(subjectChange.getDeliveryBatchNo())) {
+    						continue;
+    					}
+                	}
                     if (subjectChange.getChangeMusical() != null && isChangeMusical == false) {
                         kitGroupPurchaseType = subjectChange.getKitGroupPurchaseType();
                         musicalId = subjectChange.getChangeMusical() + "";