xg

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

@@ -245,30 +245,35 @@ func transferByPhone(t *VipGift, user, phones map[string]interface{}, platform s
 	}
 	// 赠送人时长修改  赠送人vip结束时间-赠送月份 对比 当前时间
 	endTime := qutil.Int64All(user["l_vip_endtime"])
-	t1 := time.Unix(endTime, 0).UTC()
+	t1 := time.Unix(endTime, 0).Local()
 	newTime := t1.AddDate(0, -num, 0)
 
-	if sameDay && dif == 0 {
+	if (sameDay && dif == 0) || (newTime.Unix() > time.Now().Unix()) {
 		if !util.Compatible.Update(userId, bson.M{"$set": map[string]interface{}{
 			"i_vip_status":     -i_vip_status,
 			"i_vip_expire_tip": 2,
 			"i_vip_subtips":    0,
 			"i_vip_fastimport": 0,
+			"l_vip_endtime":    newTime.Unix(),
 		},
 			"$unset": map[string]interface{}{
 				"i_vip_expire_tip_retry": "",
 			}}) {
 			return fmt.Errorf("更新异常：%s", userId)
 		}
-	} else if newTime.Unix() > time.Now().Unix() {
+	} else {
 		if !util.Compatible.Update(userId, bson.M{"$set": map[string]interface{}{
 			"l_vip_endtime": newTime.Unix(),
 		}}) {
 			return fmt.Errorf("更新异常：%s", userId)
 		}
-	} else {
-		return fmt.Errorf("赠予时长异常，赠送失败, %d", newTime.Unix())
 	}
+	//else {
+	//    log.Println("sameDay: ", sameDay)
+	//    log.Println("dif: ", dif)
+	//    log.Println("newTime.Unix(): ", newTime.Unix())
+	//    return fmt.Errorf("赠予时长异常，赠送失败, %d", newTime.Unix())
+	//}
 	clearCache(userId) // 赠送人
 	for uid, info := range updateInfo {
 		info1 := gconv.Map(info.UpdateInfo)