修改零星支付

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

@@ -278,12 +278,11 @@ public class PayServiceImpl implements PayService {
         if (paymentChannel.equals("YQPAY")) {
             routeScaleDto.setMerNo(YqPayUtil.merNo);
             routeScaleDto.setPayType(PaymentChannelEnum.YQPAY);
-            routeScaleDto.setFeeFlag("Y");
         } else {
             routeScaleDto.setMerNo(ConfigInit.merNo);
             routeScaleDto.setPayType(PaymentChannelEnum.ADAPAY);
-            routeScaleDto.setFeeFlag("Y");
         }
+        routeScaleDto.setFeeFlag("Y");
         routeScaleDtos.add(routeScaleDto);
         return routeScaleDtos;
     }
@@ -303,12 +302,11 @@ public class PayServiceImpl implements PayService {
             if (paymentChannel.equals("YQPAY")) {
                 routeScaleDto.setMerNo(YqPayUtil.merNo);
                 routeScaleDto.setPayType(PaymentChannelEnum.YQPAY);
-                routeScaleDto.setFeeFlag("Y");
             } else {
                 routeScaleDto.setMerNo(ConfigInit.merNo);
                 routeScaleDto.setPayType(PaymentChannelEnum.ADAPAY);
-                routeScaleDto.setFeeFlag("Y");
             }
+            routeScaleDto.setFeeFlag("Y");
             routeScaleDtos.add(routeScaleDto);
             return routeScaleDtos;
         }
@@ -406,8 +404,8 @@ public class PayServiceImpl implements PayService {
             routeScaleDto.setMerNo(paymentConfig.getYqMerNo());
         } else {
             routeScaleDto.setMerNo(paymentConfig.getHfMerNo());
-            routeScaleDto.setFeeFlag("Y");
         }
+        routeScaleDto.setFeeFlag("Y");
         routeScaleDtos.add(routeScaleDto);
         return routeScaleDtos;
     }
@@ -451,8 +449,8 @@ public class PayServiceImpl implements PayService {
             routeScaleDto.setMerNo(paymentConfig.getYqMerNo());
         } else {
             routeScaleDto.setMerNo(paymentConfig.getHfMerNo());
-            routeScaleDto.setFeeFlag("Y");
         }
+        routeScaleDto.setFeeFlag("Y");
         routeScaleDtos.add(routeScaleDto);
         return routeScaleDtos;
     }
@@ -481,10 +479,7 @@ public class PayServiceImpl implements PayService {
         }
         BigDecimal totalHasReceipt = studentPaymentRouteOrderDao.getRouteOrderAmount(organId, paymentChannelList, null);
         totalHasReceipt = totalHasReceipt == null ? BigDecimal.ZERO : totalHasReceipt;
-        if (amount.add(totalHasReceipt).compareTo(totalMaxReceipt) >= 0) {
-            return true;
-        }
-        return false;
+        return amount.add(totalHasReceipt).compareTo(totalMaxReceipt) >= 0;
     }
 
     private Map<String, Object> getPayRoute(BigDecimal amount, BigDecimal balanceAmount, String orderNo, String notifyUrl, String returnUrl, String orderSubject, String orderBody, List<RouteScaleDto> routeScaleDtos) throws Exception {