From cdcbb0256bfe5bece4790251e41b7ca15be16294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= Date: Tue, 28 Dec 2021 09:35:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Account/WalletController.php | 3 ++- app/Helpers/Numeric.php | 21 ------------------- app/Models/Order.php | 13 ++++++------ app/Models/UserCoupon.php | 9 ++++---- app/Models/WalletLog.php | 3 +-- app/Services/OrderService.php | 11 +++++----- 6 files changed, 19 insertions(+), 41 deletions(-) delete mode 100644 app/Helpers/Numeric.php diff --git a/app/Endpoint/Api/Http/Controllers/Account/WalletController.php b/app/Endpoint/Api/Http/Controllers/Account/WalletController.php index 9dc11e31..5ec2642c 100644 --- a/app/Endpoint/Api/Http/Controllers/Account/WalletController.php +++ b/app/Endpoint/Api/Http/Controllers/Account/WalletController.php @@ -88,13 +88,14 @@ class WalletController extends Controller { $validated = $request->validate([ 'pay_sn' => ['bail', 'required'], + 'pay_way' => ['bail', 'required'], ]); $user = $request->user(); try { DB::transaction(function () use ($user, $validated) { - $payLog = PayLog::where('pay_sn', $validated['pay_sn'])->lockForUpdate()->firstOrFail(); + $payLog = PayLog::where('pay_sn', $validated['pay_sn'])->where('pay_way', $validated['pay_way'])->lockForUpdate()->firstOrFail(); $payable = $payLog->payable; diff --git a/app/Helpers/Numeric.php b/app/Helpers/Numeric.php deleted file mode 100644 index 359a017d..00000000 --- a/app/Helpers/Numeric.php +++ /dev/null @@ -1,21 +0,0 @@ -attributes['coupon_discount_amount'], 100, 2)); + return trim_trailing_zeros(bcdiv($this->attributes['coupon_discount_amount'], 100, 2)); } /** @@ -273,7 +272,7 @@ class Order extends Model */ public function getVipDiscountAmountFormatAttribute() { - return Numeric::trimTrailingZero(bcdiv($this->attributes['vip_discount_amount'], 100, 2)); + return trim_trailing_zeros(bcdiv($this->attributes['vip_discount_amount'], 100, 2)); } /** @@ -283,7 +282,7 @@ class Order extends Model */ public function getReducedAmountFormatAttribute() { - return Numeric::trimTrailingZero(bcdiv($this->attributes['reduced_amount'], 100, 2)); + return trim_trailing_zeros(bcdiv($this->attributes['reduced_amount'], 100, 2)); } /** @@ -293,7 +292,7 @@ class Order extends Model */ public function getShippingFeeFormatAttribute() { - return Numeric::trimTrailingZero(bcdiv($this->attributes['shipping_fee'], 100, 2)); + return trim_trailing_zeros(bcdiv($this->attributes['shipping_fee'], 100, 2)); } /** @@ -303,7 +302,7 @@ class Order extends Model */ public function getTotalAmountFormatAttribute() { - return Numeric::trimTrailingZero(bcdiv($this->attributes['total_amount'], 100, 2)); + return trim_trailing_zeros(bcdiv($this->attributes['total_amount'], 100, 2)); } /** @@ -313,7 +312,7 @@ class Order extends Model */ public function getProductsTotalAmountFormatAttribute() { - return Numeric::trimTrailingZero(bcdiv($this->attributes['products_total_amount'], 100, 2)); + return trim_trailing_zeros(bcdiv($this->attributes['products_total_amount'], 100, 2)); } /** diff --git a/app/Models/UserCoupon.php b/app/Models/UserCoupon.php index 70106c8b..3b80e851 100644 --- a/app/Models/UserCoupon.php +++ b/app/Models/UserCoupon.php @@ -2,7 +2,6 @@ namespace App\Models; -use App\Helpers\Numeric as NumericHelper; use EloquentFilter\Filterable; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; @@ -142,10 +141,12 @@ class UserCoupon extends Model // 如果是折扣券 if ($this->isDiscountCoupon()) { - return NumericHelper::trimTrailingZero(bcdiv($value, 10, 1)); + $value = bcdiv($value, 10, 1); + } else { + $value = bcdiv($value, 100, 2); } - return NumericHelper::trimTrailingZero(bcdiv($value, 100, 2)); + return trim_trailing_zeros($value); } /** @@ -155,7 +156,7 @@ class UserCoupon extends Model */ public function getCouponThresholdFormatAttribute(): string { - return NumericHelper::trimTrailingZero( + return trim_trailing_zeros( bcdiv($this->attributes['coupon_threshold'], 100, 2) ); } diff --git a/app/Models/WalletLog.php b/app/Models/WalletLog.php index a32b8736..c9d58a92 100644 --- a/app/Models/WalletLog.php +++ b/app/Models/WalletLog.php @@ -2,7 +2,6 @@ namespace App\Models; -use App\Helpers\Numeric; use Illuminate\Database\Eloquent\Model; class WalletLog extends Model @@ -29,6 +28,6 @@ class WalletLog extends Model */ public function getChangeBalanceFormatAttribute() { - return Numeric::trimTrailingZero(bcdiv($this->attributes['change_balance'], 100, 2)); + return trim_trailing_zeros(bcdiv($this->attributes['change_balance'], 100, 2)); } } diff --git a/app/Services/OrderService.php b/app/Services/OrderService.php index db83d620..d0895223 100644 --- a/app/Services/OrderService.php +++ b/app/Services/OrderService.php @@ -7,7 +7,6 @@ use App\Endpoint\Api\Http\Resources\ShippingAddressResource; use App\Endpoint\Api\Http\Resources\UserCouponResource; use App\Exceptions\BizException; use App\Exceptions\ShippingNotSupportedException; -use App\Helpers\Numeric; use App\Models\Coupon; use App\Models\DistributionPreIncomeJob; use App\Models\Order; @@ -467,11 +466,11 @@ class OrderService 'coupons' => UserCouponResource::collection((new CouponService())->getAvailableCoupons($user, $products)), 'shipping_address' => $shippingAddress ? ShippingAddressResource::make($shippingAddress) : null, // 收货地址 'shipping_supported' => $shippingSupported, - 'shipping_fee' => Numeric::trimTrailingZero(bcdiv($shippingFee, 100, 2)), // 运费 - 'products_total_amount' => Numeric::trimTrailingZero(bcdiv($productsTotalAmount, 100, 2)), // 商品总额 - 'vip_discount_amount' => Numeric::trimTrailingZero(bcdiv($vipDiscountAmount, 100, 2)), // 会员折扣金额 - 'coupon_discount_amount' => Numeric::trimTrailingZero(bcdiv($couponDiscountAmount, 100, 2)), // 优惠券折扣金额 - 'total_amount' => Numeric::trimTrailingZero(bcdiv($totalAmount, 100, 2)), // 实付金额 + 'shipping_fee' => trim_trailing_zeros(bcdiv($shippingFee, 100, 2)), // 运费 + 'products_total_amount' => trim_trailing_zeros(bcdiv($productsTotalAmount, 100, 2)), // 商品总额 + 'vip_discount_amount' => trim_trailing_zeros(bcdiv($vipDiscountAmount, 100, 2)), // 会员折扣金额 + 'coupon_discount_amount' => trim_trailing_zeros(bcdiv($couponDiscountAmount, 100, 2)), // 优惠券折扣金额 + 'total_amount' => trim_trailing_zeros(bcdiv($totalAmount, 100, 2)), // 实付金额 ]; }