diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php index 9d28694..6039446 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/ComboController.php @@ -204,6 +204,7 @@ class ComboController extends Controller 'sub_intro' => $Info['sub_intro'], 'desc' => $Info['desc'], 'order' => $Info['order'], + 'sale_count' => $Info['sale_count'], ]); if ($u) { return \Yz::Return(true, "更新完成", []); diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php index 8ad28da..a07d1cf 100644 --- a/Laravel/app/Http/Controllers/API/H5/ComboController.php +++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php @@ -90,13 +90,15 @@ class ComboController extends Controller $sql = $sql . " and a.name like ? "; $canshu[] = '%'.$search.'%'; } - + if (!isset($combo_sort)) { + $sql = $sql . " order by a.order "; + } if (isset($combo_sort)) { if ($combo_sort == 1) { $sql = $sql . " "; } if ($combo_sort == 2) { - $sql = $sql . " "; + $sql = $sql . " order by a.sale_count desc"; } if ($combo_sort == 3) { $sql = $sql . " order by a.price"; @@ -104,6 +106,12 @@ class ComboController extends Controller if ($combo_sort == 4) { $sql = $sql . " order by a.price desc"; } + if ($combo_sort == 5) { + $sql = $sql . " order by b.count desc"; + } + if ($combo_sort == 6) { + $sql = $sql . " order by b.count "; + } } if(isset($keshi_name)){ @@ -139,8 +147,8 @@ class ComboController extends Controller $combos = DB::select("select * from combos as a LEFT JOIN ( -select combo_id as c_id,count(*) as count from orders where status in(2,4) group by combo_id -) as b on a.combo_id=b.c_id where a.status=1 and a.sex in(?,0) " . $sql ." order by a.`order` ", $canshu); +select combo_id as c_id,count(*) as count from combo_items where status in(1) group by combo_id +) as b on a.combo_id=b.c_id where a.status=1 and a.sex in(?,0) " . $sql ." ", $canshu); foreach ($combos as $key => $combo) { $combo->count=$combo->count?$combo->count:0; @@ -214,9 +222,11 @@ select combo_id as c_id,count(*) as count from orders where status in(2,4) group $crowd = DB::table('combo_crowd')->get(); $sort_list = [ ["id" => 1, 'name' => '综合排序'], - ["id" => 2, 'name' => '预约最多'], + ["id" => 2, 'name' => '销售最多'], ["id" => 3, 'name' => '低价优先'], ["id" => 4, 'name' => '高价优先'], + ["id" => 5, 'name' => '项目最多'], + ["id" => 6, 'name' => '项目最少'], ]; $price_list = [ ['name' => '300以下', 'id' => 1], diff --git a/Laravel/app/Http/Controllers/TestController.php b/Laravel/app/Http/Controllers/TestController.php index 3b18d9e..2d54d88 100644 --- a/Laravel/app/Http/Controllers/TestController.php +++ b/Laravel/app/Http/Controllers/TestController.php @@ -25,9 +25,9 @@ class TestController extends Controller // return \Yz::Return(true,"",['data'=>$res]); //退款------------------ $data = [ - 'orderid' => '20241208201000310vDzqKi', - 'refund_order_id' => 'T' . '20241208201000310vDzqKi', - 'refund_amount' => 102300, + 'orderid' => '20241206135049910eRWC5N', + 'refund_order_id' => 'T' . '20241206135049910eRWC5N', + 'refund_amount' => 63610, 'refund_reason' => "体检H5订单退款", ]; $XCX = new XCXApiController(); diff --git a/admin/src/views/ComboMngr/Combo.vue b/admin/src/views/ComboMngr/Combo.vue index 8268c66..10a1803 100644 --- a/admin/src/views/ComboMngr/Combo.vue +++ b/admin/src/views/ComboMngr/Combo.vue @@ -23,6 +23,7 @@ +