|
@@ -102,7 +102,7 @@ function needUpgrade(newBuyset, oldBuyset) {
|
|
|
UpgradeBuyset.areacount = newBuyset.areacount
|
|
|
}
|
|
|
|
|
|
- if (p_Diff > 0 || p_Diff + c_2_diff > 0 || p_Diff + c_2_diff + c_1_diff > 0 ) {//需要升级
|
|
|
+ if (p_Diff > 0 || p_Diff + c_2_diff > 0 || p_Diff + c_2_diff + c_1_diff > 0) {//需要升级
|
|
|
//有多余未使用名额保留
|
|
|
if (p_Diff + c_2_diff + c_1_diff < 0) {
|
|
|
if (c_1_diff < 0 && p_Diff + c_2_diff >= 0) {
|
|
@@ -313,10 +313,9 @@ function getUpgradeFinalStatus(newBuyset, oldBuyset, t, endUnix, renewList, isTr
|
|
|
function getSubPrice(oldBuyset, newBuyset, start, end) {
|
|
|
//不能降级
|
|
|
if ((oldBuyset.areacount != -1 && newBuyset.areacount != -1 && oldBuyset.areacount > newBuyset.areacount) || (oldBuyset.areacount == -1 && newBuyset.areacount != -1) ||
|
|
|
- (oldBuyset.buyerclasscount != -1 && newBuyset.buyerclasscount != -1 && oldBuyset.buyerclasscount > newBuyset.buyerclasscount) || (oldBuyset.BuyerclassCount == -1 && newBuyset.BuyerclassCount != -1)) {
|
|
|
+ (oldBuyset.buyerclasscount != -1 && newBuyset.buyerclasscount != -1 && oldBuyset.buyerclasscount > newBuyset.buyerclasscount) || (oldBuyset.buyerclasscount == -1 && newBuyset.buyerclasscount != -1)) {
|
|
|
return -1
|
|
|
}
|
|
|
-
|
|
|
var beforePrice = 0;
|
|
|
var newPrice = 0;
|
|
|
var t = getDateSub(start, end);
|