Merge remote-tracking branch 'origin/master'

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;