fix : order list

app/Model/UserSite.php

@@ -91,6 +91,6 @@ class UserSite extends Model
      */
     public function getUserDefaultInfoByUserId(int $userId)
     {
-        return $this->where('user_id', $userId)->where('is_default',SiteCode::USER_NO_DEFAULT)->first();
+        return $this->where('user_id', $userId)->where('is_default',SiteCode::USER_DEFAULT)->first();
     }
 }

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/Admin/Statement/FinancesService.php

@@ -47,7 +47,7 @@ class FinancesService extends BaseService
             ->when($searchKitchenId, function ($query) use ($searchKitchenId) {
                 $query->where('kitchen_id', $searchKitchenId);
             })
-            ->groupBy('cycle_id')
+            ->groupBy('cycle_id','date')
             ->orderByDesc('cycle_id')
             ->select(
                 'date',

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
             };
 

app/Service/Api/Order/OrderInfoService.php

@@ -156,11 +156,11 @@ class OrderInfoService extends BaseService
 
         for ($i = 1; $i <= (count($newOrderSkuList) ?? 0); $i++) {
 
-            $pickupCodeOneCopies = $pickupCodeArrList[$order['id']][$i]['pickup_code'] ?? null;
+            $pickupCodeOneCopies = $pickupCodeList[$i] ?? null;
             $boxNum = 0;
             if (!empty($pickupCodeOneCopies)) {
                 $pickupCodeOneCopiesArr = explode('-', $pickupCodeOneCopies);
-                $boxNum = ceil(end($pickupCodeOneCopiesArr) ?? '0' / (int)$this->configCache->getConfigValueByKey(ConfigCode::MAXIMUM_VALUE_IN_FULL_BOX));
+                $boxNum = ceil((int)(end($pickupCodeOneCopiesArr) ?? 0) / (int)$this->configCache->getConfigValueByKey(ConfigCode::MAXIMUM_VALUE_IN_FULL_BOX));
             }
 
             $oneCopiesInfo = [

app/Service/Api/Order/OrderListService.php

@@ -184,7 +184,7 @@ class OrderListService extends BaseService
                 $boxNum = 0;
                 if (!empty($pickupCodeOneCopies)) {
                     $pickupCodeOneCopiesArr = explode('-', $pickupCodeOneCopies);
-                    $boxNum = ceil(end($pickupCodeOneCopiesArr) ?? '0' / (int)$this->configCache->getConfigValueByKey(ConfigCode::MAXIMUM_VALUE_IN_FULL_BOX));
+                    $boxNum = ceil((int)(end($pickupCodeOneCopiesArr) ?? 0) / (int)$this->configCache->getConfigValueByKey(ConfigCode::MAXIMUM_VALUE_IN_FULL_BOX));
                 }
                 $oneCopiesInfo = [
                     'total_price' => '0.00',