diff --git a/app/common/model/store/order/StoreGroupOrder.php b/app/common/model/store/order/StoreGroupOrder.php
index 3f3d92b0..337a3c89 100644
--- a/app/common/model/store/order/StoreGroupOrder.php
+++ b/app/common/model/store/order/StoreGroupOrder.php
@@ -26,6 +26,9 @@ class StoreGroupOrder extends BaseModel
     const PAY_TYPE_ROUTINE = 2; //小程序支付
     const PAY_TYPE_H5 = 3; //H5支付
     const PAY_TYPE_CREDIT_BUY = 8; //信用购 先货后款
+    const ON_LINE_PRODUCT = 9; //线上铺货
+    const ENTITY_PRODUCT = 10; //实体铺货
+    const ON_CREDIT_PRODUCT = 11; //赊账进货
 
     public static function tablePk(): ?string
     {
diff --git a/app/common/repositories/store/order/StoreOtherOrderCreateRepository.php b/app/common/repositories/store/order/StoreOtherOrderCreateRepository.php
new file mode 100644
index 00000000..87b10b6e
--- /dev/null
+++ b/app/common/repositories/store/order/StoreOtherOrderCreateRepository.php
@@ -0,0 +1,752 @@
+<?php
+
+namespace app\common\repositories\store\order;
+
+use app\common\dao\store\order\StoreCartDao;
+use app\common\model\store\order\StoreGroupOrder;
+use app\common\model\store\order\StoreOrder;
+use app\common\model\system\merchant\Merchant;
+use app\common\repositories\community\CommunityRepository;
+use app\common\repositories\store\coupon\StoreCouponRepository;
+use app\common\repositories\store\coupon\StoreCouponUserRepository;
+use app\common\repositories\store\product\ProductAssistSkuRepository;
+use app\common\repositories\store\product\ProductAttrValueRepository;
+use app\common\repositories\store\product\ProductGroupSkuRepository;
+use app\common\repositories\store\product\ProductPresellSkuRepository;
+use app\common\repositories\store\product\ProductRepository;
+use app\common\repositories\store\product\StoreDiscountRepository;
+use app\common\repositories\store\StoreCategoryRepository;
+use app\common\repositories\system\merchant\MerchantRepository;
+use app\common\repositories\user\MemberinterestsRepository;
+use app\common\repositories\user\UserAddressRepository;
+use app\common\repositories\user\UserBillRepository;
+use app\common\repositories\user\UserMerchantRepository;
+use app\common\repositories\user\UserRepository;
+use app\validate\api\OrderVirtualFieldValidate;
+use app\validate\api\UserAddressValidate;
+use crmeb\jobs\SendSmsJob;
+use crmeb\services\SwooleTaskService;
+use think\exception\ValidateException;
+use think\facade\Db;
+use think\facade\Queue;
+
+class StoreOtherOrderCreateRepository extends StoreOrderRepository
+{
+
+    public function v2CartIdByOrderInfo($user, array $cartId, array $takes = null, array $useCoupon = null, bool $useIntegral = false, int $addressId = null, $createOrder = false)
+    {
+        $uid = $user->uid;
+        $userIntegral = $user->integral;
+        $key = md5(json_encode(compact('cartId', 'takes', 'useCoupon', 'useIntegral', 'addressId'))) . $uid;
+        app()->make(StoreCouponUserRepository::class)->failCoupon();
+        $address = null;
+        //验证地址
+        if ($addressId) {
+            $addressRepository = app()->make(UserAddressRepository::class);
+            $address = $addressRepository->getWhere(['uid' => $uid, 'address_id' => $addressId]);
+        }
+        $storeCartRepository = app()->make(StoreCartRepository::class);
+        $res = $storeCartRepository->checkCartList($storeCartRepository->cartIbByData($cartId, $uid, $address), 0, $user);
+        $merchantCartList = $res['list'];
+        $fail = $res['fail'];
+
+        //检查购物车失效数据
+        if (count($fail)) {
+            if ($fail[0]['is_fail'])
+                throw new ValidateException('[已失效]' . mb_substr($fail[0]['product']['store_name'], 0, 10) . '...');
+            if (in_array($fail[0]['product_type'], [1, 2, 3]) && !$fail[0]['userPayCount']) {
+                throw new ValidateException('[超出限购数]' . mb_substr($fail[0]['product']['store_name'], 0, 10) . '...');
+            }
+            throw new ValidateException('[已失效]' . mb_substr($fail[0]['product']['store_name'], 0, 10) . '...');
+        }
+
+        $svip_status = $user->is_svip > 0 && systemConfig('svip_switch_status') == '1';
+        $svip_integral_rate = $svip_status ? app()->make(MemberinterestsRepository::class)->getSvipInterestVal(MemberinterestsRepository::HAS_TYPE_PAY) : 0;
+        //订单活动类型
+        $order_type = 0;
+        $source = 2;
+        //虚拟订单
+        $order_model = 0;
+        //虚拟订单自定义数据
+        $order_extend = [];
+        //检查商品类型, 活动商品只能单独购买
+        foreach ($merchantCartList as $merchantCart) {
+
+            foreach ($merchantCart['list'] as $cart) {
+                if ($cart['product_type'] == 0) {
+                    if ($cart['product']['once_min_count'] > 0 &&  $cart['product']['once_min_count'] > $cart['cart_num'])
+                        throw new ValidateException('[低于起购数:' . $cart['product']['once_min_count'] . ']' . mb_substr($cart['product']['store_name'], 0, 10) . '...');
+                    if ($cart['product']['pay_limit'] == 1 && $cart['product']['once_max_count'] < $cart['cart_num'])
+                        throw new ValidateException('[超出单次限购数：' . $cart['product']['once_max_count'] . ']' . mb_substr($cart['product']['store_name'], 0, 10) . '...');
+                    if ($cart['product']['pay_limit'] == 2) {
+                        //如果长期限购
+                        //已购买数量
+                        $count = app()->make(StoreOrderRepository::class)->getMaxCountNumber($cart['uid'], $cart['product_id']);
+                        if (($cart['cart_num'] + $count) > $cart['product']['once_max_count'])
+                            throw new ValidateException('[超出限购总数：' . $cart['product']['once_max_count'] . ']' . mb_substr($cart['product']['store_name'], 0, 10) . '...');
+                    }
+                }
+                if ($cart['product_type'] > 0) {
+                    $order_type = $cart['product_type'];
+                    $source = $cart['source'];
+                }
+                if ($cart['product_type'] <= 97 && $cart['product_type'] > 0 && (($cart['product_type'] != 10 && count($merchantCart['list']) != 1) || count($merchantCartList) != 1)) {
+                    throw new ValidateException('活动商品必须单独购买');
+                }
+                if ($cart['product']['type'] && (count($merchantCart['list']) != 1 || count($merchantCartList) != 1)) {
+                    throw new ValidateException('虚拟商品必须单独购买');
+                }
+                $order_model = $cart['product']['type'];
+                if ($cart['product']['extend']) {
+                    $order_extend = json_decode($cart['product']['extend'], true);
+                }
+            }
+        }
+
+        $community = [];
+        unset($merchantCart, $cart);
+        $order_price = 0;
+        $total_true_price = 0;
+        $order_total_price = 0;
+        $order_coupon_price = 0;
+        $noDeliver = false;
+        $presellType = 0;
+        $fn = [];
+        $enabledPlatformCoupon = !$order_type;
+        $order_total_postage = 0;
+        $platformCoupon = [];
+
+        $orderDeliveryStatus = true;
+        $order_svip_discount = 0;
+        // 循环计算每个店铺的订单数据 委托商品是否设置收货方式 ?
+        foreach ($merchantCartList as &$merchantCart) {
+            $postageRule = [];
+            $total_price = 0;
+            $total_num = 0;
+            $valid_total_price = 0;
+            $postage_price = 0;
+            $product_price = [];
+            $final_price = 0;
+            $down_price = 0;
+            $total_svip_discount = 0;
+
+            //是否自提
+            $isTake = in_array($merchantCart['mer_id'], $takes ?? []);
+
+            $merTake = in_array('1', $merchantCart['delivery_way'], true);
+            $merDelivery = (!$merchantCart['delivery_way'] || !count($merchantCart['delivery_way']) || in_array('2', $merchantCart['delivery_way'], true));
+            $deliveryStatus = true;
+            $product_cart = [];
+
+
+            if ($deliveryStatus && !$isTake && ($merDelivery || $merTake)) {
+                $isTake = $merDelivery ? 0 : 1;
+            }
+
+
+            $enabledCoupon = !($order_type && $order_type != 2);
+
+            $merchantCart['coupon'] = [];
+
+            $svip_coupon_merge = merchantConfig($merchantCart['mer_id'], 'svip_coupon_merge');
+            $use_svip = 0;
+            //获取运费规则和统计商品数据
+            foreach ($merchantCart['list'] as &$cart) {
+
+                if ($cart['cart_num'] <= 0) {
+                    throw new ValidateException('购买商品数必须大于0');
+                }
+                $svip_discount = 0;
+                $realPrice = $this->cartByPrice($cart);
+                $price = bcmul($cart['cart_num'], $realPrice, 2);
+                $cart['total_price'] = $price;
+                $cart['postage_price'] = 0;
+                $cart['svip_discount'] = 0;
+                $total_price = bcadd($total_price, $price, 2);
+                $total_num += $cart['cart_num'];
+                $_price = bcmul($cart['cart_num'], $this->cartByCouponPrice($cart), 2);
+                $cart['svip_coupon_merge'] = 1;
+                if ($cart['productAttr']['show_svip_price'] && !$cart['product_type']) {
+                    $svip_discount = max(bcmul($cart['cart_num'], bcsub($cart['productAttr']['org_price'] ?? 0, $cart['productAttr']['price'], 2), 2), 0);
+                    if ($svip_coupon_merge != '1') {
+                        $_price = 0;
+                        $cart['svip_coupon_merge'] = 0;
+                    }
+                    $use_svip = 1;
+                }
+                $valid_total_price = bcadd($valid_total_price, $_price, 2);
+                $cart['allow_price'] = $_price;
+                $temp1 = $cart['product']['temp'];
+                $cart['temp_number'] = 0;
+                $total_svip_discount = bcadd($total_svip_discount, $svip_discount, 2);
+                $cart['svip_discount'] = $svip_discount;
+
+                if (!isset($product_cart[$cart['product_id']]))
+                    $product_cart[$cart['product_id']] = [$cart['cart_id']];
+                else
+                    $product_cart[$cart['product_id']][] = $cart['cart_id'];
+
+                if ($_price > 0) {
+                    $product_price[$cart['product_id']] = bcadd($product_price[$cart['product_id']] ?? 0, $_price, 2);
+                }
+
+                if (!$temp1) continue;
+
+                $number = $this->productByTempNumber($cart);
+                if ($number <= 0) continue;
+                $cart['temp_number'] = $number;
+
+                if ($order_model || !$temp1 || ($cart['product_type'] == 10 && $cart['productDiscount']['free_shipping'])) {
+                    continue;
+                }
+
+                $free = $temp1['free'][0] ?? null;
+                $region = $temp1['region'][0] ?? null;
+
+                if (!$cart['product']['delivery_free'] && !$isTake && (!$address || !$cart['product']['temp'] || ($temp1['undelivery'] == 2 && !$free && (!$region || !$region['city_id'])))) {
+                    $cart['undelivered'] = true;
+                    $noDeliver = true;
+                    continue;
+                }
+                $cart['undelivered'] = (!$isTake) && $temp1['undelivery'] == 1 && isset($temp1['undelives']);
+                $fn[] = function () use ($cart) {
+                    unset($cart['product']['temp']);
+                };
+
+                if ($cart['undelivered']) {
+                    $noDeliver = true;
+                    continue;
+                }
+                if ($cart['product']['delivery_free']) {
+                    continue;
+                }
+                $tempId = $cart['product']['temp_id'];
+                if (!isset($postageRule[$tempId])) {
+                    $postageRule[$tempId] = [
+                        'free' => null,
+                        'region' => null,
+                        'cart' => [],
+                        'price' => 0,
+                    ];
+                }
+
+                $freeRule = $postageRule[$tempId]['free'];
+                $regionRule = $postageRule[$tempId]['region'];
+                $postageRule[$tempId]['cart'][] = $cart['cart_id'];
+                $postageRule[$tempId]['price'] = bcadd($postageRule[$tempId]['price'], $cart['price'], 2);
+
+                if ($temp1['appoint'] && $free) {
+                    if (!isset($freeRule)) {
+                        $freeRule = $free;
+                        $freeRule['cart_price'] = 0;
+                        $freeRule['cart_number'] = 0;
+                    }
+                    $freeRule['cart_number'] = bcadd($freeRule['cart_number'], $number, 2);
+                    $freeRule['cart_price'] = bcadd($freeRule['cart_price'], $price, 2);
+                }
+
+                if ($region) {
+                    if (!isset($regionRule)) {
+                        $regionRule = $region;
+                        $regionRule['cart_price'] = 0;
+                        $regionRule['cart_number'] = 0;
+                    }
+                    $regionRule['cart_number'] = bcadd($regionRule['cart_number'], $number, 2);
+                    $regionRule['cart_price'] = bcadd($regionRule['cart_price'], $price, 2);
+                }
+                $postageRule[$tempId]['free'] = $freeRule;
+                $postageRule[$tempId]['region'] = $regionRule;
+            }
+            unset($cart);
+
+            $coupon_price = 0;
+            $use_store_coupon = 0;
+
+            $merCouponIds = (array)($useCoupon[$merchantCart['mer_id']] ?? []);
+            $merCouponIds = array_reverse($merCouponIds);
+            $sortIds = $merCouponIds;
+            unset($defaultSort);
+            $defaultSort = [];
+            if (count($merCouponIds)) {
+                foreach ($merchantCart['coupon'] as &$item) {
+                    $defaultSort[] = &$item;
+                    if (!in_array($item['coupon_user_id'], $sortIds, true)) {
+                        $sortIds[] = $item['coupon_user_id'];
+                    }
+                }
+                unset($item);
+                usort($merchantCart['coupon'], function ($a, $b) use ($sortIds) {
+                    return array_search($a['coupon_user_id'], $sortIds) > array_search($b['coupon_user_id'], $sortIds) ? 1 : -1;
+                });
+            }
+
+            $pay_price = max(bcsub($valid_total_price, $coupon_price, 2), 0);
+            $_pay_price = $pay_price;
+
+
+            $useCouponIds = [];
+
+            //计算单个商品实际支付金额
+            foreach ($merchantCart['list'] as $_k => &$cart) {
+                $cartTotalPrice = bcmul($this->cartByPrice($cart), $cart['cart_num'], 2);
+                $_cartTotalPrice = $cartTotalPrice;
+
+                //单个商品实际支付金额
+                $cart['coupon_price'] = bcsub($_cartTotalPrice, $cartTotalPrice, 2);
+                $cart['true_price'] = $cartTotalPrice;
+            }
+            unset($cart, $_k);
+            $total_true_price = bcadd($_pay_price, $total_true_price, 2);
+            if (count($merchantCartList) > 1 || count($merchantCart['list']) > 1) {
+                $orderDeliveryStatus = $orderDeliveryStatus && $deliveryStatus;
+            }
+            $merchantCart['order'] = [
+                'true_price' => $_pay_price,
+                'platform_coupon_price' => 0,
+                'valid_total_price' => $valid_total_price,
+                'total_price' => $total_price,
+                'final_price' => $final_price,
+                'down_price' => $down_price,
+                'coupon_price' => $coupon_price,
+                'platformCoupon' => $platformCoupon,
+                'svip_coupon_merge' => $svip_coupon_merge,
+                'postage_price' => $postage_price,
+                'isTake' => $isTake,
+                'total_num' => $total_num,
+                'enabledCoupon' => $enabledCoupon,
+                'useCouponIds' => $useCouponIds,
+                'allow_take' => $merTake,
+                'allow_delivery' => $merDelivery,
+                'delivery_status' => $deliveryStatus,
+                'svip_discount' => $total_svip_discount,
+                'use_svip' => $use_svip,
+            ];
+            $order_total_postage = bcadd($order_total_postage, $postage_price, 2);
+            $order_svip_discount = bcadd($total_svip_discount, $order_svip_discount, 2);
+            if (count($defaultSort)) {
+                $merchantCart['coupon'] = &$defaultSort;
+            }
+        }
+        unset($merchantCart);
+
+        $usePlatformCouponId = 0;
+        $total_platform_coupon_price = 0;
+
+        foreach ($merchantCartList as &$merchantCart) {
+            if (!$merchantCart['order']['use_svip'])
+                continue;
+            $totalMergePrice = 0;
+            foreach ($merchantCart['list'] as &$cart) {
+                if (!$cart['svip_coupon_merge']) {
+                    $totalMergePrice = bcadd($totalMergePrice, $cart['true_price'], 2);
+                    $cart['allow_price'] = $cart['true_price'];
+                }
+            }
+            unset($cart);
+            if ($totalMergePrice > 0) {
+                $total_true_price = bcadd($total_true_price, $totalMergePrice, 2);
+                $merchantCart['order']['valid_total_price'] = bcadd($merchantCart['order']['valid_total_price'], $totalMergePrice, 2);
+                $merchantCart['order']['true_price'] = $merchantCart['order']['valid_total_price'];
+            }
+        }
+        unset($merchantCart);
+
+        $usePlatformCouponId = 0;
+        $total_platform_coupon_price = 0;
+
+        //积分配置
+        $sysIntegralConfig = systemConfig(['integral_money', 'integral_status', 'integral_order_rate']);
+        $merIntegralFlag = false;
+        $order_total_integral = 0;
+        $order_total_integral_price = 0;
+        $order_total_give_integral = 0;
+        $allow_no_address = true;
+
+        foreach ($merchantCartList as &$merchantCart) {
+            $merchantCart['take'] = [
+                'mer_integral_rate' => 0,
+                'mer_integral_status' => 0,
+            ];
+            $allow_no_address = $allow_no_address && $merchantCart['order']['isTake'];
+            foreach ($merchantCart['config'] as $config) {
+                $merchantCart['take'][$config['config_key']] = $config['value'];
+            }
+            $merIntegralConfig = $merchantCart['take'];
+            unset($merchantCart['config']);
+            $merIntegralConfig['mer_integral_rate'] = min(1, $merIntegralConfig['mer_integral_rate'] > 0 ? bcdiv($merIntegralConfig['mer_integral_rate'], 100, 4) : $merIntegralConfig['mer_integral_rate']);
+            $total_integral = 0;
+            $total_integral_price = 0;
+            $merIntegralFlag = $merIntegralFlag || ((bool)$merIntegralConfig['mer_integral_status']);
+
+            $order_total_integral = bcadd($order_total_integral, $total_integral, 0);
+            $order_total_integral_price = bcadd($order_total_integral_price, $total_integral_price, 2);
+
+            $_pay_price = $merchantCart['order']['true_price'];
+            $valid_total_price = $merchantCart['order']['valid_total_price'];
+            $total_price = $merchantCart['order']['total_price'];
+            $final_price = $merchantCart['order']['final_price'];
+            $down_price = $merchantCart['order']['down_price'];
+            $postage_price = $merchantCart['order']['postage_price'];
+
+            //计算订单商品金额
+            $org_price = bcadd(bcsub($total_price, $valid_total_price, 2), max($_pay_price, 0), 2);
+            if ($presellType == 2) {
+                $org_price = max(bcsub($org_price, $final_price, 2), $down_price);
+            }
+
+            //获取可优惠金额
+            $coupon_price = 0;
+            $order_coupon_price = 0;
+
+            //计算订单金额
+            if ($order_type != 2 || $presellType != 2) {
+                $pay_price = bcadd($postage_price, $org_price, 2);
+            } else {
+                $pay_price = $org_price;
+            }
+
+            $total_give_integral = 0;
+
+            foreach ($fn as $callback) {
+                $callback();
+            }
+
+            $merchantCart['order']['order_type'] = $order_type;
+            $merchantCart['order']['total_give_integral'] = $total_give_integral;
+            $merchantCart['order']['total_integral_price'] = $total_integral_price;
+            $merchantCart['order']['total_integral'] = $total_integral;
+            $merchantCart['order']['org_price'] = $org_price;
+            $merchantCart['order']['pay_price'] = $pay_price;
+            $merchantCart['order']['coupon_price'] = $coupon_price;
+
+            $order_price = bcadd($order_price, $pay_price, 2);
+            $order_total_price = bcadd($order_total_price, $total_price, 2);
+        }
+        unset($merchantCart);
+
+        if ($order_model) {
+            $allow_no_address = false;
+        }
+
+        foreach ($merchantCartList as &$merchantCart) {
+            foreach ($merchantCart['list'] as &$cart) {
+                $cart['total_price'] = bcadd($cart['total_price'], $cart['svip_discount'], 2);
+            }
+            unset($cart);
+            $merchantCart['order']['total_price'] = bcadd($merchantCart['order']['total_price'], $merchantCart['order']['svip_discount'], 2);
+            $order_total_price = bcadd($order_total_price, $merchantCart['order']['svip_discount'], 2);
+        }
+        unset($merchantCart);
+        $status = ($address || $order_model || $allow_no_address) ? ($noDeliver ? 'noDeliver' : 'finish') : 'noAddress';
+        $order = $merchantCartList;
+        $total_price = $order_total_price;
+        $openIntegral = $merIntegralFlag && !$order_type && $sysIntegralConfig['integral_status'] && $sysIntegralConfig['integral_money'] > 0;
+        $total_coupon = bcadd($order_svip_discount, bcadd(bcadd($total_platform_coupon_price, $order_coupon_price, 2), $order_total_integral_price, 2), 2);
+        return compact(
+            'order_type',
+            'source',
+            'order_model',
+            'order_extend',
+            'order_total_postage',
+            'order_price',
+            'total_price',
+            'community',
+            'enabledPlatformCoupon',
+            'platformCoupon',
+            'usePlatformCouponId',
+            'order_total_integral',
+            'order_total_integral_price',
+            'order_total_give_integral',
+            'order_svip_discount',
+            'total_platform_coupon_price',
+            'total_coupon',
+            'order_coupon_price',
+            'order',
+            'status',
+            'address',
+            'openIntegral',
+            'useIntegral',
+            'key'
+        ) + ['allow_address' => !$allow_no_address, 'order_delivery_status' => $orderDeliveryStatus];
+    }
+
+    public function v2CreateOrder(int $pay_type, $user, array $cartId, array $extend, array $mark, array $receipt_data, array $takes = null, array $useCoupon = null, bool $useIntegral = false, int $addressId = null, array $post, int $product_type = 0)
+    {
+        $uid = $user->uid;
+        $orderInfo = $this->v2CartIdByOrderInfo($user, $cartId, $takes, $useCoupon, $useIntegral, $addressId, true);
+        $order_model = $orderInfo['order_model'];
+        $order_extend = $orderInfo['order_extend'];
+        if (!$orderInfo['order_delivery_status']) {
+            throw new ValidateException('部分商品配送方式不一致,请单独下单');
+        }
+        if ($orderInfo['order_price'] > 1000000) {
+            throw new ValidateException('支付金额超出最大限制');
+        }
+        if ($orderInfo['status'] == 'noDeliver') throw new ValidateException('商品不支持该区域');
+        if ($orderInfo['status'] == 'noAddress') throw new ValidateException('请选择地址');
+        if (!$order_model && $orderInfo['allow_address']) {
+            if (!$orderInfo['address']) throw new ValidateException('请选择正确的收货地址');
+            if (!$orderInfo['address']['province_id']) throw new ValidateException('请完善收货地址信息');
+            $extend = [];
+        } else if (count($order_extend)) {
+            $extend = app()->make(OrderVirtualFieldValidate::class)->load($order_extend, $extend);
+        } else {
+            $extend = [];
+        }
+        $orderType = $orderInfo['order_type'];
+        if ($orderType == 0 && $pay_type == StoreGroupOrder::PAY_TYPE_CREDIT_BUY) {
+            throw new ValidateException('该商品不支持先货后款');
+        }
+        if (!in_array($orderType, [0, 98, 99]) && (count($orderInfo['order']) > 1 || ($orderType != 10 && count($orderInfo['order'][0]['list']) > 1))) {
+            throw new ValidateException('活动商品请单独购买');
+        }
+
+        $merchantCartList = $orderInfo['order'];
+        $cartSpread = 0;
+        $hasTake = false;
+
+        foreach ($merchantCartList as $merchantCart) {
+            if ($merchantCart['order']['isTake']) {
+                $hasTake = true;
+            }
+            //检查发票状态
+            if (isset($receipt_data[$merchantCart['mer_id']]) && !$merchantCart['openReceipt'])
+                throw new ValidateException('该店铺不支持开发票');
+
+            foreach ($merchantCart['list'] as $cart) {
+                if (!$cartSpread && $cart['spread_id']) {
+                    $cartSpread = $cart['spread_id'];
+                }
+            }
+        }
+        if ($hasTake) {
+            app()->make(UserAddressValidate::class)->scene('take')->check($post);
+        }
+
+        if ($cartSpread) {
+            app()->make(UserRepository::class)->bindSpread($user, $cartSpread);
+        }
+
+        $isSelfBuy = $user->is_promoter && systemConfig('extension_self') ? 1 : 0;
+        if ($isSelfBuy) {
+            $spreadUser = $user;
+            $topUser = $user->valid_spread;
+        } else {
+            $spreadUser = $user->valid_spread;
+            $topUser = $user->valid_top;
+        }
+        $spreadUid = $spreadUser->uid ?? 0;
+        $topUid = $topUser->uid ?? 0;
+
+        $giveCouponIds = [];
+        $address = $orderInfo['address'];
+        $allUseCoupon = $orderInfo['usePlatformCouponId'] ? [$orderInfo['usePlatformCouponId']] : [];
+        $totalNum = 0;
+        $totalPostage = 0;
+        $totalCost = 0;
+        $cartIds = [];
+        $orderList = [];
+        foreach ($merchantCartList as $k => $merchantCart) {
+            $cost = 0;
+            $rate = 0;
+            if ($merchantCart['commission_rate'] > 0) {
+                $rate = $merchantCart['commission_rate'];
+            } else if (isset($merchantCart['merchantCategory']['commission_rate']) && $merchantCart['merchantCategory']['commission_rate'] > 0) {
+                $rate = bcmul($merchantCart['merchantCategory']['commission_rate'], 100, 4);
+            }
+            $user_address = isset($address) ? ($address['province'] . $address['city'] . $address['district'] . $address['street'] . $address['village'] . $address['brigade'] . $address['detail']) : '';
+            $user_address_code = isset($address) ? ($address['province_code'] . ',' . $address['city_code'] . ',' . $address['district_code'] . ',' . $address['street_code'] . ',' . $address['village_code'] . ',' . $address['brigade_id']) : '';
+            //整理订单数据
+            $_order = [
+                'cartInfo' => $merchantCart,
+                'activity_type' => $orderInfo['order_type'],
+                'source' => $orderInfo['source'] ?? 2,
+                'commission_rate' => (float)$rate,
+                'order_type' => $merchantCart['order']['isTake'] ? 1 : 0,
+                'is_virtual' => $order_model ? 1 : 0,
+                'extension_one' =>0,
+                'extension_two' => 0,
+                'order_sn' => $this->getNewOrderId(StoreOrderRepository::TYPE_SN_ORDER) . ($k + 1),
+                'uid' => $uid,
+                'spread_uid' => $spreadUid,
+                'top_uid' => $topUid,
+                'is_selfbuy' => $isSelfBuy,
+                'real_name' => $merchantCart['order']['isTake'] ? $post['real_name'] : ($address['real_name'] ?? ''),
+                'user_phone' => $merchantCart['order']['isTake'] ? $post['phone'] : ($address['phone'] ?? ''),
+                'user_address' => $user_address,
+                'user_address_code' => $user_address_code,
+                'cart_id' => implode(',', array_column($merchantCart['list'], 'cart_id')),
+                'total_num' => $merchantCart['order']['total_num'],
+                'total_price' => $merchantCart['order']['total_price'],
+                'total_postage' => $merchantCart['order']['postage_price'],
+                'pay_postage' => $merchantCart['order']['postage_price'],
+                'svip_discount' => $merchantCart['order']['svip_discount'],
+                'pay_price' => $merchantCart['order']['pay_price'],
+                'integral' => $merchantCart['order']['total_integral'],
+                'integral_price' => $merchantCart['order']['total_integral_price'],
+                'give_integral' => $merchantCart['order']['total_give_integral'],
+                'mer_id' => $merchantCart['mer_id'],
+                'cost' => $cost,
+                'order_extend' => count($extend) ? json_encode($extend, JSON_UNESCAPED_UNICODE) : '',
+                'coupon_id' => implode(',', $merchantCart['order']['useCouponIds']),
+                'mark' => $mark[$merchantCart['mer_id']] ?? '',
+                'coupon_price' => bcadd($merchantCart['order']['coupon_price'], $merchantCart['order']['platform_coupon_price'], 2),
+                'platform_coupon_price' => $merchantCart['order']['platform_coupon_price'],
+                'pay_type' => $pay_type
+            ];
+            $allUseCoupon = array_merge($allUseCoupon, $merchantCart['order']['useCouponIds']);
+            $orderList[] = $_order;
+            $totalPostage = bcadd($totalPostage, $_order['total_postage'], 2);
+            $totalCost = bcadd($totalCost, $cost, 2);
+            $totalNum += $merchantCart['order']['total_num'];
+        }
+        $groupOrder = [
+            'uid' => $uid,
+            'group_order_sn' => count($orderList) === 1 ? $orderList[0]['order_sn'] : ($this->getNewOrderId(StoreOrderRepository::TYPE_SN_ORDER) . '0'),
+            'total_postage' => $totalPostage,
+            'total_price' => $orderInfo['total_price'],
+            'total_num' => $totalNum,
+            'real_name' => $address['real_name'] ?? '',
+            'user_phone' => $address['phone'] ?? '',
+            'user_address' => $user_address,
+            'pay_price' => $orderInfo['order_price'],
+            'coupon_price' => bcadd($orderInfo['total_platform_coupon_price'], $orderInfo['order_coupon_price'], 2),
+            'pay_postage' => $totalPostage,
+            'cost' => $totalCost,
+            'coupon_id' => $orderInfo['usePlatformCouponId'] > 0 ? $orderInfo['usePlatformCouponId'] : '',
+            'pay_type' => $pay_type,
+            'give_coupon_ids' => $giveCouponIds,
+            'integral' => $orderInfo['order_total_integral'],
+            'integral_price' => $orderInfo['order_total_integral_price'],
+            'give_integral' => $orderInfo['order_total_give_integral'],
+        ];
+        $group = Db::transaction(function () use ($user, $uid, $cartIds, $groupOrder, $orderList) {
+            $storeCartRepository = app()->make(StoreCartRepository::class);
+            /** @var ProductAttrValueRepository $attrValueRepository */
+            $attrValueRepository = app()->make(ProductAttrValueRepository::class);
+            /** @var ProductRepository $productRepository */
+            $productRepository = app()->make(ProductRepository::class);
+            //订单记录
+            $storeOrderStatusRepository = app()->make(StoreOrderStatusRepository::class);
+            $userMerchantRepository = app()->make(UserMerchantRepository::class);
+
+            //减库存
+            foreach ($orderList as $order) {
+                foreach ($order['cartInfo']['list'] as $cart) {
+                    if (!isset($uniqueList[$cart['productAttr']['product_id'] . $cart['productAttr']['unique']])) {
+                        $uniqueList[$cart['productAttr']['product_id'] . $cart['productAttr']['unique']] = true;
+                    } else {
+                        throw new ValidateException('购物车商品信息重复');
+                    }
+                    try {
+                        $attrValueRepository->descStock($cart['productAttr']['product_id'], $cart['productAttr']['unique'], $cart['cart_num']);
+                        $productRepository->descStock($cart['product']['product_id'], $cart['cart_num']);
+                        /** @var PurchaseRecordRepository $purchaseRecordRepo */
+                        $purchaseRecordRepo = app()->make(PurchaseRecordRepository::class);
+                        $purchaseRecordRepo->incSalesVolume($cart['product']['product_id'], $cart['productAttr']['unique'], $cart['cart_num']);
+                        if ($cart['integral'] && $cart['integral']['use'] > 0) {
+                            $productRepository->incIntegral($cart['product']['product_id'], $cart['integral']['use'], $cart['integral']['price']);
+                        }
+                    } catch (\Exception $e) {
+                        throw new ValidateException('库存不足');
+                    }
+                }
+            }
+            //修改购物车状态
+            $storeCartRepository->updates($cartIds, [
+                'is_pay' => 1
+            ]);
+
+            //创建订单
+            // $groupOrder = $storeGroupOrderRepository->create($groupOrder);
+            $group_order_id = Db::name('store_group_order_other')->insertGetId($groupOrder);
+
+            foreach ($orderList as $k => $order) {
+                $orderList[$k]['group_order_id'] = $group_order_id;
+            }
+
+            $orderProduct = [];
+            $orderStatus = [];
+            foreach ($orderList as $order) {
+                $cartInfo = $order['cartInfo'];
+                unset($order['cartInfo']);
+                //创建子订单
+                // $_order = $this->dao->create($order);
+                $order_id = Db::name('store_order_other')->insertGetId($order);
+
+                $orderStatus[] = [
+                    'order_id' => $order_id,
+                    'order_sn' => $order['order_sn'],
+                    'type' => $storeOrderStatusRepository::TYPE_ORDER,
+                    'change_message' => '订单生成',
+                    'change_type' => $storeOrderStatusRepository::ORDER_STATUS_CREATE,
+                    'uid' => $user->uid,
+                    'nickname' => $user->nickname,
+                    'user_type' => $storeOrderStatusRepository::U_TYPE_USER,
+                ];
+
+                foreach ($cartInfo['list'] as $cart) {
+                    $productPrice = $cart['true_price'];
+                    // $extension_one = $cart['extension_one'];
+                    // $extension_two = $cart['extension_two'];
+
+
+                    $order_cart = [
+                        'product' => $cart['product'],
+                        'productAttr' => $cart['productAttr'],
+                        'product_type' => $cart['product_type']
+                    ];
+
+                    $orderProduct[] = [
+                        'order_id' => $order_id,
+                        'cart_id' => $cart['cart_id'],
+                        'uid' => $uid,
+                        'product_id' => $cart['product_id'],
+                        'activity_id' => $cart['source'],
+                        'total_price' => $cart['total_price'],
+                        'product_price' => $productPrice,
+                        'extension_one' => 0,
+                        'extension_two' => 0,
+                        'postage_price' => $cart['postage_price'],
+                        'svip_discount' => $cart['svip_discount'],
+                        'cost' => $cart['cost']??0,
+                        'coupon_price' => $cart['coupon_price'],
+                        'platform_coupon_price' => $cart['platform_coupon_price'],
+                        'product_sku' => $cart['productAttr']['unique'],
+                        'product_num' => $cart['cart_num'],
+                        'refund_num' => $cart['cart_num'],
+                        'integral_price' => $cart['integral']['price'] ?? 0,
+                        'integral' => $cart['integral'] ? bcdiv($cart['integral']['use'], $cart['cart_num'], 0) : 0,
+                        'integral_total' => $cart['integral'] ? $cart['integral']['use'] : 0,
+                        'product_type' => $cart['product_type'],
+                        'source' => $cart['source'],
+                        'source_id' => $cart['source_id'],
+                        'cart_info' => json_encode($order_cart)
+                    ];
+                }
+
+                $userMerchantRepository->getInfo($uid, $order['mer_id']);
+                app()->make(MerchantRepository::class)->incSales($order['mer_id'], $order['total_num']);
+            }
+            Db::name('store_order_status_other')->insertAll($orderStatus);
+            Db::name('store_order_product_other')->insertAll($orderProduct);
+            return $groupOrder;
+        });
+        foreach ($merchantCartList as $merchantCart) {
+            foreach ($merchantCart['list'] as $cart) {
+                if (($cart['productAttr']['stock'] - $cart['cart_num']) < (int)merchantConfig($merchantCart['mer_id'], 'mer_store_stock')) {
+                    SwooleTaskService::merchant('notice', [
+                        'type' => 'min_stock',
+                        'data' => [
+                            'title' => '库存不足',
+                            'message' => $cart['product']['store_name'] . '(' . $cart['productAttr']['sku'] . ')库存不足',
+                            'id' => $cart['product']['product_id']
+                        ]
+                    ], $merchantCart['mer_id']);
+                }
+            }
+        }
+        // Queue::push(SendSmsJob::class, ['tempId' => 'ORDER_CREATE', 'id' => $group->group_order_id]);
+        return $group;
+    }
+}
diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php
index 46e60b6b..f439e4b1 100644
--- a/app/controller/api/store/order/StoreOrder.php
+++ b/app/controller/api/store/order/StoreOrder.php
@@ -17,6 +17,7 @@ namespace app\controller\api\store\order;
 use app\common\model\store\order\StoreGroupOrder;
 use app\common\repositories\delivery\DeliveryOrderRepository;
 use app\common\repositories\store\order\StoreOrderCreateRepository;
+use app\common\repositories\store\order\StoreOtherOrderCreateRepository;
 use app\common\repositories\store\order\StoreOrderReceiptRepository;
 use app\validate\api\UserReceiptValidate;
 use crmeb\basic\BaseController;
@@ -113,7 +114,7 @@ class StoreOrder extends BaseController
                 $courierData = json_decode($response->getBody(), true);
                 if (empty($courierData['code']) || $courierData['code'] != 1) {
                     throw new ValidateException('该收货区域未设置快递员');
-                } 
+                }
             }
         }
         $groupOrder = app()->make(LockService::class)->exec('order.create', function () use ($orderCreateRepository, $receipt_data, $mark, $extend, $cartId, $payType, $takes, $couponIds, $useIntegral, $addressId, $post) {
@@ -134,6 +135,37 @@ class StoreOrder extends BaseController
         }
     }
 
+    /**
+     * 其他创建订单
+     */
+    public function otherOrder(StoreOtherOrderCreateRepository $otherOrderCreateRepository)
+    {
+        $cartId = (array)$this->request->param('cart_id', []);
+        $addressId = (int)$this->request->param('address_id');
+        $couponIds = (array)$this->request->param('use_coupon', []);
+        $takes = (array)$this->request->param('takes', []);
+        $useIntegral = (bool)$this->request->param('use_integral', false);
+        $receipt_data = (array)$this->request->param('receipt_data', []);
+        $extend = (array)$this->request->param('extend', []);
+        $mark = (array)$this->request->param('mark', []);
+        $payType = $this->request->param('pay_type');
+        $post = (array)$this->request->param('post');
+        $data= $otherOrderCreateRepository->v2CreateOrder(
+            $payType,
+            $this->request->userInfo(),
+            $cartId,
+            $extend,
+            $mark,
+            $receipt_data,
+            $takes,
+            $couponIds,
+            $useIntegral,
+            $addressId,
+            $post
+        );
+        halt($data);
+    }
+
     /**
      * @return mixed
      * @throws \think\db\exception\DataNotFoundException
@@ -146,7 +178,7 @@ class StoreOrder extends BaseController
     {
         [$page, $limit] = $this->getPage();
         $where['status'] = $this->request->param('status');
-        $where['product_type'] = $this->request->param('product_type',0);
+        $where['product_type'] = $this->request->param('product_type', 0);
         $where['search'] = $this->request->param('store_name');
         $where['uid'] = $this->request->uid();
         $where['is_user'] = 1;
@@ -283,7 +315,7 @@ class StoreOrder extends BaseController
             return app('json')->fail('订单不存在');
         if (!$order->delivery_type || !$order->delivery_id)
             return app('json')->fail('订单未发货');
-        $express = $this->repository->express($id,null);
+        $express = $this->repository->express($id, null);
         $order->append(['orderProduct']);
         return app('json')->success(compact('express', 'order'));
     }
@@ -318,7 +350,7 @@ class StoreOrder extends BaseController
 
     public function createReceipt($id)
     {
-        $data = $this->request->params(['receipt_type' , 'receipt_title' , 'duty_paragraph', 'receipt_title_type', 'bank_name', 'bank_code', 'address','tel', 'email']);
+        $data = $this->request->params(['receipt_type', 'receipt_title', 'duty_paragraph', 'receipt_title_type', 'bank_name', 'bank_code', 'address', 'tel', 'email']);
         $order = $this->repository->getWhere(['order_id' => $id, 'uid' => $this->request->uid(), 'is_del' => 0]);
         if (!$order) return app('json')->fail('订单不属于您或不存在');
         app()->make(StoreOrderReceiptRepository::class)->add($data, $order);
@@ -330,5 +362,4 @@ class StoreOrder extends BaseController
         $res = $orderRepository->show($id, $this->request->uid());
         return app('json')->success($res);
     }
-
 }
diff --git a/crmeb/jobs/SendSmsJob.php b/crmeb/jobs/SendSmsJob.php
index ce3cb5ce..91cd257d 100644
--- a/crmeb/jobs/SendSmsJob.php
+++ b/crmeb/jobs/SendSmsJob.php
@@ -35,7 +35,6 @@ class SendSmsJob implements JobInterface
             try {
                 /** @var JgPush $client */
                 $client = app()->make(JgPush::class);
-                Log::info('JgPush送发送数据：' . json_encode($data));
                 $client->send($data['tempId'], $data);
             } catch (\Exception $e) {
                 Log::info('JgPush推送消息发送失败' . json_encode($data) . ' - ' . $e->getMessage());
diff --git a/route/api.php b/route/api.php
index c0efee7a..b11d8aba 100644
--- a/route/api.php
+++ b/route/api.php
@@ -62,6 +62,8 @@ Route::group('api/', function () {
             Route::group('order', function () {
                 Route::post('check', '/v2CheckOrder');
                 Route::post('create', '/v2CreateOrder');
+                Route::post('other', '/otherOrder');//创建其他订单
+
             })->prefix('api.store.order.StoreOrder');
 
             //新的下单接口,支持分账 扫描枪