提交

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/UpgradePrice.js

@@ -324,10 +324,11 @@ function getSubPrice(oldBuyset, newBuyset, start, end) {
         }
     }
     //不能降级
-    if ((oldBuyset.areacount !== -1 && newBuyset.areacount !== -1 && (oldBuyset.areacount > newBuyset.areacount || oldBuyset.citys.length + oldBuyset.areacount > newBuyset.citys.length + newBuyset.areacount || oldCitysBuyTwo > newCitysBuyTwo))  //非全国下 新套餐省份数量小于旧套餐数量
+    if ((oldBuyset.areacount !== -1 && newBuyset.areacount !== -1 && (oldBuyset.areacount > newBuyset.areacount || oldBuyset.citys.length + oldBuyset.areacount > newBuyset.citys.length + newBuyset.areacount || oldCitysBuyTwo + oldBuyset.areacount > newCitysBuyTwo + newBuyset.areacount))  //非全国下 新套餐省份数量小于旧套餐数量
         || (oldBuyset.areacount === -1 && newBuyset.areacount !== -1)       //旧套餐全国 新套餐非全国
         || (oldBuyset.buyerclasscount !== -1 && newBuyset.buyerclasscount !== -1 && oldBuyset.buyerclasscount > newBuyset.buyerclasscount)//非全行业下 新套餐行业数量小于旧套餐数量
         || (oldBuyset.buyerclasscount === -1 && newBuyset.buyerclasscount !== -1)) {  //旧套餐全行业 新套餐非全行业
+        console.log("pppppppppp")
         return -1
     }
 

src/jfw/modules/subscribepay/src/service/vipSubscribeChange.go

@@ -507,7 +507,7 @@ func getSubtotalPrice(oldBuyset, newBuyset *entity.SubvipBuySet, startTime, endt
 		}
 	}
 
-	if (oldBuyset.AreaCount != -1 && newBuyset.AreaCount != -1 && (oldBuyset.AreaCount > newBuyset.AreaCount || len(oldBuyset.NewCitys)+oldBuyset.AreaCount > len(newBuyset.NewCitys)+newBuyset.AreaCount || oldCitysBuyTwo > newCitysBuyTwo)) ||
+	if (oldBuyset.AreaCount != -1 && newBuyset.AreaCount != -1 && (oldBuyset.AreaCount > newBuyset.AreaCount || len(oldBuyset.NewCitys)+oldBuyset.AreaCount > len(newBuyset.NewCitys)+newBuyset.AreaCount || oldCitysBuyTwo+oldBuyset.AreaCount > newCitysBuyTwo+newBuyset.AreaCount)) ||
 		(oldBuyset.AreaCount == -1 && newBuyset.AreaCount != -1) || //旧套餐全国 新套餐非全国
 		(oldBuyset.BuyerclassCount != -1 && newBuyset.BuyerclassCount != -1 && oldBuyset.BuyerclassCount > newBuyset.BuyerclassCount) || //非全行业下 新套餐行业数量小于旧套餐数量
 		oldBuyset.BuyerclassCount == -1 && newBuyset.BuyerclassCount != -1 { //旧套餐全行业 新套餐非全行业

src/web/staticres/vipsubscribe/js/UpgradePrice.js

@@ -324,10 +324,11 @@ function getSubPrice(oldBuyset, newBuyset, start, end) {
         }
     }
     //不能降级
-    if ((oldBuyset.areacount !== -1 && newBuyset.areacount !== -1 && (oldBuyset.areacount > newBuyset.areacount || oldBuyset.citys.length + oldBuyset.areacount > newBuyset.citys.length + newBuyset.areacount || oldCitysBuyTwo > newCitysBuyTwo))  //非全国下 新套餐省份数量小于旧套餐数量
+    if ((oldBuyset.areacount !== -1 && newBuyset.areacount !== -1 && (oldBuyset.areacount > newBuyset.areacount || oldBuyset.citys.length + oldBuyset.areacount > newBuyset.citys.length + newBuyset.areacount || oldCitysBuyTwo + oldBuyset.areacount > newCitysBuyTwo + newBuyset.areacount))  //非全国下 新套餐省份数量小于旧套餐数量
         || (oldBuyset.areacount === -1 && newBuyset.areacount !== -1)       //旧套餐全国 新套餐非全国
         || (oldBuyset.buyerclasscount !== -1 && newBuyset.buyerclasscount !== -1 && oldBuyset.buyerclasscount > newBuyset.buyerclasscount)//非全行业下 新套餐行业数量小于旧套餐数量
         || (oldBuyset.buyerclasscount === -1 && newBuyset.buyerclasscount !== -1)) {  //旧套餐全行业 新套餐非全行业
+        console.log("pppppppppp")
         return -1
     }