019090

app/controller/api/Home.php

@@ -41,7 +41,7 @@ class Home extends Base
                 ]
             ];
             $store = (new SaasStore)->where("poi_id",$param['store'])->field("poi_name,start_at,end_at,longitude,latitude,service_mobile,poi_id")->findOrEmpty();
-            $goods = (new SaasGoods)->where("poi_id",$param['store'])->where("status",1)->field("product_id,product_name,image_list,category,price,line_price,sale_stock,id")->limit(10)->select()->toArray();
+            $goods = (new SaasGoods)->where("poi_id",$param['store'])->where("status",1)->field("product_id,product_name,image_list,category,price,line_price,sale_stock,id")->limit(10)->order('id','desc')->select()->toArray();
             return success("ok",compact('banner','store','goods'));
         } catch (\Throwable $th) {
             return error($th->getMessage());

app/controller/merchant/Order.php

@@ -40,6 +40,8 @@ class Order extends Base
                     }
                     return $productTypeArr[$resp['product_type']]??'';
                 }]);
+            }],true,['end_time'],["end_time" => function ($resp,$next) {
+                return timeDiff(strtotime("+30 minutes",strtotime($next['create_at'])),time());
             }]);
             return successTrans("success.data",pageFormat($data),200);
         } catch (\Throwable $throwable) {