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

@@ -64,11 +64,10 @@ func (this *vipSubscribeStruct) PayCallBack(param *CallBackParam) (ok bool) {
 			})
 			if update {
 				//支付成功后 其他未支付vip订阅订单 变为已取消
-				bo := PayCancel(userid)
-				if !bo {
+				if PayCancel(userid) {
 					log.Println(userid, "更改其余未支付订单失效")
 				}
-				if JyVipSubStruct.StartSubVip(userid, vmsg.Area, vmsg.Industry, startTime, endTime, false) {
+				if JyVipSubStruct.StartSubVip(userid, vmsg.Area, vmsg.Industry, startTime, endTime, false, vmsg.Cyclecount, vmsg.Cycleunit) {
 					ok = true
 				}
 			}
@@ -87,7 +86,7 @@ type SubvipBuySet struct {
 }
 
 //设置开始使用
-func (this *vipSubscribeStruct) StartSubVip(userId string, area *map[string]interface{}, industry []string, startTime, endTime time.Time, isTrial bool) bool {
+func (this *vipSubscribeStruct) StartSubVip(userId string, area *map[string]interface{}, industry []string, startTime, endTime time.Time, isTrial bool, count, unit int) bool {
 	buyset := SubvipBuySet{}
 	//a_buyset 计算  0:省份数量 1:城市数量 2:行业数量
 	if !isTrial { //购买
@@ -121,6 +120,8 @@ func (this *vipSubscribeStruct) StartSubVip(userId string, area *map[string]inte
 			"o_vipjy.o_area":       area,                    //试用设置地区
 			"o_vipjy.a_buyerclass": industry,                //试用设置行业
 			"o_vipjy.o_buyset":     buyset,                  //购买内容 城市、省份、行业数量
+			"o_vipjy.i_cycleunit":  unit,                    //购买单位
+			"o_vipjy.i_cyclecount": count,                   //购买时长
 			"l_vip_starttime":      startTime.Unix(),        //开始时间
 			"l_vip_endtime":        endTime.Unix(),          //结束时间
 			"i_vip_status":         qutil.If(isTrial, 1, 2), //1试用 2正式
@@ -128,6 +129,7 @@ func (this *vipSubscribeStruct) StartSubVip(userId string, area *map[string]inte
 		}}) {
 		return false
 	}
+	go util.MergeKws(userId) //初始化vip订阅关键词
 	return true
 }
 

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

@@ -270,7 +270,7 @@ func (this *TrialOrder) TrialPay() {
 		if orderid == -1 {
 			return &entity.FuncResult{false, errors.New("数据保存异常"), nil}
 		}
-		if !entity.JyVipSubStruct.StartSubVip(userId, area, industry, now, endTime,true) { //设置开始试用
+		if !entity.JyVipSubStruct.StartSubVip(userId, area, industry, now, endTime,true,date_count,date_unit) { //设置开始试用
 			return &entity.FuncResult{false, errors.New("开通试用异常"), nil}
 		}
 		return &entity.FuncResult{true, nil, map[string]interface{}{"code": ordercode}}

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

@@ -149,7 +149,7 @@
                 // ajax提交成功后跳转至vip购买页
                 $DoPost("/subscribepay/trial/submitApply",post_data,function(r){
                   if(r.success){
-                    window.location.replace("/front/vipsubscribe/toPurchasePage/trial");
+                    window.location.replace("/front/vipsubscribe/introducePage");
                   }
                 })
                 return false;