From 4acf2affcb1803355aa81c7a24753df304a5facc Mon Sep 17 00:00:00 2001
From: heshupeng <hsp@bronet.cn>
Date: Tue, 26 Jan 2021 11:21:31 +0800
Subject: [PATCH] 代码优化

---
 addons/shopro/model/Cart.php        | 6 +++++-
 application/api/controller/Cart.php | 3 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/shopro/model/Cart.php b/addons/shopro/model/Cart.php
index 5b4cb08..3f559c5 100644
--- a/addons/shopro/model/Cart.php
+++ b/addons/shopro/model/Cart.php
@@ -35,12 +35,16 @@ class Cart extends Model
         ])->order('createtime desc')->select();
 
         // 删除失效数据
+        $newCartData = [];
         foreach ($cartData as $v){
             if(!$v->goods || !$v->sku_price){
                 $v->delete();
+            }else{
+                $v['sku_price'] = \addons\shopro\model\Goods::operActivitySkuPrice($v['goods'], [$v['sku_price']])['sku_price'][0];
+                $newCartData[] = $v;
             }
         }
-        return $cartData;
+        return $newCartData;
     }
 
     public static function add($goodsList)
diff --git a/application/api/controller/Cart.php b/application/api/controller/Cart.php
index 4cf93a6..6dc53b0 100644
--- a/application/api/controller/Cart.php
+++ b/application/api/controller/Cart.php
@@ -83,9 +83,6 @@ class Cart extends Base
     public function index()
     {
         $data = CartModel::info();
-        foreach ($data as $key => $v) {
-            $data[$key]['sku_price'] = \addons\shopro\model\Goods::operActivitySkuPrice($v['goods'], [$v['sku_price']])['sku_price'][0];
-        }
         $this->success('我的购物车', $data);
     }
 
--
libgit2 0.24.0