mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整下单校验

Browse Source
This commit is contained in:
luofei 2024-01-21 17:36:16 +08:00
parent d605bf2627
commit c2d403039c
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/common/repositories/store/order/StoreOrderCreateRepository.php
View File

@ -73,6 +73,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
//虚拟订单自定义数据 //虚拟订单自定义数据
$order_extend = []; $order_extend = [];
//检查商品类型, 活动商品只能单独购买 //检查商品类型, 活动商品只能单独购买
$allowDelivery = true;
foreach ($merchantCartList as $merchantCart) { foreach ($merchantCartList as $merchantCart) {
if (($merchantCart['type_id'] != Merchant::TypeSupplyChain) && $address) { if (($merchantCart['type_id'] != Merchant::TypeSupplyChain) && $address) {
@ -108,7 +109,6 @@ class StoreOrderCreateRepository extends StoreOrderRepository
if ($cart['product']['extend']) { if ($cart['product']['extend']) {
$order_extend = json_decode($cart['product']['extend'], true); $order_extend = json_decode($cart['product']['extend'], true);
} }
$allowDelivery = true;
if ($address) { if ($address) {
if ($cart['source'] == 0 || $cart['source'] == 103) { if ($cart['source'] == 0 || $cart['source'] == 103) {
$userAddressCode = ($address['province_code'] ?? '') . ',' . ($address['city_code'] ?? '') . ',' . ($address['district_code'] ?? '') . ',' . ($address['street_code'] ?? '') . ',' . ($address['village_code'] ?? '') . ',' . ($address['brigade_id'] ?? 0); $userAddressCode = ($address['province_code'] ?? '') . ',' . ($address['city_code'] ?? '') . ',' . ($address['district_code'] ?? '') . ',' . ($address['street_code'] ?? '') . ',' . ($address['village_code'] ?? '') . ',' . ($address['brigade_id'] ?? 0);
@ -196,11 +196,11 @@ class StoreOrderCreateRepository extends StoreOrderRepository
$merTake = $merTake && $proTake; $merTake = $merTake && $proTake;
$proDelivery = (!count($delivery_way) || in_array('2', $delivery_way, true)); $proDelivery = (!count($delivery_way) || in_array('2', $delivery_way, true));
$merDelivery = $merDelivery && $proDelivery; $merDelivery = $merDelivery && $proDelivery;
$merchantCart['list'][$k]['allow_take'] = $proTake; $merchantCart['list'][$k]['allow_take'] = true;
$merchantCart['list'][$k]['allow_delivery'] = $proDelivery; $merchantCart['list'][$k]['allow_delivery'] = $allowDelivery;
} else { } else {
$merchantCart['list'][$k]['allow_take'] = $_merTake; $merchantCart['list'][$k]['allow_take'] = true;
$merchantCart['list'][$k]['allow_delivery'] = $_merDelivery; $merchantCart['list'][$k]['allow_delivery'] = $allowDelivery;
} }
if ($createOrder && $isTake && !$merTake) { if ($createOrder && $isTake && !$merTake) {
$deliveryStatus = false; $deliveryStatus = false;
@ -669,8 +669,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
'key', 'key',
'platformConsumption', 'platformConsumption',
'consumption_money', 'consumption_money',
'consumption_id', 'consumption_id'
'allowDelivery'
) + ['allow_address' => !$allow_no_address, 'order_delivery_status' => $orderDeliveryStatus]; ) + ['allow_address' => !$allow_no_address, 'order_delivery_status' => $orderDeliveryStatus];
} }