1

app/api/model/Order.php

@@ -12,24 +12,23 @@ declare (strict_types=1);
 
 namespace app\api\model;
 
-use app\common\model\TransferRecord;
 use app\api\model\{Goods as GoodsModel, OrderRefund as OrderRefundModel, Setting as SettingModel, user\UserCoupon};
-use app\api\service\{User as UserService, order\source\Factory as OrderSourceFactory};
+use app\api\service\{order\source\Factory as OrderSourceFactory, User as UserService};
-use app\common\model\Order as OrderModel;
+use app\api\service\Store as StoreService;
-use app\common\service\{Order as OrderService, order\Complete as OrderCompleteService};
+use app\common\enum\{order\DeliveryStatus as DeliveryStatusEnum,
-use app\common\enum\{OrderType,
-    RecoveryStatusEnum,
-    Setting as SettingEnum,
-    order\PayStatus as PayStatusEnum,
-    order\OrderStatus as OrderStatusEnum,
     order\DeliveryType as DeliveryTypeEnum,
+    order\OrderStatus as OrderStatusEnum,
+    order\PayStatus as PayStatusEnum,
     order\ReceiptStatus as ReceiptStatusEnum,
-    order\DeliveryStatus as DeliveryStatusEnum,
+    OrderType,
-    user\UserTypeEnum};
+    RecoveryStatusEnum,
-use app\api\service\Store as StoreService;
+    Setting as SettingEnum};
 use app\common\library\helper;
+use app\common\model\Order as OrderModel;
+use app\common\model\TransferRecord;
+use app\common\service\{Order as OrderService, order\Complete as OrderCompleteService};
 use cores\exception\BaseException;
-use app\api\model\PreSaleLog;
+
 /**
  * 订单模型
  * Class Order
@@ -240,6 +239,7 @@ class Order extends OrderModel
             ->where('is_delete', '=', 0)
             ->count();
     }
+
     /**
      * 设置订单类型条件
      * @param string $dataType
@@ -474,7 +474,7 @@ class Order extends OrderModel
 
         //这边后面改成多商户的话需要根据storeid去获取信息
         $service = new StoreService;
-        $info = $service->data()['storeInfo']->toArray();
+        $info = $service->data();
         $order->storeInfo = $info;
         return $order;
     }
@@ -611,7 +611,8 @@ class Order extends OrderModel
     }
 
 
-    public function getZitiAddressAttr($value) {
+    public function getZitiAddressAttr($value)
+    {
         if (!empty($value)) return json_decode($value, true);
         return $value;
     }