Merge branch 'gpt_two_renew'

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -4228,8 +4228,14 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				return;
 			}
 			if (orderDonRenewRecord != null) {
-				//同规格续费无需更新
+				//同规格续费新或者同属性低规格 无需更新
 				if (!ObjectUtil.equal(groupsTrips.getSkuId(), order.getSkuId())) {
+					Long gtSkuId = groupsTrips.getSkuId();
+					GoodsDonSku groupsSku = goodsDonSkuMapper.selectById(gtSkuId);
+					//同属性 低规格 只增加车票时长
+					if (sku.getMonths() < groupsSku.getMonths() && sku.getGptLimitNum() == groupsSku.getGptLimitNum()) {
+						return;
+					}
 					log.info("用户续费升级订单skuId:{}将用户车票relationId:{}套餐续费升级", order.getSkuId(), relationId);
 					chatgptUser.setLimitTime(sku.getGptLimitTime());
 					chatgptUser.setLimitNum(sku.getGptLimitNum());

netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

@@ -985,8 +985,13 @@ public class GroupRelationController {
 //                } else {
 //                    builder.field(RenewUpgradePackageFrontView.RenewSkuView::getMonths, minMonths.get()).op(Operator.GreaterEqual);
 //                }
-                //同续费时间规格
-                builder.field(RenewUpgradePackageFrontView.RenewSkuView::getMonths, minMonths.get()).op(Operator.GreaterEqual);
+                //GPT镜像2月规格 特殊处理
+                if (sku.getGoodsId() == 18 && sku.getMonths() == 2) {
+
+                } else {
+                    //同续费时间规格
+                    builder.field(RenewUpgradePackageFrontView.RenewSkuView::getMonths, minMonths.get()).op(Operator.GreaterEqual);
+                }
                 if (renewSkuId != null) {
                     upgradeSkuIds.remove(renewSkuId);
                 }