|
@@ -75,7 +75,8 @@ class StoreOrderController
|
|
|
$bargain_id = StoreCart::where('id', $cartId)->value('bargain_id');
|
|
$bargain_id = StoreCart::where('id', $cartId)->value('bargain_id');
|
|
|
}
|
|
}
|
|
|
$data['deduction'] = $seckill_id || $combination_id || $bargain_id;
|
|
$data['deduction'] = $seckill_id || $combination_id || $bargain_id;
|
|
|
- $data['usableCoupon'] = $usableCoupon;
|
|
|
|
|
|
|
+// $data['usableCoupon'] = $usableCoupon;
|
|
|
|
|
+ $data['usableCoupon'] = 0;
|
|
|
$data['addressInfo'] = UserAddress::getUserDefaultAddress($uid);
|
|
$data['addressInfo'] = UserAddress::getUserDefaultAddress($uid);
|
|
|
$data['seckill_id'] = $seckill_id;
|
|
$data['seckill_id'] = $seckill_id;
|
|
|
$data['combination_id'] = $combination_id;
|
|
$data['combination_id'] = $combination_id;
|