|
@@ -190,13 +190,13 @@ class FinancialManager extends Base{
|
|
|
if($product->is_combind==1){
|
|
|
$rednum=$data['balance_num'];
|
|
|
if($product->ProductsCombind->isEmpty()) throw new \Exception('组合商品未找到明细');
|
|
|
- $product->ProductsCombind->each(function ($item) use ($rednum, &$productID,$data) {
|
|
|
+ $product->ProductsCombind->each(function ($item) use ($rednum, &$productID,$data) {
|
|
|
ProductStock::AddStock($item->child_id, $rednum * $item->child_num);
|
|
|
- $productID[] = ['product_id' => $item->child_id, 'type'=>1,'num' => $rednum * $item->child_num,'apply_id'=>$data['apply_id'], 'apply_name'=>$data['apply_name']];
|
|
|
+ $productID[] = ['product_id' => $item->child_id, 'type'=>1,'status'=>1,'num' => $rednum * $item->child_num,'apply_id'=>$data['apply_id'], 'apply_name'=>$data['apply_name']];
|
|
|
});
|
|
|
}else{
|
|
|
ProductStock::AddStock($product->id,$data['balance_num']);
|
|
|
- $productID[]=["product_id"=>$product->id,"type"=>1,"num"=>$data['balance_num'],'apply_id'=>$data['apply_id'], 'apply_name'=>$data['apply_name']];
|
|
|
+ $productID[]=["product_id"=>$product->id,"type"=>1,'status'=>1,"num"=>$data['balance_num'],'apply_id'=>$data['apply_id'], 'apply_name'=>$data['apply_name']];
|
|
|
}
|
|
|
$data['balance_num']="0";
|
|
|
$data['status']=2;
|
|
@@ -264,12 +264,13 @@ class FinancialManager extends Base{
|
|
|
$productID=ProductsCombind::CombindSubStock($product->id,$rednum);
|
|
|
array_map(function (&$item) use ($mainData){
|
|
|
ProductStock::OutStock($item['product_id'], $item['num']);
|
|
|
+ $item['status']=1;
|
|
|
$item['apply_id']=$mainData['apply_id'];
|
|
|
$item['apply_name']=$mainData['apply_name'];
|
|
|
},$productID);
|
|
|
}else{
|
|
|
ProductStock::OutStock($product->id, $rednum);
|
|
|
- $productID[] = ['product_id' => $product->id, 'type'=>2,'num' => $rednum,'apply_id'=>$mainData['apply_id'], 'apply_name'=>$mainData['apply_name']];
|
|
|
+ $productID[] = ['product_id' => $product->id, 'type'=>2,'status'=>1,'num' => $rednum,'apply_id'=>$mainData['apply_id'], 'apply_name'=>$mainData['apply_name']];
|
|
|
}
|
|
|
// $mainData['manager_status']=$mainData['balance_num']=='0'?1:2;
|
|
|
} else {
|