正在显示
2 个修改的文件
包含
32 行增加
和
1 行删除
@@ -57,7 +57,7 @@ class Order extends Backend | @@ -57,7 +57,7 @@ class Order extends Backend | ||
57 | ->paginate($limit); | 57 | ->paginate($limit); |
58 | 58 | ||
59 | foreach ($list as $row) { | 59 | foreach ($list as $row) { |
60 | - $row->visible(['id','order_no','verification_store_id','createtime','type','paytime','refundtime','name','phone']); | 60 | + $row->visible(['id','order_no','verification_store_id','user_id','createtime','type','paytime','refundtime','name','phone']); |
61 | $row->visible(['store']); | 61 | $row->visible(['store']); |
62 | $row->getRelation('store')->visible(['name']); | 62 | $row->getRelation('store')->visible(['name']); |
63 | $row->visible(['coupon']); | 63 | $row->visible(['coupon']); |
@@ -276,6 +276,14 @@ class Client extends Base | @@ -276,6 +276,14 @@ class Client extends Base | ||
276 | } | 276 | } |
277 | } | 277 | } |
278 | 278 | ||
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 | + } | ||
279 | 287 | ||
280 | /** | 288 | /** |
281 | * 6、卡卷详情 | 289 | * 6、卡卷详情 |
@@ -416,4 +424,27 @@ class Client extends Base | @@ -416,4 +424,27 @@ class Client extends Base | ||
416 | } | 424 | } |
417 | } | 425 | } |
418 | 426 | ||
427 | + /** | ||
428 | + * 12、删除订单 | ||
429 | + */ | ||
430 | + public function deleteorder(){ | ||
431 | + $order_id=$this->postParam['id']; | ||
432 | + //查询到订单信息 | ||
433 | + $order=Db::name('verification_order')->find($order_id); | ||
434 | + if($order['type']==0){ | ||
435 | + Db::startTrans(); | ||
436 | + try{ | ||
437 | + $res=Db::name('verification_order')->where(['id'=>$order_id])->delete(); | ||
438 | + | ||
439 | + Db::commit(); | ||
440 | + }catch (Exception $e){ | ||
441 | + Db::rollback(); | ||
442 | + $this->error($e->getMessage()); | ||
443 | + } | ||
444 | + return $this->success("删除成功"); | ||
445 | + }else{ | ||
446 | + return $this->error("删除失败"); | ||
447 | + | ||
448 | + } | ||
449 | + } | ||
419 | } | 450 | } |
-
请 注册 或 登录 后发表评论