qifengquan 1 year ago
parent
commit
fbc75b2a95
2 changed files with 9 additions and 2 deletions
  1. 7 0
      application/api/controller/Pricing.php
  2. 2 2
      application/api/controller/User.php

+ 7 - 0
application/api/controller/Pricing.php

@@ -93,6 +93,13 @@ class Pricing extends Api
         }
     }
     /**
+     * 取消订单
+     * @ApiParams (name="id")
+     */
+    public function cancellation_order(){
+        Order::get(['id'=>input('id')]);
+    }
+    /**
      * 定价产品支付
      * @ApiMethod   (POST)
      */

+ 2 - 2
application/api/controller/User.php

@@ -494,7 +494,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')->order('id desc');
+            $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');
         });
 //        foreach ($list as $v){
 //            $v['user'] = \app\admin\model\User::field('username,mobile,postcode,email,company,company_site')->find(['id'=>$v['uid']]);
@@ -522,7 +522,7 @@ class User extends Api
      */
     public function mypjorder_details(){
         $list = Order::get(function ($query){
-            $query->where(['uid'=>$this->auth->id,'type'=>2,'id'=>input('id')])->field('id,uid,type,goods_id,goods_name,order_no,amount_real,market,status,create_time,deploy_type,deploy,billing_status')->order('id desc');
+            $query->where(['uid'=>$this->auth->id,'type'=>2,'id'=>input('id')])->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');
         });
         $list['user'] = \app\admin\model\User::field('username,mobile,postcode,email,company,company_site')->find(['id'=>$list['uid']]);