Merge branch 'master' of http://git.liuniu946.com/Kirin/zccy

app/models/store/StoreOrder.php

@@ -2033,7 +2033,7 @@ class StoreOrder extends BaseModel
         else if ($status == 0)//未支付
             return $model->where($alert . 'paid', 0)->where($alert . 'status', 0)->where($alert . 'refund_status', 0);
         else if ($status == 1)//已支付 未发货
-            return $model->where($alert . 'paid', 1)->where($alert . 'status', 0)->where($alert . 'refund_status', 0);
+            return $model->where($alert . 'paid', 1)->where('shipping_type', 1)->where($alert . 'status', 0)->where($alert . 'refund_status', 0);
         else if ($status == 5)//待核销
             return $model->where($alert . 'paid', 1)->where('shipping_type', 2)->where($alert . 'status', 0)->where($alert . 'refund_status', 0);
         else if ($status == 2)//已支付  待收货