ad

app/admin/controller/Purchin.php

@@ -662,18 +662,8 @@ class Purchin extends Base
 //                        $order = ["order_code" => $good['spuCode'], "status" => 1, "action_remark" => '', "action_type" => "edit"];
                     }
                     $good['wait_in_stock'] -= $send_num;
-//                    if ($good['presale_stock'] > 0) {
-//                        if ($good['presale_stock'] >= $send_num) {
-//                            $good['presale_stock'] -= $send_num;
-//                            $good['wait_out_stock'] += $send_num;
-//                        } else {
-//                            $good['presale_stock'] = 0;
-//                            $good['usable_stock'] += $send_num - $good['presale_stock'];
-//                            $good['wait_out_stock'] += $good['presale_stock'];
-//                        }
-//                    } else {
                     $good['usable_stock'] += $send_num;
-//                    }
+
 
                     $good['total_stock'] = $good['usable_stock'] + $good['wait_out_stock'];
                     $good['updatetime'] = date("Y-m-d H:i:s");

app/youzan/logic/Goodup.php

@@ -180,8 +180,12 @@ class Goodup
                     $iso = Db::name("good")->where(["spuCode" => $value['spuCode'], "is_del" => 0])->find();
                     if ($iso == false) {
                         unset($value['id']);
-                        $value['addtime'] = date("Y-m-d H:i:s");
-                        $value['updatetime'] = date("Y-m-d H:i:s");
+                        $stock_num = Db::name('good_stock')->alias("a")
+                            ->leftJoin("warehouse_info b","a.wsm_code=b.wsm_code")
+                            ->where(['a.is_del' => 0, 'a.spuCode' =>$value['spuCode'],"b.wsm_type"=>[2,5]])->sum('usable_stock');
+                        $value['usable_stock'] =$stock_num;
+                        $value['addtime']=date("Y-m-d H:i:s");
+                        $value['updatetime']=date("Y-m-d H:i:s");
                     } else {
                         $value['id'] = $iso['id'];
                         $value['updatetime'] = date("Y-m-d H:i:s");