|
|
@@ -76,7 +76,7 @@ class StoreOrder extends BaseController
|
|
76
|
76
|
|
|
77
|
77
|
if (!($count = count($cartId)) || $count != count($cartRepository->validIntersection($cartId, $uid)))
|
|
78
|
78
|
return app('json')->fail('已失效或已下单');
|
|
79
|
|
- $orderInfo = $this->repository->cartIdByOrderInfo($uid, $cartId, $addressId,true,$psType,'',$is_commercetrade);
|
|
|
79
|
+ $orderInfo = $this->repository->cartIdByOrderInfo($uid, $cartId, $addressId,true,$psType,'','',$is_commercetrade);
|
|
80
|
80
|
$orderInfo['product_type']=0;
|
|
81
|
81
|
if($this->source=='yhc'){
|
|
82
|
82
|
$product_type=Db::name('store_cart')->alias('c')->join('store_product p','c.product_id=p.product_id')->whereIn('cart_id',$cartId)->column('p.type');
|