48h

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

@@ -355,9 +355,7 @@ 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)
-
+		order_code := qutil.ObjToString(v["order_code"])
 		create_time_str := qutil.ObjToString(v["create_time"])
 		//创建时间戳
 		create_time, _ := time.ParseInLocation(qutil.Date_Full_Layout, create_time_str, time.Local)
@@ -369,6 +367,9 @@ func (o *OrderListDetails) SetRes(res []map[string]interface{}, queryM map[strin
 			if v["order_status"] != nil {
 				order_status := qutil.Int64All(v["order_status"])
 				if order_status == 0 {
+					//数据库更改
+					go FortyEightHoursCancel(order_code, create_time_stamp, now_time_stamp)
+					//前端传参更改
 					v["order_status"] = orderStatus_cancel
 				}
 			}
@@ -457,7 +458,7 @@ func getPayTransactionId(payWay, tradeNo string) (transaction_id string) {
 }
 
 //检查vip订单是否到期，如果到期 订单取消48h
-func FortyEightHoursCancel(order string) {
+func FortyEightHoursCancel(order string, create_time_stamp, now_time_stamp int64) {
 	//查询vip订单条件
 	queryM := map[string]interface{}{
 		"order_code":   order,
@@ -472,14 +473,7 @@ func FortyEightHoursCancel(order string) {
 			"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小时 取消订单
+		//如果超过48小时 取消订单  创建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"]))