feat(admin): 新增1688商品批量导入功能

- 在路由文件中添加 POST /admin/alibaba/goods/import 接口
- 更新商品详情API文档链接为正确的接口地址
- 重构商品控制器方法注释返回类型并优化代码结构
- 在商品服务类中实现 batchImport 方法支持批量入库
- 添加商品详情获取功能并完善数据格式化逻辑
- 实现价格加价50%处理机制并记录入库日志
- 支持多商品ID批量处理和重复入库检查机制

app/controller/admin/alibaba/Goods.php

@@ -9,7 +9,7 @@ use app\services\ThirdParty\AlibabaAgent\ProductService;
  *
  * API文档:
  *   商品列表: https://open.1688.com/api/apidocdetail.htm?id=com.alibaba.fenxiao%3Ajxhy.product.getPageList-1
- *   商品详情: https://open.1688.com/api/apidocdetail.htm?id=com.alibaba.fenxiao%3Aalibaba.fenxiao.productInfo.get-1
+ *   商品详情: https://open.1688.com/api/apidocdetail.htm?id=com.alibaba.fenxiao%3Aalibaba.pifatuan.product.detail.list-2
  */
 class Goods
 {
@@ -17,7 +17,7 @@ class Goods
      * 获取1688分销商品分页列表
      *
      * @param ProductService $productService
-     * @return \think\response\Json
+     * @return \think\Response
      *
      * @api {GET} /admin/alibaba/goods/lst 获取商品列表
      * @apiParam {string}  [access_token]  1688 access_token（不传则使用配置中的默认token）
@@ -33,7 +33,6 @@ class Goods
     {
         $request = app('request');
 
-        // 获取请求参数
         $page = (int)$request->param('page', 1);
         $limit = (int)$request->param('limit', 20);
         $keyword = $request->param('keyword', '');
@@ -42,7 +41,6 @@ class Goods
         $maxPrice = $request->param('maxPrice', '');
         $sort = $request->param('sort', '');
 
-        // 构建搜索参数
         $params = [
             'page' => max(1, $page),
             'limit' => min(max(1, $limit), 50),
@@ -51,24 +49,19 @@ class Goods
         if (!empty($keyword)) {
             $params['keyword'] = $keyword;
         }
-
         if (!empty($categoryId)) {
             $params['categoryId'] = (int)$categoryId;
         }
-
         if ($minPrice !== '' && $minPrice > 0) {
             $params['minPrice'] = (float)$minPrice;
         }
-
         if ($maxPrice !== '' && $maxPrice > 0) {
             $params['maxPrice'] = (float)$maxPrice;
         }
-
         if (!empty($sort)) {
             $params['sort'] = $sort;
         }
 
-        // 调用1688 API获取商品列表
         $result = $productService->searchProducts($params);
 
         if ($result === false) {
@@ -82,7 +75,7 @@ class Goods
      * 获取1688分销商品详情
      *
      * @param ProductService $productService
-     * @return \think\response\Json
+     * @return mixed
      *
      * @api {GET} /admin/alibaba/goods/detail 获取商品详情
      * @apiParam {string}  [access_token]  1688 access_token（不传则使用配置中的默认token）
@@ -98,7 +91,6 @@ class Goods
             return app('json')->fail('参数错误：productId不能为空');
         }
 
-        // 调用1688 API获取商品详情
         $result = $productService->getProductDetail($productId);
 
         if ($result === false) {
@@ -107,4 +99,56 @@ class Goods
 
         return app('json')->success($result);
     }
+
+    /**
+     * 批量导入1688商品到 alibaba_import_goods 表
+     *
+     * 业务场景：从1688商品列表中选择多个商品，一键入库
+     * 商品详情以JSON格式完整存储到 alibaba_import_goods 表
+     *
+     * @param ProductService $productService
+     * @return mixed
+     *
+     * @api {POST} /admin/alibaba/goods/import 批量入库
+     * @apiParam {string}  productIds  1688商品ID（必填），多个用逗号分隔，如：787533862434 或 787533862434,787533862435
+     */
+    public function import(ProductService $productService)
+    {
+        $request = app('request');
+
+        $raw = $request->param('productIds', '');
+
+        // 参数校验
+        if (empty($raw)) {
+            return app('json')->fail('参数错误：productIds不能为空');
+        }
+
+        // 解析productIds：支持 "787533862434" 或 "787533862434,787533862435"
+        $productIds = explode(',', str_replace(' ', '', $raw));
+        $productIds = array_unique(array_filter($productIds, function ($v) {
+            return $v !== '' && $v !== null;
+        }));
+
+        if (empty($productIds)) {
+            return app('json')->fail('参数错误：productIds格式不正确');
+        }
+
+        // 执行批量入库
+        $result = $productService->batchImport($productIds, 0);
+
+        $successCount = count($result['success']);
+        $failCount = count($result['fail']);
+
+        if ($successCount > 0) {
+            return app('json')->success([
+                'success'       => $result['success'],
+                'fail'          => $result['fail'],
+                'success_count' => $successCount,
+                'fail_count'    => $failCount,
+                'message'       => "成功入库 {$successCount} 个商品" . ($failCount > 0 ? "，{$failCount} 个失败" : ''),
+            ]);
+        }
+
+        return app('json')->fail('入库失败：' . implode('; ', array_values($result['fail'])));
+    }
 }

app/services/ThirdParty/AlibabaAgent/ProductService.php

@@ -2,8 +2,7 @@
 /**
  * 1688分销严选采购解决方案 - 商品服务类
  *
- * 提供商品搜索/列表查询功能
- * API文档: https://open.1688.com/api/apidocdetail.htm?id=com.alibaba.fenxiao%3Ajxhy.product.getPageList-1&aopApiCategory=category_new
+ * 提供商品搜索/列表查询、详情获取、批量入库等功能
  *
  * @author: yourname
  * @day: 2026/04/27
@@ -11,6 +10,9 @@
 
 namespace app\services\ThirdParty\AlibabaAgent;
 
+use think\facade\Db;
+use think\facade\Log;
+
 class ProductService extends AlibabaAgentBaseService
 {
     /**
@@ -25,33 +27,20 @@ class ProductService extends AlibabaAgentBaseService
     {
         $businessParams = [];
 
-        // 关键词搜索
         if (!empty($params['keyword'])) {
             $businessParams['keyword'] = $params['keyword'];
         }
-
-        // 类目ID
         if (!empty($params['categoryId'])) {
             $businessParams['categoryId'] = $params['categoryId'];
         }
-
-        // 页码，默认1
         $businessParams['pageNo'] = $params['page'] ?? 1;
-
-        // 每页条数，最大50
         $businessParams['pageSize'] = min($params['limit'] ?? 20, 50);
-
-        // 排序方式
         if (!empty($params['sort'])) {
             $businessParams['sort'] = $params['sort'];
         }
-
-        // 最低价格过滤（仅当 > 0 时传入）
         if (!empty($params['minPrice']) && $params['minPrice'] > 0) {
             $businessParams['priceStart'] = $params['minPrice'];
         }
-
-        // 最高价格过滤（仅当 > 0 时传入）
         if (!empty($params['maxPrice']) && $params['maxPrice'] > 0) {
             $businessParams['priceEnd'] = $params['maxPrice'];
         }
@@ -79,30 +68,16 @@ class ProductService extends AlibabaAgentBaseService
     protected function formatSearchResult(array $result): array
     {
         $productList = [];
-
-        // 1688 API返回结构:
-        // {
-        //   "result": {
-        //     "success": true,
-        //     "code": "0",
-        //     "result": [ {商品1}, {商品2}, ... ],  // 商品列表
-        //     "pageInfo": {
-        //       "currentPage": 1,
-        //       "totalRecords": 2000,
-        //       "pageSize": 10
-        //     }
-        //   }
-        // }
         $data = $result['result'] ?? $result;
-        $products = $data['result'] ?? [];  // 商品列表在 result.result 中
+        $products = $data['result'] ?? [];
         $pageInfo = $data['pageInfo'] ?? [];
 
         if (empty($products)) {
             return [
-                'total' => 0,
-                'page' => (int)($pageInfo['currentPage'] ?? 1),
+                'total'    => 0,
+                'page'     => (int)($pageInfo['currentPage'] ?? 1),
                 'pageSize' => (int)($pageInfo['pageSize'] ?? 20),
-                'list' => [],
+                'list'     => [],
             ];
         }
 
@@ -111,10 +86,10 @@ class ProductService extends AlibabaAgentBaseService
         }
 
         return [
-            'total' => (int)($pageInfo['totalRecords'] ?? count($productList)),
-            'page' => (int)($pageInfo['currentPage'] ?? 1),
+            'total'    => (int)($pageInfo['totalRecords'] ?? count($productList)),
+            'page'     => (int)($pageInfo['currentPage'] ?? 1),
             'pageSize' => (int)($pageInfo['pageSize'] ?? 20),
-            'list' => $productList,
+            'list'     => $productList,
         ];
     }
 
@@ -126,13 +101,8 @@ class ProductService extends AlibabaAgentBaseService
      */
     public function formatProduct(array $product): array
     {
-        // 1688分销商品列表API返回字段:
-        // itemId, title, imgUrl, minPrice, maxPrice, salesCnt90d, skuCnt, serviceList
-
-        // 主图
         $mainImage = $product['imgUrl'] ?? $product['mainImage'] ?? $product['mainPicture'] ?? '';
 
-        // 服务标签
         $serviceTags = [];
         if (!empty($product['serviceList'])) {
             foreach ($product['serviceList'] as $service) {
@@ -141,62 +111,44 @@ class ProductService extends AlibabaAgentBaseService
         }
 
         return [
-            // 基础信息
-            'productId' => $product['itemId'] ?? $product['productId'] ?? $product['offerId'] ?? $product['id'] ?? 0,
-            'productType' => $product['productType'] ?? '',
-            'categoryId' => $product['categoryId'] ?? $product['catId'] ?? 0,
-            'categoryName' => $product['categoryName'] ?? '',
-
-            // 标题与描述
-            'title' => $product['title'] ?? $product['subject'] ?? $product['name'] ?? '',
-            'description' => $product['description'] ?? $product['detail'] ?? '',
-
-            // 价格信息
-            'price' => $product['minPrice'] ?? $product['price'] ?? $product['offerPrice'] ?? 0,
-            'salePrice' => $product['maxPrice'] ?? $product['salePrice'] ?? $product['price'] ?? 0,
-            'minPrice' => $product['minPrice'] ?? $product['price'] ?? 0,
-            'maxPrice' => $product['maxPrice'] ?? $product['price'] ?? 0,
-
-            // 库存信息（该接口不返回库存，用skuCnt作为参考）
-            'stock' => $product['stock'] ?? $product['totalAvailableStock'] ?? 0,
-            'unit' => $product['unit'] ?? '件',
-
-            // 图片信息
-            'mainImage' => $mainImage,
-            'imageList' => [$mainImage],
-
-            // SKU数量
-            'skuCnt' => $product['skuCnt'] ?? 0,
-
-            // 销售信息
-            'monthSales' => $product['monthSales'] ?? $product['salesCnt90d'] ?? 0,
-            'totalSales' => $product['totalSales'] ?? 0,
-
-            // 服务标签
-            'serviceTags' => $serviceTags,
-
-            // 分销属性
-            'isDistribution' => $product['isDistribution'] ?? false,
+            'productId'        => $product['itemId'] ?? $product['productId'] ?? $product['offerId'] ?? $product['id'] ?? 0,
+            'productType'      => $product['productType'] ?? '',
+            'categoryId'       => $product['categoryId'] ?? $product['catId'] ?? 0,
+            'categoryName'     => $product['categoryName'] ?? '',
+            'title'            => $product['title'] ?? $product['subject'] ?? $product['name'] ?? '',
+            'description'      => $product['description'] ?? $product['detail'] ?? '',
+            'price'            => $product['minPrice'] ?? $product['price'] ?? $product['offerPrice'] ?? 0,
+            'salePrice'        => $product['maxPrice'] ?? $product['salePrice'] ?? $product['price'] ?? 0,
+            'minPrice'         => $product['minPrice'] ?? $product['price'] ?? 0,
+            'maxPrice'         => $product['maxPrice'] ?? $product['price'] ?? 0,
+            'stock'            => $product['stock'] ?? $product['totalAvailableStock'] ?? 0,
+            'unit'             => $product['unit'] ?? '件',
+            'mainImage'        => $mainImage,
+            'imageList'        => [$mainImage],
+            'skuCnt'           => $product['skuCnt'] ?? 0,
+            'monthSales'       => $product['monthSales'] ?? $product['salesCnt90d'] ?? 0,
+            'totalSales'       => $product['totalSales'] ?? 0,
+            'serviceTags'      => $serviceTags,
+            'isDistribution'   => $product['isDistribution'] ?? false,
             'isStrictSelected' => $product['isStrictSelected'] ?? false,
             'distributorPrice' => $product['distributorPrice'] ?? 0,
-
-            // 店铺信息（该接口不返回店铺信息）
-            'shopName' => $product['shopName'] ?? $product['companyName'] ?? '',
-            'shopId' => $product['shopId'] ?? $product['memberId'] ?? '',
-
-            // 链接
-            'detailUrl' => $product['detailUrl'] ?? $product['offerUrl'] ?? '',
+            'shopName'         => $product['shopName'] ?? $product['companyName'] ?? '',
+            'shopId'           => $product['shopId'] ?? $product['memberId'] ?? '',
+            'detailUrl'        => $product['detailUrl'] ?? $product['offerUrl'] ?? '',
         ];
     }
 
+    // ================================================================
+    //  商品详情
+    // ================================================================
+
     /**
      * 获取分销商品详情（含SKU、图片等完整信息）
      *
      * API: com.alibaba.fenxiao:alibaba.pifatuan.product.detail.list-2
-     * 文档: https://open.1688.com/api/apidocdetail.htm?id=com.alibaba.fenxiao%3Aalibaba.pifatuan.product.detail.list-2
      *
      * @param int|string $productId 1688商品ID
-     * @return array|false
+     * @return array|false 格式化后的商品详情数据
      */
     public function getProductDetail($productId)
     {
@@ -205,7 +157,6 @@ class ProductService extends AlibabaAgentBaseService
             return false;
         }
 
-        // API要求参数名为 offerIds，类型为 Long[]（数组）
         $businessParams = [
             'offerIds' => '[' . $productId . ']',
         ];
@@ -221,23 +172,33 @@ class ProductService extends AlibabaAgentBaseService
             return false;
         }
 
-        // 临时：直接返回原始数据，方便查看结构
-        return $result;
+        return $this->formatDetailResult($result);
     }
 
     /**
      * 格式化商品详情结果
      *
-     * 1688商品详情API返回结构:
+     * 实际API返回结构:
      * {
      *   "result": {
      *     "success": true,
-     *     "code": "0",
-     *     "result": {
-     *       "productInfo": { 商品详细信息 },
-     *       "skuList": [ SKU列表 ],
-     *       "productImgList": [ 图片列表 ]
-     *     }
+     *     "result": [
+     *       {
+     *         "wangwangAccount": "...",
+     *         "productInfo": {
+     *           "productID": 635835395997,
+     *           "subject": "商品标题",
+     *           "image": { "images": ["img/ibank/..."] },
+     *           "saleInfo": { "amountOnSale": 536989, "priceRanges": [...], "unit": "PCS" },
+     *           "skuInfos": [{ "skuId": 5580608617712, "consignPrice": 4.14, "pifaPrice": 0.14, ... }],
+     *           "categoryID": 202060914,
+     *           "categoryName": "晶体振荡器",
+     *           "description": "<div>..."
+     *         },
+     *         "tagInfoList": ["一件代发", "一件代发包邮"],
+     *         "sellerOpenUid": "BBBAAvFPtiSWOJWNj2-MpLo4w"
+     *       }
+     *     ]
      *   }
      * }
      *
@@ -247,103 +208,244 @@ class ProductService extends AlibabaAgentBaseService
     protected function formatDetailResult(array $result): array
     {
         $data = $result['result'] ?? $result;
-        $detailData = $data['result'] ?? [];
+        $items = $data['result'] ?? [];
 
-        if (empty($detailData)) {
+        if (empty($items) || !is_array($items)) {
             return [];
         }
 
-        $productInfo = $detailData['productInfo'] ?? $detailData;
-        $skuList = $detailData['skuList'] ?? [];
-        $productImgList = $detailData['productImgList'] ?? [];
+        // 取第一个商品（API按offerIds查询单个商品）
+        $item = $items[0] ?? [];
+        if (empty($item)) {
+            return [];
+        }
 
-        // 格式化SKU
-        $formattedSkus = [];
-        if (!empty($skuList)) {
-            foreach ($skuList as $sku) {
-                $formattedSkus[] = [
-                    'skuId' => $sku['skuId'] ?? '',
-                    'specId' => $sku['specId'] ?? '',
-                    'price' => $sku['price'] ?? $sku['retailPrice'] ?? 0,
-                    'salePrice' => $sku['salePrice'] ?? $sku['price'] ?? 0,
-                    'stock' => $sku['stock'] ?? $sku['availableStock'] ?? 0,
-                    'specName' => $sku['specName'] ?? $sku['name'] ?? '',
-                    'image' => $sku['image'] ?? '',
-                ];
+        $productInfo = $item['productInfo'] ?? [];
+        $tagInfoList = $item['tagInfoList'] ?? [];
+        $wangwangAccount = $item['wangwangAccount'] ?? '';
+
+        // --- 图片处理 ---
+        $imageData = $productInfo['image'] ?? [];
+        $rawImages = $imageData['images'] ?? [];
+        $imageList = [];
+        $mainImage = '';
+        if (!empty($rawImages)) {
+            foreach ($rawImages as $img) {
+                $fullUrl = $this->buildImageUrl($img);
+                $imageList[] = $fullUrl;
+                if (empty($mainImage)) {
+                    $mainImage = $fullUrl;
+                }
             }
         }
 
-        // 格式化图片列表
-        $imageList = [];
-        if (!empty($productImgList)) {
-            foreach ($productImgList as $img) {
-                $url = is_string($img) ? $img : ($img['url'] ?? $img['imgUrl'] ?? '');
-                if (!empty($url)) {
-                    $imageList[] = $url;
+        // --- 价格处理 ---
+        $saleInfo = $productInfo['saleInfo'] ?? [];
+        $priceRanges = $saleInfo['priceRanges'] ?? [];
+        $minPrice = 0;
+        $maxPrice = 0;
+        if (!empty($priceRanges)) {
+            $prices = array_column($priceRanges, 'price');
+            $minPrice = !empty($prices) ? (float)min($prices) : 0;
+            $maxPrice = !empty($prices) ? (float)max($prices) : 0;
+        }
+
+        // --- 商品属性（如品牌、货号、规格等） ---
+        $attributes = $productInfo['attributes'] ?? [];
+
+        // --- SKU处理（提取规格名称、规格值、成本价） ---
+        $skuInfos = $productInfo['skuInfos'] ?? [];
+        $formattedSkus = [];
+        if (!empty($skuInfos)) {
+            foreach ($skuInfos as $sku) {
+                // 提取规格属性（规则名称 + 规格值名称）
+                $skuAttrs = $sku['attributes'] ?? [];
+                $specNames = [];
+                $specValues = [];
+                $skuAttrList = [];
+                foreach ($skuAttrs as $attr) {
+                    $attrName = $attr['attributeName'] ?? '';
+                    $attrValue = $attr['attributeValue'] ?? '';
+                    if ($attrName !== '') {
+                        $specNames[] = $attrName;
+                        $specValues[] = $attrValue;
+                        $skuAttrList[] = [
+                            'name'  => $attrName,
+                            'value' => $attrValue,
+                        ];
+                    }
                 }
+
+                // 成本价（consignPrice 是分销价/代发价）
+                $costPrice = (float)($sku['consignPrice'] ?? $sku['pifaPrice'] ?? 0);
+
+                $formattedSkus[] = [
+                    'skuId'        => $sku['skuId'] ?? '',
+                    'specId'       => $sku['specId'] ?? '',
+                    'consignPrice' => $costPrice,
+                    'pifaPrice'    => (float)($sku['pifaPrice'] ?? 0),
+                    'costPrice'    => $costPrice,
+                    'stock'        => $sku['amountOnSale'] ?? 0,
+                    'cargoNumber'  => $sku['cargoNumber'] ?? '',
+                    // 规格信息
+                    'specNames'    => $specNames,
+                    'specValues'   => $specValues,
+                    'specInfo'     => !empty($skuAttrList) ? json_encode($skuAttrList, JSON_UNESCAPED_UNICODE) : ($sku['specInfo'] ?? ''),
+                    'skuAttrs'     => $skuAttrList,
+                    // 规格图片
+                    'image'        => !empty($skuAttrs[0]['skuImageUrl'] ?? '') ? $this->buildImageUrl($skuAttrs[0]['skuImageUrl']) : '',
+                ];
             }
         }
 
-        // 主图
-        $mainImage = $productInfo['imgUrl'] ?? $productInfo['mainImage'] ?? $productInfo['mainPicture'] ?? '';
-        if (empty($mainImage) && !empty($imageList)) {
-            $mainImage = $imageList[0];
+        // --- 描述处理 ---
+        $description = $productInfo['description'] ?? '';
+
+        return [
+            'productId'     => $productInfo['productID'] ?? $productInfo['productId'] ?? 0,
+            'categoryId'    => $productInfo['categoryID'] ?? $productInfo['categoryId'] ?? 0,
+            'categoryName'  => $productInfo['categoryName'] ?? '',
+            'title'         => $productInfo['subject'] ?? '',
+            'description'   => $description,
+            'price'         => $minPrice,
+            'minPrice'      => $minPrice,
+            'maxPrice'      => $maxPrice,
+            'stock'         => $saleInfo['amountOnSale'] ?? 0,
+            'unit'          => $saleInfo['unit'] ?? '件',
+            'mainImage'     => $mainImage,
+            'imageList'     => $imageList,
+            'attributes'    => $attributes,
+            'skuList'       => $formattedSkus,
+            'shopName'      => $wangwangAccount,
+            'sellerOpenUid' => $item['sellerOpenUid'] ?? '',
+            'serviceTags'   => $tagInfoList,
+        ];
+    }
+
+    /**
+     * 构建图片完整URL
+     *
+     * @param string $path 图片路径
+     * @return string
+     */
+    protected function buildImageUrl(string $path): string
+    {
+        if (empty($path)) {
+            return '';
+        }
+        if (strpos($path, 'http://') === 0 || strpos($path, 'https://') === 0) {
+            return $path;
         }
+        // 1688 图片路径为相对路径如 img/ibank/O1CN01...，需拼接阿里云CDN域名
+        return 'https://cbu01.alicdn.com/' . ltrim($path, '/');
+    }
 
-        // 服务标签
-        $serviceTags = [];
-        if (!empty($productInfo['serviceList'])) {
-            foreach ($productInfo['serviceList'] as $service) {
-                $serviceTags[] = $service['name'] ?? '';
+    // ================================================================
+    //  批量入库
+    // ================================================================
+
+    /**
+     * 对价格进行加价处理（加价50%）
+     *
+     * @param float $price 原价
+     * @return float 加价后的价格
+     */
+    protected function applyMarkup(float $price): float
+    {
+        return round($price * 1.5, 2);
+    }
+
+    /**
+     * 批量导入1688商品到 alibaba_import_goods 表
+     *
+     * 业务场景：从1688商品列表中选择多个商品，一键入库
+     * 将商品详情数据以JSON格式完整存储到 alibaba_import_goods 表
+     * 入库时自动对所有价格加价50%
+     *
+     * @param array $productIds 1688商品ID数组，如 [635835395997, 635835395998]
+     * @param int   $merId      商户ID
+     * @param array $extra      额外参数（预留）
+     * @return array ['success' => [productId => localId], 'fail' => [productId => reason]]
+     */
+    public function batchImport(array $productIds, int $merId, array $extra = []): array
+    {
+        $success = [];
+        $fail = [];
+        $now = date('Y-m-d H:i:s');
+
+        foreach ($productIds as $productId) {
+            try {
+                // 检查是否已入库（product_id唯一）
+                $exists = Db::name('alibaba_import_goods')
+                    ->where('product_id', (int)$productId)
+                    ->where('status', 1)
+                    ->find();
+
+                if ($exists) {
+                    $success[$productId] = $exists['id'];
+                    Log::info("[1688入库] 商品{$productId}已存在，跳过入库，本地ID:{$exists['id']}");
+                    continue;
+                }
+
+                // 调用详情API获取完整数据
+                $detail = $this->getProductDetail($productId);
+                if ($detail === false || empty($detail)) {
+                    $fail[$productId] = '获取1688商品详情失败';
+                    continue;
+                }
+
+                // ===== 加价处理：所有价格加价50% =====
+                // 1. SKU级别成本价加价
+                $skuList = $detail['skuList'] ?? [];
+                foreach ($skuList as &$sku) {
+                    $sku['originalCostPrice'] = $sku['costPrice'] ?? 0;
+                    $sku['costPrice'] = $this->applyMarkup((float)$sku['costPrice']);
+                    $sku['originalConsignPrice'] = $sku['consignPrice'] ?? 0;
+                    $sku['consignPrice'] = $this->applyMarkup((float)$sku['consignPrice']);
+                    $sku['originalPifaPrice'] = $sku['pifaPrice'] ?? 0;
+                    $sku['pifaPrice'] = $this->applyMarkup((float)$sku['pifaPrice']);
+                }
+                unset($sku);
+                $detail['skuList'] = $skuList;
+
+                // 2. 商品级别价格加价
+                $detail['originalMinPrice'] = $detail['minPrice'] ?? 0;
+                $detail['originalMaxPrice'] = $detail['maxPrice'] ?? 0;
+                $detail['originalPrice'] = $detail['price'] ?? 0;
+                $detail['minPrice'] = $this->applyMarkup((float)$detail['minPrice']);
+                $detail['maxPrice'] = $this->applyMarkup((float)$detail['maxPrice']);
+                $detail['price'] = $this->applyMarkup((float)$detail['price']);
+
+                // 3. 标记加价比例
+                $detail['markupRate'] = 50;
+                $detail['markupMultiplier'] = 1.5;
+
+                // 写入 alibaba_import_goods 表（完整JSON存储，含加价后价格）
+                $insertData = [
+                    'product_id'   => (int)$productId,
+                    'product_name' => $detail['title'] ?? '',
+                    'image'        => $detail['mainImage'] ?? '',
+                    'product_info' => json_encode($detail, JSON_UNESCAPED_UNICODE),
+                    'status'       => 1,
+                    'create_time'  => $now,
+                ];
+                $localId = Db::name('alibaba_import_goods')->insertGetId($insertData);
+
+                if ($localId) {
+                    $success[$productId] = $localId;
+                    Log::info("[1688入库] 商品{$productId}入库成功，本地ID:{$localId}，已加价50%");
+                } else {
+                    $fail[$productId] = '写入数据库失败';
+                }
+            } catch (\Throwable $e) {
+                $fail[$productId] = '异常: ' . $e->getMessage();
+                Log::error("[1688入库] 商品{$productId}入库异常: " . $e->getMessage());
             }
         }
 
         return [
-            // 基础信息
-            'productId' => $productInfo['itemId'] ?? $productInfo['productId'] ?? $productInfo['offerId'] ?? 0,
-            'productType' => $productInfo['productType'] ?? '',
-            'categoryId' => $productInfo['categoryId'] ?? $productInfo['catId'] ?? 0,
-            'categoryName' => $productInfo['categoryName'] ?? '',
-
-            // 标题与描述
-            'title' => $productInfo['title'] ?? $productInfo['subject'] ?? $productInfo['name'] ?? '',
-            'description' => $productInfo['description'] ?? $productInfo['detail'] ?? '',
-
-            // 价格信息
-            'price' => $productInfo['minPrice'] ?? $productInfo['price'] ?? $productInfo['offerPrice'] ?? 0,
-            'salePrice' => $productInfo['maxPrice'] ?? $productInfo['salePrice'] ?? $productInfo['price'] ?? 0,
-            'minPrice' => $productInfo['minPrice'] ?? $productInfo['price'] ?? 0,
-            'maxPrice' => $productInfo['maxPrice'] ?? $productInfo['price'] ?? 0,
-
-            // 库存信息
-            'stock' => $productInfo['stock'] ?? $productInfo['totalAvailableStock'] ?? 0,
-            'unit' => $productInfo['unit'] ?? '件',
-
-            // 图片信息
-            'mainImage' => $mainImage,
-            'imageList' => $imageList,
-
-            // SKU列表
-            'skuList' => $formattedSkus,
-
-            // 销售信息
-            'monthSales' => $productInfo['monthSales'] ?? $productInfo['salesCnt90d'] ?? 0,
-            'totalSales' => $productInfo['totalSales'] ?? 0,
-
-            // 服务标签
-            'serviceTags' => $serviceTags,
-
-            // 分销属性
-            'isDistribution' => $productInfo['isDistribution'] ?? false,
-            'isStrictSelected' => $productInfo['isStrictSelected'] ?? false,
-            'distributorPrice' => $productInfo['distributorPrice'] ?? 0,
-
-            // 店铺信息
-            'shopName' => $productInfo['shopName'] ?? $productInfo['companyName'] ?? '',
-            'shopId' => $productInfo['shopId'] ?? $productInfo['memberId'] ?? '',
-
-            // 链接
-            'detailUrl' => $productInfo['detailUrl'] ?? $productInfo['offerUrl'] ?? '',
+            'success' => $success,
+            'fail'    => $fail,
         ];
     }
 }

route/admin.php

@@ -717,6 +717,7 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
         Route::group('alibaba/goods',function(){
             Route::get('lst', '/lst')->name('alibabaGoodsLst');
             Route::get('detail', '/detail')->name('alibabaGoodsDetail');
+            Route::post('import', '/import')->name('alibabaGoodsImport');
         })->prefix('admin.alibaba.Goods');