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

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_order_detail.js

@@ -264,6 +264,10 @@ $(function () {
         order_create_time = order_create_time.replace(/-/g, '/')
         var downtime = r.data.order.order_countdown.split("h")[0]
         downtime = downtime * 60 * 60 * 1000
+        var create_unix = new Date(order_create_time).getTime()
+        if(parseInt(liveActiveEndTime)*1000 - create_unix < 72*60*60*1000){
+            downtime = parseInt(liveActiveEndTime) * 1000 - create_unix;
+        }
         var t = setInterval(() => {
           var nowtime = new Date()  //获取当前时间
           endtime = new Date(order_create_time);  //定义结束时间

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

@@ -65,15 +65,23 @@ func (this *OrderListDetails) GetOrderPayAllMsg() {
 			//"order_status": 1,
 		}
 		oData := util.Mysql.FindOne(tableName_order, query, "id,order_code,prepay_time,create_time,pay_time,pay_way,original_price,applybill_status,out_trade_no,filter,product_type,order_status,applybill_type,applybill_taxnum,applybill_company,vip_starttime,vip_endtime,vip_type", "")
-
+		orderStatus := qutil.IntAll((*oData)["order_status"])
 		//配置订单到期时间
 		order_countdown := config.Config.OrderCountdown //配置文件读取
 		//优惠码
-		order_countdown = config.Config.LiveOrderCountdown
+		nowTime := time.Now().Unix()
+		if nowTime >= liveActiveStartTime && nowTime < liveActiveEndTime {
+			order_countdown = config.Config.LiveOrderCountdown
+		}
 		create_time_str := qutil.ObjToString((*oData)["create_time"])
 		create_time, _ := time.ParseInLocation(qutil.Date_Full_Layout, create_time_str, time.Local)
 		if create_time.Unix() >= liveActiveStartTime && create_time.Unix() < liveActiveEndTime {
 			(*oData)["isLiveActive"] = true
+			if nowTime >= liveActiveEndTime && orderStatus == 0 {
+				if util.Mysql.Update(tableName_order, query, map[string]interface{}{"order_status": -2}) {
+					log.Println("VIP活动订单到期取消", orderCode)
+				}
+			}
 		}
 		activeData := util.Mysql.FindOne("prefer_active", map[string]interface{}{"order_code": orderCode, "user_id": userId}, "active_code", "")
 		if activeData != nil {

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

@@ -227,8 +227,8 @@ try{
 			$("#order_detail").hide();
 		}
         //下单时间
-        if(r.data.order.prepay_time) {
-        	$(".prepayTime").text(r.data.order.prepay_time.replace("-",".").replace("-","."));
+        if(r.data.order.create_time) {
+        	$(".prepayTime").text(r.data.order.create_time.replace("-",".").replace("-","."));
         }
         //产品类型
         if(r.data.order.product_type) $(".productType").text(r.data.order.product_type);