feat(merchant): 阿里巴巴产品控制器增加商户ID过滤和入库状态标识

- 在产品列表查询中添加商户ID过滤条件
- 为每个产品项添加是否已入库的状态标识
- 查询店铺产品表判断产品入库状态
- 修复重复分号语法错误

app/controller/merchant/alibaba/Product.php

@@ -23,6 +23,8 @@ class Product extends BaseController
         $limit   = (int)($request->param('limit', 20));
         $keyword = $request->param('keyword', '');
         $status  = $request->param('status', '');
+        $merId = $this->request->merId();
+        // $merId = 3447;
 
         $query = Db::name('alibaba_import_goods');
 
@@ -73,6 +75,11 @@ class Product extends BaseController
             $item['markup_rate'] = $productInfo['markupRate'] ?? 0;
             $item['original_min_price'] = $productInfo['originalMinPrice'] ?? 0;
             $item['original_max_price'] = $productInfo['originalMaxPrice'] ?? 0;
+
+            // 是否已入库
+            $item['isStoreProduct'] = 0;
+            $storeProduct = Db::name('store_product')->where(['spu_id' => $item['product_id'], 'mer_id' => $merId])->find();
+            if ($storeProduct) $item['isStoreProduct'] = 1;
         }
         unset($item);
 
@@ -187,7 +194,8 @@ class Product extends BaseController
             return json(['code' => 400, 'message' => '参数错误：id格式不正确']);
         }
 
-        $merId = $this->request->merId();;
+        $merId = $this->request->merId();
+        // $merId = 3447;
 
         $successList = [];
         $failList    = [];