|
@@ -124,9 +124,9 @@ class StoreOrderController
|
|
|
$uid = $request->uid();
|
|
|
if (StoreOrder::be(['order_id|unique' => $key, 'uid' => $uid, 'is_del' => 0]))
|
|
|
return app('json')->status('extend_order', '订单已生成', ['orderId' => $key, 'key' => $key]);
|
|
|
- list($addressId, $couponId, $payType, $useIntegral, $mark, $combinationId, $pinkId, $seckill_id, $formId, $bargainId, $shipping_type, $is_consumer) = UtilService::postMore([
|
|
|
+ list($addressId, $couponId, $payType, $useIntegral, $mark, $combinationId, $pinkId, $seckill_id, $formId, $bargainId, $shipping_type, $is_consumer, $offline_type) = UtilService::postMore([
|
|
|
'addressId', 'couponId', ['payType', 'yue'], ['useIntegral', 0], 'mark', ['combinationId', 0], ['pinkId', 0], ['seckill_id', 0], ['formId', ''], ['bargainId', ''],
|
|
|
- ['shipping_type', 1], ['is_consumer', 0]
|
|
|
+ ['shipping_type', 1], ['is_consumer', 0], ['offline_type', 0]
|
|
|
], $request, true);
|
|
|
$payType = strtolower($payType);
|
|
|
if ($bargainId) {
|
|
@@ -148,7 +148,7 @@ class StoreOrderController
|
|
|
if (StoreOrder::getIsOrderPink($pinkId, $request->uid()))
|
|
|
return app('json')->status('ORDER_EXIST', '订单生成失败,你已经参加该团了,请先支付订单', ['orderId' => StoreOrder::getStoreIdPink($pinkId, $request->uid())]);
|
|
|
}
|
|
|
- $priceGroup = StoreOrder::cacheKeyCreateOrder($request->uid(), $key, $addressId, $payType, (int)$useIntegral, $couponId, $mark, $combinationId, $pinkId, $seckill_id, $bargainId, true, 0, $shipping_type, '', '', 0, $is_consumer);
|
|
|
+ $priceGroup = StoreOrder::cacheKeyCreateOrder($request->uid(), $key, $addressId, $payType, (int)$useIntegral, $couponId, $mark, $combinationId, $pinkId, $seckill_id, $bargainId, true, 0, $shipping_type, '', '', 0, $is_consumer, $offline_type);
|
|
|
if ($priceGroup)
|
|
|
return app('json')->status('NONE', 'ok', $priceGroup);
|
|
|
else
|
|
@@ -172,9 +172,9 @@ class StoreOrderController
|
|
|
$uid = $request->uid();
|
|
|
if (StoreOrder::be(['order_id|unique' => $key, 'uid' => $uid, 'is_del' => 0]))
|
|
|
return app('json')->status('extend_order', '订单已生成', ['orderId' => $key, 'key' => $key]);
|
|
|
- list($addressId, $couponId, $payType, $useIntegral, $mark, $combinationId, $pinkId, $seckill_id, $formId, $bargainId, $from, $shipping_type, $real_name, $phone, $storeId, $is_consumer) = UtilService::postMore([
|
|
|
+ list($addressId, $couponId, $payType, $useIntegral, $mark, $combinationId, $pinkId, $seckill_id, $formId, $bargainId, $from, $shipping_type, $real_name, $phone, $storeId, $is_consumer, $offline_type) = UtilService::postMore([
|
|
|
'addressId', 'couponId', 'payType', ['useIntegral', 0], 'mark', ['combinationId', 0], ['pinkId', 0], ['seckill_id', 0], ['formId', ''], ['bargainId', ''], ['from', 'weixin'],
|
|
|
- ['shipping_type', 1], ['real_name', ''], ['phone', ''], ['store_id', 0], ['is_consumer', 0]
|
|
|
+ ['shipping_type', 1], ['real_name', ''], ['phone', ''], ['store_id', 0], ['is_consumer', 0], ['offline_type', 0]
|
|
|
], $request, true);
|
|
|
$payType = strtolower($payType);
|
|
|
if ($bargainId) {
|
|
@@ -202,7 +202,7 @@ class StoreOrderController
|
|
|
elseif ($from == 'weixinh5')
|
|
|
$isChannel = 2;
|
|
|
|
|
|
- $order = StoreOrder::cacheKeyCreateOrder($request->uid(), $key, $addressId, $payType, (int)$useIntegral, $couponId, $mark, $combinationId, $pinkId, $seckill_id, $bargainId, false, $isChannel, $shipping_type, $real_name, $phone, $storeId, $is_consumer);
|
|
|
+ $order = StoreOrder::cacheKeyCreateOrder($request->uid(), $key, $addressId, $payType, (int)$useIntegral, $couponId, $mark, $combinationId, $pinkId, $seckill_id, $bargainId, false, $isChannel, $shipping_type, $real_name, $phone, $storeId, $is_consumer, $offline_type);
|
|
|
|
|
|
if ($order === false) return app('json')->fail(StoreOrder::getErrorInfo('订单生成失败'));
|
|
|
$orderId = $order['order_id'];
|