合并分支 'master-server' 到 'master'

gx2059项目单独设置产品及设置



查看合并请求 !826

@@ -206,8 +206,12 @@ class ProductController extends BaseController
             $query = $query->where('created_uid',$this->map['created_uid']);
             $query = $query->where('created_uid',$this->map['created_uid']);
         }
         }
         if(!empty($this->param['start_at']) && !empty($this->param['end_at'])){
         if(!empty($this->param['start_at']) && !empty($this->param['end_at'])){
+            if($this->user['project_id'] == 2059){
+                $query->where('send_time', '>=' ,$this->param['start_at'].' 00:00:00')->where('send_time', '<=' ,$this->param['end_at'].' 59:59:59');
+            }else{
                 $query->where('created_at', '>=' ,$this->param['start_at'].' 00:00:00')->where('created_at', '<=' ,$this->param['end_at'].' 59:59:59');
                 $query->where('created_at', '>=' ,$this->param['start_at'].' 00:00:00')->where('created_at', '<=' ,$this->param['end_at'].' 59:59:59');
             }
             }
+        }
         $this->param['featured_status']  = $this->param['featured_status'] ?? 0;
         $this->param['featured_status']  = $this->param['featured_status'] ?? 0;
         if($this->param['featured_status'] != Category::STATUS_ACTIVE) {
         if($this->param['featured_status'] != Category::STATUS_ACTIVE) {
             $cateModel = new Category();
             $cateModel = new Category();

@@ -56,7 +56,9 @@ class ProductLogic extends  BaseLogic
                 $id = $this->param['id'];
                 $id = $this->param['id'];
             }else{
             }else{
                 $this->param = $this->addHandleParam($this->param);
                 $this->param = $this->addHandleParam($this->param);
-                $this->param['sort'] = $this->setNewsSort();
+                if($this->user['project_id'] != 2059){//2059项目不处理排序
+                    $this->param['sort'] = $this->setProductSort();
+                }
                 $id = $this->model->addReturnId($this->param);
                 $id = $this->model->addReturnId($this->param);
                 $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $id, $this->user['project_id']);
                 $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $id, $this->user['project_id']);
                 $this->model->edit(['route'=>$route],['id'=>$id]);
                 $this->model->edit(['route'=>$route],['id'=>$id]);
@@ -81,7 +83,7 @@ class ProductLogic extends  BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/12/25 9:27
      * @time   :2023/12/25 9:27
      */
      */
-    public function setNewsSort(){
+    public function setProductSort(){
         $info = $this->model->orderBy('sort','desc')->first();
         $info = $this->model->orderBy('sort','desc')->first();
         if(empty($info)){
         if(empty($info)){
             return 1;
             return 1;