Merge branch 'dev2.8.5' of http://192.168.3.207:10080/qmx/jy into dev2.8.5

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

@@ -128,13 +128,6 @@ func (this *vipSubscribeStruct) PayCallBack(param *CallBackParam) bool {
 		log.Printf("%s更新订单状态出错%+v\n", userid, updateMap)
 		return false
 	}
-	//支付提醒
-	vip_type := qutil.IntAll((*orderdata)["vip_type"])
-	if vip_type == 0 {
-		vip_type = -1
-	}
-
-	util.MsgRemind.PaySuccess(qutil.IntAll((*orderdata)["id"]), qutil.ObjToString((*orderdata)["order_code"]), qutil.ObjToString((*orderdata)["user_id"]), qutil.ObjToString((*orderdata)["prepay_time"]), vip_type)
 	flag := false
 	if vmsg.OrderType == 1 { //新订单
 		flag = JyVipSubStruct.StartSubVip(userid, vmsg, startTime, endTime, false)
@@ -149,8 +142,11 @@ func (this *vipSubscribeStruct) PayCallBack(param *CallBackParam) bool {
 		//	} else if vmsg.OrderType == 6 { //下月升级未生效再次升级
 		//		flag = JyVipSubStruct.UpgradeSubVipTwo(userid, vmsg, qutil.ObjToString((*orderdata)["vip_endtime"]), false)
 	}
-	//支付成功后 其他未支付vip订阅订单 变为已取消
+	//支付成功后
 	if flag {
+		//支付提醒
+		util.MsgRemind.PaySuccess(qutil.IntAll((*orderdata)["id"]), qutil.ObjToString((*orderdata)["order_code"]), qutil.ObjToString((*orderdata)["user_id"]), qutil.ObjToString((*orderdata)["prepay_time"]), qutil.IntAllDef((*orderdata)["vip_type"], -1))
+		//其他未支付vip订阅订单 变为已取消
 		go PayCancel(userid)
 	}
 	return flag

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

@@ -321,11 +321,11 @@ func (this *TrialOrder) TrialPay() {
 		if orderid == -1 {
 			return &entity.FuncResult{false, errors.New("数据保存异常"), nil}
 		}
-		//支付提醒
-		util.MsgRemind.PaySuccess(qutil.IntAll(orderid), ordercode, userId, qutil.FormatDate(&now, qutil.Date_Full_Layout), 0)
 		if !entity.JyVipSubStruct.StartSubVip(userId, filter, now, endTime, true) { //设置开始试用
 			return &entity.FuncResult{false, errors.New("开通试用异常"), nil}
 		}
+		//支付提醒
+		util.MsgRemind.PaySuccess(qutil.IntAll(orderid), ordercode, userId, qutil.FormatDate(&now, qutil.Date_Full_Layout), 0)
 		return &entity.FuncResult{true, nil, map[string]interface{}{"code": ordercode}}
 	}()
 	if r.Err != nil {

src/jfw/modules/subscribepay/src/util/msgremind.go

@@ -108,6 +108,16 @@ func (m *msgRemind) PaySuccess(orderId int, orderCode, userId, prepayTime string
 	}()
 }
 
+func (m *msgRemind) getExpireTime() int64 {
+	order_countdown := Config.OrderCountdown //配置文件读取
+	if strings.Contains(util.ObjToString(order_countdown), "h") {
+		onehour, _ := time.ParseDuration(util.ObjToString(order_countdown))
+		return int64(onehour.Seconds())
+	} else {
+		return util.Int64All(order_countdown) * 24 * 60 * 60
+	}
+}
+
 func (m *msgRemind) getVipType(vipType int) string {
 	switch vipType {
 	case 0:
@@ -131,7 +141,7 @@ func (m *msgRemind) run() {
 			now_unix := time.Now().Unix()
 			remind_status := 0
 			//剩余2小时
-			if unpaidOrder.remindStatus != 2 && now_unix >= unpaidOrder.prepayTime+259200-TimeTaskConfig.UnpaidRemind.BeforeExpire {
+			if unpaidOrder.remindStatus != 2 && unpaidOrder.prepayTime+m.getExpireTime() < now_unix && now_unix >= unpaidOrder.prepayTime+m.getExpireTime()-TimeTaskConfig.UnpaidRemind.BeforeExpire {
 				remind_status = 2
 			} else if unpaidOrder.remindStatus == 0 && now_unix > unpaidOrder.prepayTime+TimeTaskConfig.UnpaidRemind.AfterOrder { //下单时间后2小时未支付
 				remind_status = 1
@@ -199,7 +209,20 @@ func (m *msgRemind) run() {
 		m.run()
 	})
 }
-
+func (m *msgRemind) gc() {
+	log.Println(m.getExpireTime())
+	time.AfterFunc(5*time.Minute, func() {
+		defer util.Catch()
+		m.unpaidOrders.Range(func(k interface{}, v interface{}) bool {
+			unpaidOrder, _ := v.(*unpaidOrder)
+			if time.Now().Unix() > unpaidOrder.prepayTime+m.getExpireTime() {
+				m.unpaidOrders.Delete(k)
+			}
+			return true
+		})
+		m.gc()
+	})
+}
 func init() {
 	go func() {
 		log.Println("开始加载72小时内的订单到内存中。。。")
@@ -226,4 +249,5 @@ func init() {
 		log.Println("加载72小时内的订单到内存中结束。。。", len(*list))
 	}()
 	MsgRemind.run()
+	MsgRemind.gc()
 }

src/web/templates/weixin/dataExport/dataExport_toMyOrder.html

@@ -611,7 +611,7 @@
 			}
 			//续费 1 再次购买 2
 			function renewalOrBuyAgain(pattern,e){
-				sessionStorage.orderTabActive=$("ul .active").index();
+				setSessionStorage();
 				var orderCode = $(e).parent(".card-footer").prev(".card-content").find("a").attr("eid");
 				if (pattern==1){
 					var checkOrder_bl=checkOrder()
@@ -756,12 +756,13 @@
 				sessionStorage.removeItem("applysuccess");
 				sessionStorage.removeItem("companyName");
 				sessionStorage.removeItem("taxNumer");
-				$("#order_list").on('scroll' ,function(){
-					scrollTop=$(".main")[0].scrollTop
-					console.log(scrollTop)
-					console.log(this)
-				});
+//				$("#order_list").on('scroll' ,function(){
+//					scrollTop=$(".main")[0].scrollTop
+//					console.log(scrollTop)
+//					console.log(this)
+//				});
 				//var i=0
+				
 				$(".buttons-tab .tab-link").each(function() {
 					$(".loading_").hide();
 					var index = $(this).index();
@@ -803,7 +804,16 @@
 						
 					}
 				}else{
-					queryOrder(0,10);
+					//后续版本用
+					var active=getParam("active");
+					if (active){
+						$(".buttons-tab .tab-link").eq(active).addClass("active").siblings().removeClass("active");
+						$(".tabs>.tab").eq(active).show().siblings().hide();
+						$(".card_lists").empty();
+						queryOrder(active,10);
+					}else{
+						queryOrder(0,10);
+					}
 				}
 			})