grade

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

@@ -373,9 +373,9 @@ class HomeController extends Controller
 
 
         if ($province == "全部省份") {
-            $college = MajorInfoModel::where('year', $year)->where('batch', $batch)->where('class', $class)->where('min_grade', "<=", $grade)->groupBy('college')->get();
+            $college = MajorInfoModel::where('year', $year)->where('batch', $batch)->where('class', $class)->where("batch_grade miss_grade", "<=", "$grade - miss_grade")->groupBy('college')->get();
         } else {
-            $college = MajorInfoModel::where('year', $year)->where('batch', $batch)->where('class', $class)->where('province', 'like', '%' . $province . '%')->where('min_grade', "<=", $grade)->groupBy('college')->get();
+            $college = MajorInfoModel::where('year', $year)->where('batch', $batch)->where('class', $class)->where('province', 'like', '%' . $province . '%')->where("batch_grade", "<=", "$grade - miss_grade")->groupBy('college')->get();
         }
 
         $college_count = count($college);
@@ -470,9 +470,9 @@ class HomeController extends Controller
 
 
             if ($province == "全部省份") {
-                $major = MajorInfoModel::where('year', $year)->where('batch', $batch)->where('class', $class)->where('min_grade', "<=", $grade)->paginate(10);
+                $major = MajorInfoModel::where('year', $year)->where('batch', $batch)->where('class', $class)->where('batch_grade', "<=", "$grade - miss_grade")->paginate(10);
             } else {
-                $major = MajorInfoModel::where('year', $year)->where('batch', $batch)->where('class', $class)->where('province', 'like', '%' . $province . '%')->where('min_grade', "<=", $grade)->paginate(10);
+                $major = MajorInfoModel::where('year', $year)->where('batch', $batch)->where('class', $class)->where('province', 'like', '%' . $province . '%')->where('batch_grade', "<=", "$grade - miss_grade")->paginate(10);
             }
 
             $count = count($major);

database/migrations/2018_06_08_091607_create_ord_info_table.php

@@ -18,7 +18,7 @@ class CreateOrdInfoTable extends Migration
             $table->string('order_no',64)->comment('订单号');
             $table->double('price')->comment('支付金额');
             $table->integer('user_id')->comment('用户ID');
-            $table->integer('code')->comment('推荐码');
+            $table->string('code',32)->comment('推荐码');
 
             $table->softDeletes();
             $table->timestamps();