修改零星支付导出

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

@@ -485,7 +485,6 @@ public class PayServiceImpl implements PayService {
     private Map<String, Object> getPayRoute(BigDecimal amount, BigDecimal balanceAmount, String orderNo, String notifyUrl, String returnUrl, String orderSubject, String orderBody, List<RouteScaleDto> routeScaleDtos) throws Exception {
         Map<String, Object> unionPay = new HashMap<>();
         Map<String, Object> payMap = null;
-        String routingMerNos;
 
         List<StudentPaymentRouteOrder> RouteOrders = new ArrayList<>();
 
@@ -498,6 +497,7 @@ public class PayServiceImpl implements PayService {
 
         PaymentChannelEnum patType = null;
         boolean feeFlag = false;
+        Set<String> routingMerNoSet = new HashSet<>();
         for (RouteScaleDto routeScaleDto : routeScaleDtos) {
             patType = routeScaleDto.getPayType();
             Map<String, Object> routingList = new HashMap<>();
@@ -542,6 +542,7 @@ public class PayServiceImpl implements PayService {
             studentPaymentRouteOrder.setRouteBalanceAmount(routeBalanceAmount);
             studentPaymentRouteOrder.setMerNo(routeScaleDto.getMerNo());
             RouteOrders.add(studentPaymentRouteOrder);
+            routingMerNoSet.add(routeScaleDto.getMerNo());
         }
 
         if (studentPaymentRouteOrderDao.batchAdd(RouteOrders) <= 0) {
@@ -556,7 +557,7 @@ public class PayServiceImpl implements PayService {
         } else {
             payMap = Payment.getPayMap(amount, orderNo, notifyUrl, returnUrl, orderSubject, orderBody, ConfigInit.merNo, tempRoutingList);
         }
-        routingMerNos = routeScaleDtos.stream().map(RouteScaleDto::getMerNo).collect(Collectors.joining(","));
+        String routingMerNos = String.join(",", routingMerNoSet);
 
         unionPay.put("orderNo", orderNo);
         unionPay.put("type", patType.getCode());