...
|
...
|
@@ -148,7 +148,7 @@ class Client extends Base |
|
|
->alias('a')
|
|
|
->join('verification_store b','a.verification_store_id=b.id')
|
|
|
->join('verification_activity c','a.verification_activity_id=c.id')
|
|
|
->field('a.id,a.type,a.status,c.image,a.order_no,c.title,b.address,b.lng,b.lat,a.price,a.payMode,DATE_FORMAT(FROM_UNIXTIME(a.paytime), "%Y-%m-%d %H:%i:%S") AS paytime')
|
|
|
->field('a.id,a.type,a.name,a.phone,a.status,c.image,a.order_no,c.title,b.address,b.lng,b.lat,a.price,a.payMode,DATE_FORMAT(FROM_UNIXTIME(a.paytime), "%Y-%m-%d %H:%i:%S") AS paytime')
|
|
|
->where($where)
|
|
|
->order('a.id desc')
|
|
|
->paginate($total, false, ['page' => $page])
|
...
|
...
|
@@ -241,7 +241,6 @@ class Client extends Base |
|
|
}
|
|
|
}else{
|
|
|
$this->error("活动不存在!");
|
|
|
|
|
|
}
|
|
|
$phone=$this->postParam['phone'];
|
|
|
$name=$this->postParam['name'];
|
...
|
...
|
@@ -249,8 +248,6 @@ class Client extends Base |
|
|
$order_no=$time.rand(10000,99999);
|
|
|
$verification_store_id=$this->store_id;
|
|
|
$user_id=$this->auth->id;
|
|
|
|
|
|
|
|
|
$createtime=$time;
|
|
|
$type=0;
|
|
|
//整理数组
|
...
|
...
|
@@ -276,14 +273,7 @@ class Client extends Base |
|
|
}
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 5.1立即支付
|
|
|
*/
|
|
|
public function immediate_payment(){
|
|
|
$order_no=$this->postParam['order_no'];
|
|
|
$res = (new \app\api\controller\v1\Wechat())->prepare_order($order_no);
|
|
|
$this->success('添加订单成功',$res);
|
|
|
}
|
|
|
|
|
|
|
|
|
/**
|
|
|
* 6、卡卷详情
|
...
|
...
|
|