update

app/Http/Controllers/Api/V1/OrderController.php

@@ -220,7 +220,7 @@ class OrderController extends AuthController
             $orderPatient = OrderPatient::create($addPatient);
             //保存订单疫苗信息
             if ($req['product_type'] == 4) {
-                $addVaccine = Vaccine::join('organization_vaccines', 'organization_vaccines.vaccine_id', '=', 'vaccines.id')->select(['vaccines.id as vaccine_id', 'organization_vaccines.type as vaccine_type', 'organization_vaccines.price as vaccine_price', 'vaccines.name as vaccine_name', 'organization_vaccines.remark as vaccine_remark', 'organization_vaccines.supplier as vaccine_supplier'])->where('organization_vaccines.org_id', $req['organization_id'])->where('organization_vaccines.vaccine_id', $req['vaccine_id'])->first()->getOriginal();
+                $addVaccine = Vaccine::select(['id as vaccine_id', 'type as vaccine_type', 'price as vaccine_price', 'name as vaccine_name', 'remark as vaccine_remark', 'supplier as vaccine_supplier'])->where('id', $req['vaccine_id'])->where('org_id', $req['organization_id'])->first()->getOriginal();
                 $addVaccine['order_id'] = $order['id'];
                 $addVaccine['order_patient_id'] = $orderPatient['id'];
                 $addVaccine = array_filter($addVaccine);

app/Http/Controllers/Api/V1/VaccineController.php

@@ -22,19 +22,19 @@ class VaccineController extends AuthController
             'sort_type' => 'in:0,1,2',
         ]);
 
-        $builder = Vaccine::join('organization_vaccines', 'organization_vaccines.vaccine_id', '=', 'vaccines.id')->select(['vaccines.id', 'organization_vaccines.id as organization_vaccine_id', 'organization_vaccines.type', 'organization_vaccines.price', 'vaccines.name', 'organization_vaccines.remark', 'organization_vaccines.supplier', 'vaccines.stock'])->where('vaccines.stock', '>', 0)->where('organization_vaccines.org_id', $req['organization_id']);
+        $builder = Vaccine::select(['id', 'type', 'price', 'name', 'remark', 'supplier', 'stock'])->where('stock', '>', 0)->where('org_id', $req['organization_id']);
         if (!empty($req['type'])) {
-            $builder->where('organization_vaccines.type', $req['type']);
+            $builder->where('type', $req['type']);
         }
         if (!empty($req['name'])) {
-            $builder->where('vacciness.name', 'like', '%'.$req['name'].'%');
+            $builder->where('name', 'like', '%'.$req['name'].'%');
         }
         if (!empty($req['sort_type'])) {
             if ($req['sort_type'] == 1) {
-                $builder->orderBy('organization_vaccines.price', 'asc');
+                $builder->orderBy('price', 'asc');
             }
             elseif ($req['sort_type'] == 2) {
-                $builder->orderBy('organization_vaccines.price', 'desc');
+                $builder->orderBy('price', 'desc');
             }
         }