Merge branch 'dev2.8.5' of ssh://192.168.3.207:10022/qmx/jy into dev2.8.5

src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -132,9 +132,11 @@ 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_endtime"]), true)
-	} else if vmsg.OrderType == 4 || vmsg.OrderType == 5 { //下月升级
-		flag = JyVipSubStruct.UpgradeSubVip(userid, vmsg, qutil.ObjToString((*orderdata)["vip_endtime"]), false)
+		flag = JyVipSubStruct.UpgradeSubVip(userid, vmsg, qutil.ObjToString((*orderdata)["vip_starttime"]), qutil.ObjToString((*orderdata)["vip_endtime"]), true, "no")
+	} else if vmsg.OrderType == 4 { //下月升级
+		flag = JyVipSubStruct.UpgradeSubVip(userid, vmsg, qutil.ObjToString((*orderdata)["vip_starttime"]), qutil.ObjToString((*orderdata)["vip_endtime"]), false, "no")
+	} else if vmsg.OrderType == 5 {
+		flag = JyVipSubStruct.UpgradeSubVip(userid, vmsg, qutil.ObjToString((*orderdata)["vip_starttime"]), qutil.ObjToString((*orderdata)["vip_endtime"]), false, "exprie")
 	} else if vmsg.OrderType == 6 { //下月升级未生效再次升级
 		flag = JyVipSubStruct.UpgradeSubVipTwo(userid, vmsg, qutil.ObjToString((*orderdata)["vip_endtime"]), false)
 	}
@@ -182,13 +184,14 @@ func (this *vipSubscribeStruct) RenewSubVip(userId, endtime string) bool {
 }
 
 //升级
-func (this *vipSubscribeStruct) UpgradeSubVip(userId string, vmsg VipSimpleMsg, end string, isNow bool) bool {
+func (this *vipSubscribeStruct) UpgradeSubVip(userId string, vmsg VipSimpleMsg, start string, end string, isNow bool, isExprie string) 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)
+	endTime, _ := time.ParseInLocation(qutil.Date_Full_Layout, end, time.Local)
+	startTime, err := time.ParseInLocation(qutil.Date_Full_Layout, start, time.Local)
 	if err != nil {
 		log.Println("%s格式化日期出错%s\n", userId, endTime)
 		return false
@@ -213,7 +216,13 @@ func (this *vipSubscribeStruct) UpgradeSubVip(userId string, vmsg VipSimpleMsg,
 			log.Printf("%s更新结束%d日期出错\n", userId, endTime.Unix())
 			return false
 		}
-		effectTime := time.Date(time.Now().Year(), time.Now().Month()+1, 1, 0, 0, 0, 0, time.Local)
+		var effectTime time.Time
+		if isExprie != "no" {
+			effectTime = startTime
+		} else {
+			effectTime = time.Date(time.Now().Year(), time.Now().Month()+1, 1, 0, 0, 0, 0, time.Local)
+		}
+
 		return util.MQFW.Save("vip_upgrade",
 			bson.M{
 				"s_userid":     userId,            //试用设置地区

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

@@ -135,7 +135,7 @@ func (this *SubVipPayOrder) CreateOrder() {
 		if orderType == 5 { //插入生效时间和结束时间
 			timeStamp := qutil.Int64All((*userData)["l_vip_endtime"])
 			startTime := time.Unix(timeStamp, 0)
-			endTime := util.GetDATE(filter.Cycleunit, filter.Cycleunit, timeStamp)
+			endTime := util.GetDATE(filter.Cycleunit, filter.Cyclecount, timeStamp)
 			insertMap["vip_starttime"] = qutil.FormatDate(&startTime, qutil.Date_Full_Layout)
 			insertMap["vip_endtime"] = qutil.FormatDate(&endTime, qutil.Date_Full_Layout)
 		}

src/jfw/modules/weixin/src/wx/wx.go

@@ -102,7 +102,7 @@ func MsgTxtHandler(w ResponseWriter, r *Request) {
 	}
 	autoReply_reg, _ := regexp.Compile("剑鱼|招标|中标|订阅|公告|项目|设置|推送")
 	shalong_text, shalong_img := "", ""
-	log.Println(len(autoReply_reg.FindStringIndex(r.Content)))
+	//	log.Println(len(autoReply_reg.FindStringIndex(r.Content)))
 	if strings.Replace(r.Content, " ", "", -1) == "沙龙" {
 		shalong_text, shalong_img = shalongActive.Get()
 	}
@@ -213,8 +213,8 @@ func pcSetUserKeys(user map[string]interface{}, shareid, pccodepre string) (map[
 	result := "fail"
 	subkey := redis.Get("sso", "pc_subscribe_"+shareid)
 	keys := strings.Split(fmt.Sprint(subkey), " ")
-	log.Println(subkey)
-	log.Println(keys)
+	//	log.Println(subkey)
+	//	log.Println(keys)
 	if subkey != nil {
 		if o_jy, ok := user["o_jy"].(map[string]interface{}); ok {
 			if tmp, ok := o_jy["a_key"].([]interface{}); ok {
@@ -242,7 +242,7 @@ func pcSetUserKeys(user map[string]interface{}, shareid, pccodepre string) (map[
 							}
 							if result != "repeat" {
 								keys := strings.Split(fmt.Sprint(subkey), " ")
-								log.Println("==:", keys)
+								//								log.Println("==:", keys)
 								tmp = append(tmp, map[string]interface{}{"key": keys})
 								o_jy["a_key"] = tmp
 								result = "ok"
@@ -329,7 +329,7 @@ func saveUser(u *UserInfo, source, pre, RSource string) (bool, string, string) {
 	isJyopUser := strings.HasPrefix(source, "Jyop")
 	pcresult := "" //pc订阅结果
 	subkey := ""   //pc订阅关键词
-	log.Println("保存用户：", subkey)
+	//	log.Println("保存用户：", subkey)
 	fg := false
 	tusers, ok := tools.MQFW.Find("user", map[string]interface{}{
 		"s_unionid": u.UnionId,
@@ -1396,7 +1396,7 @@ func YjHandle(w http.ResponseWriter, r *http.Request) {
 	} else {
 		tmp := map[string]interface{}{}
 		json.Unmarshal(ret, &tmp)
-		log.Println(tmp)
+		//		log.Println(tmp)
 		url := tmp["url"].(string)
 		w.Write([]byte(url))
 	}
@@ -1559,7 +1559,7 @@ func vipFastSubscribe(user *map[string]interface{}, keyWord, openId string) (ret
 		}
 		if keysCount+len(keysFilter) > 300 {
 			//vip订阅超过300组关键词
-			log.Println("vip订阅超过300组关键词-----")
+			//			log.Println("vip订阅超过300组关键词-----")
 			return -3, strings.Replace(keyWord, "+", " ", -1), hasOldKey
 		}
 	}

src/web/templates/weixin/historypush.html

@@ -96,9 +96,9 @@
 				hasNextPage = sessionStorage.historypushHasNextPage=="true"?true:false;
 				scrollTop = sessionStorage.historypushScrollTop;
 				dataCache = JSON.parse(sessionStorage.historypushDataCache);
-				isVipSub = sessionStorage.isVipSub=="true"?true:false;;
-				isPassCount = sessionStorage.isPassCount=="true"?true:false;;
-				haskey = sessionStorage.haskey=="true"?true:false;;
+				isVipSub = sessionStorage.isVipSub=="true"?true:false;
+				isPassCount = sessionStorage.isPassCount=="true"?true:false;
+				haskey = sessionStorage.haskey=="true"?true:false;
 				isOnTail = sessionStorage.isOnTail;
 				isExpire = sessionStorage.isExpire;
 				userId = sessionStorage.userId;
@@ -109,10 +109,12 @@
 			    }
 				$("#list>*").remove();
 				count = 0;
+				firstPage = dataCache;
 				if(dataCache.length==0){
 					hasNoData();
+				}else{
+					structureHtml(dataCache,true);
 				}
-				structureHtml(dataCache,true);
 				$(window).scrollTop(scrollTop);
 				sessionStorage.removeItem("historypushDataCache");
 				sessionStorage.removeItem("historypushPageIndexCache");
@@ -152,21 +154,6 @@
 						isExpire = data.isExpire;
 						sessionStorage.isExpire = isExpire;
 						sessionStorage.setItem(userId+"_searchTime",firstTime);
-						if(!firstPage.length>0 && !haskey){
-							if(sessionStorage&&(sessionStorage.keysetindexToHistory=="1"||sessionStorage.keysetindexToHistory=="2"||sessionStorage.keysetindexToHistory=="3")){
-								sessionStorage.removeItem("keysetindexToHistory");
-								if(sessionStorage.keysetindexToHistory=="1"){
-									wx.ready(function () {
-										wx.closeWindow();
-									});
-								}else{
-									setTimeout(function(){
-										wx.closeWindow();
-									},2000);
-								}
-								return
-							}
-						}
 						showPage();
 					},
 					error: function(xhr, type){
@@ -248,22 +235,37 @@
 			//地区渲染
   			mapData();
 			if(!isVipSub){
-				history.pushState({},"","");
-				if(isInTSguide){
-					if(localStorage){
-						localStorage.removeItem("tsGuide_status");
-					}
-					window.location.href='/front/tenderSubscribe/guide';
-				}else{
-					window.location.href='/wxkeyset/keyset/index';
-				}
+				$(".normal_set").show();
+				$(".tab_left .area").hide();
 				$(".vip_banner").show();
 				$(".subscribe").css("margin-top","2rem");
 				if(isPassCount){
 					$(".open_remind").show();
 				}
-				$(".normal_set").show();
-				$(".tab_left .area").hide();
+				if(!firstPage.length>0 && !haskey){
+					if(sessionStorage&&(sessionStorage.keysetindexToHistory=="1"||sessionStorage.keysetindexToHistory=="2"||sessionStorage.keysetindexToHistory=="3")){
+						sessionStorage.removeItem("keysetindexToHistory");
+						if(sessionStorage.keysetindexToHistory=="1"){
+							wx.ready(function () {
+								wx.closeWindow();
+							});
+						}else{
+							setTimeout(function(){
+								wx.closeWindow();
+							},2000);
+						}
+						return
+					}
+					history.pushState({},"","");
+					if(isInTSguide){
+						if(localStorage){
+							localStorage.removeItem("tsGuide_status");
+						}
+						window.location.href='/front/tenderSubscribe/guide';
+					}else{
+						window.location.href='/wxkeyset/keyset/index';
+					}
+				}
 			}else{
 				if(!haskey){
 					$(".set_keyword").show();

src/web/templates/weixin/wxkeyset/index.html

@@ -209,6 +209,11 @@ $(function(){
 		if(myArray.length>=10){
 			$("#ten").css("margin-bottom","1rem");
 		}
+		if (myArray.length>0){
+			sessionStorage.haskey = true;
+		}else{
+			sessionStorage.haskey = false;
+		}
 		isfocusing = false;
 		var thisClass = $(this);
 		$(".keyword").attr("readonly",false);