Merge branch 'dev'

app/common/dao/store/order/StoreCartDao.php

@@ -88,7 +88,7 @@ class StoreCartDao extends BaseDao
     {
         return StoreCart::getDb()->where('uid', $uid)->with([
             'product' => function (Relation $query) use ($cityId) {
-            $query->field('pension_is,share_is,product_id,image,store_name,is_show,status,is_del,unit_name,price,mer_status,temp_id,give_coupon_ids,is_gift_bag,is_used,product_type,old_product_id');
+            $query->field('pension_is,share_is,product_id,image,store_name,is_show,status,is_del,unit_name,price,mer_status,temp_id,give_coupon_ids,is_gift_bag,is_used,product_type,old_product_id,is_alibaba,spu_id');
             if ($cityId) {
                 $query->with(['temp' => ['regionAddress' => function ($query) use ($cityId) {
                     $query->where(function ($query) use ($cityId) {
@@ -102,7 +102,7 @@ class StoreCartDao extends BaseDao
             }
         }
         , 'productAttr' => function (Relation $query) use ($confirm) {
-            $query->field('pension_num,share_num,stock_num,shares_num,gong_mer_profit,gong_pension,gong_market_price,cost_price,product_id,stock,price,unique,sku,volume,weight,ot_price,dacang_price,gong_sku_id' . ($confirm ? '' : ',cost'))
+            $query->field('sku_id,spec_id,pension_num,share_num,stock_num,shares_num,gong_mer_profit,gong_pension,gong_market_price,cost_price,product_id,stock,price,unique,sku,volume,weight,ot_price,dacang_price,gong_sku_id' . ($confirm ? '' : ',cost'))
                 ->append(['bc_extension_one', 'bc_extension_two']);
         }, 'merchant' => function (Relation $query) use ($uid) {
             $query->field('mer_id,mer_name,mer_state,mer_avatar')->with(['coupon' => function ($query) use ($uid) {

app/common/repositories/store/order/StoreGroupOrderRepository.php

@@ -42,6 +42,7 @@ use app\entity\data\user\UserEntity;
 use app\entity\monomer\store\FzonePayTypeEntity;
 use app\entity\monomer\store\StoreOrderPensionJsonEntity;
 use app\entity\request\api\store\order\StoreOrderCreateRequestEntity;
+use app\services\ThirdParty\AlibabaAgent\OrderService;
 use think\db\exception\DbException;
 use think\exception\ValidateException;
 use think\facade\Db;
@@ -741,6 +742,35 @@ class StoreGroupOrderRepository extends BaseRepository
             //     $addressEntity->getCityId()
             // );
             $postage = 0.00; // 默认全都包邮s
+            $alibabaOrderId = null;
+            // 1688商品要获取运费
+            if ($productEntity->getIsAlibaba() == 1) {
+                // 地址数据
+                $addressParam = [
+                    'fullName' => $addressEntity->getRealName(),
+                    'mobile' => $addressEntity->getPhone(),
+                    'provinceText' => $addressEntity->getProvince(),
+                    'cityText' => $addressEntity->getCity(),
+                    'areaText' => $addressEntity->getDistrict(),
+                    'address' => $addressEntity->getDetail(),
+                ];
+                // 商品数据
+                $cargoParamList = [
+                    'offerId' => $productEntity->getSpuId(),
+                    'specId' => $productAttrValueEntity->getSpecId(),
+                    'quantity' => $cartEntity->getCartNum()
+                ];
+                $orderService = new OrderService();
+                $alibabaOrder = $orderService->previewOrder(['cargoParamList' => $cargoParamList, 'addressParam' => $addressParam]);
+                $postage = $alibabaOrder['preview']['sumCarriage'] / 100;
+
+                // 创建1688订单
+                $flow = $alibabaOrder['preview']['flowFlag'] ?? 'general';
+                $createOrderRes = $orderService->fastCreateOrder(['cargoParamList' => $cargoParamList, 'addressParam' => $addressParam,'flow'=>$flow]);
+                if ($createOrderRes['success']) $alibabaOrderId = $createOrderRes['orderId'];
+            }
+
+
 
             // 汇付手续费 （订单价格 + 邮费） * 汇付手续费比例
             $commissionRate = bcmul(bcadd($price, $postage, CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT), CommonEnum::HUIFU_COMMISSION_CHARGE, CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
@@ -782,7 +812,7 @@ class StoreGroupOrderRepository extends BaseRepository
                 ->setTotalPrice(bcadd($price, $postage, CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT))
                 ->setTotalPostage($postage)
                 ->setPayPostage($postage)
-                ->setPayPrice($price)
+                ->setPayPrice(bcadd($price, $postage, CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT))
                 ->setMerId($cartEntity->getMerId())
                 ->setCost($cost)
                 ->setMerMoney($merMoney)
@@ -807,6 +837,7 @@ class StoreGroupOrderRepository extends BaseRepository
                         ->setAttrValuePensionNum($productAttrValueEntity->getPensionNum())
                         ->toArray()
                 )->setPickUpId($storeOrderCreateRequestEntity->getPickUpId())
+                ->setAlibabaOrderId($alibabaOrderId)
                 ->setMark($storeOrderCreateRequestEntity->getMark());
             $storeOrderEntityList[] = $storeOrderEntity;
         }
@@ -822,7 +853,7 @@ class StoreGroupOrderRepository extends BaseRepository
             ->setRealName($addressEntity->getRealName())
             ->setUserPhone($addressEntity->getPhone())
             ->setUserAddress($addressEntity->getProvince() . $addressEntity->getCity() . $addressEntity->getDistrict() . $addressEntity->getDetail())
-            ->setPayPrice($totalPrice)
+            ->setPayPrice(bcadd($totalPrice, $totalPostage, CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT))
             ->setPayPostage($totalPostage)
             ->setCost($totalCost)
             ->setPayType($storeOrderCreateRequestEntity->getPayType())
@@ -1006,6 +1037,10 @@ class StoreGroupOrderRepository extends BaseRepository
 
         // 9、订单 分账 将收入的现金 商户部分 发放给 商户
         $storeOrderRepository->independentAccountByOrderIdList(array_column($storeOrderEntityList, 'orderId'));
+
+        // 10、 1688订单调用免密支付接口
+        $aliOrderService = new OrderService();
+        $aliOrderService->paySuccess($storeOrderEntityList);
     }
 
     /**

app/common/repositories/store/order/StoreOrderRepository.php

@@ -110,6 +110,7 @@ use app\entity\request\api\store\order\CalculatePostageRequestEntity;
 use app\entity\request\api\store\order\StoreOrderCreateRequestEntity;
 use app\model\common\JdOrderModel;
 use app\model\common\TbOrderModel;
+use app\services\ThirdParty\AlibabaAgent\OrderService;
 use app\traits\GongApiRequest;
 use app\traits\HuiPay;
 use app\traits\ShouxinyiApiRequest;
@@ -2615,6 +2616,28 @@ class StoreOrderRepository extends BaseRepository
             }
 
 
+            // 1688商品获取运费
+            if($cart['product']['is_alibaba'] == 1) {
+                $addressParam = [
+                    'fullName' => $address['real_name'],
+                    'mobile' => $address['phone'],
+                    'provinceText' => $address['province'],
+                    'cityText' => $address['city'],
+                    'areaText' => $address['district'],
+                    'address' => $address['detail'],
+                ];
+                $cargoParamList = [
+                    'offerId' => $cart['product']['spu_id'],
+                    'specId' => $cart['productAttr']['spec_id'],
+                    'quantity' => $cart['cart_num']
+                ];
+                $orderService = new OrderService();
+                $ailOrder = $orderService->previewOrder(['cargoParamList' => $cargoParamList, 'addressParam' => $addressParam]);
+                if ($ailOrder['preview']['sumCarriage'] > 0) {
+                    $postage_price = bcadd($postage_price, $ailOrder['preview']['sumCarriage'] / 100, 2);
+                }
+            }
+
             $take = $merchantTakeRepository->get($cartInfo['mer_id']);
             $org_price = bcadd(bcsub($total_price, $valid_total_price, 2), max($_pay_price, 0), 2);
             $coupon_price = set_price_rtrim(min($coupon_price, $total_price));
@@ -2622,7 +2645,7 @@ class StoreOrderRepository extends BaseRepository
             $org_price = bcsub($org_price, $youhui_price, 2);
 
             $pay_price = bcadd($postage_price, $org_price, 2);
-
+            $total_price = bcadd($total_price, $postage_price, 2);
 
             $postage_price = set_price_rtrim($postage_price);
             $org_price = set_price_rtrim($org_price);
@@ -2632,7 +2655,6 @@ class StoreOrderRepository extends BaseRepository
 
             //var_dump( $cartInfo['list'][$_k]);
 
-
             $cartInfo['take'] = $take['mer_take_status'] == '1' ? $take : ['mer_take_status' => 0];
             $cartInfo['coupon'] = array_values($cartInfo['coupon']);
             $cartInfo['order'] = compact('valid_total_price', 'product_cart', 'product_price', 'postage_price', 'org_price', 'total_price', 'total_num', 'pay_price', 'coupon_price', 'use_coupon_product', 'use_store_coupon', 'youhui_price');

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

@@ -96,6 +96,11 @@ class ProductAttrValueRepository extends BaseRepository
         if($debug){
             return true;
         }
+        $is_alibaba = Db::name('store_product') -> where('product_id',$product_id)->value('is_alibaba');
+        if ($is_alibaba) {
+            return true;
+        }
+
         $spu_id = Db::name('store_product') -> where('product_id',$product_id)->value('spu_id');
 
         if($spu_id == ''){

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

@@ -425,7 +425,7 @@ class ProductRepository extends BaseRepository
                     $value['detail'] = ['默认'];
                     $sku = '默认';
                 }
-                $product_data = Db::name('store_product')->where('product_id', $id)->value('spu_id');
+                $product_data = Db::name('store_product')->where('product_id', $id)->where('is_alibaba',0)->value('spu_id');
                 if ($product_data) {
                     if (!in_array($merId, ['319', '320', '321', '322', '323', '324', '325', '326', '327', '328'])) {
                         if ($value['price'] < $value['cost']) {
@@ -463,7 +463,7 @@ class ProductRepository extends BaseRepository
                         "sku"           => $sku,
                         "unique"        => $unique,
                         "dacang_price"  => $value['dacang_price'],
-                        "cost_price"    => $value['cost_price'],
+                        "cost_price"    => $value['cost_price'] ?? 0.00,
                         "gong_sku_id"   => $value['gong_sku_id'],
                         "pension_num"   => 0,
                         "share_num"     => 0,
@@ -473,6 +473,8 @@ class ProductRepository extends BaseRepository
                         'gong_mer_profit' => $value['gong_mer_profit'] ?? 0.00,
                         'gong_market_price' => $value['gong_market_price'] ?? 0.00,
                         'plate_mer_profit' => $value['plate_mer_profit'] ?? 0.00,
+                        'sku_id' => $value['sku_id'] ?? null,
+                        'spec_id' => $value['spec_id'] ?? null,
                     ];
                 } else {
                     $result['attrValue'][] = [
@@ -655,7 +657,7 @@ class ProductRepository extends BaseRepository
         $result[] = [
             'type'  => 2,
             'name'  => '仓库中' . $name,
-            'count' => $this->dao->search($merId, $this->switchType(2, $merId, $productType))->whereNull('spu_id')->count()
+            'count' => $this->dao->search($merId, $this->switchType(2, $merId, $productType))->count()
         ];
         if ($merId) {
             $result[] = [
@@ -677,7 +679,7 @@ class ProductRepository extends BaseRepository
         $result[] = [
             'type'  => 6,
             'name'  => '待审核' . $name,
-            'count' => $this->dao->search($merId, $this->switchType(6, $merId, $productType, $is_gift_bag))->whereNull('spu_id')->count()
+            'count' => $this->dao->search($merId, $this->switchType(6, $merId, $productType, $is_gift_bag))->count()
         ];
         $result[] = [
             'type'  => 7,
@@ -733,7 +735,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/common/repositories/system/merchant/MerchantRepository.php

@@ -216,6 +216,7 @@ class MerchantRepository extends BaseRepository
             Elm::switches('is_audit', '产品审核', 1)->activeValue(1)->inactiveValue(0)->inactiveText('关闭')->activeText('开启')->col(12),
             //Elm::switches('is_bro_goods', '直播间商品审核', $config['broadcast_goods_type'] == 1 ? 0 : 1)->activeValue(1)->inactiveValue(0)->inactiveText('关闭')->activeText('开启')->col(12),
             Elm::switches('is_best', '是否推荐')->activeValue(1)->inactiveValue(0)->inactiveText('关闭')->activeText('开启'),
+            Elm::switches('is_show_alibaba', '阿里巴巴')->activeValue(1)->inactiveValue(0)->inactiveText('关闭')->activeText('开启'),
         ];
 
         $form->setRule($rule);

app/controller/admin/alibaba/Goods.php

@@ -0,0 +1,154 @@
+<?php
+
+namespace app\controller\admin\alibaba;
+
+use app\services\ThirdParty\AlibabaAgent\ProductService;
+
+/**
+ * 1688分销严选 - 商品管理
+ *
+ * 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.pifatuan.product.detail.list-2
+ */
+class Goods
+{
+    /**
+     * 获取1688分销商品分页列表
+     *
+     * @param ProductService $productService
+     * @return \think\Response
+     *
+     * @api {GET} /admin/alibaba/goods/lst 获取商品列表
+     * @apiParam {string}  [access_token]  1688 access_token（不传则使用配置中的默认token）
+     * @apiParam {int}     [page=1]        页码
+     * @apiParam {int}     [limit=20]      每页条数（最大50）
+     * @apiParam {string}  [keyword]       关键词搜索
+     * @apiParam {int}     [categoryId]    类目ID
+     * @apiParam {number}  [minPrice]      最低价格
+     * @apiParam {number}  [maxPrice]      最高价格
+     * @apiParam {string}  [sort]          排序方式
+     */
+    public function lst(ProductService $productService)
+    {
+        $request = app('request');
+
+        $page = (int)$request->param('page', 1);
+        $limit = (int)$request->param('limit', 20);
+        $keyword = $request->param('keyword', '');
+        $categoryId = $request->param('categoryId', '');
+        $minPrice = $request->param('minPrice', '');
+        $maxPrice = $request->param('maxPrice', '');
+        $sort = $request->param('sort', '');
+
+        $params = [
+            'page' => max(1, $page),
+            'limit' => min(max(1, $limit), 50),
+        ];
+
+        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;
+        }
+
+        $result = $productService->searchProducts($params);
+
+        if ($result === false) {
+            return app('json')->fail('获取1688商品列表失败，请查看日志');
+        }
+
+        return app('json')->success($result);
+    }
+
+    /**
+     * 获取1688分销商品详情
+     *
+     * @param ProductService $productService
+     * @return mixed
+     *
+     * @api {GET} /admin/alibaba/goods/detail 获取商品详情
+     * @apiParam {string}  [access_token]  1688 access_token（不传则使用配置中的默认token）
+     * @apiParam {int}     productId       1688商品ID（必填）
+     */
+    public function detail(ProductService $productService)
+    {
+        $request = app('request');
+
+        $productId = $request->param('productId', '');
+
+        if (empty($productId)) {
+            return app('json')->fail('参数错误：productId不能为空');
+        }
+
+        $result = $productService->getProductDetail($productId);
+
+        if ($result === false) {
+            return app('json')->fail('获取1688商品详情失败，请查看日志');
+        }
+
+        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/controller/admin/system/auth/Menu.php

@@ -206,23 +206,30 @@ class Menu extends BaseController
             $menus[$k] = $menu;
         }
 
-        if($this->merchant){
-
-            foreach($menus as $key => $value){
-                if($value['menu_id'] == '1112' && $this->request->merId() != 439){
+        if ($this->merchant) {
+            // 获取是否拥有阿里巴巴选品库权限
+            $show = 0;
+            $isShowAlibaba = Db::name('merchant')->where('mer_id', $this->request->merId())->value('is_show_alibaba');
+            if ($isShowAlibaba) $show = 1;
+            foreach ($menus as $key => $value) {
+                if ($value['menu_id'] == '1112' && $this->request->merId() != 439) {
                     unset($menus[$key]);
                 }
-                if($value['menu_id'] == '1127' && $this->request->merId() != 439){
+                if ($value['menu_id'] == '1127' && $this->request->merId() != 439) {
                     unset($menus[$key]);
                 }
-                if($value['menu_id'] == '1103'){
+                if ($value['menu_id'] == '1103') {
                     unset($menus[$key]);
                 }
+                if ($value['route'] == '/merchant/product/alibaba') {
+                    if ($show == 0) {
+                        unset($menus[$key]);
+                    }
+                }
             }
         }
 
 
-
         return app('json')->success(array_values(array_filter(formatCategory($menus, 'menu_id'), function ($v) {
             return 0 == $v['pid'];
         })));

app/controller/admin/system/merchant/Merchant.php

@@ -179,7 +179,7 @@ class Merchant extends BaseController
      */
     public function checkParam(MerchantValidate $validate, $isUpdate = false)
     {
-        $data = $this->request->params([['category_id', 0], 'mer_type','mer_name', 'commission_rate', 'real_name', 'mer_phone', 'mer_keyword', 'mer_address', 'mark', ['sort', 0], ['status', 0], ['is_audit', 0], ['is_best', 0], ['is_bro_goods', 0], ['is_bro_room', 0]]);
+        $data = $this->request->params([['category_id', 0], 'mer_type','mer_name', 'commission_rate', 'real_name', 'mer_phone', 'mer_keyword', 'mer_address', 'mark', ['sort', 0], ['status', 0], ['is_audit', 0], ['is_best', 0], ['is_bro_goods', 0], ['is_bro_room', 0],['is_show_alibaba',0]]);
         if (!$isUpdate)
             $data += $this->request->params(['mer_account', 'mer_password']);
         else

app/controller/api/store/order/AlibabaOrder.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace app\controller\api\store\order;
+
+use app\common\repositories\store\order\StoreCartRepository;
+use app\services\ThirdParty\AlibabaAgent\OrderService;
+use think\facade\Db;
+
+class AlibabaOrder
+{
+    public function checkOrder(StoreCartRepository $cartRepository)
+    {
+        $cartId = request()->param('cart_id', []);
+        $addressId = request()->param('address_id');
+
+        if (empty($addressId)) {
+            return app('json')->fail('请选择收货地址');
+        }
+
+        $postagePrice = 0;
+
+        // 判断是否是阿里巴巴商品
+        $cartInfo = Db::name('store_cart')->whereIn('cart_id', $cartId)->select()->toArray();
+        $productInfo = Db::name('store_product')->whereIn('product_id', array_column($cartInfo, 'product_id'))->find();
+        if (!$productInfo['is_alibaba']) {
+            return app('json')->success(['postagePrice' => $postagePrice]);
+        }
+
+        // 获取地址
+        $addressInfo = Db::name('user_address')->where('address_id', $addressId)->find();
+        $addressParam = [
+            'fullName' => $addressInfo['real_name'],
+            'mobile' => $addressInfo['phone'],
+            'provinceText' => $addressInfo['province'],
+            'cityText' => $addressInfo['city'],
+            'areaText' => $addressInfo['district'],
+            'address' => $addressInfo['detail'],
+        ];
+
+
+        // 获取商品规格
+        $quantity = array_column($cartInfo, 'cart_num')[0];
+        $offerId = $productInfo['spu_id'];
+        $specId = Db::name('store_product_attr_value')->where('product_id', $productInfo['product_id'])->whereIn('unique', array_column($cartInfo, 'product_attr_unique'))->value('spec_id');
+        $cargoParamList = [
+            'offerId' => $offerId,
+            'specId' => $specId,
+            'quantity' => $quantity
+        ];
+
+        $orderService = new OrderService();
+
+        $res = $orderService->previewOrder(['cargoParamList' => $cargoParamList, 'addressParam' => $addressParam]);
+        if (!$res) {
+            return app('json')->fail('预下单失败');
+        }
+        return app('json')->success(['postagePrice' => $res['preview']['sumCarriage'] / 100, 'flow' => $res['preview']['flowFlag']]);
+    }
+}

app/controller/api/user/User.php

@@ -3323,6 +3323,7 @@ class User extends BaseController
     public function new_sign_info()
     {
         $uid = $this->request->uid();
+
         // 查询今天是否已经签到
         $today_signin_info = Db::name('user_sign_score')->where(array('uid' => $uid))->whereDay('signin_time')->find();
         // 查询昨天是否已经签到了
@@ -3331,7 +3332,8 @@ class User extends BaseController
 
         $data = [
             'today' => 0,
-            'day'   => 0
+            'day'   => 0,
+            'show' => 1
         ];
 
         if ($yes_signin_info) $data['day'] = (int)$yes_signin_info['continuity_day'];
@@ -3340,6 +3342,17 @@ class User extends BaseController
             $data['today'] = 1;
             $data['day'] = $data['day'] + 1;
         }
+
+        $key = 'user_sign_score_' . $uid;
+        if (Cache::get($key)) {
+            $data['show'] = 0;
+        }
+
+        $now = time();
+        $todayEnd = strtotime('today 23:59:59');
+        $remainingSeconds = $todayEnd - $now + rand(1, 100);
+        Cache::set($key, 1, $remainingSeconds);
+
         return app('json')->success($data);
     }
 

app/controller/merchant/alibaba/Product.php

@@ -0,0 +1,233 @@
+<?php
+
+namespace app\controller\merchant\alibaba;
+
+use think\facade\Db;
+use app\services\ThirdParty\AlibabaAgent\ProductService;
+use crmeb\basic\BaseController;
+
+class Product extends BaseController
+{
+    /**
+     * 已入库的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', '');
+        $merId = $this->request->merId();
+        // $merId = 3447;
+
+        $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;
+
+            // 是否已入库
+            $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);
+
+        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');
+        $idStr = $request->param('id', '');
+
+        if (empty($idStr)) {
+            return json(['code' => 400, 'message' => '参数错误：请传入id']);
+        }
+
+        // 解析要入库的ID列表（支持单个id或逗号分隔的多个id）
+        $importIds = [];
+        $parts = explode(',', $idStr);
+        foreach ($parts as $part) {
+            $part = (int)trim($part);
+            if ($part > 0) $importIds[] = $part;
+        }
+
+        if (empty($importIds)) {
+            return json(['code' => 400, 'message' => '参数错误：id格式不正确']);
+        }
+
+        $merId = $this->request->merId();
+        // $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/entity/data/store/StoreOrderEntity.php

@@ -103,6 +103,8 @@ class StoreOrderEntity extends DataEntity
 
     public $pickUpId = null;
 
+    public $alibabaOrderId = null;
+
     /**
      * @return mixed
      */
@@ -1784,6 +1786,17 @@ class StoreOrderEntity extends DataEntity
         return $this;
     }
 
+    public function getAlibabaOrderId()
+    {
+        return $this->alibabaOrderId;
+    }
+
+    public function setAlibabaOrderId($alibabaOrderId): StoreOrderEntity
+    {
+        $this->alibabaOrderId = $alibabaOrderId;
+        return $this;
+    }
+
     public function deconstructionFzonePaytype()
     {
         if (!empty($this->getFzonePayType()) && is_array(json_decode($this->getFzonePayType(), true))) {

app/entity/data/store/StoreProductAttrValueEntity.php

@@ -34,6 +34,8 @@ class StoreProductAttrValueEntity extends DataEntity
     public $stockNum = null;  // 股权%
     public $sharesNum = null;  // 股票
 
+    public $specId = null; // 阿里巴巴规格ID
+
     /**
      * @return mixed
      */
@@ -519,4 +521,15 @@ class StoreProductAttrValueEntity extends DataEntity
         $this->sharesNum = $sharesNum;
         return $this;
     }
+
+    public function getSpecId()
+    {
+        return $this->specId;
+    }
+
+    public function setSpecId($specId): StoreProductAttrValueEntity
+    {
+        $this->specId = $specId;
+        return $this;
+    }
 }

app/entity/data/store/StoreProductEntity.php

@@ -69,6 +69,8 @@ class StoreProductEntity extends DataEntity
     public $argument = null;  // 下架说明理由
     public $isStatus = null;  // 下架状态
 
+    public $isAlibaba = null; // 是否是阿里商品
+
     /**
      * @return mixed
      */
@@ -1184,4 +1186,15 @@ class StoreProductEntity extends DataEntity
         $this->isStatus = $isStatus;
         return $this;
     }
+
+    public function getIsAlibaba()
+    {
+        return $this->isAlibaba;
+    }
+
+    public function setIsAlibaba($isAlibaba): StoreProductEntity
+    {
+        $this->isAlibaba = $isAlibaba;
+        return $this;
+    }
 }

app/services/ThirdParty/AlibabaAgent/AlibabaAgentBaseService.php

@@ -0,0 +1,449 @@
+<?php
+/**
+ * 1688分销严选采购解决方案（分销买家版） - 基础服务类
+ *
+ * 提供OAuth 2.0认证、API请求签名、HTTP请求等基础能力
+ *
+ * @author: yourname
+ * @day: 2026/04/27
+ */
+
+namespace app\services\ThirdParty\AlibabaAgent;
+
+use crmeb\services\HttpService;
+use think\facade\Config;
+use think\facade\Log;
+
+class AlibabaAgentBaseService
+{
+    /** @var array 配置 */
+    protected $config;
+
+    /** @var string App Key */
+    protected $appKey;
+
+    /** @var string App Secret */
+    protected $appSecret;
+
+    /** @var string 网关地址 */
+    protected $gatewayUrl;
+
+    /** @var string 访问令牌 */
+    protected $accessToken = '';
+
+    /** @var string 刷新令牌 */
+    protected $refreshToken = '';
+
+    /**
+     * 构造函数
+     */
+    public function __construct()
+    {
+        $this->config = Config::get('third_party.alibaba_agent', []);
+        $this->appKey = $this->config['appKey'] ?? '';
+        $this->appSecret = $this->config['appSecret'] ?? '';
+        $this->accessToken = $this->config['accessToken'] ?? '';
+        $this->gatewayUrl = $this->config['gatewayUrl'] ?? 'https://gw.open.1688.com/openapi/';
+    }
+
+    /**
+     * 设置访问令牌
+     *
+     * @param string $accessToken
+     * @return $this
+     */
+    public function setAccessToken(string $accessToken): self
+    {
+        $this->accessToken = $accessToken;
+        return $this;
+    }
+
+    /**
+     * 设置刷新令牌
+     *
+     * @param string $refreshToken
+     * @return $this
+     */
+    public function setRefreshToken(string $refreshToken): self
+    {
+        $this->refreshToken = $refreshToken;
+        return $this;
+    }
+
+    /**
+     * 获取访问令牌
+     *
+     * @return string
+     */
+    public function getAccessToken(): string
+    {
+        return $this->accessToken;
+    }
+
+    /**
+     * 获取OAuth 2.0授权URL
+     *
+     * @param string $state 防CSRF状态码
+     * @return string
+     */
+    public function getAuthUrl(string $state = ''): string
+    {
+        $params = [
+            'client_id' => $this->appKey,
+            'redirect_uri' => $this->config['redirectUri'] ?? '',
+            'response_type' => 'code',
+            'state' => $state,
+        ];
+        return 'https://auth.1688.com/oauth/authorize?' . http_build_query($params);
+    }
+
+    /**
+     * 通过授权码获取访问令牌
+     *
+     * @param string $code 授权码
+     * @return array|false
+     */
+    public function getAccessTokenByCode(string $code)
+    {
+        $url = 'https://gw.open.1688.com/openapi/http/1/system.oauth2/getAccessTokenByCode/' . $this->appKey;
+
+        $params = [
+            'code' => $code,
+            'appKey' => $this->appKey,
+            'appSecret' => $this->appSecret,
+            'redirect_uri' => $this->config['redirectUri'] ?? '',
+            'grant_type' => 'authorization_code',
+        ];
+
+        return $this->parseResponse(
+            HttpService::postRequest($url, $params)
+        );
+    }
+
+    /**
+     * 刷新访问令牌
+     *
+     * @param string $refreshToken
+     * @return array|false
+     */
+    public function refreshAccessToken(string $refreshToken)
+    {
+        $url = 'https://gw.open.1688.com/openapi/http/1/system.oauth2/getAccessTokenByCode/' . $this->appKey;
+
+        $params = [
+            'refreshToken' => $refreshToken,
+            'appKey' => $this->appKey,
+            'appSecret' => $this->appSecret,
+            'grant_type' => 'refresh_token',
+        ];
+
+        $result = $this->parseResponse(
+            HttpService::postRequest($url, $params)
+        );
+
+        if ($result && isset($result['access_token'])) {
+            $this->setAccessToken($result['access_token']);
+            if (isset($result['refresh_token'])) {
+                $this->setRefreshToken($result['refresh_token']);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * 生成1688 API签名（param2方式）
+     *
+     * 参考可调通的代码：
+     *   $aliParams = array();
+     *   foreach ($code_arr as $key => $val) {
+     *       if (is_array($val)) { $val = json_encode($val); }
+     *       $aliParams[] = $key . $val;
+     *   }
+     *   sort($aliParams);
+     *   $sign_str = join('', $aliParams);
+     *   $sign_str = $param . $apiInfo . $sign_str;
+     *   return strtoupper(bin2hex(hash_hmac("sha1", $sign_str, $appSecret, true)));
+     *
+     * @param string $param 协议前缀，如 "param2/1/"
+     * @param string $apiInfo API路径（含appKey），如 "com.alibaba.fenxiao/jxhy.product.getPageList/6512262"
+     * @param array $params 所有请求参数（含access_token，不含_aop_signature）
+     * @return string
+     */
+    protected function generateSignature(string $param, string $apiInfo, array $params): string
+    {
+        $aliParams = array();
+        foreach ($params as $key => $val) {
+            // 数组参数需要json_encode
+            if (is_array($val)) {
+                $val = json_encode($val);
+            }
+            $aliParams[] = $key . $val;
+        }
+        sort($aliParams);
+        $sign_str = join('', $aliParams);
+        // 注意顺序: param + apiInfo + 参数拼装
+        $sign_str = $param . $apiInfo . $sign_str;
+        
+        return strtoupper(bin2hex(hash_hmac("sha1", $sign_str, $this->appSecret, true)));
+    }
+
+    /**
+     * 执行API请求（param2方式 - RESTful风格）
+     *
+     * @param string $namespace API命名空间
+     * @param string $name API名称
+     * @param int $version API版本号
+     * @param array $businessParams 业务参数
+     * @return array|false
+     */
+    protected function executeParam2(
+        string $namespace,
+        string $name,
+        int $version = 1,
+        array $businessParams = []
+    ) {
+        // param2方式URL格式: https://gw.open.1688.com/openapi/param2/{version}/{namespace}/{name}/{appKey}
+        // 注意: URL路径最后一部分是 appKey，不是API版本号
+        $appKey = $this->getConfig('appKey', '');
+        
+        // 协议前缀: param2/{version}/
+        $param = 'param2/' . $version . '/';
+        
+        // API路径（含appKey）: {namespace}/{name}/{appKey}
+        $apiInfo = $namespace . '/' . $name . '/' . $appKey;
+        
+        // 完整URL（不含query参数，参数通过POST body发送）
+        $url = rtrim($this->gatewayUrl, '/') . '/' . $param . $apiInfo;
+
+        // 所有参数（包括access_token和业务参数）
+        $allParams = array_merge(
+            ['access_token' => $this->accessToken],
+            $businessParams
+        );
+
+        // 生成签名
+        // 注意: generateSignature($param, $apiInfo, $params)
+        // sign_str = $param . $apiInfo . 参数拼装
+        $signature = $this->generateSignature($param, $apiInfo, $allParams);
+        $allParams['_aop_signature'] = $signature;
+
+        $this->logRequest($url, $allParams);
+
+        try {
+            // 使用POST方式发送请求，参数放在POST body中（参考可调通的代码）
+            $ch = curl_init();
+            curl_setopt($ch, CURLOPT_URL, $url);
+            curl_setopt($ch, CURLOPT_POST, true);
+            curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($allParams));
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+            curl_setopt($ch, CURLOPT_TIMEOUT, 15);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+            curl_setopt($ch, CURLOPT_FAILONERROR, false);
+            $response = curl_exec($ch);
+            $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+            $curlError = curl_error($ch);
+            curl_close($ch);
+
+            if ($response === false) {
+                $this->logError('HTTP请求失败', $curlError ?: '未知curl错误');
+                return false;
+            }
+
+            $this->logResponse($url, $response);
+
+            return $this->parseResponse($response, $httpCode);
+        } catch (\Exception $e) {
+            $this->logError('API请求异常', $e->getMessage());
+            return false;
+        }
+    }
+
+    /**
+     * 执行API请求（http方式 - 传统POST方式）
+     *
+     * @param string $namespace API命名空间
+     * @param string $name API名称
+     * @param int $version API版本号
+     * @param array $businessParams 业务参数
+     * @return array|false
+     */
+    protected function executeHttp(
+        string $namespace,
+        string $name,
+        int $version = 1,
+        array $businessParams = []
+    ) {
+        // 构建URL: https://gw.open.1688.com/openapi/http/1/cn.alibaba.open/offer.get/1
+        $url = rtrim($this->gatewayUrl, '/') . '/http/' . $version . '/' . $namespace . '/' . $name . '/' . $version;
+
+        // 构建请求参数
+        $params = [
+            'access_token' => $this->accessToken,
+            'appKey' => $this->appKey,
+            'appSecret' => $this->appSecret,
+        ];
+
+        // 业务参数
+        if (!empty($businessParams)) {
+            $params = array_merge($params, $businessParams);
+        }
+
+        $this->logRequest($url, $params);
+
+        try {
+            $response = HttpService::postRequest($url, $params);
+
+            $this->logResponse($url, $response);
+
+            return $this->parseResponse($response);
+        } catch (\Exception $e) {
+            $this->logError('API请求异常', $e->getMessage());
+            return false;
+        }
+    }
+
+    /**
+     * 解析响应
+     *
+     * @param string|false $response 响应体
+     * @param int $httpCode HTTP状态码
+     * @return array|false
+     */
+    protected function parseResponse($response, int $httpCode = 200)
+    {
+        if ($response === false || empty($response)) {
+            $this->logError('HTTP请求失败', '响应为空或请求失败');
+            return false;
+        }
+
+        $result = json_decode($response, true);
+
+        if (json_last_error() !== JSON_ERROR_NONE) {
+            $this->logError('JSON解析失败', json_last_error_msg() . ' | 原始响应: ' . substr($response, 0, 500));
+            return false;
+        }
+
+        // HTTP状态码非200，记录错误并返回false
+        if ($httpCode !== 200) {
+            $errorMsg = json_encode($result, JSON_UNESCAPED_UNICODE);
+            $this->logError("HTTP请求失败(status:{$httpCode})", $errorMsg);
+            return false;
+        }
+
+        // 检查1688 API标准错误格式
+        if (isset($result['error_code']) || isset($result['errorMessage'])) {
+            $errorMsg = $result['errorMessage'] ?? ($result['error_message'] ?? '未知错误');
+            $errorCode = $result['error_code'] ?? ($result['code'] ?? 0);
+            $this->logError('1688 API错误', "[{$errorCode}] {$errorMsg}");
+            return false;
+        }
+
+        // 检查result中的错误
+        if (isset($result['result']) && isset($result['result']['errorCode'])) {
+            $errorMsg = $result['result']['errorMessage'] ?? '未知错误';
+            $errorCode = $result['result']['errorCode'];
+            $this->logError('1688 API业务错误', "[{$errorCode}] {$errorMsg}");
+            return false;
+        }
+
+        // 检查alibaba标准错误响应格式
+        if (isset($result['errorResponse']) && isset($result['errorResponse']['code'])) {
+            $errorMsg = $result['errorResponse']['message'] ?? '未知错误';
+            $errorCode = $result['errorResponse']['code'];
+            $this->logError('1688 API错误响应', "[{$errorCode}] {$errorMsg}");
+            return false;
+        }
+
+        return $result;
+    }
+
+    /**
+     * 记录请求日志
+     *
+     * @param string $url
+     * @param array $params
+     */
+    protected function logRequest(string $url, array $params): void
+    {
+        if (!($this->config['logEnabled'] ?? false)) {
+            return;
+        }
+
+        $logData = [
+            'url' => $url,
+            'params' => $this->maskSensitiveData($params),
+        ];
+
+        Log::channel('alibaba')->info('[1688分销采购] 请求: ' . json_encode($logData, JSON_UNESCAPED_UNICODE));
+    }
+
+    /**
+     * 记录响应日志
+     *
+     * @param string $url
+     * @param string|false $response
+     */
+    protected function logResponse(string $url, $response): void
+    {
+        if (!($this->config['logEnabled'] ?? false)) {
+            return;
+        }
+
+        Log::channel('alibaba')->info('[1688分销采购] 响应: ' . substr((string)$response, 0, 2000));
+    }
+
+    /**
+     * 记录错误日志
+     *
+     * @param string $title
+     * @param string $message
+     */
+    protected function logError(string $title, string $message): void
+    {
+        Log::channel('alibaba')->error("[1688分销采购] {$title}: {$message}");
+
+        // 同时写入文件日志（兼容旧的文件日志方式）
+        $logPath = $this->config['logPath'] ?? runtime_path() . 'alibaba/';
+        $logFile = $logPath . 'error_' . date('Y-m-d') . '.log';
+        $logDir = dirname($logFile);
+        if (!is_dir($logDir)) {
+            @mkdir($logDir, 0755, true);
+        }
+        @file_put_contents(
+            $logFile,
+            '[' . date('Y-m-d H:i:s') . "] {$title}: {$message}\n",
+            FILE_APPEND
+        );
+    }
+
+    /**
+     * 脱敏敏感数据
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function maskSensitiveData(array $data): array
+    {
+        $sensitiveKeys = ['appSecret', 'access_token', 'refreshToken'];
+        foreach ($data as $key => $value) {
+            if (in_array($key, $sensitiveKeys) && is_string($value)) {
+                $data[$key] = substr($value, 0, 4) . '****' . substr($value, -4);
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * 获取配置项
+     *
+     * @param string $key
+     * @param mixed $default
+     * @return mixed
+     */
+    protected function getConfig(string $key, $default = null)
+    {
+        return $this->config[$key] ?? $default;
+    }
+}

app/services/ThirdParty/AlibabaAgent/OrderService.php

@@ -0,0 +1,400 @@
+<?php
+/**
+ * 1688分销严选采购解决方案 - 订单服务类
+ *
+ * 提供预下单、下单、订单查询等功能
+ *
+ * @author: yourname
+ * @day: 2026/04/28
+ */
+
+namespace app\services\ThirdParty\AlibabaAgent;
+
+use app\entity\data\store\StoreOrderEntity;
+use app\entity\data\store\StoreOrderStatusEntity;
+use think\facade\Db;
+use think\facade\Log;
+
+class OrderService extends AlibabaAgentBaseService
+{
+    /**
+     * API命名空间
+     */
+    const NAMESPACE = 'com.alibaba.trade';
+
+    /**
+     * 预下单
+     *
+     * API: com.alibaba.trade:alibaba.createOrder.preview-1
+     *
+     * 接口文档: https://open.1688.com/api/apidocdetail.htm?id=com.alibaba.trade%3Aalibaba.createOrder.preview-1
+     *
+     * 请求参数格式:
+     *   - flow: 流程标识（saleproxy=分销采购, general=普通下单）
+     *   - productList: 商品列表JSON数组，每个商品包含 offerId, quantity, specId
+     *   - addressParam: 地址参数JSON对象，包含 fullName, mobile, provinceText, cityText, areaText, address
+     *   - totalAmount: 总金额（单位：分，可选）
+     *   - message: 买家留言（可选）
+     *
+     * @param array $params 预下单参数
+     * @return array|false
+     */
+    public function previewOrder(array $params = [])
+    {
+        $businessParams = [];
+
+        // --- productList（商品列表，JSON字符串） ---
+        // 直接传入已格式化的数组，由方法转为JSON
+        if (!empty($params['cargoParamList'])) {
+            $businessParams['cargoParamList'] = is_array($params['cargoParamList'])
+                ? json_encode($params['cargoParamList'], JSON_UNESCAPED_UNICODE)
+                : $params['cargoParamList'];
+        }
+
+        // --- addressParam（地址参数，JSON字符串） ---
+        // 直接传入已格式化的数组，由方法转为JSON
+        if (!empty($params['addressParam'])) {
+            $businessParams['addressParam'] = is_array($params['addressParam'])
+                ? json_encode($params['addressParam'], JSON_UNESCAPED_UNICODE)
+                : $params['addressParam'];
+        }
+        // --- 调用API ---
+        $result = $this->executeParam2(
+            self::NAMESPACE,
+            'alibaba.createOrder.preview',
+            1,
+            $businessParams
+        );
+
+        if ($result === false) {
+            Log::channel('alibaba')->error('[预下单] API请求失败', $businessParams);
+            return false;
+        }
+
+        Log::channel('alibaba')->info('[预下单] API请求成功', ['result' => json_encode($result)]);
+
+        return $this->formatPreviewResult($result);
+    }
+
+    /**
+     * 格式化预下单返回结果
+     *
+     * 实际返回结构:
+     * {
+     *   "orderPreviewResuslt": [{
+     *     "tradeModeNameList": ["assureTrade"],
+     *     "status": true,
+     *     "sumPayment": 370,           // 总支付金额（单位：分）
+     *     "sumCarriage": 300,          // 总运费（单位：分）
+     *     "sumPaymentNoCarriage": 70,  // 商品总金额（不含运费，单位：分）
+     *     "flowFlag": "fenxiaonew",
+     *     "cargoList": [{              // 商品列表
+     *       "amount": 0.7,
+     *       "finalUnitPrice": 0.7,
+     *       "specId": "...",
+     *       "skuId": 6148579878582,
+     *       "offerId": 678279922176,
+     *       "openOfferId": "...",
+     *       "cargoPromotionList": []
+     *     }],
+     *     "tradeModelList": [{"name":"担保交易","tradeType":"assureTrade","opSupport":true}],
+     *     "payChannelInfos": [{"name":"alipay"}],
+     *     "orderGroup": "79d4f82d...",
+     *     "canUseOfficialSolution": false
+     *   }],
+     *   "success": true,
+     *   "unsupportedCrossBorderPayOfferList": []
+     * }
+     *
+     * @param array $result API原始返回数据
+     * @return array
+     */
+    protected function formatPreviewResult(array $result): array
+    {
+        $success = $result['success'] ?? false;
+        $previewList = $result['orderPreviewResuslt'] ?? [];
+
+        if (empty($previewList) || !is_array($previewList)) {
+            return [
+                'success' => $success,
+                'preview' => null,
+                'list'    => [],
+            ];
+        }
+
+        $formattedList = [];
+        foreach ($previewList as $item) {
+            $formattedList[] = [
+                'sumPayment'           => $item['sumPayment'] ?? 0,
+                'sumCarriage'          => $item['sumCarriage'] ?? 0,
+                'sumPaymentNoCarriage' => $item['sumPaymentNoCarriage'] ?? 0,
+                'flowFlag'             => $item['flowFlag'] ?? '',
+                // 'orderGroup'           => $item['orderGroup'] ?? '',
+                // 'status'               => $item['status'] ?? false,
+                // 'cargoList'            => $item['cargoList'] ?? [],
+                // 'tradeModeNameList'    => $item['tradeModeNameList'] ?? [],
+                // 'tradeModelList'       => $item['tradeModelList'] ?? [],
+                // 'payChannelInfos'      => $item['payChannelInfos'] ?? [],
+                // 'shopPromotionList'    => $item['shopPromotionList'] ?? [],
+                // 'tradeServiceList'     => $item['tradeServiceList'] ?? [],
+                // 'taoSampleSinglePromotion' => $item['taoSampleSinglePromotion'] ?? false,
+                // 'canUseOfficialSolution'   => $item['canUseOfficialSolution'] ?? false,
+            ];
+        }
+
+        return [
+            // 'success'    => $success,
+            'preview'    => $formattedList[0] ?? null,
+            // 'list'       => $formattedList,
+            // 'unsupportedCrossBorderPayOfferList' => $result['unsupportedCrossBorderPayOfferList'] ?? [],
+        ];
+    }
+
+    /**
+     * 快速创建订单
+     *
+     * API: com.alibaba.trade:alibaba.trade.fastCreateOrder-1
+     *
+     * 接口文档: https://open.1688.com/api/apidocdetail.htm?id=com.alibaba.trade%3Aalibaba.trade.fastCreateOrder-1
+     *
+     * 请求参数:
+     *   - flow: 流程标识（saleproxy=分销采购, general=普通下单）
+     *   - cargoParamList: 商品列表JSON数组（alibaba.trade.fast.cargo[]），每个商品包含 offerId, quantity, specId
+     *   - addressParam: 地址参数JSON对象，包含 fullName, mobile, provinceText, cityText, areaText, address
+     *   - totalAmount: 总金额（单位：分，可选）
+     *   - message: 买家留言（可选）
+     *   - orderGroup: 订单分组标识（从预下单返回的 orderGroup 字段获取，可选）
+     *
+     * @param array $params 创建订单参数
+     * @return array|false
+     */
+    public function fastCreateOrder(array $params = [])
+    {
+        $businessParams = [];
+
+        // --- flow（流程标识） ---
+        $businessParams['flow'] = $params['flow'] ?? 'general';
+
+        // --- cargoParamList（商品列表，JSON字符串） ---
+        if (!empty($params['cargoParamList'])) {
+            $businessParams['cargoParamList'] = is_array($params['cargoParamList'])
+                ? json_encode($params['cargoParamList'], JSON_UNESCAPED_UNICODE)
+                : $params['cargoParamList'];
+        }
+
+        // --- addressParam（地址参数，JSON字符串） ---
+        if (!empty($params['addressParam'])) {
+            $businessParams['addressParam'] = is_array($params['addressParam'])
+                ? json_encode($params['addressParam'], JSON_UNESCAPED_UNICODE)
+                : $params['addressParam'];
+        }
+
+        // --- 调用API ---
+        $result = $this->executeParam2(
+            self::NAMESPACE,
+            'alibaba.trade.fastCreateOrder',
+            1,
+            $businessParams
+        );
+
+        if ($result === false) {
+            Log::channel('alibaba')->error('[创建订单] API请求失败', $businessParams);
+            return false;
+        }
+
+        Log::channel('alibaba')->info('[创建订单] API请求成功', ['result' => json_encode($result)]);
+
+        return $this->formatCreateOrderResult($result);
+    }
+
+    /**
+     * @param StoreOrderEntity[] $storeOrderEntityList
+     * @return bool
+     * @author 史晨
+     * @date 2026/4/30 09:44
+     * 支付成功通知1688
+     */
+    public function paySuccess(array $storeOrderEntityList): bool
+    {
+        foreach ($storeOrderEntityList as $storeOrderEntity) {
+            $alibabaOrderId = $storeOrderEntity->getAlibabaOrderId();
+            if (empty($alibabaOrderId)) {
+                Log::channel('alibaba')->error($storeOrderEntity->getOrderSn() . '不是1688订单，不需要调取1688支付成功接口');
+                continue;
+            }
+            $res = $this->prepareProtocolPay(['orderId' => $alibabaOrderId]);
+            if ($res['success'] === false) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 免密支付准备
+     *
+     * API: com.alibaba.trade:alibaba.trade.pay.protocolPay.preparePay-1
+     *
+     * 接口文档: https://open.1688.com/api/apidocdetail.htm?id=com.alibaba.trade%3Aalibaba.trade.pay.protocolPay.preparePay-1
+     *
+     * 请求参数说明（接口文档定义）:
+     *   - tradeWithholdPreparePayParam: 必填，类型 message:alibaba.trade.pay.withhold.preparePayParam
+     *     preparePayParam 结构:
+     *       - orderId: 订单ID（Long，必填）
+     *
+     * 调用示例:
+     *   $orderService->prepareProtocolPay([
+     *     'orderId' => 123456789,
+     *   ]);
+     *
+     * @param array $params 免密支付参数（orderId）
+     * @return array|false
+     */
+    public function prepareProtocolPay(array $params = [])
+    {
+        // --- 参数校验 ---
+        if (empty($params['orderId'])) {
+            Log::channel('alibaba')->error('[免密支付] orderId不能为空');
+            return false;
+        }
+
+        // --- 构建 tradeWithholdPreparePayParam（message类型需序列化为JSON字符串） ---
+        $businessParams = [
+            'tradeWithholdPreparePayParam' => json_encode([
+                'orderId' => (int)$params['orderId'],
+            ], JSON_UNESCAPED_UNICODE),
+        ];
+
+        // --- 调用API ---
+        $result = $this->executeParam2(
+            self::NAMESPACE,
+            'alibaba.trade.pay.protocolPay.preparePay',
+            1,
+            $businessParams
+        );
+
+        if ($result === false) {
+            Log::channel('alibaba')->error('[免密支付] API请求失败', $businessParams);
+            return false;
+        }
+
+        Log::channel('alibaba')->info('[免密支付] API请求成功', ['result' => json_encode($result)]);
+
+        return $this->formatProtocolPayResult($result);
+    }
+
+    /**
+     * 格式化免密支付准备返回结果
+     *
+     * @param array $result API原始返回数据
+     * @return array
+     */
+    protected function formatProtocolPayResult(array $result): array
+    {
+        // 返回结构: { "result": { ... }, "success": true }
+        $data = $result['result'] ?? $result;
+        $success = $result['success'] ?? false;
+
+        Log::channel('alibaba')->info('[免密支付] 返回结果', [
+            'success' => $success,
+            'data'    => $data,
+        ]);
+
+        return [
+            'success' => $success,
+            'data'    => $data,
+            'rawData' => $result,
+        ];
+    }
+
+    /**
+     * 格式化创建订单返回结果
+     *
+     * @param array $result API原始返回数据
+     * @return array
+     */
+    protected function formatCreateOrderResult(array $result): array
+    {
+        // 创建订单成功返回: { "result": { "orderId": "123456", "totalAmount": 370 }, "success": true }
+        $data = $result['result'] ?? $result;
+        $success = $result['success'] ?? false;
+
+        return [
+            'success'     => $success,
+            'orderId'     => $data['orderId'] ?? 0,
+            'totalAmount' => $data['totalAmount'] ?? 0,
+            'rawData'     => $data,
+        ];
+    }
+
+    /**
+     * 构建商品列表参数（便捷方法）
+     *
+     * @param array $items 商品列表 [['offerId' => 123, 'quantity' => 2, 'skuId' => 456], ...]
+     * @return array
+     */
+    public function buildProductList(array $items): array
+    {
+        $productList = [];
+        foreach ($items as $item) {
+            $product = [
+                'offerId'  => (int)($item['offerId'] ?? $item['productId'] ?? 0),
+                'quantity' => (int)($item['quantity'] ?? 1),
+            ];
+            if (!empty($item['skuId'])) {
+                $product['skuId'] = (int)$item['skuId'];
+            }
+            if (!empty($item['price'])) {
+                $product['price'] = (int)$item['price']; // 单位：分
+            }
+            if (!empty($item['productUnit'])) {
+                $product['productUnit'] = $item['productUnit'];
+            }
+            $productList[] = $product;
+        }
+        return $productList;
+    }
+
+    /**
+     * 构建地址参数（便捷方法）
+     *
+     * @param int $addressId 地址ID
+     * @return array
+     */
+    public function buildAddressParam(int $addressId): array
+    {
+        return [
+            'addressId' => $addressId,
+        ];
+    }
+
+    /**
+     * 构建完整地址参数（使用系统地址数据格式）
+     *
+     * 适配系统 user_address 表字段:
+     *   address_id, real_name, phone, province, city, district, detail, post_code, code_list
+     *
+     * @param array $address 地址信息（系统user_address表数据）
+     * @return array
+     */
+    public function buildFullAddressParam(array $address): array
+    {
+        // 解析地区编码列表: "1,67449,35,493"
+        $codeList = $address['code_list'] ?? '';
+        $codes = explode(',', $codeList);
+        $districtCode = $codes[1] ?? $codes[0] ?? '';
+
+        return [
+            'fullName'       => $address['real_name'] ?? $address['fullName'] ?? '',
+            'mobile'         => $address['phone'] ?? $address['mobile'] ?? '',
+            'phone'          => $address['phone'] ?? $address['phone'] ?? '',
+            'postCode'       => $address['post_code'] ?? $address['postCode'] ?? '',
+            'cityText'       => $address['city'] ?? $address['cityText'] ?? '',
+            'provinceText'   => $address['province'] ?? $address['provinceText'] ?? '',
+            'areaText'       => $address['district'] ?? $address['areaText'] ?? '',
+            'townText'       => $address['village'] ?? $address['townText'] ?? '',
+            'address'        => $address['detail'] ?? $address['address'] ?? '',
+            'districtCode'   => $districtCode,
+        ];
+    }
+}

app/services/ThirdParty/AlibabaAgent/ProductService.php

@@ -0,0 +1,738 @@
+<?php
+/**
+ * 1688分销严选采购解决方案 - 商品服务类
+ *
+ * 提供商品搜索/列表查询、详情获取、批量入库等功能
+ *
+ * @author: yourname
+ * @day: 2026/04/27
+ */
+
+namespace app\services\ThirdParty\AlibabaAgent;
+
+use think\facade\Db;
+use think\facade\Log;
+
+class ProductService extends AlibabaAgentBaseService
+{
+    /**
+     * 获取分销商品分页列表
+     *
+     * API: com.alibaba.fenxiao:jxhy.product.getPageList-1
+     *
+     * @param array $params 搜索参数
+     * @return array|false
+     */
+    public function searchProducts(array $params = [])
+    {
+        $businessParams = [];
+
+        if (!empty($params['keyword'])) {
+            $businessParams['keyword'] = $params['keyword'];
+        }
+        if (!empty($params['categoryId'])) {
+            $businessParams['categoryId'] = $params['categoryId'];
+        }
+        $businessParams['pageNum'] = $params['page'] ?? 1;
+        $businessParams['pageSize'] = min($params['limit'] ?? 20, 50);
+        if (!empty($params['sort'])) {
+            $businessParams['sort'] = $params['sort'];
+        }
+        if (!empty($params['minPrice']) && $params['minPrice'] > 0) {
+            $businessParams['priceStart'] = $params['minPrice'];
+        }
+        if (!empty($params['maxPrice']) && $params['maxPrice'] > 0) {
+            $businessParams['priceEnd'] = $params['maxPrice'];
+        }
+
+        $result = $this->executeParam2(
+            'com.alibaba.fenxiao',
+            'jxhy.product.getPageList',
+            1,
+            $businessParams
+        );
+
+        if ($result === false) {
+            return false;
+        }
+
+        return $this->formatSearchResult($result);
+    }
+
+    /**
+     * 格式化搜索结果
+     *
+     * @param array $result
+     * @return array
+     */
+    protected function formatSearchResult(array $result): array
+    {
+        $productList = [];
+        $data = $result['result'] ?? $result;
+        $products = $data['result'] ?? [];
+        $pageInfo = $data['pageInfo'] ?? [];
+
+        if (empty($products)) {
+            return [
+                'total'    => 0,
+                'page'     => (int)($pageInfo['currentPage'] ?? 1),
+                'pageSize' => (int)($pageInfo['pageSize'] ?? 20),
+                'list'     => [],
+            ];
+        }
+
+        foreach ($products as $product) {
+            $productList[] = $this->formatProduct($product);
+        }
+
+        return [
+            'total'    => (int)($pageInfo['totalRecords'] ?? count($productList)),
+            'page'     => (int)($pageInfo['currentPage'] ?? 1),
+            'pageSize' => (int)($pageInfo['pageSize'] ?? 20),
+            'list'     => $productList,
+        ];
+    }
+
+    /**
+     * 格式化商品数据为统一格式
+     *
+     * @param array $product
+     * @return array
+     */
+    public function formatProduct(array $product): array
+    {
+        $mainImage = $product['imgUrl'] ?? $product['mainImage'] ?? $product['mainPicture'] ?? '';
+
+        $serviceTags = [];
+        if (!empty($product['serviceList'])) {
+            foreach ($product['serviceList'] as $service) {
+                $serviceTags[] = $service['name'] ?? '';
+            }
+        }
+
+        // 判断是否加入商品池
+        $product['importStatus'] = 0;
+        $import = Db::name('alibaba_import_goods')->where('product_id', $product['itemId'])->find();
+        if ($import) {
+            $product['importStatus'] = 1;
+        }
+        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,
+            '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'] ?? '',
+            'importStatus'     => $product['importStatus'],
+        ];
+    }
+
+    // ================================================================
+    //  商品详情
+    // ================================================================
+
+    /**
+     * 获取分销商品详情（含SKU、图片等完整信息）
+     *
+     * API: com.alibaba.fenxiao:alibaba.pifatuan.product.detail.list-2
+     *
+     * @param int|string $productId 1688商品ID
+     * @return array|false 格式化后的商品详情数据
+     */
+    public function getProductDetail($productId)
+    {
+        if (empty($productId)) {
+            $this->logError('参数错误', 'productId不能为空');
+            return false;
+        }
+
+        $businessParams = [
+            'offerIds' => '[' . $productId . ']',
+        ];
+
+        $result = $this->executeParam2(
+            'com.alibaba.fenxiao',
+            'alibaba.pifatuan.product.detail.list',
+            2,
+            $businessParams
+        );
+
+        if ($result === false) {
+            return false;
+        }
+
+        return $this->formatDetailResult($result);
+    }
+
+    /**
+     * 格式化商品详情结果
+     *
+     * 实际API返回结构:
+     * {
+     *   "result": {
+     *     "success": true,
+     *     "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"
+     *       }
+     *     ]
+     *   }
+     * }
+     *
+     * @param array $result
+     * @return array
+     */
+    protected function formatDetailResult(array $result): array
+    {
+        $data = $result['result'] ?? $result;
+        $items = $data['result'] ?? [];
+
+        if (empty($items) || !is_array($items)) {
+            return [];
+        }
+
+        // 取第一个商品（API按offerIds查询单个商品）
+        $item = $items[0] ?? [];
+        if (empty($item)) {
+            return [];
+        }
+
+        $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;
+                }
+            }
+        }
+
+        // --- 价格处理（取SKU规格价格） ---
+        $saleInfo = $productInfo['saleInfo'] ?? [];
+        $skuInfos = $productInfo['skuInfos'] ?? [];
+        $minPrice = 0;
+        $maxPrice = 0;
+        if (!empty($skuInfos)) {
+            $skuPrices = [];
+            foreach ($skuInfos as $sku) {
+                $skuPrice = (float)($sku['consignPrice'] ?? $sku['pifaPrice'] ?? 0);
+                if ($skuPrice > 0) {
+                    $skuPrices[] = $skuPrice;
+                }
+            }
+            if (!empty($skuPrices)) {
+                $minPrice = (float)min($skuPrices);
+                $maxPrice = (float)max($skuPrices);
+            }
+        }
+
+        // --- 商品属性（如品牌、货号、规格等） ---
+        $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']) : '',
+                ];
+            }
+        }else{
+
+        }
+
+        // --- 描述处理 ---
+        $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,
+            'sale'          => $saleInfo,
+            '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, '/');
+    }
+
+    // ================================================================
+    //  批量入库
+    // ================================================================
+
+    /**
+     * 对价格进行加价处理（加价50%）
+     *
+     * @param float $price 原价
+     * @return float 加价后的价格
+     */
+    protected function applyMarkup(float $price): float
+    {
+        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, 'consignPrice');
+            $minPrice = !empty($prices) ? (float)min($prices) : 0;
+            $maxPrice = !empty($prices) ? (float)max($prices) : 0;
+            // 成本价取第一个SKU的成本价
+            $costPrice = $skuList[0]['costPrice'] ?? 0;
+            if (empty($skuList)) {
+                $prices = $productInfo['price'];
+                $minPrice = $prices;
+                $maxPrice = $prices;
+                $costPrice = $prices;
+            }
+
+            // 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'        => 0,
+                'status'         => 1,
+                '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,
+                'is_alibaba'     => 1
+            ];
+            $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, $costPrice,$mainImage);
+
+            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, $costPrice, $mainImage): 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'       => $mainImage,
+                'cost'        => $costPrice,
+                'ot_price'    => $costPrice,
+                'price'       => $costPrice,
+                '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'] ?? '';
+            $specId = $sku['specId'] ?? '';
+            $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' => $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,
+                'sku_id' => $skuId,
+                'spec_id' => $specId
+            ]);
+        }
+    }
+
+    /**
+     * 生成唯一值 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 表
+     *
+     * 业务场景：从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::channel('alibaba')->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. 商品级别价格加价
+                if ($detail['minPrice'] == 0) $detail['minPrice'] = $detail['sale']['consignPrice'];
+                if ($detail['maxPrice'] == 0) $detail['maxPrice'] = $detail['sale']['consignPrice'];
+                if ($detail['price'] == 0) $detail['price'] = $detail['sale']['consignPrice'];
+                $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::channel('alibaba')->info("[1688入库] 商品{$productId}入库成功，本地ID:{$localId}，已加价50%");
+                } else {
+                    $fail[$productId] = '写入数据库失败';
+                }
+            } catch (\Throwable $e) {
+                $fail[$productId] = '异常: ' . $e->getMessage();
+                Log::channel('alibaba')->error("[1688入库] 商品{$productId}入库异常: " . $e->getMessage());
+            }
+        }
+
+        return [
+            'success' => $success,
+            'fail'    => $fail,
+        ];
+    }
+}

config/log.php

@@ -47,6 +47,12 @@ return [
             'path' => app()->getRootPath().'runtime/gong',
             'time_format' => 'Y-m-d H:i:s',
             'format' => '[%s][%s]:%s'
+        ],
+        'alibaba' => [
+            'type' => 'File',
+            'path' => app()->getRootPath().'runtime/alibaba',
+            'time_format' => 'Y-m-d H:i:s',
+            'format' => '[%s][%s]:%s'
         ]
     ],
 

config/third_party.php

@@ -8,5 +8,23 @@ return [
         'adzoneId' => 116174700455,
         // 商品筛选-后台类目ID。用,分割，最大10个
         'cat' => '50016422,50012486,50008164,50002766,50050359,50022703,50000436,50011130,50011277,50020579'
+    ],
+    // 1688分销严选采购解决方案（分销买家版）
+    'alibaba_agent' => [
+        'appKey' => '6512262',
+        'appSecret' => 'uNPRZE7895',
+        'accessToken' => 'dc8eab20-f10f-4688-9e45-9ebfa182c7c2',
+        // 授权回调地址
+        // 'redirectUri' => 'https://yourdomain.com/api/alibaba/callback',
+        // 1688 API网关地址
+        'gatewayUrl' => 'https://gw.open.1688.com/openapi/',
+        // 协议版本
+        'version' => '1',
+        // 分销买家ID（在1688分销平台获取）
+        'distributorId' => '',
+        // 日志开关
+        'logEnabled' => true,
+        // 日志目录
+        'logPath' => runtime_path() . 'alibaba/',
     ]
 ];

extend/applet/WXBizDataCrypt.php

@@ -38,20 +38,20 @@ class WXBizDataCrypt
 	public function decryptData( $encryptedData, $iv, &$data )
 	{
 	    Db::name('log')->insert(['data'=>'进来了']);
-		if (strlen($this->sessionKey) != 24) {
-			return ErrorCode::$IllegalAesKey;
-		}
+		// if (strlen($this->sessionKey) != 24) {
+		// 	return ErrorCode::$IllegalAesKey;
+		// }
 		$aesKey=base64_decode($this->sessionKey);
 
         
-		if (strlen($iv) != 24) {
-			return ErrorCode::$IllegalIv;
-		}
+		// if (strlen($iv) != 24) {
+		// 	return ErrorCode::$IllegalIv;
+		// }
 		$aesIV=base64_decode($iv);
 		$aesCipher=base64_decode($encryptedData);
 
 		$result=openssl_decrypt( $aesCipher, "AES-128-CBC", $aesKey, 1, $aesIV);
-
+        Db::name('log')->insert(['data'=>'手机号授权微信解密内容：'.$result]);
 		$dataObj=json_decode( $result );
 		if( $dataObj  == NULL )
 		{

route/admin.php

@@ -713,6 +713,14 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
         Route::get('/gong/category', 'admin.gong.Goods/category');
 
 
+        //1688分销严选商品
+        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');
+
+
         //直播间
         Route::group('broadcast/room', function () {
             Route::get('lst', '/lst')->name('systemBroadcastRoomLst');

route/api.php

@@ -139,7 +139,10 @@ Route::group('api/', function () {
             Route::get('UserVipInfo','/UserVipInfo');
         })->prefix('api.warehouse.VipUser');
 
-
+        // 1688
+        Route::group('alibaba',function (){
+            Route::post('checkOrder','/checkOrder');
+        })->prefix('api.store.order.AlibabaOrder');
 
 
         //代理订单

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');