diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php index 15a6da7e..1ff34999 100644 --- a/app/common/repositories/store/order/StoreOrderCreateRepository.php +++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php @@ -224,6 +224,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository $use_svip = 0; //获取运费规则和统计商品数据 foreach ($merchantCart['list'] as &$cart) { + if ($cart['product_type'] == 10 && $cart['productDiscountAttr']) { $cart['productAttr']['price'] = $cart['productDiscountAttr']['active_price']; @@ -234,8 +235,13 @@ class StoreOrderCreateRepository extends StoreOrderRepository throw new ValidateException('购买商品数必须大于0'); } $svip_discount = 0; - - $price = bcmul($cart['cart_num'], $this->cartByPrice($cart), 2); + $realPrice = $this->cartByPrice($cart); + if ($cart['product_type'] == 98) { + $cart['product']['price'] = $realPrice; + $cart['productAttr']['price'] = $realPrice; + $cart['productAttr']['stock'] = $cart['cart_num']; + } + $price = bcmul($cart['cart_num'], $realPrice, 2); $cart['total_price'] = $price; $cart['postage_price'] = 0; $cart['svip_discount'] = 0; diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php index 1a796b5b..6f012699 100644 --- a/app/controller/api/store/order/StoreOrder.php +++ b/app/controller/api/store/order/StoreOrder.php @@ -64,7 +64,7 @@ class StoreOrder extends BaseController $user = $this->request->userInfo(); $uid = $user->uid; if (!($count = count($cartId)) || $count != count($cartRepository->validIntersection($cartId, $uid))) - return app('json')->fail('数据无效1'); + return app('json')->fail('数据无效'); $orderInfo = $orderCreateRepository->v2CartIdByOrderInfo($user, $cartId, $takes, $couponIds, $useIntegral, $addressId); return app('json')->success($orderInfo);