wangkaiyue 4 years ago
parent
commit
5360134e09

+ 1 - 1
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/price.js

@@ -41,7 +41,7 @@ var Calculation = {
                 "allProvince_allBuyerClass": 59900
             },
             "year": {
-                "oneProvince_allBuyerClass": 38800,
+                "oneProvince_allBuyerClass": 38000,
                 "allProvince_allBuyerClass": 599900
             },
             "provincePrice": 3800,

+ 1 - 1
src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -386,7 +386,7 @@ func (this *vipSubscribeStruct) NewBuySet(area *map[string]interface{}, industry
 	} else {
 		buyset.Upgrade = 1 //升级版超级订阅标识
 		if len(*area) > 0 {
-			pCount := len(*area)
+			pCount = len(*area)
 			//省份数量自动转换全国
 			if pCount > SubVipPrice.New.ProvinceMaxCount {
 				pCount = -1

+ 5 - 0
src/jfw/modules/subscribepay/src/service/vipSubscribeChange.go

@@ -517,10 +517,15 @@ func getSubtotalPrice(oldBuyset, newBuyset *entity.SubvipBuySet, startTime, endt
 	if monthNum != 0 {
 		beforePrice += entity.JyVipSubStruct.GetSubVipPriceByBuySet(oldBuyset, monthNum, 2, false)
 		newPrice += entity.JyVipSubStruct.GetSubVipPriceByBuySet(newBuyset, monthNum, 2, false)
+		log.Println("monthNum beforePrice", entity.JyVipSubStruct.GetSubVipPriceByBuySet(oldBuyset, monthNum, 2, false))
+		log.Println("monthNum newPrice", entity.JyVipSubStruct.GetSubVipPriceByBuySet(newBuyset, monthNum, 2, false))
 	}
 	if yearNum != 0 {
 		beforePrice += entity.JyVipSubStruct.GetSubVipPriceByBuySet(oldBuyset, yearNum, 1, false)
 		newPrice += entity.JyVipSubStruct.GetSubVipPriceByBuySet(newBuyset, yearNum, 1, false)
+
+		log.Println("yearNum beforePrice", entity.JyVipSubStruct.GetSubVipPriceByBuySet(oldBuyset, yearNum, 1, false))
+		log.Println("newPrice newPrice", entity.JyVipSubStruct.GetSubVipPriceByBuySet(newBuyset, yearNum, 1, false))
 	}
 	log.Printf("old %+v \n new %+v \n %d-%d 相差%d年 %d个月\n price: %d-%d=%d  \n", oldBuyset, newBuyset, startTime, endtime, yearNum, monthNum, newPrice, beforePrice, newPrice-beforePrice)
 	return newPrice - beforePrice

+ 1 - 1
src/web/staticres/vipsubscribe/js/price.js

@@ -41,7 +41,7 @@ var Calculation = {
                 "allProvince_allBuyerClass": 59900
             },
             "year": {
-                "oneProvince_allBuyerClass": 38800,
+                "oneProvince_allBuyerClass": 38000,
                 "allProvince_allBuyerClass": 599900
             },
             "provincePrice": 3800,