Merge remote-tracking branch 'origin/master'

# Conflicts:
#	netflix-service/src/main/java/com/cyksj/service/pay/impl/AliPayCommonServiceImpl.java

netflix-service/src/main/java/com/cyksj/service/pay/impl/AliPayCommonServiceImpl.java

@@ -212,6 +212,9 @@ public class AliPayCommonServiceImpl implements AliPayCommonService {
 				.gt(ZfbShopOrderDayLimit::getDayRemainOrders, 0)
 				.gt(ZfbShopOrderDayLimit::getHourRemainOrders, 0)
 				.eq(ZfbShopOrderDayLimit::getStatus, 1));
+		if (orderDayLimits.isEmpty()) {
+			return null;
+		}
 		int randomIndex = RandomUtil.randomInt(orderDayLimits.size());
 		ZfbShopOrderDayLimit dayLimit = orderDayLimits.get(randomIndex);
 		Integer update = zfbShopOrderDayLimitMapper.decrRemainOrdersById(dayLimit.getId());