正在显示
1 个修改的文件
包含
2 行增加
和
12 行删除
@@ -148,7 +148,7 @@ class Client extends Base | @@ -148,7 +148,7 @@ class Client extends Base | ||
148 | ->alias('a') | 148 | ->alias('a') |
149 | ->join('verification_store b','a.verification_store_id=b.id') | 149 | ->join('verification_store b','a.verification_store_id=b.id') |
150 | ->join('verification_activity c','a.verification_activity_id=c.id') | 150 | ->join('verification_activity c','a.verification_activity_id=c.id') |
151 | - ->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') | 151 | + ->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') |
152 | ->where($where) | 152 | ->where($where) |
153 | ->order('a.id desc') | 153 | ->order('a.id desc') |
154 | ->paginate($total, false, ['page' => $page]) | 154 | ->paginate($total, false, ['page' => $page]) |
@@ -241,7 +241,6 @@ class Client extends Base | @@ -241,7 +241,6 @@ class Client extends Base | ||
241 | } | 241 | } |
242 | }else{ | 242 | }else{ |
243 | $this->error("活动不存在!"); | 243 | $this->error("活动不存在!"); |
244 | - | ||
245 | } | 244 | } |
246 | $phone=$this->postParam['phone']; | 245 | $phone=$this->postParam['phone']; |
247 | $name=$this->postParam['name']; | 246 | $name=$this->postParam['name']; |
@@ -249,8 +248,6 @@ class Client extends Base | @@ -249,8 +248,6 @@ class Client extends Base | ||
249 | $order_no=$time.rand(10000,99999); | 248 | $order_no=$time.rand(10000,99999); |
250 | $verification_store_id=$this->store_id; | 249 | $verification_store_id=$this->store_id; |
251 | $user_id=$this->auth->id; | 250 | $user_id=$this->auth->id; |
252 | - | ||
253 | - | ||
254 | $createtime=$time; | 251 | $createtime=$time; |
255 | $type=0; | 252 | $type=0; |
256 | //整理数组 | 253 | //整理数组 |
@@ -276,14 +273,7 @@ class Client extends Base | @@ -276,14 +273,7 @@ class Client extends Base | ||
276 | } | 273 | } |
277 | } | 274 | } |
278 | 275 | ||
279 | - /** | ||
280 | - * 5.1立即支付 | ||
281 | - */ | ||
282 | - public function immediate_payment(){ | ||
283 | - $order_no=$this->postParam['order_no']; | ||
284 | - $res = (new \app\api\controller\v1\Wechat())->prepare_order($order_no); | ||
285 | - $this->success('添加订单成功',$res); | ||
286 | - } | 276 | + |
287 | 277 | ||
288 | /** | 278 | /** |
289 | * 6、卡卷详情 | 279 | * 6、卡卷详情 |
-
请 注册 或 登录 后发表评论