feat(order): 添加1688商品预下单接口集成

- 集成1688预下单功能，支持获取商品价格和运费信息
- 添加地址参数构建逻辑，包括收货人姓名、电话、地区和详细地址
- 实现商品参数列表构建，包含商品ID、规格ID和数量信息
- 添加订单服务调用，处理预下单请求并验证返回结果
- 实现运费计算逻辑，将1688返回的运费加入总邮费中
- 添加订单金额计算，将1688返回的商品总价加入订单价格中
- 注释掉原有重复的1688运费获取代码以避免重复计算

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

@@ -2394,6 +2394,36 @@ class StoreOrderRepository extends BaseRepository
             }
 
             $orderpri = bcmul($cartInfo['list'][$_k]['productAttr']['price'], $cartInfo['list'][$_k]['cart_num'], 2);
+
+            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']
+                ];
+                if (!$cart['product']['spu_id'] || !$cart['productAttr']['spec_id']) {
+                    throw new ValidateException('1688预下单接口请求失败');
+                }
+                $orderService = new OrderService();
+                $ailOrder = $orderService->previewOrder(['cargoParamList' => $cargoParamList, 'addressParam' => $addressParam]);
+                if (!$ailOrder['success']) {
+                    throw new ValidateException($ailOrder['preview']['msg']);
+                }
+                if ($ailOrder['preview']['sumCarriage'] > 0) {
+                    $postage_price = bcadd($postage_price, $ailOrder['preview']['sumCarriage'] / 100, 2);
+                }
+
+                $orderpri = bcadd($orderpri, $ailOrder['preview']['sumPrice'] / 100, 2);
+            }
+
             //var_dump($ss);
             //支付组合
             $num_yl = 0;
@@ -2621,32 +2651,32 @@ 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']
-                ];
-                if (!$cart['product']['spu_id'] || !$cart['productAttr']['spec_id']) {
-                    throw new ValidateException('1688预下单接口请求失败');
-                }
-                $orderService = new OrderService();
-                $ailOrder = $orderService->previewOrder(['cargoParamList' => $cargoParamList, 'addressParam' => $addressParam]);
-                if (!$ailOrder['success']) {
-                    throw new ValidateException($ailOrder['preview']['msg']);
-                }
-                if ($ailOrder['preview']['sumCarriage'] > 0) {
-                    $postage_price = bcadd($postage_price, $ailOrder['preview']['sumCarriage'] / 100, 2);
-                }
-            }
+            // 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']
+            //     ];
+            //     if (!$cart['product']['spu_id'] || !$cart['productAttr']['spec_id']) {
+            //         throw new ValidateException('1688预下单接口请求失败');
+            //     }
+            //     $orderService = new OrderService();
+            //     $ailOrder = $orderService->previewOrder(['cargoParamList' => $cargoParamList, 'addressParam' => $addressParam]);
+            //     if (!$ailOrder['success']) {
+            //         throw new ValidateException($ailOrder['preview']['msg']);
+            //     }
+            //     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);