行业

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

@@ -109,8 +109,6 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 	pay_source := this.GetString("pay_source") //类型  续费-Renew or 升级-Upgrade
 	userId := qutil.ObjToString(this.GetSession("userId"))
 	openId := qutil.ObjToString(this.GetSession("s_m_openid"))
-	log.Println("area", area)
-	log.Println("industry", industry)
 	//	isvalidOk, _ := this.GetBool("isvalidOk")
 	r := func() *entity.FuncResult {
 		now := time.Now()
@@ -140,7 +138,7 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 			}
 		}
 
-		res, ok := util.MQFW.FindById("user", userId, `{"l_vip_endtime":1,"l_vip_starttime":1}`)
+		res, ok := util.MQFW.FindById("user", userId, `{"l_vip_endtime":1,"l_vip_starttime":1,"o_vipjy":1}`)
 		if res == nil || len(*res) == 0 || !ok {
 			return &entity.FuncResult{false, errors.New("数据库操作异常"), nil}
 		}
@@ -169,7 +167,6 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 		} else { //续费时间
 			orderType = 2 //续费操作
 			startTime = endTime
-			log.Println("startTime", startTime)
 		}
 		//		if date_unit == 1 { ///延长时间
 		//			endTime = endTime.AddDate(date_count, 0, 0)
@@ -179,7 +176,6 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 		if date_unit >= 1 {
 			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 { ///延长时间
@@ -224,6 +220,22 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 			upgradeYear, upgradeMonth := MaxUpgradeMonth(end) //获取最大升级月数
 			log.Println(upgradeYear)
 			log.Println(upgradeMonth)
+			vipjy := (*res)["o_vipjy"].(map[string]interface{})
+			addIndustry := qutil.ObjArrToStringArr(vipjy["a_buyerclass"].([]interface{}))
+			buyerclasscount := vipjy["o_buyset"].(map[string]interface{})["buyerclasscount"]
+			if len(addIndustry) != 0 {
+				log.Println("buyerclasscount", buyerclasscount)
+				log.Println("addIndustry", addIndustry)
+				reduce := qutil.IntAll(buyerclasscount) - len(addIndustry)
+				log.Println("reduce", reduce)
+				if reduce > 0 {
+					log.Println("industry", industry)
+					Leng := len(industry) - reduce
+					industry = industry[0:Leng]
+					log.Println("industry", industry)
+				}
+			}
+
 			addAreaY := 0
 			addAreaM := 0
 			oldAreaY := 0
@@ -231,22 +243,17 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 			addIndustryY := 0
 			addIndustryM := 0
 			if (*area)["no"] != "no" && industry[0] != "no" {
-				log.Println("1")
 				addAreaY = entity.JyVipSubStruct.GetSubVipPrice(area, industry, upgradeYear, 1)
 				addAreaM = entity.JyVipSubStruct.GetSubVipPrice(area, industry, upgradeMonth, 2)
 			}
 			if (*area)["no"] != "no" {
-				log.Println("2")
 				oldAreaY = entity.JyVipSubStruct.GetSubVipPrice(area, industrys, upgradeYear, 1)
 				oldAreaM = entity.JyVipSubStruct.GetSubVipPrice(area, industrys, upgradeMonth, 2)
 			}
 			if industry[0] != "no" {
-				log.Println("3")
 				addIndustryY = entity.JyVipSubStruct.GetSubVipPrice(areas, industry, upgradeYear, 1)
 				addIndustryM = entity.JyVipSubStruct.GetSubVipPrice(areas, industry, upgradeMonth, 2)
 			}
-			log.Println("addIndustryY", addIndustryY)
-			log.Println("addIndustryM", addIndustryM)
 			//			addY := entity.JyVipSubStruct.GetSubVipPrice(area, industry, upgradeYear, 1)  //已购+新增，以年为单位的价格
 			//			addM := entity.JyVipSubStruct.GetSubVipPrice(area, industry, upgradeMonth, 2) //已购+新增，以月为单位的价格
 			//			addPrice := addM + addY                                                       //已购+新增总价格

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

@@ -26,8 +26,9 @@
     	</script>
         <main class="choose_industry main">
             <div class="result">
-                <span class="label">已新增：</span>
-                <span class="result_name">全部行业</span>
+                <span class="label buyset">已购买：2/3个行业</span><br>
+                <span style="display: none;" class="label addUpgrade">升级新增：2个行业</span>
+                <!--<span class="result_name">全部行业</span>-->
             </div>
             <div class="form">
                 <div class="select-area-box">
@@ -243,7 +244,7 @@
             <div class="tips_btn">
                 <div class="tips_discount">
                     <!--<div class="tips_d_money" style="display: block">&yen;38</div>-->
-                    <div class="tips_d_text">已选择4个行业，建议购买“全部行业”。~</div>
+                    <div class="tips_d_text">已选择4个行业，建议购买“全部行业”</div>
                 </div>
                 <div class="btns">
                     <button class="reset-btn">重置</button>
@@ -289,10 +290,36 @@
                         }
                     }
                 })
-                
+                if(selectedArr.length > 0){
+                	let adds = selectedArr.length+buyIndustryLen
+                	if(adds <= buyset){
+                		$(".addUpgrade").hide();
+	            		buyLen = adds;
+	            		$(".buyset").text("已购买："+buyLen+"/"+buyset+"个行业");
+	            		$(".tips_btn .btns .save-btn").attr("disabled","disabled");
+						$(".tips_btn .btns .reset-btn").attr("disabled","disabled");
+	            	}else{
+	            		let add = adds - buyset;
+	            		$(".addUpgrade").text("已新增："+add+"个行业");
+	            		$(".addUpgrade").show();
+	            		$(".tips_btn .btns .save-btn").removeAttr("disabled");
+						$(".tips_btn .btns .reset-btn").removeAttr("disabled");
+	            	}
+                }else{
+                	$(".buyset").text("已购买："+buyIndustryLen+"/"+buyset+"个行业")
+                }
+                for(var i in selectedArr){
+                	if(selectedArr[i] === "全部行业"){
+                		$(".buyset").text("已购买："+buyIndustry.length+"/"+buyset+"个行业");
+                		$(".addUpgrade").text("已新增：全部行业");
+                		$(".addUpgrade").show();
+                		$(".tips_btn .btns .save-btn").removeAttr("disabled");
+						$(".tips_btn .btns .reset-btn").removeAttr("disabled");
+                	}
+                }
                 // 显示隐藏优惠tips
                 if (selectedArr.length >= 4 && !vipSubisTrial) {
-                	$('.tips_btn .tips_d_text').text("已选择"+selectedArr.length+"个行业，建议购买“全部行业”。");
+                	$('.tips_btn .tips_d_text').text("已选择"+selectedArr.length+"个行业，建议购买“全部行业”");
                     $('.tips_btn .tips_d_text').slideDown();
                 } else {
                     $('.tips_btn .tips_d_text').slideUp()
@@ -307,6 +334,7 @@
 //                  var allButton = $('#all button')
 //                  allButton.trigger('click')
 //                  $('.result .result_name').text(allButton.text())
+					$(".addUpgrade").hide();
 					$(".tips_btn .btns .save-btn").attr("disabled","disabled");
 					$(".tips_btn .btns .reset-btn").attr("disabled","disabled");
                 }
@@ -356,7 +384,6 @@
             
             // 每个button的点击事件
             $('.select-area-box .list').on('click', 'button', function (e) {
-                $('.tips_btn .btns button').removeAttr('disabled')
 
                 $(this).toggleClass('active')
                 // 如果点击全部行业，则其他所有按钮都取消active
@@ -386,7 +413,16 @@
 
              // 确认按钮事件
             $('.save-btn').on('click', function () {
-                console.log(selectedIndustryArr)
+            	var selectedIndustrysArr = ["全部行业"];
+        		if(selectedIndustryArr[0] !== "全部行业"){
+        			let reduce = buyset - buyIndustry.length
+        			if(reduce > 0){
+        				selectedIndustrysArr = selectedIndustryArr.slice(0, -reduce);
+        			}else{
+        				selectedIndustrysArr = selectedIndustryArr;
+        			}
+        		}
+        		sessionStorage.setItem("vipSubSelectIndustryAdd",JSON.stringify(selectedIndustrysArr));
                 sessionStorage.setItem("vipSubSelectIndustryUpgrade",JSON.stringify(selectedIndustryArr));
                 history.go(-1);
             })
@@ -396,6 +432,9 @@
             var timeSelect = [1,2]//计算价格临时变量 timeSelect[0]时长  timeSelect[1] 1:年 2:月
             var vipSubisTrial = false;
             var buyIndustry = "";//已购买
+            var buyIndustryLen = 0;
+            var buyset = "";
+            var buyLen = 0;
             $(function(){
               try{
                 if(sessionStorage.getItem("vipSubSelectIndustryUpgrade")){
@@ -413,6 +452,10 @@
                 $DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
                 	if(data){
 		            	buyIndustry = data.buyerclass;
+		            	buyLen = buyIndustry.length
+		            	buyIndustryLen = buyIndustry.length;
+		            	buyset = data.buyset.buyerclasscount;
+		            	$(".buyset").text("已购买："+buyLen+"/"+buyset+"个行业");
                 	}
                 },false);
                 if(checkObj(buyIndustry)){

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

@@ -794,8 +794,8 @@
 	    $(".save_renew").on("click", function(){
 	        $(".save_renew").attr("disabled","disabled");
 	    	var param = {
-	    		"area": JSON.stringify(area),
-	    		"industry": buyerclass.toString(),
+	    		"area": JSON.stringify(areas),
+	    		"industry": industrys.toString(),
 	    		"time": $('.choose_item.select_cycle .info').val(),
 	    		"payWay":"wx_js",
 	    		"pay_source": "Renew",

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

@@ -42,7 +42,7 @@
 <body class="no-touch">
     <div class="vip_update">
         <div class="choose_condition">
-            <p class="update_tip">提示：订阅升级可在已购买的服务基础上，增加区域、行业、以及延长订阅周期!</p>
+            <p class="update_tip">提示：订阅升级可在已购买的服务基础上，增加区域、行业、以及延长订阅周期。升级完成后，将立即生效。</p>
             <ul class="chooseList">
                 <li class="choose_item">
                     <a href="/front/vipsubscribe/toChooseAreaUpgrade">
@@ -1152,8 +1152,8 @@
 //			}
 
 			console.log("areasArr",areasArr)
-			if(sessionStorage.vipSubSelectIndustryUpgrade!==""&&sessionStorage.vipSubSelectIndustryUpgrade!==undefined){
-				var vipIndustry = JSON.parse(sessionStorage.vipSubSelectIndustryUpgrade);
+			if(sessionStorage.vipSubSelectIndustryAdd!==""&&sessionStorage.vipSubSelectIndustryAdd!==undefined){
+				var vipIndustry = JSON.parse(sessionStorage.vipSubSelectIndustryAdd);
 				for(let i in vipIndustry){
 		    		let industry = vipIndustry[i];
 		    		industrysArr.push(industry);
@@ -1448,7 +1448,7 @@
 //      	}
         	//
         	let areas = areasArr;
-        	let industrys = industrysArr;
+        	let industrys = JSON.parse(sessionStorage.vipSubSelectIndustryUpgrade);
         	let industryArr = "";
         	let areaArr = "";
         	if(areas !== null){
@@ -1516,6 +1516,7 @@
 	    	sessionStorage.removeItem("proPrice");
 	    	sessionStorage.removeItem("vipSubSelectAreaUpgrade");
 	    	sessionStorage.removeItem("vipSubSelectIndustryUpgrade");
+	    	sessionStorage.removeItem("vipSubSelectIndustryAdd");
 //	    	sessionStorage.removeItem("effectiveDate");
 	    	sessionStorage.removeItem("buyCheck");
 	    }