|
@@ -200,10 +200,11 @@ function getUpgradeFinalStatus(newBuyset, oldBuyset, t, endUnix, renewList) {
|
|
|
var Upgrade = Upgradestatus[0];
|
|
|
console.log("Upgrade", Upgrade, Upgradestatus);
|
|
|
if (Upgrade === -1) {
|
|
|
- if (t.length == 0) {
|
|
|
+ if (t.length === 0) {
|
|
|
return [-1, false, false] //订阅修改
|
|
|
}
|
|
|
- return getsubVipOrderPriceBybuyset(oldBuyset, t)//续费
|
|
|
+ var renewPrice = getsubVipOrderPriceBybuyset(oldBuyset, t)//续费
|
|
|
+ return [renewPrice, false, false]
|
|
|
}
|
|
|
var final_price = 0;
|
|
|
var nowEndTime = endUnix;
|
|
@@ -230,7 +231,7 @@ function getUpgradeFinalStatus(newBuyset, oldBuyset, t, endUnix, renewList) {
|
|
|
final_price += now_price;
|
|
|
//新增续费升级价格
|
|
|
if (t.length != 0) {
|
|
|
- var this_price = getsubVipOrderPriceBybuyset(Upgrade, t);
|
|
|
+ var this_price = getsubVipOrderPriceBybuyset(oldBuyset, t);
|
|
|
if (this_price < 0) {
|
|
|
return [-2, false, false]
|
|
|
}
|