Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -1374,7 +1374,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
         Date date = new Date();
 
-        if (date.after(expireDate)) {
+        if (expireDate.before(date)) {
             throw new BizException("日期设置错误");
         }
 

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

@@ -419,7 +419,7 @@ public class PayServiceImpl implements PayService {
         BigDecimal sellHasRouteBalance = BigDecimal.ZERO;
 
         Iterator<RouteScaleDto> iterator = routeScaleDtos.iterator();
-        boolean hasFeeFlag = false;
+        BigDecimal maxAmount = BigDecimal.ZERO;
         while (iterator.hasNext()) {
             RouteScaleDto routeScaleDto = iterator.next();
             routeScaleDto.setPayType(paymentConfig.getPayType());
@@ -428,6 +428,8 @@ public class PayServiceImpl implements PayService {
                 routeBalance = balanceAmount.subtract(sellAmount.get("balance"));
                 serviceCount--;
             } else {
+                routeAmount = sellAmount.get("actualAmount");
+                routeBalance = sellAmount.get("balance");
                 sellCount--;
             }
 
@@ -456,11 +458,8 @@ public class PayServiceImpl implements PayService {
                 iterator.remove();
                 continue;
             }
-            if (!hasFeeFlag && routeScaleDto.getAmount().compareTo(amount.divide(new BigDecimal(routeScaleDtos.size()), 2, BigDecimal.ROUND_DOWN)) >= 0) {
-                routeScaleDto.setFeeFlag("Y");
-                hasFeeFlag = true;
-            } else {
-                routeScaleDto.setFeeFlag("N");
+            if (routeScaleDto.getAmount().compareTo(maxAmount) > 0) {
+                maxAmount = routeScaleDto.getAmount();
             }
 
             for (SysPaymentConfig paymentConfigByOrganId : paymentConfigByOrganIds) {
@@ -472,6 +471,15 @@ public class PayServiceImpl implements PayService {
                 }
             }
         }
+        boolean hasFeeFlag = false;
+        for (RouteScaleDto routeScaleDto : routeScaleDtos) {
+            if (!hasFeeFlag && routeScaleDto.getAmount().compareTo(maxAmount) == 0) {
+                routeScaleDto.setFeeFlag("Y");
+                hasFeeFlag = true;
+            } else {
+                routeScaleDto.setFeeFlag("N");
+            }
+        }
         return routeScaleDtos;
     }
 }

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

@@ -242,7 +242,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
 
 	                BigDecimal hasRouteSellOrderActualAmount = BigDecimal.ZERO;
 	                for (SellOrder sellOrder : sellOrderList) {
-	                    if (!goodsMap.getKey().equals(sellOrder.getParentGoodsId()) && !goodsMap.getKey().equals(sellOrder.getGoodsId())) {
+	                    if (!goodsMap.getKey().equals(sellOrder.getParentGoodsId()) && !goodsMap.getKey().equals(sellOrder.getGoodsId().toString())) {
 	                        continue;
 	                    }
 	                    BigDecimal sellOrderActualAmount = BigDecimal.ZERO;