diff --git a/app/common/dao/store/consumption/StoreConsumptionUserDao.php b/app/common/dao/store/consumption/StoreConsumptionUserDao.php index 646c7cf8..d89aef54 100755 --- a/app/common/dao/store/consumption/StoreConsumptionUserDao.php +++ b/app/common/dao/store/consumption/StoreConsumptionUserDao.php @@ -350,7 +350,7 @@ class StoreConsumptionUserDao extends BaseDao $groupOrderTotalPrice = $this->groupOrderTotalPrice * 100; $consumptionBalance = $this->consumptionTotalAmount * 100; $rate = bcdiv($orderTotalPrice, $groupOrderTotalPrice, 5); - if ($consumptionBalance >= $orderTotalPrice) { + if ($consumptionBalance >= $groupOrderTotalPrice) { $useAmount = $orderTotalPrice; } else { $useAmount = $this->isLast ? $consumptionBalance : ceil(bcmul($consumptionBalance, $rate, 5)); diff --git a/app/common/repositories/store/order/StoreCartRepository.php b/app/common/repositories/store/order/StoreCartRepository.php index 06b0d220..8c1ff748 100755 --- a/app/common/repositories/store/order/StoreCartRepository.php +++ b/app/common/repositories/store/order/StoreCartRepository.php @@ -58,6 +58,7 @@ class StoreCartRepository extends BaseRepository public function checkCartList($res, $hasCoupon = 0, $user = null) { $arr = $fail = []; + /** @var ProductRepository $product_make */ $product_make = app()->make(ProductRepository::class); $svip_status = ($user && $user->is_svip > 0 && systemConfig('svip_switch_status')) ? true : false; foreach ($res as $item) { diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php index e08b60a7..d853e6d1 100755 --- a/app/common/repositories/store/order/StoreOrderCreateRepository.php +++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php @@ -53,6 +53,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository $addressRepository = app()->make(UserAddressRepository::class); $address = $addressRepository->getWhere(['uid' => $uid, 'address_id' => $addressId]); } + /** @var StoreCartRepository $storeCartRepository */ $storeCartRepository = app()->make(StoreCartRepository::class); $res = $storeCartRepository->checkCartList($storeCartRepository->cartIbByData($cartId, $uid, $address), 0, $user); $merchantCartList = $res['list'];