48h到期

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

@@ -245,8 +245,8 @@ func (o *OrderListDetails) SetEmail() {
 		var email_used = true
 		if email != o.GetSession("EmailBindingVerifyEmail") {
 			//user表里校验邮箱是否被使用  字段待定
-			res, _ := util.MQFW.FindOne("user", bson.M{"email": email})
-			if res != nil && qutil.ObjToString((*res)["email"]) != "" {
+			res, _ := util.MQFW.FindOne("user", bson.M{"s_myemail": email})
+			if res != nil && qutil.ObjToString((*res)["s_myemail"]) != "" {
 				email_used = false
 				o.T["success"] = false
 				o.T["errCode"] = 4
@@ -354,6 +354,25 @@ func (o *OrderListDetails) SetRes(res []map[string]interface{}, queryM map[strin
 	}
 	delete(queryM, "product_type")
 	for _, v := range res {
+		//获取单号 如果是vip 48小时取消
+		//order_code := qutil.ObjToString(v["order_code"])
+		//go FortyEightHoursCancel(order_code)
+
+		create_time_str := qutil.ObjToString(v["create_time"])
+		//创建时间戳
+		create_time, _ := time.ParseInLocation(qutil.Date_Full_Layout, create_time_str, time.Local)
+		//48小时后的时间戳
+		create_time_stamp := create_time.AddDate(0, 0, 2).Unix()
+		//当前时间时间戳
+		now_time_stamp := time.Now().Unix()
+		if create_time_stamp < now_time_stamp && qutil.ObjToString(v["product_type"]) == "VIP订阅" {
+			if v["order_status"] != nil {
+				order_status := qutil.Int64All(v["order_status"])
+				if order_status == 0 {
+					v["order_status"] = orderStatus_cancel
+				}
+			}
+		}
 		if v["filter_publishtime"] != nil {
 			filter_publishtime := v["filter_publishtime"]
 			if filter_publishtime != nil {
@@ -436,3 +455,40 @@ func getPayTransactionId(payWay, tradeNo string) (transaction_id string) {
 	}
 	return
 }
+
+//检查vip订单是否到期，如果到期 订单取消48h
+func FortyEightHoursCancel(order string) {
+	//查询vip订单条件
+	queryM := map[string]interface{}{
+		"order_code":   order,
+		"product_type": "VIP订阅",
+	}
+	flag := false
+	//order := util.Mysql.FindOne(tableName_order, queryMap, "pay_way,out_trade_no,prepay_time,order_status", "")
+	res := util.Mysql.FindOne(tableName_order, queryM, "id,order_code,create_time,pay_way,out_trade_no,prepay_time,order_status,user_id", "")
+	if res != nil {
+		id := qutil.Int64All((*res)["id"])
+		queryMap := map[string]interface{}{
+			"id":      id,
+			"user_id": qutil.ObjToString((*res)["user_id"]),
+		}
+		create_time_str := qutil.ObjToString((*res)["create_time"])
+		//创建时间戳
+		create_time, _ := time.ParseInLocation(qutil.Date_Full_Layout, create_time_str, time.Local)
+		//48小时后的时间戳
+		create_time_stamp := create_time.AddDate(0, 0, 2).Unix()
+		//当前时间时间戳
+		now_time_stamp := time.Now().Unix()
+		//如果超过48小时 取消订单
+		if create_time_stamp < now_time_stamp {
+			if qutil.IntAll((*res)["order_status"]) == 0 { //未支付状态下 删除订单需要先关闭订单
+				flag = pay.CloseDataExportOrder(qutil.ObjToString((*res)["pay_way"]), qutil.ObjToString((*res)["out_trade_no"]), qutil.ObjToString((*res)["prepay_time"]))
+			} else {
+				flag = true
+			}
+			if flag {
+				flag = util.Mysql.Update(tableName_order, queryMap, map[string]interface{}{"order_status": -2})
+			}
+		}
+	}
+}

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

@@ -440,7 +440,7 @@
 			function beforeJump(eid,isVipOrder){
 				setSessionStorage();
 				if (isVipOrder=="true"){
-					window.location.href="/front/vipsubscribe/toOrderDetailPage?orderCode="+eid;
+					window.location.href="/weixin/pay/toOrderDetailPage?orderCode="+eid;
 				}else{
 					window.location.href="/weixin/pay/wxToOrderDetail?orderCode="+eid;
 				}
@@ -633,6 +633,7 @@
 					var result = true;
 					$.post("/subscribepay/orderListDetails/myOrder",{"type":typ},function(data){
 							$(".loading_").hide();
+							console.log(data.res)
 							var list=data.res;
 							dataCache =data.res;
 							pageIndex=2;

src/web/templates/weixin/email/bind_email.html

@@ -114,13 +114,13 @@
 								if(data.success){
 									if ($("#bindBtn").text()=="确定"){	//更改绑定
 										sessionStorage.removeItem("send_myemail_"+{{.T.userId}});
-										window.location.replace("/front/wxMyOrder/setSuccess?name=changeEmail"); 
+										window.location.replace("/jyapp/front/myorder/setSuccess?name=changeEmail"); 
 									}else{
 										sessionStorage.removeItem("send_myemail_"+{{.T.userId}});
-										if((param="invoice")&&(orderCode!="")){
-											window.location.replace("/front/wxMyOrder/setSuccess?name=invoice&orderCode="+orderCode); 
+										if((param="invoice")&&(orderCode!=null)){
+											window.location.replace("/jyapp/front/myorder/setSuccess?name=invoice&orderCode="+orderCode); 
 										}else{
-											window.location.replace("/front/wxMyOrder/setSuccess?name=bindEmail"); 
+											window.location.replace("/jyapp/front/myorder/setSuccess?name=bindEmail"); 
 										}
 									}
 								}

src/web/templates/weixin/email/bind_success.html

@@ -1,33 +1,79 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<meta charset="utf-8">
		<title>绑定成功</title>
		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<meta charset="utf-8">
+		<title>绑定成功</title>
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/reset.css?v={{Msg "seo" "version"}}">
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/common.css?v={{Msg "seo" "version"}}">
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxmyemail/css/mine.css?v={{Msg "seo" "version"}}"/>   
 		{{include "/common/weixin.html"}}
-		<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>    
+		<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>    
 	</head>
 	<body>
-		<div class="bind_success">
			<div class="success">
				<img src="{{Msg "seo" "cdn"}}/wxmyemail/img/successed.png" >
				<p></p>
			</div>
			<button class="common_btn back">返回 <time class="time">()</time> </button>
		</div>
		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/zepto.js"></script>
		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/public.js"></script>
		<script>
			$(function(){
+		<div class="bind_success">
+			<div class="success">
+				<img src="{{Msg "seo" "cdn"}}/wxmyemail/img/successed.png" >
+				<p></p>
+			</div>
+			<button class="common_btn back">返回 <time class="time">()</time> </button>
+		</div>
+		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/zepto.js"></script>
+		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/public.js"></script>
+		<script>
+			$(function(){
 				//分享
-				initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
				
+				initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
+				
 				let param = getParam('name');//获取url传来的参数 判断显示成功的字幕
-				var orderCode=getParam("orderCode"); //开发票的订单
				console.log(param)
				var time = 6;
				function countDown(){
					if(time == 0){
						$('.time').html('');
+				var orderCode=getParam("orderCode"); //开发票的订单
+				console.log(param)
+				var time = 6;
+				function countDown(){
+					if(time == 0){
+						$('.time').html('');
 						if((param="invoice")&&(orderCode!="")){
-							window.location.replace('/front/vipsubscribe/toOrderDetailPage?orderCode='+orderCode);
+							window.location.replace('/weixin/pay/toOrderDetailPage?orderCode='+orderCode);
 						}else{
 							window.location.replace('/front/wxMyOrder/myEmail');
-						}
					}else{
						$('.time').html('(' + time + ')');
						time--;
						setTimeout(()=>{
							countDown()
						},1000)
					}
				}
				if(param == 'bindEmail'){
					$('.success>p').html('邮箱绑定成功');
					countDown();
				}else if(param == 'bindPhoe'){
					$('.success>p').html('手机号绑定成功');
					countDown();
				}else if(param == 'changeEmail'){
					$('.success>p').html('邮箱更换成功');
					countDown();
				}else if(param == 'choosePhone'){
					$('.success>p').html('手机号更换成功');
					countDown();
				}else if(param =="unbind"){
+						}
+					}else{
+						$('.time').html('(' + time + ')');
+						time--;
+						setTimeout(()=>{
+							countDown()
+						},1000)
+					}
+				}
+				if(param == 'bindEmail'){
+					$('.success>p').html('邮箱绑定成功');
+					countDown();
+				}else if(param == 'bindPhoe'){
+					$('.success>p').html('手机号绑定成功');
+					countDown();
+				}else if(param == 'changeEmail'){
+					$('.success>p').html('邮箱更换成功');
+					countDown();
+				}else if(param == 'choosePhone'){
+					$('.success>p').html('手机号更换成功');
+					countDown();
+				}else if(param =="unbind"){
 					$('.success>p').html('邮箱解绑成功');
 					countDown();
 				}else if(param=="invoice"){
 					$('.success>p').html('邮箱绑定成功');
 					countDown();
-				}
				/* 返回 */
				$('.back').on('click',() =>{
					if((param="invoice")&&(orderCode!="")){
-							window.location.replace('/front/vipsubscribe/toOrderDetailPage?orderCode='+orderCode);
+				}
+				/* 返回 */
+				$('.back').on('click',() =>{
+					if((param="invoice")&&(orderCode!="")){
+							window.location.replace('/weixin/pay/toOrderDetailPage?orderCode='+orderCode);
 						}else{
 							window.location.replace('/front/wxMyOrder/myEmail');
-						}
				})
			})
		</script>
-	{{include "/common/baiducc.html"}}
	</body>
+						}
+				})
+			})
+		</script>
+	{{include "/common/baiducc.html"}}
+	</body>
 </html>

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

@@ -46,7 +46,7 @@
     $(function(){
       //查看订单
       $(".left_btn").on("click",function(){
-        window.location.href ='/front/vipsubscribe/toOrderDetailPage?orderCode='+orderCode
+        window.location.href ='/weixin/pay/toOrderDetailPage?orderCode='+orderCode
       })
       //设置关键词
       $(".right_btn").on("click",function(){