pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

Fix

release
李静 2021-12-28 11:13:14 +08:00
parent e56998ff39
commit c754906de4
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Services/OrderService.php
View File

@ -7,7 +7,6 @@ use App\Endpoint\Api\Http\Resources\ShippingAddressResource;
use App\Endpoint\Api\Http\Resources\UserCouponResource; use App\Endpoint\Api\Http\Resources\UserCouponResource;
use App\Exceptions\BizException; use App\Exceptions\BizException;
use App\Exceptions\ShippingNotSupportedException; use App\Exceptions\ShippingNotSupportedException;
use App\Models\Coupon;
use App\Models\DistributionPreIncomeJob; use App\Models\DistributionPreIncomeJob;
use App\Models\Order; use App\Models\Order;
use App\Models\OrderProduct; use App\Models\OrderProduct;
@ -162,7 +161,7 @@ class OrderService
* @param int $vipDiscountAmount * @param int $vipDiscountAmount
* @param int $shippingFee * @param int $shippingFee
* @param string|null $note * @param string|null $note
* @param \App\Models\Coupon|null $coupon * @param \App\Models\UserCoupon|null $coupon
* @return \App\Models\Order * @return \App\Models\Order
*/ */
protected function storeOrder( protected function storeOrder(
@ -173,7 +172,7 @@ class OrderService
int $vipDiscountAmount, int $vipDiscountAmount,
int $shippingFee, int $shippingFee,
?string $note = null, ?string $note = null,
?Coupon $coupon = null, ?UserCoupon $coupon = null,
): Order { ): Order {
// 订单支付金额=商品总额-券折扣金额-会员折扣金额+邮费 // 订单支付金额=商品总额-券折扣金额-会员折扣金额+邮费
$totalAmount = $productsTotalAmount - $couponDiscountAmount - $vipDiscountAmount; $totalAmount = $productsTotalAmount - $couponDiscountAmount - $vipDiscountAmount;