到期显示

src/jfw/front/vipsubscribe.go

@@ -4,6 +4,7 @@ import (
 	"jfw/public"
 	"jfw/wx"
 	"qfw/util"
+	"time"
 
 	"github.com/go-xweb/xweb"
 )
@@ -264,6 +265,14 @@ func (s *Subscribepay) RenewPage(sign string) {
 	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
 	mynickname, _ := s.Session().Get("s_nickname").(string)
 	myavatar, _ := s.Session().Get("s_avatar").(string)
+	startTime := util.Int64All(s.GetString("startTime"))
+	endTime := util.Int64All(s.GetString("endTime"))
+	orderId := s.GetString("orderId")
+	startTimes := time.Unix(startTime, 0).Format("2006-01-02")
+	endTimes := time.Unix(endTime, 0).Format("2006-01-02")
+	s.T["orderId"] = orderId
+	s.T["startTime"] = startTimes
+	s.T["endTime"] = endTimes
 	s.T["nickname"] = mynickname
 	s.T["avatar"] = myavatar
 	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url())

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

@@ -24,6 +24,7 @@ type RenewUpgrade struct {
 	*xweb.Action
 	getBuyMsg               xweb.Mapper `xweb:"/renewUpgrade/getBuyMsg"`               //获取购买相关信息
 	renewUpgradeCreateOrder xweb.Mapper `xweb:"/renewUpgrade/renewUpgradeCreateOrder"` //续费升级支付
+	getExprie               xweb.Mapper `xweb:"/renewUpgrade/getExprie"`               //获取到期页面购买信息
 }
 
 //获取购买订阅相关信息
@@ -41,6 +42,7 @@ func (this *RenewUpgrade) GetBuyMsg() {
 		endtime := qutil.Int64All((*data)["l_vip_endtime"])
 		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"]
 
 		dataArr := map[string]interface{}{
 			"area":       area,
@@ -52,6 +54,7 @@ func (this *RenewUpgrade) GetBuyMsg() {
 			"start":      start,
 			"end":        end,
 			"now":        now,
+			"vipStatus":  vipStatus,
 		}
 		this.ServeJson(dataArr)
 	}
@@ -244,6 +247,34 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 	this.ServeJson(r.Format())
 }
 
+//获取到期页面购买信息
+func (this *RenewUpgrade) GetExprie() {
+	userId := qutil.ObjToString(this.GetSession("userId"))
+	data, ok := util.MQFW.FindById("user", userId, nil)
+	var vipStatus string
+	if ok && len(*data) > 0 && *data != nil {
+		vipStatus = qutil.ObjToString((*data)["i_vip_status"])
+	}
+	orderId := this.GetString("orderId")
+	orderdata := util.Mysql.FindOne("dataexport_order", map[string]interface{}{
+		"id": orderId,
+	}, "filter", "")
+	vmsg := entity.VipSimpleMsg{}
+	if orderdata != nil && len(*orderdata) > 0 {
+		filterStr := qutil.ObjToString((*orderdata)["filter"])
+		if err := json.Unmarshal([]byte(filterStr), &vmsg); err != nil {
+			log.Printf("%s vipSubscribeStruct PayCallBack Unmarshal 出错 [%s]\n", filterStr)
+			return
+		}
+		dataArr := map[string]interface{}{
+			"area":       vmsg.Area,
+			"buyerclass": vmsg.Industry,
+			"vipStatus":  vipStatus,
+		}
+		this.ServeJson(dataArr)
+	}
+}
+
 //cycleunit(1:年 2:月)
 //cyclecount 数字长度
 func checkReqDates(dateStr string) (cyclecount, cycleunit int, err error) {

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

@@ -60,70 +60,140 @@
     	<script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
 		<script type="text/javascript">
 			//
-			$DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
-				var area = data.area;
-			    var buyerclass = data.buyerclass;
-			    var startTime = data.start;
-			    var endTime = data.end;
-			    var exprie = {{.T.exprie}};
-			    //
-			    var areaArr = [];
-			    var areaHtml = "";
-			    var buyerclassArr = [];
-			    var buyerclassHtml = "";
-		//	    var dateName = "";
-			    var dateHtml = "";
-			    if (area !== "" && area !== undefined){
-			    	for(var province in area){
-			    		var citys = area[province]
-	//		    		console.log(citys);
-			    		if(citys.length===0){
-			    			areaArr.push(province);
-			    		}else{
-			    			for(var i in citys){
-			    				areaArr.push(citys[i]);
-			    			}
-			    		}
-			    	}
-			    	areaHtml = areaArr.toString().replace(/,/g, "、");
-			    	if(checkObj(area)){
-						areaHtml = "全国";
+			var orderId = {{.T.orderId}};
+			var starts = {{.T.startTime}};
+			var ends = {{.T.endTime}};
+//			console.log(orderId)
+//			alert("starts",starts)
+//			alert("ends",ends)
+			if(orderId !== "" && orderId !== undefined){
+				$DoPost("/subscribepay/renewUpgrade/getExprie", {"orderId":orderId}, function (r) {
+					if(r){
+						var area = r.area
+						var buyerclass = r.buyerclass
+						var exprie = {{.T.exprie}};
+						var vipStatus = Number(r.vipStatus);
+						if (area !== "" && area !== undefined){
+					    	for(var province in area){
+					    		var citys = area[province]
+			//		    		console.log(citys);
+					    		if(citys.length===0){
+					    			areaArr.push(province);
+					    		}else{
+					    			for(var i in citys){
+					    				areaArr.push(citys[i]);
+					    			}
+					    		}
+					    	}
+					    	areaHtml = areaArr.toString().replace(/,/g, "、");
+					    	if(checkObj(area)){
+								areaHtml = "全国";
+							}
+					    	$('.area-list').text(areaHtml);
+					    }
+					    if(buyerclass !== "" && buyerclass !== undefined){
+					    	for(var i in buyerclass){
+					    		var industry = buyerclass[i];
+					    		buyerclassArr.push(industry);
+					    		buyerclassHtml = buyerclassArr.toString().replace(/,/g, " ");
+					    	}
+					    	if(checkObj(buyerclass)){
+					    		buyerclassHtml = "全行业";
+					    	}
+							$('.industry-list').text(buyerclassHtml);
+					    }
+					    if(starts !== "" && ends !== ""){
+					    	let start = starts.toString().replace(/-/g, ".");
+					    	let end = ends.toString().replace(/-/g, ".");
+					    	let dateHtml = start + " - " + end;
+					    	$(".date-span").text(dateHtml);
+					    }
+					    if(exprie === "will"){
+					    	$(".free_service").hide();
+					    	$("#exprie").text("VIP订阅服务即将到期，请及时续费")
+					    	$(".recommend_title").text("以下区域、行业的订阅推送即将停止，为了不影响您的使用，请立即续费！")
+					    }else{
+					    	$(".free_service").show();
+					    }
+					    if(vipStatus === 2){
+					    	$(".free_service").hide();
+					    	$(".renew_service").hide();
+					    }
 					}
-			    	$('.area-list').text(areaHtml);
-			    }
-			    if(buyerclass !== "" && buyerclass !== undefined){
-			    	for(var i in buyerclass){
-			    		var industry = buyerclass[i];
-			    		buyerclassArr.push(industry);
-			    		buyerclassHtml = buyerclassArr.toString().replace(/,/g, " ");
-			    	}
-			    	if(checkObj(buyerclass)){
-			    		buyerclassHtml = "全行业";
-			    	}
-					$('.industry-list').text(buyerclassHtml);
-			    }
-		//	    if(cycleunit !== "" && cycleunit !== undefined){
-		//	    	if(cycleunit === 1){
-		//	    		dateName = cyclecount + " 年";
-		//	    	}else if(cycleunit === 2){
-		//	    		dateName = cyclecount + " 个月";
-		//	    	}
-		//	    	$(".item_cycle .label_for").text(dateName);
-		//	    }
-			    if(startTime !== "" && endTime !== ""){
-			    	var start = startTime.toString().replace(/-/g, ".");
-			    	var end = endTime.toString().replace(/-/g, ".");
-			    	dateHtml = start + " - " + end;
-			    	$(".date-span").text(dateHtml);
-			    }
-			    if(exprie === "will"){
-			    	$(".free_service").hide();
-			    	$("#exprie").text("VIP订阅服务即将到期，请及时续费")
-			    	$(".recommend_title").text("以下区域、行业的订阅推送即将停止，为了不影响您的使用，请立即续费！")
-			    }else{
-			    	$(".free_service").show();
-			    }
-			});
+				});
+			}else{
+				$DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
+					if(data){
+						var area = data.area;
+					    var buyerclass = data.buyerclass;
+					    var startTime = data.start;
+					    var endTime = data.end;
+					    var exprie = {{.T.exprie}};
+					    var vipStatus = Number(data.vipStatus);
+					    //
+					    var areaArr = [];
+					    var areaHtml = "";
+					    var buyerclassArr = [];
+					    var buyerclassHtml = "";
+				//	    var dateName = "";
+					    var dateHtml = "";
+					    if (area !== "" && area !== undefined){
+					    	for(var province in area){
+					    		var citys = area[province]
+			//		    		console.log(citys);
+					    		if(citys.length===0){
+					    			areaArr.push(province);
+					    		}else{
+					    			for(var i in citys){
+					    				areaArr.push(citys[i]);
+					    			}
+					    		}
+					    	}
+					    	areaHtml = areaArr.toString().replace(/,/g, "、");
+					    	if(checkObj(area)){
+								areaHtml = "全国";
+							}
+					    	$('.area-list').text(areaHtml);
+					    }
+					    if(buyerclass !== "" && buyerclass !== undefined){
+					    	for(var i in buyerclass){
+					    		var industry = buyerclass[i];
+					    		buyerclassArr.push(industry);
+					    		buyerclassHtml = buyerclassArr.toString().replace(/,/g, " ");
+					    	}
+					    	if(checkObj(buyerclass)){
+					    		buyerclassHtml = "全行业";
+					    	}
+							$('.industry-list').text(buyerclassHtml);
+					    }
+				//	    if(cycleunit !== "" && cycleunit !== undefined){
+				//	    	if(cycleunit === 1){
+				//	    		dateName = cyclecount + " 年";
+				//	    	}else if(cycleunit === 2){
+				//	    		dateName = cyclecount + " 个月";
+				//	    	}
+				//	    	$(".item_cycle .label_for").text(dateName);
+				//	    }
+					    if(startTime !== "" && endTime !== ""){
+					    	var start = startTime.toString().replace(/-/g, ".");
+					    	var end = endTime.toString().replace(/-/g, ".");
+					    	dateHtml = start + " - " + end;
+					    	$(".date-span").text(dateHtml);
+					    }
+					    if(exprie === "will"){
+					    	$(".free_service").hide();
+					    	$("#exprie").text("VIP订阅服务即将到期，请及时续费")
+					    	$(".recommend_title").text("以下区域、行业的订阅推送即将停止，为了不影响您的使用，请立即续费！")
+					    }else{
+					    	$(".free_service").show();
+					    }
+					    if(vipStatus === 2){
+					    	$(".free_service").hide();
+					    	$(".renew_service").hide();
+					    }
+					}
+				});	
+			}
 			
 	        //
 		    function checkObj(obj) {

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

@@ -487,6 +487,16 @@
         
         // 选择周期
         $('.lengthen > a').click(function () {
+        	if((nowRenew)>=36){
+            	var overtimeWarning = `最长订阅周期不可超过3年<br />当前订阅周期：${nowRenew}个月`
+		        weui.toast(overtimeWarning, {
+		            duration: 3000,
+		            className: 'custom-toast',
+		            callback: function() {
+		            }
+		        })
+		        return
+            }
             $('#time_cycle').show(200);
         })
         // 对订阅时间选择的 input绑定点击事件