|
@@ -955,9 +955,11 @@ class StoreOrderCreateRepository extends StoreOrderRepository
|
|
|
$totalCost = 0;
|
|
$totalCost = 0;
|
|
|
$cartIds = [];
|
|
$cartIds = [];
|
|
|
$orderList = [];
|
|
$orderList = [];
|
|
|
|
|
+ $product_type = 0;
|
|
|
//Cache::delete($cache_key);
|
|
//Cache::delete($cache_key);
|
|
|
//订单支付以后是否支持取消， 目前仅用于预约商品
|
|
//订单支付以后是否支持取消， 目前仅用于预约商品
|
|
|
$is_cancel = 0;
|
|
$is_cancel = 0;
|
|
|
|
|
+ var_dump($merchantCartList);die();
|
|
|
foreach ($merchantCartList as $k => $merchantCart) {
|
|
foreach ($merchantCartList as $k => $merchantCart) {
|
|
|
$cost = 0;
|
|
$cost = 0;
|
|
|
$total_extension_one = 0;
|
|
$total_extension_one = 0;
|
|
@@ -1065,6 +1067,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
|
|
|
$user_address = isset($address) ? ($address['province'] . $address['city'] . $address['district'] . $address['street'] . $address['detail']) : '';
|
|
$user_address = isset($address) ? ($address['province'] . $address['city'] . $address['district'] . $address['street'] . $address['detail']) : '';
|
|
|
//整理订单数据
|
|
//整理订单数据
|
|
|
$_order = [
|
|
$_order = [
|
|
|
|
|
+ 'product_type' =>$product_type,
|
|
|
'cartInfo' => $merchantCart,
|
|
'cartInfo' => $merchantCart,
|
|
|
'activity_type' => $orderInfo['order_type'],
|
|
'activity_type' => $orderInfo['order_type'],
|
|
|
'commission_rate' => (float)$rate,
|
|
'commission_rate' => (float)$rate,
|
