feat(merchant): 添加1688分销严选入库商品功能

- 新增alibaba/product路由组，包含商品列表、详情、删除和正式入库接口
- 实现Product控制器，提供lst、detail、delete和importStore方法
- 添加1688商品正式入库逻辑，支持单个和批量导入到store_product表
- 实现商品属性和规格数据的完整写入流程
- 修复商品列表查询时遗漏spu_id条件的问题

app/common/repositories/store/product/ProductRepository.php

@@ -733,7 +733,7 @@ class ProductRepository extends BaseRepository
      */
     public function getList(?int $merId, array $where, int $page, int $limit)
     {
-        $query = $this->dao->search($merId, $where)->whereNull('spu_id')->with(['merCateId.category', 'storeCategory', 'brand']);
+        $query = $this->dao->search($merId, $where)->with(['merCateId.category', 'storeCategory', 'brand']);
         $count = $query->count($this->dao->getPk());
         $list = $query->page($page, $limit)->setOption('field', [])->field($this->filed)->select();
         $list->append(['max_extension', 'min_extension']);

app/controller/merchant/alibaba/Product.php

@@ -0,0 +1,226 @@
+<?php
+
+namespace app\controller\merchant\alibaba;
+
+use think\facade\Db;
+use app\services\ThirdParty\AlibabaAgent\ProductService;
+
+class Product
+{
+    /**
+     * 已入库的1688商品列表
+     *
+     * 展示 rrx_alibaba_import_goods 表中的商品数据
+     * GET /merchant/alibaba/product/lst?page=1&limit=20&keyword=&status=
+     *
+     * @return \think\Response
+     */
+    public function lst()
+    {
+        $request = app('request');
+        $page    = (int)($request->param('page', 1));
+        $limit   = (int)($request->param('limit', 20));
+        $keyword = $request->param('keyword', '');
+        $status  = $request->param('status', '');
+
+        $query = Db::name('alibaba_import_goods');
+
+        // 关键词搜索（商品名称）
+        if (!empty($keyword)) {
+            $query->where('product_name', 'like', '%' . $keyword . '%');
+        }
+
+        // 状态筛选
+        if ($status !== '') {
+            $query->where('status', (int)$status);
+        }
+
+        $count = $query->count('id');
+
+        $list = $query
+            ->order('create_time', 'DESC')
+            ->page($page, $limit)
+            ->select()
+            ->toArray();
+
+        // 格式化返回数据
+        foreach ($list as &$item) {
+            $item['id']          = (int)$item['id'];
+            $item['product_id']  = (int)$item['product_id'];
+            $item['status']      = (int)$item['status'];
+            $item['create_time'] = (string)$item['create_time'];
+
+            // 解析 product_info JSON
+            $productInfo = [];
+            if (!empty($item['product_info'])) {
+                $productInfo = json_decode($item['product_info'], true) ?: [];
+            }
+            $item['product_info'] = $productInfo;
+
+            // 提取关键展示字段
+            $item['price']       = $productInfo['price'] ?? 0;
+            $item['minPrice']    = $productInfo['minPrice'] ?? 0;
+            $item['maxPrice']    = $productInfo['maxPrice'] ?? 0;
+            $item['stock']       = $productInfo['stock'] ?? 0;
+            $item['unit']        = $productInfo['unit'] ?? '件';
+            $item['sku_count']   = isset($productInfo['skuList']) ? count($productInfo['skuList']) : 0;
+            $item['image_list']  = $productInfo['imageList'] ?? [];
+            $item['shop_name']   = $productInfo['shopName'] ?? '';
+            $item['category_name'] = $productInfo['categoryName'] ?? '';
+
+            // 加价标记
+            $item['markup_rate'] = $productInfo['markupRate'] ?? 0;
+            $item['original_min_price'] = $productInfo['originalMinPrice'] ?? 0;
+            $item['original_max_price'] = $productInfo['originalMaxPrice'] ?? 0;
+        }
+        unset($item);
+
+        return json([
+            'code' => 200,
+            'message' => 'success',
+            'data' => [
+                'list'  => $list,
+                'count' => $count,
+                'page'  => $page,
+                'limit' => $limit,
+            ],
+        ]);
+    }
+
+    /**
+     * 获取单个入库商品的详细信息
+     *
+     * GET /merchant/alibaba/product/detail?id=123
+     *
+     * @return \think\Response
+     */
+    public function detail()
+    {
+        $request = app('request');
+        $id = (int)$request->param('id', 0);
+        if ($id <= 0) {
+            return json(['code' => 400, 'message' => '参数错误：id不能为空']);
+        }
+
+        $item = Db::name('alibaba_import_goods')
+            ->where('id', $id)
+            ->find();
+
+        if (!$item) {
+            return json(['code' => 404, 'message' => '商品不存在']);
+        }
+
+        $item['id']         = (int)$item['id'];
+        $item['product_id'] = (int)$item['product_id'];
+        $item['status']     = (int)$item['status'];
+
+        // 解析 product_info JSON
+        if (!empty($item['product_info'])) {
+            $item['product_info'] = json_decode($item['product_info'], true) ?: [];
+        }
+
+        return json([
+            'code' => 200,
+            'message' => 'success',
+            'data' => $item,
+        ]);
+    }
+
+    /**
+     * 删除入库商品（软删除：修改status为0）
+     *
+     * POST /merchant/alibaba/product/delete
+     * Body: id=123
+     *
+     * @return \think\Response
+     */
+    public function delete()
+    {
+        $request = app('request');
+        $id = (int)$request->param('id', 0);
+        if ($id <= 0) {
+            return json(['code' => 400, 'message' => '参数错误：id不能为空']);
+        }
+
+        $exists = Db::name('alibaba_import_goods')->where('id', $id)->find();
+        if (!$exists) {
+            return json(['code' => 404, 'message' => '商品不存在']);
+        }
+
+        Db::name('alibaba_import_goods')->where('id', $id)->update(['status' => 0]);
+
+        return json(['code' => 200, 'message' => '删除成功']);
+    }
+
+    /**
+     * 正式入库：将 alibaba_import_goods 表中的商品写入 store_product 系列表
+     *
+     * 业务场景：从 alibaba_import_goods 表中选择已导入的1688商品，
+     * 正式写入到 rrx_store_product、rrx_store_product_attr、rrx_store_product_attr_value 表中
+     *
+     * POST /merchant/alibaba/product/importStore
+     * Body: id=123   (alibaba_import_goods 表的主键ID)
+     * 或 Body: ids=123,456  (批量入库，逗号分隔)
+     *
+     * @param ProductService $productService
+     * @return \think\Response
+     */
+    public function importStore(ProductService $productService)
+    {
+        $request = app('request');
+        $id  = $request->param('id', '');
+        $ids = $request->param('ids', '');
+
+        // 解析要入库的ID列表
+        $importIds = [];
+        if (!empty($ids)) {
+            $parts = explode(',', $ids);
+            foreach ($parts as $part) {
+                $part = (int)trim($part);
+                if ($part > 0) $importIds[] = $part;
+            }
+        } elseif (!empty($id)) {
+            $importIds[] = (int)$id;
+        }
+
+        if (empty($importIds)) {
+            return json(['code' => 400, 'message' => '参数错误：请传入id或ids']);
+        }
+
+        // mer_id 写死 3447
+        $merId = 3447;
+
+        $successList = [];
+        $failList    = [];
+
+        foreach ($importIds as $importId) {
+            $result = $productService->importToStoreProduct($importId, $merId);
+            if ($result['code'] === 200) {
+                $successList[] = [
+                    'import_goods_id' => $importId,
+                    'product_id'      => $result['product_id'],
+                    'msg'             => $result['msg'],
+                ];
+            } else {
+                $failList[] = [
+                    'import_goods_id' => $importId,
+                    'msg'             => $result['msg'],
+                ];
+            }
+        }
+
+        $message = count($successList) . '个商品入库成功';
+        if (!empty($failList)) {
+            $message .= '，' . count($failList) . '个商品入库失败';
+        }
+
+        return json([
+            'code'    => 200,
+            'message' => $message,
+            'data'    => [
+                'success' => $successList,
+                'fail'    => $failList,
+            ],
+        ]);
+    }
+}

app/services/ThirdParty/AlibabaAgent/ProductService.php

@@ -355,6 +355,263 @@ class ProductService extends AlibabaAgentBaseService
         return round($price * 1.5, 2);
     }
 
+    // ================================================================
+    //  商品入库到 store_product 表
+    // ================================================================
+
+    /**
+     * 将 alibaba_import_goods 表中的商品数据写入 store_product 系列表
+     *
+     * 业务场景：从 alibaba_import_goods 表中选择已入库的1688商品，正式写入到
+     * rrx_store_product、rrx_store_product_attr、rrx_store_product_attr_value 表中
+     *
+     * @param int $importGoodsId alibaba_import_goods 表的主键ID
+     * @param int $merId         商户ID（目前写死3447）
+     * @return array ['code' => 200|400, 'msg' => '...', 'product_id' => int]
+     */
+    public function importToStoreProduct(int $importGoodsId, int $merId): array
+    {
+        try {
+            // 1. 读取 alibaba_import_goods 记录
+            $importGoods = Db::name('alibaba_import_goods')
+                ->where('id', $importGoodsId)
+                ->where('status', 1)
+                ->find();
+
+            if (empty($importGoods)) {
+                return ['code' => 400, 'msg' => '商品不存在或已下架', 'product_id' => 0];
+            }
+
+            // 2. 检查是否已入库（按 product_id 去重）
+            $exists = Db::name('store_product')
+                ->where('mer_id', $merId)
+                ->where('spu_id', (string)$importGoods['product_id'])
+                ->where('is_del', 0)
+                ->value('product_id');
+
+            if ($exists) {
+                return ['code' => 400, 'msg' => '商品已入库，product_id=' . $exists, 'product_id' => $exists];
+            }
+
+            // 3. 解析 product_info JSON
+            $productInfo = json_decode($importGoods['product_info'], true) ?: [];
+            if (empty($productInfo)) {
+                return ['code' => 400, 'msg' => '商品数据解析失败', 'product_id' => 0];
+            }
+
+            $skuList = $productInfo['skuList'] ?? [];
+            $imageList = $productInfo['imageList'] ?? [];
+            $mainImage = $productInfo['mainImage'] ?? $importGoods['image'] ?? '';
+            $title = $productInfo['title'] ?? $importGoods['product_name'] ?? '';
+            $description = $productInfo['description'] ?? '';
+
+            // 4. 判断是否为多规格
+            $specType = count($skuList) > 1 ? 1 : 0;
+
+            // 5. 轮播图处理
+            $sliderImage = !empty($imageList) ? implode(',', $imageList) : $mainImage;
+
+            // 6. 取最低价和最高价作为 price 和 ot_price
+            $prices = array_column($skuList, 'price');
+            $minPrice = !empty($prices) ? (float)min($prices) : 0;
+            $maxPrice = !empty($prices) ? (float)max($prices) : 0;
+
+            // 成本价取第一个SKU的成本价
+            $costPrice = $skuList[0]['costPrice'] ?? 0;
+
+            // 7. 写入 store_product 表
+            $productData = [
+                'mer_id'         => $merId,
+                'image'          => $mainImage,
+                'slider_image'   => $sliderImage,
+                'store_name'     => $title,
+                'store_info'     => mb_substr($title, 0, 100),
+                'keyword'        => mb_substr($title, 0, 10),
+                'is_show'        => 1,
+                'status'         => 0,
+                'cate_id'        => 0,
+                'unit_name'      => $productInfo['unit'] ?? '件',
+                'price'          => $minPrice,
+                'cost'           => $costPrice,
+                'ot_price'       => $maxPrice,
+                'stock'          => 9999,
+                'spec_type'      => $specType,
+                'extension_type' => 0,
+                'mer_status'     => 1,
+                'is_used'        => 1,
+                'volunteer'      => 0,
+                'type'           => 1,
+                'pension'        => '0.00',
+                'commission'     => '',
+                'spu_id'         => (string)$importGoods['product_id'],
+                'temp_id'        => 105,
+                'concession_pri' => '0.00',
+                'cost_price'     => $costPrice,
+            ];
+            $productId = Db::name('store_product')->insertGetId($productData);
+
+            if (!$productId) {
+                return ['code' => 400, 'msg' => '写入store_product表失败', 'product_id' => 0];
+            }
+
+            // 8. 写入 store_product_content 表（商品详情）
+            $contentHtml = $description;
+            // Db::name('store_product_content')->insert([
+            //     'product_id' => $productId,
+            //     'content'    => $contentHtml,
+            //     'type'       => 0,
+            // ]);
+
+            // 9. 写入 store_product_attr 和 store_product_attr_value
+            $this->insertStoreSkus($productId, $skuList, $merId);
+
+            Log::channel('alibaba')->info("[1688正式入库1] 商品{$importGoods['product_id']}入库成功，product_id={$productId}，mer_id={$merId}");
+
+            return [
+                'code'       => 200,
+                'msg'        => '入库成功',
+                'product_id' => $productId,
+            ];
+        } catch (\Throwable $e) {
+            Log::channel('alibaba')->error("[1688正式入库2] 异常: " . $e->getMessage());
+            return ['code' => 400, 'msg' => '入库异常: ' . $e->getMessage(), 'product_id' => 0];
+        }
+    }
+
+    /**
+     * 写入 store_product_attr 和 store_product_attr_value
+     *
+     * @param int   $productId
+     * @param array $skuList    formatDetailResult 返回的 skuList
+     * @param int   $merId
+     */
+    protected function insertStoreSkus(int $productId, array $skuList, int $merId): void
+    {
+        if (empty($skuList)) {
+            // 单规格：写入默认规格
+            Db::name('store_product_attr')->insert([
+                'product_id'  => $productId,
+                'attr_name'   => '规格',
+                'attr_values' => '',
+                'type'        => 0,
+            ]);
+
+            $unique = $this->generateUnique($productId, 'default');
+            Db::name('store_product_attr_value')->insert([
+                'product_id'  => $productId,
+                'detail'      => json_encode(['规格' => '默认'], JSON_UNESCAPED_UNICODE),
+                'sku'         => '默认',
+                'image'       => '',
+                'cost'        => 0,
+                'ot_price'    => 0,
+                'price'       => 0,
+                'unique'      => $unique,
+                'stock'       => 9999,
+                'cost_price'  => 0,
+                'extension_one' => 5,
+                'gong_sku_id' => '',
+                'gong_mer_profit' => 0,
+                'gong_pension'    => 0,
+                'gong_market_price' => 0,
+                'plate_mer_profit' => 0,
+                'volume' => 0,
+                'weight' => 0,
+                'dacang_price' => 0
+            ]);
+            return;
+        }
+
+        // 多规格处理
+        // 收集所有规格名称和值
+        $attrNames = [];    // ['颜色', '尺寸']
+        $attrValueMap = []; // ['颜色' => ['红', '蓝'], '尺寸' => ['S', 'M']]
+
+        foreach ($skuList as $sku) {
+            $skuAttrs = $sku['skuAttrs'] ?? [];
+            foreach ($skuAttrs as $attr) {
+                $name = $attr['name'] ?? '';
+                $value = $attr['value'] ?? '';
+                if ($name === '') continue;
+                if (!in_array($name, $attrNames)) {
+                    $attrNames[] = $name;
+                }
+                if (!isset($attrValueMap[$name])) {
+                    $attrValueMap[$name] = [];
+                }
+                if (!in_array($value, $attrValueMap[$name])) {
+                    $attrValueMap[$name][] = $value;
+                }
+            }
+        }
+
+        // 写入 store_product_attr
+        foreach ($attrNames as $attrName) {
+            $attrValues = $attrValueMap[$attrName] ?? [];
+            Db::name('store_product_attr')->insert([
+                'product_id'  => $productId,
+                'attr_name'   => $attrName,
+                'attr_values' => implode('-!-', $attrValues),
+                'type'        => 0,
+            ]);
+        }
+
+        // 写入 store_product_attr_value
+        foreach ($skuList as $sku) {
+            $skuAttrs = $sku['skuAttrs'] ?? [];
+            $detailArr = [];
+            $skuKey = '';
+            foreach ($skuAttrs as $attr) {
+                $name = $attr['name'] ?? '';
+                $value = $attr['value'] ?? '';
+                if ($name !== '') {
+                    $detailArr[$name] = $value;
+                    $skuKey .= $value;
+                }
+            }
+            if (empty($detailArr)) {
+                $detailArr = ['规格' => '默认'];
+                $skuKey = '默认';
+            }
+
+            $skuId = $sku['skuId'] ?? '';
+            $unique = $this->generateUnique($productId, $skuId ?: $skuKey);
+
+            Db::name('store_product_attr_value')->insert([
+                'product_id'  => $productId,
+                'detail'      => json_encode($detailArr, JSON_UNESCAPED_UNICODE),
+                'sku'         => $skuKey,
+                'image'       => $sku['image'] ?? '',
+                'cost'        => $sku['costPrice'] ?? 0,
+                'ot_price'    => $sku['consignPrice'] ?? 0,
+                'price'       => $sku['costPrice'] ?? 0,
+                'unique'      => $unique,
+                'stock'       => $sku['stock'] ?? 9999,
+                'cost_price'  => $sku['costPrice'] ?? 0,
+                'extension_one' => 5,
+                'gong_sku_id' => (string)$skuId,
+                'gong_mer_profit' => 0,
+                'gong_pension'    => 0,
+                'gong_market_price' => $sku['consignPrice'] ?? 0,
+                'plate_mer_profit' => 0,
+                'volume' => 0,
+                'weight' => 0,
+                'dacang_price' => 0
+            ]);
+        }
+    }
+
+    /**
+     * 生成唯一值 unique
+     *
+     * @param int    $productId
+     * @param string $sku
+     * @return string
+     */
+    protected function generateUnique(int $productId, string $sku): string
+    {
+        return substr(md5($sku . $productId), 12, 11) . '0';
+    }
+
     /**
      * 批量导入1688商品到 alibaba_import_goods 表
      *

route/merchant.php

@@ -596,6 +596,14 @@ Route::group(config('admin.api_merchant_prefix') . '/', function () {
             Route::get('status_filter', '/getStatusFilter')->name('getStatusFilter');
         })->prefix('merchant.gong.Goods');
 
+        // 1688分销严选 - 入库商品
+        Route::group('alibaba/product', function () {
+            Route::get('lst', '/lst');             // 商品列表（alibaba_import_goods表）
+            Route::get('detail', '/detail');       // 商品详情
+            Route::post('delete', '/delete');      // 删除（软删除）
+            Route::post('importStore', '/importStore'); // 正式入库到store_product表
+        })->prefix('merchant.alibaba.Product');
+
 
         Route::get('envet', 'merchant.user.User/envt');