|
@@ -63,8 +63,8 @@ class StoreOrderController
|
|
|
'offlinePostage' => sys_config('offline_postage'),
|
|
'offlinePostage' => sys_config('offline_postage'),
|
|
|
'integralRatio' => sys_config('integral_ratio')
|
|
'integralRatio' => sys_config('integral_ratio')
|
|
|
];
|
|
];
|
|
|
-// $usableCoupons = StoreCouponUser::getUsableCouponList($uid, $cartGroup, $priceGroup['totalPrice']);
|
|
|
|
|
-// $usableCoupon = isset($usableCoupons[0]) ? $usableCoupons[0] : null;
|
|
|
|
|
|
|
+ $usableCoupons = StoreCouponUser::getUsableCouponList($uid, $cartGroup, $priceGroup['totalPrice']);
|
|
|
|
|
+ $usableCoupon = isset($usableCoupons[0]) ? $usableCoupons[0] : null;
|
|
|
$cartIdA = explode(',', $cartId);
|
|
$cartIdA = explode(',', $cartId);
|
|
|
$seckill_id = 0;
|
|
$seckill_id = 0;
|
|
|
$combination_id = 0;
|
|
$combination_id = 0;
|
|
@@ -75,8 +75,7 @@ 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'] = 0;
|
|
|
|
|
|
|
+ $data['usableCoupon'] = $usableCoupon;
|
|
|
$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;
|