xiugai

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

@@ -16,7 +16,7 @@ import (
 	"util"
 
 	"github.com/go-xweb/xweb"
-	"gopkg.in/mgo.v2/bson"
+	//	"gopkg.in/mgo.v2/bson"
 )
 
 //订阅升级修改相关接口
@@ -43,14 +43,14 @@ func (this *RenewUpgrade) GetBuyMsg() {
 		end := time.Unix(endtime, 0).Format("2006-01-02")
 		now := time.Unix(time.Now().Unix(), 0).Format("2006-01-02")
 		vipStatus := (*data)["i_vip_status"]
-		isvalidOk := true
+		//		isvalidOk := true
 
-		str, oks := util.MQFW.FindOne("vip_upgrade", bson.M{"s_userid": userId, "i_isvalid": 0})
-		if oks && len(*str) > 0 && *str != nil {
-			area = (*str)["o_area"]
-			buyerclass = (*str)["a_buyerclass"]
-			isvalidOk = false
-		}
+		//		str, oks := util.MQFW.FindOne("vip_upgrade", bson.M{"s_userid": userId, "i_isvalid": 0})
+		//		if oks && len(*str) > 0 && *str != nil {
+		//			area = (*str)["o_area"]
+		//			buyerclass = (*str)["a_buyerclass"]
+		//			isvalidOk = false
+		//		}
 
 		dataArr := map[string]interface{}{
 			"area":       area,
@@ -63,7 +63,7 @@ func (this *RenewUpgrade) GetBuyMsg() {
 			"end":        end,
 			"now":        now,
 			"vipStatus":  vipStatus,
-			"isvalidOk":  isvalidOk,
+			//			"isvalidOk":  isvalidOk,
 		}
 		this.ServeJson(dataArr)
 	}
@@ -78,11 +78,12 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 	industrys := strings.Split(this.GetString("industryarr"), ",") //已购买行业
 	date := this.GetString("time")                                 //不延长时为空，正常为 年或月
 	payWay := this.GetString("payWay")                             //支付方式
-	effect := this.GetString("effect")                             //升级 生效日期 立即生效-now  下月一号生效-下月一号的时间戳
-	pay_source := this.GetString("pay_source")                     //类型  续费-Renew or 升级-Upgrade
+	log.Println("payWay", payWay)
+	//	effect := this.GetString("effect")         //升级 生效日期 立即生效-now  下月一号生效-下月一号的时间戳
+	pay_source := this.GetString("pay_source") //类型  续费-Renew or 升级-Upgrade
 	userId := qutil.ObjToString(this.GetSession("userId"))
 	openId := qutil.ObjToString(this.GetSession("s_m_openid"))
-	isvalidOk, _ := this.GetBool("isvalidOk")
+	//	isvalidOk, _ := this.GetBool("isvalidOk")
 	r := func() *entity.FuncResult {
 		now := time.Now()
 		//数据校验
@@ -122,19 +123,20 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 		isRenew := true
 		if pay_source == "Upgrade" { //计算升级时间
 			isRenew = false
-			if effect == "now" { //立即生效
-				orderType = 3
-				//				startTime = time.Now()
-			} else { //下月生效
-				orderType = 4
-				//				startTime = time.Date(time.Now().Year(), time.Now().Month()+1, 1, 0, 0, 0, 0, time.Local)
-			}
-			if !isvalidOk {
-				orderType = 6
-			}
+			//			if effect == "now" { //立即生效
+			orderType = 3
+			startTime = time.Now()
+			//			} else { //下月生效
+			//				orderType = 4
+			//				startTime = time.Date(time.Now().Year(), time.Now().Month()+1, 1, 0, 0, 0, 0, time.Local)
+			//			}
+			//			if !isvalidOk {
+			//				orderType = 6
+			//			}
 		} else { //续费时间
 			orderType = 2 //续费操作
 			startTime = endTime
+			log.Println("startTime", startTime)
 		}
 		//		if date_unit == 1 { ///延长时间
 		//			endTime = endTime.AddDate(date_count, 0, 0)
@@ -145,15 +147,15 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 			endTime = util.GetDATE(date_unit, date_count, end)
 		}
 		log.Println("endend", endTime)
-		if pay_source == "Renew" && now.Unix() > end { //到期后的续费从当前时间往后延长
-			startTime = now
-			//			if date_unit == 1 { ///延长时间
-			//				endTime = startTime.AddDate(date_count, 0, 0)
-			//			} else if date_unit == 2 { //月
-			//				endTime = startTime.AddDate(0, date_count, 0)
-			//			}
-			endTime = util.GetDATE(date_unit, date_count, startTime.Unix())
-		}
+		//		if pay_source == "Renew" && now.Unix() > end { //到期后的续费从当前时间往后延长
+		//			startTime = now
+		//			//			if date_unit == 1 { ///延长时间
+		//			//				endTime = startTime.AddDate(date_count, 0, 0)
+		//			//			} else if date_unit == 2 { //月
+		//			//				endTime = startTime.AddDate(0, date_count, 0)
+		//			//			}
+		//			endTime = util.GetDATE(date_unit, date_count, startTime.Unix())
+		//		}
 		filter := entity.VipSimpleMsg{
 			area,
 			industry,
@@ -170,7 +172,7 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 		if pay_source == "Renew" {
 			totalfee = entity.JyVipSubStruct.GetSubVipPrice(area, industry, date_count, date_unit)
 		} else if pay_source == "Upgrade" {
-			upgradeYear, upgradeMonth := MaxUpgradeMonth(end, effect)                     //获取最大升级月数
+			upgradeYear, upgradeMonth := MaxUpgradeMonth(end)                             //获取最大升级月数
 			addY := entity.JyVipSubStruct.GetSubVipPrice(area, industry, upgradeYear, 1)  //已购+新增，以年为单位的价格
 			addM := entity.JyVipSubStruct.GetSubVipPrice(area, industry, upgradeMonth, 2) //已购+新增，以月为单位的价格
 			addPrice := addM + addY                                                       //已购+新增总价格
@@ -224,6 +226,7 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 			}
 			prepayid = qutil.ObjToString((*ret)["prepayid"])
 			payStr = pay.WxStruct.GetAppWxPayStr(prepayid)
+			log.Println("tradeno", tradeno)
 		} else { //支付宝支付
 			var err error
 			payStr, tradeno, err = pay.Alipay.GetOrderPayParam((qutil.Float64All(totalfee)), "", pay.ALI_SUBVIP_APP)
@@ -321,7 +324,7 @@ func checkReqDates(dateStr string) (cyclecount, cycleunit int, err error) {
 }
 
 //获取最大升级月数
-func MaxUpgradeMonth(endTime int64, effect string) (int, int) {
+func MaxUpgradeMonth(endTime int64) (int, int) {
 	endYear := time.Unix(endTime, 0).Year()
 	endMonth := int(time.Unix(endTime, 0).Month())
 	endDay := time.Unix(endTime, 0).Day()
@@ -361,9 +364,6 @@ func MaxUpgradeMonth(endTime int64, effect string) (int, int) {
 		}
 	}
 
-	if effect != "now" {
-		nowUpgrade = nowUpgrade - 1
-	}
 	if nowUpgrade == 0 {
 		nowUpgrade = 1
 	}