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

Update

base
Jing Li 2023-10-18 11:51:19 +08:00
parent 706cf3f739
commit 61b32d6f8e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Endpoint/Api/Http/Controllers/Order/OrderVerifyController.php
View File

@ -6,9 +6,9 @@ use App\Endpoint\Api\Http\Controllers\Controller;
use App\Exceptions\BizException; use App\Exceptions\BizException;
use App\Models\OrderPre; use App\Models\OrderPre;
use App\Models\ProductSku; use App\Models\ProductSku;
use App\Models\Store\ProductSku as StoreProductSku;
use App\Services\OrderService; use App\Services\OrderService;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Models\Store\ProductSku as StoreProductSku;
class OrderVerifyController extends Controller class OrderVerifyController extends Controller
{ {
@ -35,7 +35,7 @@ class OrderVerifyController extends Controller
'quantity' => $item['quantity'] 'quantity' => $item['quantity']
]); ]);
} }
return response()->json($orderService->verifyOrder($user, $products, $request->input('shipping_address_id'), $request->input('coupon_id'), null)); return response()->json($orderService->verifyOrder($user, $products, $request->input('shipping_address_id'), $request->input('coupon_id'), null, $request->input('ignore_shipping_fee', false)));
} }
if ($request->filled('store_id')) { if ($request->filled('store_id')) {
@ -49,7 +49,7 @@ class OrderVerifyController extends Controller
'quantity' => $item['quantity'] 'quantity' => $item['quantity']
]); ]);
} }
return response()->json($orderService->verifyOrder($user, $products, $request->input('shipping_address_id'), $request->input('coupon_id'), null)); return response()->json($orderService->verifyOrder($user, $products, $request->input('shipping_address_id'), $request->input('coupon_id'), null, $request->input('ignore_shipping_fee', false)));
} }
$rules = [ $rules = [
'coupon_id' => ['bail', 'nullable', 'int'], 'coupon_id' => ['bail', 'nullable', 'int'],

3
app/Services/OrderService.php
View File

@ -784,6 +784,7 @@ class OrderService
?int $shippingAddressId = null, ?int $shippingAddressId = null,
?int $couponId = null, ?int $couponId = null,
?int $bargainOrderId = null, ?int $bargainOrderId = null,
bool $ignoreShippingFee = false,
): array { ): array {
// 获取收货地址 // 获取收货地址
$shippingAddress = $this->getShippingAddress($user, $shippingAddressId); $shippingAddress = $this->getShippingAddress($user, $shippingAddressId);
@ -807,7 +808,7 @@ class OrderService
// 运费 // 运费
$shippingFee = 0; $shippingFee = 0;
if ($shippingAddress) { if (! $ignoreShippingFee && $shippingAddress) {
try { try {
$shippingFee = $this->calculateShippingFee($mapProducts, $shippingAddress); $shippingFee = $this->calculateShippingFee($mapProducts, $shippingAddress);
} catch (ShippingNotSupportedException $e) { } catch (ShippingNotSupportedException $e) {