fix : order list

app/Service/Admin/Order/OrderListService.php

@@ -68,6 +68,18 @@ class OrderListService extends BaseService
             ->when($this->request->input('search_kitchen_id'), function ($query) {
                 $query->where('kitchen_id', $this->request->input('search_kitchen_id'));
             })
+            ->when($this->request->input('search_order_sno'), function ($query) {
+                $searchOrderSno = $this->request->input('search_order_sno');
+                $query->where('order_sno', 'like', "$searchOrderSno%");
+            })
+            ->when($this->request->input('search_create_time'), function ($query) {
+                $searchCreateTime = $this->request->input('search_create_time');
+                $query->whereBetween('create_time', [reset($searchCreateTime), end($searchCreateTime)]);
+            })
+            ->when($this->request->input('search_pay_time'), function ($query) {
+                $searchPayTime = $this->request->input('search_pay_time');
+                $query->whereBetween('pay_time', [reset($searchPayTime), end($searchPayTime)]);
+            })
             ->select([
                 'id',
                 'cycle_id',

app/Service/Api/Order/ConfirmationOrderService.php

@@ -72,7 +72,20 @@ class ConfirmationOrderService extends BaseOrderService
         foreach ($filtered as &$value) {
             $value['amount'] = match ($value['coupon_type']) {
                 CouponCode::COUPON_TYPE_INSTANT_REDUCTION => $value['amount'],
-                CouponCode::COUPON_TYPE_DISCOUNT => bcmul(bcsub("1", (string)$value['ratio'],2),(string)$orderMaxPrice,2),
+//                CouponCode::COUPON_TYPE_DISCOUNT => bcmul(bcsub("100", (string)$value['ratio'],2),(string)$orderMaxPrice,2),
+                CouponCode::COUPON_TYPE_DISCOUNT => bcmul(
+                    bcdiv(
+                        bcsub(
+                            "100",
+                            (string)$value['ratio'],
+                            2
+                        ),
+                        "100",
+                        2
+                    ),
+                    bcadd((string)max(array_column($this->orderRes['good'],'price')),(string)$this->orderRes['sundry_price'],2),
+                    2
+                ),
                 default => 0
             };