fix : order list

app/Cache/Redis/Api/GoodCache.php

@@ -210,7 +210,7 @@ class GoodCache
 
         foreach ($list as &$item) {
             $item['sku_list'] = $skuListArr[$item['id']] ?? [];
-            $item['spu_image_url'] = $imageList[$item['image_id']] ?? '';
+            $item['spu_image_url']['url'] = $imageList[$item['image_id']]['url'] ?? '';
             $item['image_list'] = $imageArr[$item['id']] ?? [];
             $item['price'] = !empty($price[$item['id']]) ? (min($price[$item['id']]) ?? 0) : 0;
         }
@@ -349,7 +349,10 @@ class GoodCache
      */
     private function buildStockData(&$data): mixed
     {
+        if (empty($data)) return $data;
+
         foreach ($data as &$spu) {
+            if (empty($spu['sku_list'])) continue;
             foreach ($spu['sku_list'] as &$sku) {
                 $sku['stock'] = $this->getStock($sku['id']);
             }

app/Controller/Api/SystemController.php

@@ -12,6 +12,7 @@ use App\Service\Api\System\GetLeaderboardService;
 use App\Service\Api\System\MiniWxConfigService;
 use App\Service\Api\System\SiteListService;
 use App\Service\Api\System\SystemConfigService;
+use App\Service\Api\System\TestService;
 use App\Service\Api\User\IndexService;
 use DateMalformedStringException;
 use Hyperf\HttpServer\Annotation\Controller;
@@ -87,4 +88,10 @@ class SystemController extends AbstractController
     {
         return (new GetLeaderboardService)->handle();
     }
+
+    #[RequestMapping(path: "test", methods: "GET")]
+    public function test()
+    {
+        return (new TestService)->handle();
+    }
 }

app/Cron/Coupon/UserCouponTask.php

@@ -16,6 +16,8 @@ use App\Model\UserCoupon;
 use Exception;
 use Hyperf\Crontab\Annotation\Crontab;
 use Hyperf\Di\Annotation\Inject;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 #[Crontab(rule: "* * * * *", name: "UserCouponTask", singleton: true , callback: "execute", memo: "每秒执行优惠券过期")]
 class UserCouponTask
@@ -32,12 +34,17 @@ class UserCouponTask
     #[Inject]
     protected UserCoupon $userCouponModel;
 
-    public function execute()
+    /**
+     * @return void
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     */
+    public function execute(): void
     {
         try {
             $this->userCouponModel
-                ->whereTime('validity_end_time', '>', date('Y-m-d H:i:s'))
                 ->where('status', CouponCode::COUPON_STATUS_UNUSED)
+                ->where('validity_end_time', '<', date('Y-m-d H:i:s'))
                 ->update(['status' => CouponCode::COUPON_STATUS_EXPIRE]);
         }catch (Exception $e){
             $this->log->error(__CLASS__.$e->getMessage());

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/ChefService.php

@@ -87,11 +87,17 @@ class ChefService extends BaseService
 
         $skuIds = array_column($list['data'], 'sku_id');
         $chefIds = array_column($list['data'], 'chef_id');
-        $skuList = $this->skuModel->whereIn('id', $skuIds)->pluck('title', 'id')->toArray();
-        $chefList = $this->adminUserModel->whereIn('id',$chefIds)->pluck('chinese_name','id')->toArray();
+        $skuList = $this->skuModel->whereIn('id', $skuIds)->select('price','title','id')->get();
+        if ($skuList->isNotEmpty()) {
+            $skuList = array_column($skuList->toArray(), null,'id');
+        }
+
+        $chefList = $this->adminUserModel->getChefNameByIds($chefIds);
         foreach ($list['data'] as &$v) {
-            $v['sku_title'] = $skuList[$v['sku_id']] ?? '';
-            $v['chef_name'] = $chefList[$v['chef_id']] ?? '';
+            $v['sku_title'] = $skuList[$v['sku_id']]['title'] ?? '';
+            $v['sku_price'] = $skuList[$v['sku_id']]['price'] ?? '0.00';
+            $v['total_price'] = bcmul($skuList[$v['sku_id']]['price'],(string)$v['sale'],2);
+            $v['chef_name'] = $chefList[$v['chef_id']]['chinese_name'] ?? '';
         }
 
         return $this->return->success('success', ['list' => $list]);

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/Good/OptionalListService.php

@@ -114,9 +114,11 @@ class OptionalListService extends BaseService
         $favorable = [];
         $skuList = [];
         foreach ($data as &$item) {
-            foreach ($item['sku_list'] as &$v) {
-                $v['surplus_stock'] = $this->redisCache->zScore($stockKey,$v['id']) ?? 0;
-                $v['category_id'] = $item['category_id'];
+            if (!empty($item['sku_list'])) {
+                foreach ($item['sku_list'] as &$v) {
+                    $v['surplus_stock'] = $this->redisCache->zScore($stockKey,$v['id']) ?? 0;
+                    $v['category_id'] = $item['category_id'];
+                }
             }
 
             if ($item['favorable'] == GoodCode::IS_FAVORABLE) {
@@ -136,10 +138,10 @@ class OptionalListService extends BaseService
             }
 
             $res[$item['category_id']]['spu_list'][] = $item;
-            $skuList = array_merge($skuList, $item['sku_list']);
+            $skuList = array_merge($skuList, $item['sku_list'] ?? []);
         }
 
-        if (empty($skuList)) throw new ErrException('数据错误');
+        if (empty($skuList)) return array_values($res);
         $skuList = array_column($skuList,null,'id');
 
         if (!empty($purchaseData)) {

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

@@ -11,8 +11,10 @@ declare(strict_types=1);
 namespace App\Service\Api\Order;
 
 use App\Cache\Redis\Api\SiteCache;
+use App\Cache\Redis\Common\ConfigCache;
 use App\Constants\Common\GoodCode;
 use App\Constants\Common\OrderCode;
+use App\Constants\ConfigCode;
 use App\Exception\ErrException;
 use App\Model\AdminUser;
 use App\Model\Chef;
@@ -69,6 +71,12 @@ class OrderInfoService extends BaseService
     #[Inject]
     protected SiteCache $siteCache;
 
+    /**
+     * @var ConfigCache
+     */
+    #[Inject]
+    protected ConfigCache $configCache;
+
     /**
      * @return array
      * @throws ContainerExceptionInterface
@@ -147,11 +155,20 @@ class OrderInfoService extends BaseService
         }
 
         for ($i = 1; $i <= (count($newOrderSkuList) ?? 0); $i++) {
+
+            $pickupCodeOneCopies = $pickupCodeList[$i] ?? null;
+            $boxNum = 0;
+            if (!empty($pickupCodeOneCopies)) {
+                $pickupCodeOneCopiesArr = explode('-', $pickupCodeOneCopies);
+                $boxNum = ceil((int)(end($pickupCodeOneCopiesArr) ?? 0) / (int)$this->configCache->getConfigValueByKey(ConfigCode::MAXIMUM_VALUE_IN_FULL_BOX));
+            }
+
             $oneCopiesInfo = [
                 'total_price' => '0.00',
                 'total_quantity' => 0,
                 'sku_list' => [],
-                'pickup_code' => $pickupCodeList[$i] ?? '', //取餐码
+                'pickup_code' => $pickupCodeOneCopies ?? '', // 取餐码
+                'box_num' => $boxNum,
                 'is_add_staple_food' => GoodCode::IS_NOT_ADD_STAPLE_FOOD,
             ];
 

app/Service/Api/Order/OrderListService.php

@@ -11,8 +11,10 @@ declare(strict_types=1);
 namespace App\Service\Api\Order;
 
 use App\Cache\Redis\Api\SiteCache;
+use App\Cache\Redis\Common\ConfigCache;
 use App\Constants\Common\GoodCode;
 use App\Constants\Common\OrderCode;
+use App\Constants\ConfigCode;
 use App\Model\Order;
 use App\Model\OrderGood;
 use App\Model\PickupCode;
@@ -61,6 +63,12 @@ class OrderListService extends BaseService
     #[Inject]
     protected SiteCache $siteCache;
 
+    /**
+     * @var ConfigCache
+     */
+    #[Inject]
+    protected ConfigCache $configCache;
+
     /**
      * @return array
      * @throws ContainerExceptionInterface
@@ -164,6 +172,7 @@ class OrderListService extends BaseService
                     'total_price' => '0.00',
                     'total_quantity' => 0,
                     'pickup_code' => '', //这个没有取餐码
+                    'box_num' => 0,
                     'image_list' => [],
                     'is_add_staple_food' => GoodCode::IS_ADD_STAPLE_FOOD,
                 ];
@@ -171,11 +180,18 @@ class OrderListService extends BaseService
 
             for ($i = 1; $i <= (count($newOrderSkuList[$order['id']]) ?? 0); $i++) {
                 $breakFlag = 0;
+                $pickupCodeOneCopies = $pickupCodeArrList[$order['id']][$i]['pickup_code'] ?? null;
+                $boxNum = 0;
+                if (!empty($pickupCodeOneCopies)) {
+                    $pickupCodeOneCopiesArr = explode('-', $pickupCodeOneCopies);
+                    $boxNum = ceil((int)(end($pickupCodeOneCopiesArr) ?? 0) / (int)$this->configCache->getConfigValueByKey(ConfigCode::MAXIMUM_VALUE_IN_FULL_BOX));
+                }
                 $oneCopiesInfo = [
                     'total_price' => '0.00',
                     'total_quantity' => 0,
                     'image_list' => [],
-                    'pickup_code' => $pickupCodeArrList[$order['id']][$i]['pickup_code'] ?? '', // 取餐码
+                    'pickup_code' => $pickupCodeOneCopies ?? '', // 取餐码
+                    'box_num' => $boxNum,
                     'is_add_staple_food' => GoodCode::IS_NOT_ADD_STAPLE_FOOD,
                 ];
 

app/Service/Api/System/TestService.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * This service file is part of item.
+ *
+ * @author   ctexthuang
+ * @contact  ctexthuang@qq.com
+ */
+
+declare(strict_types=1);
+
+namespace App\Service\Api\System;
+
+use App\Constants\Common\CouponCode;
+use App\Model\UserCoupon;
+use App\Service\Api\BaseService;
+use Hyperf\Di\Annotation\Inject;
+
+class TestService extends BaseService
+{
+
+    /**
+     * @var UserCoupon
+     */
+    #[Inject]
+    protected UserCoupon $userCouponModel;
+
+    public function handle()
+    {
+        var_dump(date('Y-m-d H:i:s'));
+        $data = $this->userCouponModel
+            ->where('status', CouponCode::COUPON_STATUS_UNUSED)
+            ->where('validity_end_time', '<', date('Y-m-d H:i:s'))
+            ->get();
+
+        $data = $data->toArray();
+
+        var_dump($data);
+    }
+}