diff --git a/api/controllers/plan/Plan.php b/api/controllers/plan/Plan.php index 819c9684..7a57ad32 100644 --- a/api/controllers/plan/Plan.php +++ b/api/controllers/plan/Plan.php @@ -53,6 +53,7 @@ class Plan extends CI_Controller $plan[] = array('url' => base_url(array('plan', 'syt', 'subscribemsg')), 'interval' => 1); //私域通模板消息 $plan[] = array('url' => base_url(array('plan', 'syt', 'syn_polyv')), 'interval' => 60); //私域通直播间数据同步 + $plan[] = array('url' => base_url(array('plan', 'syt', 'out_time')), 'interval' => 1); //订单过期 $this->plan = $plan; } diff --git a/api/controllers/plan/Syt.php b/api/controllers/plan/Syt.php index 7dab23e1..0d226c9a 100644 --- a/api/controllers/plan/Syt.php +++ b/api/controllers/plan/Syt.php @@ -224,5 +224,23 @@ class Syt extends CI_Controller } return $results; } - + //订单过期 + public function out_time(){ + $this->load->model('market/market_sylive_activity_orders_model','mdSytActivityOrders'); + $this->load->model('market/market_sylive_order_model'); + //商家订单过期 + $where = [ + 'expire_time>' => 0, + 'expire_time<' => time(), + 'status' => 0 + ]; + $this->mdSytActivityOrders->update(['status'=>-1],$where); + //用户订单过期 + $where = [ + 'expire_time>' => 0, + 'expire_time<' => time(), + 'status' => 0 + ]; + $this->market_sylive_order_model->update(['status'=>-1],$where); + } } \ No newline at end of file diff --git a/common/libraries/market/Sylive_entity.php b/common/libraries/market/Sylive_entity.php index 98b8c8ad..b6dce4b5 100644 --- a/common/libraries/market/Sylive_entity.php +++ b/common/libraries/market/Sylive_entity.php @@ -60,10 +60,12 @@ class Sylive_entity{ $where["areaId in (select organizationId from lc_market_sylive_organization where parentId={$organizationId} and status=0)"] = null; } $res = false; - $act = $this->ci->mdSytActivityBiz->count($where); + $act = $this->ci->mdSytActivityBiz->get($where,'activityId'); if($act){ + $row = $this->ci->market_sylive_activity_model->get(['activityId'=>$act['activityId']],'activityId,jsondata'); + $jsondata = json_decode($row['jsondata'],true); $res = true; - if(in_array($group_id,[2,3])){ //判断是否支付 + if(in_array($group_id,[2,3]) && $jsondata['pay']['way']==2){ //判断是否支付 $where = [ 'activityId'=>$a_id, 'status'=>1, diff --git a/home/controllers/h5/market/sylive/Act.php b/home/controllers/h5/market/sylive/Act.php index 18d0e7f4..347af1c1 100644 --- a/home/controllers/h5/market/sylive/Act.php +++ b/home/controllers/h5/market/sylive/Act.php @@ -310,7 +310,7 @@ class Act extends Wx { 'item_id' => $a_id, 'item_title' => $item['title'], 'total_price' => $pay_price, - 'expire_time' => time()+24*60*60,//订单过期时间 + 'expire_time' => time()+30*60,//订单过期时间 'createTime' => date('Y-m-d H:i:s') ]; $name && $unpay['uname'] = $name; diff --git a/home/controllers/h5/market/sylive/Biz.php b/home/controllers/h5/market/sylive/Biz.php index 745feb5a..f40c8cd8 100644 --- a/home/controllers/h5/market/sylive/Biz.php +++ b/home/controllers/h5/market/sylive/Biz.php @@ -388,7 +388,7 @@ class Biz extends Admin { 'userId' => $this->uid, 'bizId' => $this->session['org_id'], 'totalPrice' => $pay_price, - 'expireTime' => time()+24*60*60,//订单过期时间 + 'expireTime' => time()+30*60,//订单过期时间 'createTime' => date('Y-m-d H:i:s') ]; $oid = $this->mdSytActivityOrders->add($unpay); diff --git a/home/controllers/h5/market/sylive/Login.php b/home/controllers/h5/market/sylive/Login.php index b686b63e..c8f47669 100644 --- a/home/controllers/h5/market/sylive/Login.php +++ b/home/controllers/h5/market/sylive/Login.php @@ -32,6 +32,11 @@ class Login extends CI_Controller{ if($wx_info['nickname'] || $wx_info['headimgurl']){ $data['auth_userinfo'] = true; } + //微信分享 + $this->load->library('Jssdk'); + $jssdk = new Jssdk('liche'); + $sign_package = $jssdk->getSignPackage(); + $data['sign_package'] = $sign_package; $this->load->view('h5/market/sylive/login',$data); } } diff --git a/home/views/h5/market/sylive/login.php b/home/views/h5/market/sylive/login.php index 36dcfa41..31ceaa43 100644 --- a/home/views/h5/market/sylive/login.php +++ b/home/views/h5/market/sylive/login.php @@ -13,6 +13,7 @@ +