自提点，不要地址就下订单

addons/unishop/behavior/Order.php

@@ -213,10 +213,11 @@ class Order
         }*/
         $delivery = [];
 
-        $address = (new Address)->where(['id' => $extra['address_id'], 'user_id' => $extra['userId']])->find();
+        /*$address = (new Address)->where(['id' => $extra['address_id'], 'user_id' => $extra['userId']])->find();
         if (!$address) {
             throw new Exception(__('Address not exist'));
-        }
+        }*/
+        $address = [];
 
         // 条件四
         /*if ($extra['coupon_id']) {

addons/unishop/controller/Order.php

@@ -128,7 +128,7 @@ class Order extends Base
             }
 
             /** 默认地址 **/
-            $address_map = ['user_id' => $user_id, 'is_default' => AddressModel::IS_DEFAULT_YES];
+            /*$address_map = ['user_id' => $user_id, 'is_default' => AddressModel::IS_DEFAULT_YES];
 
             $address_id = input('address_id',0);
             if($address_id){
@@ -136,13 +136,13 @@ class Order extends Base
             }
             $address = (new AddressModel)->where($address_map)->find();
             if ($address) {
-                /*$area = (new Area)->whereIn('id', [$address->province_id, $address->city_id, $address->area_id])->column('name', 'id');
+                $area = (new Area)->whereIn('id', [$address->province_id, $address->city_id, $address->area_id])->column('name', 'id');
                 $address = $address->toArray();
                 $address['province']['name'] = $area[$address['province_id']];
                 $address['city']['name'] = $area[$address['city_id']];
-                $address['area']['name'] = $area[$address['area_id']];*/
+                $address['area']['name'] = $area[$address['area_id']];
             }
-
+            */
 
             /** 可用优惠券 **/
             /*$coupon = CouponModel::all(function ($query) {
@@ -174,7 +174,7 @@ class Order extends Base
 
             $this->success('', [
                 'product' => $productData,
-                'address' => $address,
+//                'address' => $address,
 //                'coupon' => $coupon,
 //                'delivery' => $delivery['list'],
                 'order_price' => $order_price,

addons/unishop/model/Order.php

@@ -274,8 +274,8 @@ class Order extends Model
             'coupon_json' => json_encode($coupon),
             'delivery_id' => $delivery ? $delivery['id'] : 0,
             'delivery_json' => json_encode($delivery),
-            'address_id' => $address['id'],
-            'address_json' => json_encode($address),
+//            'address_id' => $address['id'],
+//            'address_json' => json_encode($address),
         ]);
 
 

addons/unishop/validate/Order.php

@@ -21,7 +21,7 @@ class Order extends Validate
 //        'city_id' => 'require|integer',
         'delivery_id' => 'require|integer',
         'remark' => 'max:250',
-        'address_id' => 'require',
+//        'address_id' => 'require',
         'flash_id' => 'require',
     ];
 
@@ -36,7 +36,7 @@ class Order extends Validate
         'delivery_id.require' => '请选择配送方式',
         'delivery_id.integer' => '配送方式格式错误',
         'remark.max' => '备注不能超过250个文字',
-        'address_id.require' => '请选择收货地址',
+//        'address_id.require' => '请选择收货地址',
         'flash_id.require' => '秒杀id不能为空',
     ];
 
@@ -44,8 +44,8 @@ class Order extends Validate
      * 验证场景
      */
     protected $scene = [
-        'submit'  => [/*'product_id', 'number', /*'city_id',*/ 'address_id', /*'delivery_id',*/ 'remark'], // 创建订单
-        'submitFlash'  => [/*'product_id',*/ 'number',/* 'city_id',*/ 'address_id', /*'delivery_id',*/ 'remark', 'flash_id'], // 秒杀创建订单
+        'submit'  => [/*'product_id', 'number', /*'city_id', 'address_id', 'delivery_id',*/ 'remark'], // 创建订单
+        'submitFlash'  => [/*'product_id',*/ 'number',/* 'city_id', 'address_id', 'delivery_id',*/ 'remark', 'flash_id'], // 秒杀创建订单
     ];
 
 }

application/api/controller/Baseconfig.php

@@ -27,6 +27,13 @@ class Baseconfig extends Api
         $this->success('success',$config);
     }
 
+    //自提点
+    public function zitidian(){
+        $list = Db::name('zitidian')->order('id desc')->select();
+
+        $this->success('success',$list);
+    }
+
 
 
 }