update

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

@@ -413,6 +413,16 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                         if (subjectChange.getChangeMusical() == null) {
                             continue;
                         }
+                        if(deliveryStatus != null){
+        					if (deliveryStatus == 0 && StringUtils.isNotBlank(subjectChange.getDeliveryBatchNo())) {
+        						continue;
+        					}
+        					
+        					if (deliveryStatus == 1 && StringUtils.isBlank(subjectChange.getDeliveryBatchNo())) {
+        						continue;
+        					}
+                    	}
+                        
                         if(spod.getType() == OrderDetailTypeEnum.MUSICAL){
                             kitGroupPurchaseType = subjectChange.getKitGroupPurchaseType();
                             musicalId = subjectChange.getChangeMusical() + "";
@@ -437,6 +447,15 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                         if (StringUtils.isBlank(subjectChange.getChangeAccessories()) || isCalculatedOfAccessories == true) {
                             continue;
                         }
+                        if(deliveryStatus != null){
+        					if (deliveryStatus == 0 && StringUtils.isNotBlank(subjectChange.getDeliveryBatchNo())) {
+        						continue;
+        					}
+        					
+        					if (deliveryStatus == 1 && StringUtils.isBlank(subjectChange.getDeliveryBatchNo())) {
+        						continue;
+        					}
+                    	}
                         isCalculatedOfAccessories = true;
                         accessoriesId = accessoriesId.append(subjectChange.getChangeAccessories()).append(",");
                         //accessoriesAmount = accessoriesAmount.add(subjectChange.getChangeAccessoriesPrice());