1

application/api/controller/Pricing.php

@@ -97,7 +97,12 @@ class Pricing extends Api
      * @ApiParams (name="id")
      */
     public function cancellation_order(){
-        Order::where(['id'=>input('id')])->update(['status'=>0,'cancel_datetime'=>date('Y-m-d H:i:s')]);
+        $dispose = Order::where(['id'=>input('id')])->update(['status'=>0,'cancel_datetime'=>date('Y-m-d H:i:s')]);
+        if($dispose){
+            $this->success('取消成功');
+        }else{
+            $this->success('取消失败');
+        }
     }
     /**
      * 定价产品支付

application/api/controller/TimedTask.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace app\api\controller;
+
+use app\common\controller\Api;
+use app\common\model\Order;
+
+/**
+ * 定时任务
+ */
+class TimedTask extends Api
+{
+    protected $noNeedLogin = ['cancellation_order'];
+    protected $noNeedRight = '*';
+
+    /**
+     * 订单过期自动取消
+     * @return void
+     */
+    public function cancellation_order(){
+        $list = Order::all(function ($query){
+            $query->where(['type'=>2])->field('id,create_time');
+        });
+        foreach ($list as $k=>$v){
+            $valid_time = strtotime($v['create_time']) + 1800;
+            if($valid_time < time()){
+                Order::where('id',$v['id'])->update(['stauts'=>0]);
+            }
+        }
+    }
+}

application/api/controller/User.php

@@ -449,7 +449,11 @@ class User extends Api
         $list = Order::all(function ($query){
            $query->where(['uid'=>$this->auth->id,'type'=>1])->field('id,uid,type,goods_id,goods_name,order_no,amount_real,status,create_time,deploy_type,deploy,billing_status')->order('id desc');
         });
-        $this->success('请求成功',$list);
+        $bjlist = Order::all(function ($query){
+            $query->where(['uid'=>$this->auth->id,'type'=>2,'status'=>2])->order('id desc');
+        });
+        $res = array_merge($list,$bjlist);
+        $this->success('请求成功',$res);
     }
     /**
      * 我的订单详情
@@ -495,7 +499,7 @@ class User extends Api
      */
     public function mypjorder(){
         $list = Order::all(function ($query){
-            $query->where(['uid'=>$this->auth->id,'type'=>2])->field('id,uid,type,goods_id,goods_name,order_no,amount_real,market,status,create_time,deploy_type,deploy,billing_status,valid_time')->order('id desc');
+            $query->where(['uid'=>$this->auth->id,'type'=>2])->where('status','<>',2)->field('id,uid,type,goods_id,goods_name,order_no,amount_real,market,status,create_time,deploy_type,deploy,billing_status,valid_time')->order('id desc');
         });
 //        foreach ($list as $v){
 //            $v['user'] = \app\admin\model\User::field('username,mobile,postcode,email,company,company_site')->find(['id'=>$v['uid']]);
@@ -597,4 +601,31 @@ class User extends Api
             return false;
         }
     }
+    /**
+     * 发票列表
+     * @ApiMethod ("POST")
+     * @ApiReturnParams  (name="cp_order_no",description="产品订单编号")
+     * @ApiReturnParams  (name="order_no",description="订单编号")
+     * @ApiReturnParams (name="invoice_type",description="发票类型 1普通发票2增值税发票")
+     * @ApiReturnParams (name="invoice_shape",description="发票形式 1纸质发票2电子发票")
+     * @ApiReturnParams (name="type",description="类型 1个人2企业")
+     * @ApiReturnParams (name="name",description="抬头名称")
+     * @ApiReturnParams (name="duty_paragraph",description="单位税号")
+     * @ApiReturnParams (name="address",description="注册地址")
+     * @ApiReturnParams (name="company_phone",description="公司电话")
+     * @ApiReturnParams (name="bank",description="银行")
+     * @ApiReturnParams (name="compellation",description="姓名")
+     * @ApiReturnParams (name="phone",description="个人电话")
+     * @ApiReturnParams (name="location",description="所在地")
+     * @ApiReturnParams (name="postcode",description="邮编")
+     * @ApiReturnParams (name="emial",description="邮箱")
+     * @ApiReturnParams (name="apply_time",description="申请时间")
+     * @ApiReturnParams (name="status",description="开票状态1待开票2已寄出3已完成")
+     */
+    public function invoice_list(){
+        $data = OrderInvoice::all(function ($query){
+           $query->where('uid',$this->auth->id);
+        });
+        $this->success('请求成功',$data);
+    }
 }