更新

@@ -587,6 +587,15 @@ class Order extends Api
         $model = new \app\api\model\Order();
         $order = $model->where('id',$order_id)->find();
         if ($order['freight_status'] == 20) $this->error('订单已发货无法取消');
+        $goodsmodel = new \app\api\model\OrderGoods();
+        $skumodel = new \app\api\model\GoodsSpec();
+        // 增加库存
+        $list = $goodsmodel->where('order_id',$order['id'])->select();
+        foreach ($list as $key => $value){
+            if ($value['deduct_stock_type'] == 10){
+                $skumodel->where('goods_spec_id',$value['goods_spec_id'])->setInc('stock_num',$value['total_num']);
+            }
+        }
         $config = Service::getConfig('wechat');
         $config['notify_url'] = $this->request->domain().'api/notify/refund/type/wechat';
         $config['return_url'] = '';
@@ -686,4 +695,24 @@ class Order extends Api
         $this->success('评价成功');
     }
 
+
+    /**
+     * @ApiTitle    (删除订单)
+     * @ApiMethod   (POST)
+     * @ApiHeaders  (name=token, type=string, required=true, description="请求的Token")
+     * @ApiParams   (name="order_id", type="integer", required=true, description="订单ID")
+     * @ApiReturn   ({
+    'code':'1',
+    'msg':'SUCCESS'
+    })
+     */
+    public function delOrder()
+    {
+        $order_id = $this->request->post('order_id');
+        if (!is_numeric($order_id)) $this->error('order_id参数不合法');
+        $ordermodel = new \app\api\model\Order();
+        $ordermodel->where('id',$order_id)->isUpdate()->save(['status'=>'hidden']);
+        $this->success('SUCCESS');
+    }
+
 }
\ No newline at end of file

+<?php
+
+
+namespace app\api\controller;
+
+
+use app\common\controller\Api;
+
+/**
+ * @ApiInternal
+ */
+class Timetask extends Api
+{
+    protected $noNeedLogin = ['*'];
+    protected $noNeedRight = ['*'];
+
+    /**
+     * 取消订单
+     */
+    public function orderCancel()
+    {
+        $model = new \app\api\model\Order();
+        $list = $model->where('order_status','10')->where('pay_status','10')->select();
+        $goodsmodel = new \app\api\model\OrderGoods();
+        $skumodel = new \app\api\model\GoodsSpec();
+        foreach ($list as $key => $value){
+            // 增加库存
+            $goods = $goodsmodel->where('order_id',$value['id'])->select();
+            foreach ($goods as $k => $val){
+                if ($value['deduct_stock_type'] == 10){
+                    $skumodel->where('goods_spec_id',$val['goods_spec_id'])->setInc('stock_num',$val['total_num']);
+                }
+            }
+        }
+        $model->where('order_status','10')->where('pay_status','10')->isUpdate()->save(['order_status'=>'20']);
+    }
+}
\ No newline at end of file

@@ -119,7 +119,11 @@ class User extends Api
             $third->isUpdate()->save(['session_key'=>$wxapi['session_key']],['user_id'=>$userid]);
             $this->success('登录成功',['token'=>$this->auth->getToken(),'user_type'=>$this->auth->user_type]);
         }else{
-            $userid = $this->auth->register($nickname,'','','',['avatar'=>$avatar,'invite_user_id'=>$invite_id,'invite_time'=>time()]);
+            if ($invite_id > 0){
+                $userid = $this->auth->register($nickname,'','','',['avatar'=>$avatar,'invite_user_id'=>$invite_id,'invite_time'=>time()]);
+            }else{
+                $userid = $this->auth->register($nickname,'','','',['avatar'=>$avatar]);
+            }
             if ($userid){
                 $third->isUpdate(false)->save(['openid'=>$wxapi['openid'],'user_id'=>$userid,'session_key'=>$wxapi['session_key']]);
                 $this->success('登录成功',['token'=>$this->auth->getToken(),'user_type'=>$this->auth->user_type]);