Merge remote-tracking branch 'origin/feature-operating-report' into feature-operating-report

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

@@ -172,7 +172,8 @@ public class PayServiceImpl implements PayService {
         List<AmountChannelDto> amountChannelDtoList = JSON.parseArray(amountChannel, AmountChannelDto.class);
         for (AmountChannelDto amountChannelDto : amountChannelDtoList) {
             if (amountChannelDto.getOrganId().equals(organId) &&
-                    amount.compareTo(amountChannelDto.getAmount()) == 0 &&
+                    //0的时候不限定金额
+                    (amountChannelDto.getAmount().compareTo(BigDecimal.ZERO) == 0 || amount.compareTo(amountChannelDto.getAmount()) == 0) &&
                     receiver.equals(amountChannelDto.getType())
             ) {
                 routeOrganId = amountChannelDto.getRouteOrganId();