1

.idea/workspace.xml

@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/common/model/GoodsOrderItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/GoodsOrderItem.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Order.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Order.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/common/model/ShoppingTrolley.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/ShoppingTrolley.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -169,7 +169,7 @@
       <workItem from="1661430114608" duration="642000" />
       <workItem from="1661520525074" duration="602000" />
       <workItem from="1666054299858" duration="23137000" />
-      <workItem from="1666140525910" duration="14572000" />
+      <workItem from="1666140525910" duration="14670000" />
     </task>
     <servers />
   </component>

application/api/controller/Order.php

@@ -241,7 +241,7 @@ class Order extends Base
                     'original_price' => $trolley['goods_spec']['original_price'],
                     'sell_price' => $trolley['goods_spec']['sell_price'],
                     'num' => $trolley['num'],
-                    'depot_id' => $trolley['goods_info']['depot_id'],
+                    'depot_id' => 0,
                     'trolley_id' => $trolley['id'],
                 ];
             }

application/common/model/ShoppingTrolley.php

@@ -19,7 +19,7 @@ class ShoppingTrolley extends Model
 
     public function goodsInfo()
     {
-        return $this->belongsTo('StoreGoods','goods_id')->field('id,name,cover,depot_id,base_id,depot_goods');
+        return $this->belongsTo('StoreGoods','goods_id')->field('id,name,cover');
 
     }