|
|
@@ -51,7 +51,7 @@ class ReturnExchangeOrderService extends Service
|
|
|
'return_or_exchange' => ReturnExchangeOrderProductInfo::type_one,
|
|
|
'crt_time' => $time,
|
|
|
'storehouse_id' => $data['storehouse_id'] ?? 0,
|
|
|
- 'basic_type_id' => $value['basic_type_id'],
|
|
|
+ 'basic_type_id' => $value['basic_type_id'] ?? 0,
|
|
|
'price' => $value['price'],
|
|
|
'final_amount' => $value['final_amount'] ?? 0,
|
|
|
'return_exchange_price' => $value['return_exchange_price'],
|
|
|
@@ -63,6 +63,7 @@ class ReturnExchangeOrderService extends Service
|
|
|
if(! empty($data['product_two'])){
|
|
|
$sub = [];
|
|
|
foreach ($data['product_two'] as $value){
|
|
|
+ if(empty($value['product_id'])) continue;
|
|
|
$sub[] = [
|
|
|
'return_exchange_id' => $material_model->id,
|
|
|
'product_id' => $value['product_id'],
|
|
|
@@ -73,11 +74,11 @@ class ReturnExchangeOrderService extends Service
|
|
|
'return_or_exchange' => ReturnExchangeOrderProductInfo::type_two,
|
|
|
'crt_time' => $time,
|
|
|
'storehouse_id' => $data['storehouse_id'] ?? 0,
|
|
|
- 'basic_type_id' => $value['basic_type_id'],
|
|
|
+ 'basic_type_id' => $value['basic_type_id'] ?? 0,
|
|
|
'price' => $value['price'],
|
|
|
];
|
|
|
}
|
|
|
- ReturnExchangeOrderProductInfo::insert($sub);
|
|
|
+ if(! empty($sub)) ReturnExchangeOrderProductInfo::insert($sub);
|
|
|
}
|
|
|
|
|
|
//锁定库存
|
|
|
@@ -128,7 +129,7 @@ class ReturnExchangeOrderService extends Service
|
|
|
'return_or_exchange' => ReturnExchangeOrderProductInfo::type_one,
|
|
|
'crt_time' => $time,
|
|
|
'storehouse_id' => $data['storehouse_id'] ?? 0,
|
|
|
- 'basic_type_id' => $value['basic_type_id'],
|
|
|
+ 'basic_type_id' => $value['basic_type_id'] ?? 0,
|
|
|
'price' => $value['price'],
|
|
|
'final_amount' => $value['final_amount'] ?? 0,
|
|
|
'return_exchange_price' => $value['return_exchange_price'],
|
|
|
@@ -140,6 +141,7 @@ class ReturnExchangeOrderService extends Service
|
|
|
if(! empty($data['product_two'])){
|
|
|
$sub = [];
|
|
|
foreach ($data['product_two'] as $value){
|
|
|
+ if(empty($value['product_id'])) continue;
|
|
|
$sub[] = [
|
|
|
'return_exchange_id' => $material_model->id,
|
|
|
'product_id' => $value['product_id'],
|
|
|
@@ -150,11 +152,11 @@ class ReturnExchangeOrderService extends Service
|
|
|
'return_or_exchange' => ReturnExchangeOrderProductInfo::type_two,
|
|
|
'crt_time' => $time,
|
|
|
'storehouse_id' => $data['storehouse_id'] ?? 0,
|
|
|
- 'basic_type_id' => $value['basic_type_id'],
|
|
|
+ 'basic_type_id' => $value['basic_type_id'] ?? 0,
|
|
|
'price' => $value['price'],
|
|
|
];
|
|
|
}
|
|
|
- ReturnExchangeOrderProductInfo::insert($sub);
|
|
|
+ if(! empty($sub)) ReturnExchangeOrderProductInfo::insert($sub);
|
|
|
}
|
|
|
|
|
|
//锁定库存
|
cqpCow