xiugai

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

@@ -238,19 +238,6 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 				if upgradeBuyset.AreaCount == -1 {
 					return &entity.FuncResult{false, errors.New("非法请求"), nil}
 				}
-				//				for province, cityCount := range *cityArr {
-				//					if qutil.IntAll((*newCityArr)[province]) < qutil.IntAll(cityCount) {
-				//						return &entity.FuncResult{false, errors.New("非法请求"), nil}
-				//					}
-				//				}
-				//				citysMap := upgradeBuyset.Citys
-				//				for provinces, cityCounts := range *newCityArr {
-				//					if citysMap[provinces] != nil {
-				//						if qutil.IntAll(citysMap[provinces]) > qutil.IntAll(cityCounts) {
-				//							return &entity.FuncResult{false, errors.New("非法请求"), nil}
-				//						}
-				//					}
-				//				}
 			}
 			//------校验buyset、区域、行业是否异常
 
@@ -273,13 +260,6 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 				totalfee = totalfee + lengPrice                                                                                   //已购+新增延长时间价格 + 升级差价 = 最终价格
 			}
 		}
-		//		log.Println("price", totalfee)
-		//		tmp := float64(totalfee) * 0.000001
-		//		if tmp < 1 {
-		//			if tmp != 0 {
-		//				totalfee = 1
-		//			}
-		//		}
 		log.Println("price", totalfee)
 
 		//创建订单

src/web/templates/weixin/vipsubscribe/vip_upgrade.html

@@ -968,10 +968,10 @@
 			
 			//
 			if(nowUpgradeYear >= 1){
-				let newPriceY = getsubVipOrderPriceBybuyset(newBuysetObj(areaObj()),[nowUpgradeYear,1]);
-				let newPriceM = getsubVipOrderPriceBybuyset(newBuysetObj(areaObj()),[nowUpgrade,2]);
-				let yearprice = getsubVipOrderPriceBybuyset(newBuysetObj(areaObj()),[nowUpgradeYear,1]);
-				let monthprice = getsubVipOrderPriceBybuyset(newBuysetObj(areaObj()),[nowUpgrade,2]);
+				let newPriceY = getsubVipOrderPriceBybuyset(buySetObj(newBuysetObj(areaObj())),[nowUpgradeYear,1]);
+				let newPriceM = getsubVipOrderPriceBybuyset(buySetObj(newBuysetObj(areaObj())),[nowUpgrade,2]);
+				let yearprice = getsubVipOrderPriceBybuyset(buySetObj(newBuysetObj(areaObj())),[nowUpgradeYear,1]);
+				let monthprice = getsubVipOrderPriceBybuyset(buySetObj(newBuysetObj(areaObj())),[nowUpgrade,2]);
 				price = newPriceY + newPriceM - oldPrice;
 				// ------- 升级延长周期价格计算 ---------
 				if(monthprice === 0){