update

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

@@ -179,6 +179,8 @@ public class PayServiceImpl implements PayService {
 		BigDecimal subBalance = BigDecimal.ZERO;
 		
 		BigDecimal subCashAmount = BigDecimal.ZERO;
+		
+		RouteScaleDto routeScaleDtoForGoodsSell = null;
     	//忽略的分部
 		List<Integer> ignoreOrganList = Arrays.asList(4, 55, 59);
 		
@@ -345,6 +347,15 @@ public class PayServiceImpl implements PayService {
     	            studentPaymentRouteOrder.setCreateTime(date);
     	            studentPaymentRouteOrder.setUpdateTime(date);
     	            studentPaymentRouteOrderDao.insert(studentPaymentRouteOrder);
+    	            
+
+    	            routeScaleDtoForGoodsSell = new RouteScaleDto();
+    	            routeScaleDtoForGoodsSell.setAmount(subCashAmount);
+    	            routeScaleDtoForGoodsSell.setOrganId(sysPaymentConfig.getOrganId());
+    	            routeScaleDtoForGoodsSell.setPayType(PaymentChannelEnum.ADAPAY);
+    	            routeScaleDtoForGoodsSell.setScale(100);
+    	            routeScaleDtoForGoodsSell.setMerNo(goodsSellReceiptMerNo);
+    	            routeScaleDtoForGoodsSell.setFeeFlag("Y");
         		}
         	}
         }
@@ -381,6 +392,10 @@ public class PayServiceImpl implements PayService {
         for (RouteScaleDto routeScaleDto : routeScaleDtos) {
             checkMaxReceipt(routeScaleDto, routeScaleDto.getMerNo());
         }
+        
+        if(routeScaleDtoForGoodsSell != null){
+        	routeScaleDtos.add(routeScaleDtoForGoodsSell);
+        }
 
         return getPayRoute(amount, balanceAmount, orderNo, notifyUrl, returnUrl, orderSubject, orderBody, routeScaleDtos, subCashAmount);
     }
@@ -732,8 +747,10 @@ public class PayServiceImpl implements PayService {
             routingMerNoSet.add(routeScaleDto.getMerNo());
         }
 
-        if (studentPaymentRouteOrderDao.batchAdd(RouteOrders) <= 0) {
-            throw new BizException("调用支付接口失败");
+        if(RouteOrders.size() > 0) {
+	        if (studentPaymentRouteOrderDao.batchAdd(RouteOrders) <= 0) {
+	            throw new BizException("调用支付接口失败");
+	        }
         }
 
         if (payType.equals(PaymentChannelEnum.YQPAY)) {

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

@@ -16,6 +16,7 @@ import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
+import org.apache.commons.collections.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -308,7 +309,8 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
         	if(StringUtils.isNotBlank(subjectChange.getOriginalAccessories())){
         		originalAccessories = Arrays.asList(subjectChange.getOriginalAccessories().split(","));
         	}
-        	changeAccessoriesList.removeAll(originalAccessories);
+        	//changeAccessoriesList.removeAll(originalAccessories);
+        	changeAccessoriesList = ListUtils.subtract(changeAccessoriesList, originalAccessories);
         	
         	if(subjectChange.getChangeMusical() != subjectChange.getOriginalMusical()){
         		changeAccessoriesList.add(subjectChange.getChangeMusical()+"");