wesmiler пре 3 месеци
родитељ
комит
381fa36fa5

+ 0 - 2
app/Http/Controllers/Api/v1/CartController.php

@@ -4,8 +4,6 @@ namespace App\Http\Controllers\Api\v1;
 
 use App\Http\Controllers\Api\webApp;
 use App\Services\Api\CartService;
-use App\Services\Api\GoodsService;
-use App\Services\Api\MemberService;
 
 /**
  * 购物车管理

+ 1 - 1
app/Models/CartModel.php

@@ -48,7 +48,7 @@ class CartModel extends BaseModel
      */
     public function cartGoods()
     {
-        return $this->hasMany(CartModel::class, 'store_id', 'store_id')
+        return $this->hasMany(CartModel::class, 'sk_key', 'sk_key')
             ->with(['goods','sku'])
             ->where(['status'=>1,'mark'=>1]);
     }

+ 2 - 4
app/Services/Api/CartService.php

@@ -100,7 +100,6 @@ class CartService extends BaseService
         } else {
             unset($where['a.status']);
         }
-
         $model = $this->model->with(['store','cartGoods'])
             ->from('carts as a')
             ->leftJoin('goods as b', 'b.id', '=', 'a.goods_id')
@@ -169,16 +168,15 @@ class CartService extends BaseService
         $this->model->where(['user_id' => $userId, 'mark' => 1])->whereNotIn('store_id', [$storeId])->update(['mark' => 0, 'update_time' => time()]);
 
         // 添加购物型
-        dump($goodsId);
         if ($id = $this->model->where(['user_id' => $userId,'sku_id'=>$skuId, 'goods_id' => $goodsId])->value('id')) {
-            dump($id);
-            $this->model->where(['id' => $id])->update(['store_id' => $storeId,'num'=> DB::raw("num+{$num}"), 'sku_id' => $skuType == 1 ? 0 : $skuId, 'status' => 1, 'mark' => 1, 'create_time' => time()]);
+            $this->model->where(['id' => $id])->update(['store_id' => $storeId,'num'=> DB::raw("num+{$num}"),'sk_key'=>"{$userId}-{$storeId}", 'sku_id' => $skuType == 1 ? 0 : $skuId, 'status' => 1, 'mark' => 1, 'create_time' => time()]);
         } else {
             $data = [
                 'user_id' => $userId,
                 'goods_id' => $goodsId,
                 'store_id' => $storeId,
                 'num'=> $num,
+                'sk_key'=>"{$userId}-{$storeId}",
                 'sku_id' => $skuType == 1 ? 0 : $skuId,
                 'create_time' => time(),
                 'status' => 1,