fix 奈飞更换车票账号选择顺序

netflix-dao/src/main/java/com/cyksj/model/views/EmptyGroupsRelationView.java

@@ -37,6 +37,9 @@ public class EmptyGroupsRelationView {
 	@DbField("a.expiry_time")
 	private Date expiryTime;
 
+	@DbField("a.created_time")
+	private Date createdTime;
+
 	@DbField("gt.status")
 	private GroupsTrips.Status status;
 }

netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -878,10 +878,13 @@ public class CmsOrderController {
 	@GetMapping("/get/sameSpec/empty/relation")
 	public Result<SearchResult<EmptyGroupsRelationView>> getSameSpecEmptyRelation(Long skuId, Long groupsId, Long relationId, Boolean isNormal) {
 		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap())
-				.field(EmptyGroupsRelationView::getStatus, GroupsTrips.Status.down.name()).op(Operator.NotEqual)
-				.field(EmptyGroupsRelationView::getSkuId, skuId).orderBy(EmptyGroupsRelationView::getAvailableNum)
-				.desc();
+				.field(EmptyGroupsRelationView::getStatus, GroupsTrips.Status.down.name()).op(Operator.NotEqual);
 		GoodsDonSku sku = skuMapper.selectById(skuId);
+		if (sku.getGoodsId() == Constant.NETFLIX_GID) {
+			builder.orderBy(EmptyGroupsRelationView::getCreatedTime).desc().orderBy(EmptyGroupsRelationView::getAvailableNum).desc();
+		} else {
+			builder.field(EmptyGroupsRelationView::getSkuId, skuId).orderBy(EmptyGroupsRelationView::getAvailableNum).desc();
+		}
 		Date expiryTime = null;
 		if (relationId != null) {
 			GroupsRelation relation = relationMapper.selectById(relationId);