|
@@ -100,9 +100,9 @@ func (this *vipSubscribeStruct) PayCallBack(param *CallBackParam) bool {
|
|
|
} else if vmsg.OrderType == 2 { //续费
|
|
|
flag = JyVipSubStruct.RenewSubVip(userid, qutil.ObjToString((*orderdata)["vip_endtime"]))
|
|
|
} else if vmsg.OrderType == 3 { //立即升级
|
|
|
- flag = JyVipSubStruct.UpgradeSubVip(userid, vmsg, qutil.ObjToString((*orderdata)["vip_starttime"]), qutil.ObjToString((*orderdata)["vip_endtime"]), true)
|
|
|
+ flag = JyVipSubStruct.UpgradeSubVip(userid, vmsg, qutil.ObjToString((*orderdata)["vip_endtime"]), true)
|
|
|
} else if vmsg.OrderType == 4 || vmsg.OrderType == 5 { //下月升级
|
|
|
- flag = JyVipSubStruct.UpgradeSubVip(userid, vmsg, qutil.ObjToString((*orderdata)["vip_starttime"]), qutil.ObjToString((*orderdata)["vip_endtime"]), false)
|
|
|
+ flag = JyVipSubStruct.UpgradeSubVip(userid, vmsg, qutil.ObjToString((*orderdata)["vip_endtime"]), false)
|
|
|
}
|
|
|
//支付成功后 其他未支付vip订阅订单 变为已取消
|
|
|
if flag {
|
|
@@ -148,12 +148,12 @@ func (this *vipSubscribeStruct) RenewSubVip(userId, endtime string) bool {
|
|
|
}
|
|
|
|
|
|
//升级
|
|
|
-func (this *vipSubscribeStruct) UpgradeSubVip(userId string, vmsg VipSimpleMsg, start, end string, isNow bool) bool {
|
|
|
- startTime, err := time.ParseInLocation(qutil.Date_Full_Layout, start, time.Local)
|
|
|
- if err != nil {
|
|
|
- log.Println("%s格式化日期出错%s\n", userId, start)
|
|
|
- return false
|
|
|
- }
|
|
|
+func (this *vipSubscribeStruct) UpgradeSubVip(userId string, vmsg VipSimpleMsg, end string, isNow bool) bool {
|
|
|
+ // startTime, err := time.ParseInLocation(qutil.Date_Full_Layout, start, time.Local)
|
|
|
+ // if err != nil {
|
|
|
+ // log.Println("%s格式化日期出错%s\n", userId, start)
|
|
|
+ // return false
|
|
|
+ // }
|
|
|
endTime, err := time.ParseInLocation(qutil.Date_Full_Layout, end, time.Local)
|
|
|
if err != nil {
|
|
|
log.Println("%s格式化日期出错%s\n", userId, endTime)
|