Merge branch 'master' of e.coding.net:zdap/weixiu/weixiu_api into order_effective_log-m

app/adminapi/lists/effective/OrderEffectiveLogLists.php

@@ -19,6 +19,7 @@ use app\adminapi\lists\BaseAdminDataLists;
 use app\adminapi\logic\effective\OrderEffectiveLogLogic;
 use app\common\model\orders\OrderEffectiveLog;
 use app\common\lists\ListsSearchInterface;
+use app\common\model\user\User;
 use app\common\model\works\ServiceWork;
 
 
@@ -39,9 +40,14 @@ class OrderEffectiveLogLists extends BaseAdminDataLists implements ListsSearchIn
      */
     public function setSearch(): array
     {
-        return [
-            '=' => ['effective_id', 'sn', 'user_id', 'work_id', 'goods_id', 'effective_unit', 'effective_num', 'remark', 'end_effective_time'],
+        if(isset($this->params['mobile']) && !empty($this->params['mobile'])){
+            $userIds = User::whereLike('mobile',"%{$this->params['mobile']}%")->column('id')??[0];
+            $this->params['user_id'] = $userIds;
+        }
 
+        return [
+            '=' => ['effective_id', 'sn', 'work_id', 'goods_id', 'effective_unit', 'effective_num', 'remark', 'end_effective_time','effective_status'],
+            'in' => ['user_id']
         ];
     }
 
@@ -61,7 +67,7 @@ class OrderEffectiveLogLists extends BaseAdminDataLists implements ListsSearchIn
                 $query->with(['goodsCategory'=>function ($query1) {
                     $query1->field(['name','picture']);
                 }]);
-            },'serviceWork','originalServiceWork'])->where('effective_status','>',0)->where($this->searchWhere)
+            },'serviceWork','originalServiceWork','userInfo'])->where('effective_status','>',0)->where($this->searchWhere)
             ->field(['*'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])

app/adminapi/lists/works/ServiceWorkLists.php

@@ -138,7 +138,11 @@ class ServiceWorkLists extends BaseAdminDataLists implements ListsSearchInterfac
         }
 
         if(isset($this->params['property_activity_id']) && !empty($this->params['property_activity_id'])){
-            $where[] = ['property_activity_id','>',0];
+            if($this->params['property_activity_id'] == 2){
+                $where[] = ['order_effective_id','>',0];
+            }else{
+                $where[] = ['property_activity_id','>',0];
+            }
         }
         return $where;
     }
@@ -173,7 +177,7 @@ class ServiceWorkLists extends BaseAdminDataLists implements ListsSearchInterfac
             ->where($this->searchWhere)
             ->where($this->queryWhere())
             ->where($this->queryDataWhere())
-            ->field(['id', 'work_sn', 'real_name', 'mobile', 'address', 'title', 'category_type', 'goods_category_ids', 'goods_category_id', 'base_service_fee', 'service_fee', 'work_status','work_pay_status', 'service_status', 'dispatch_time', 'receive_time', 'appointment_time', 'finished_images', 'finished_time', 'master_worker_id', 'work_amount', 'work_type', 'create_time', 'update_time','lon', 'lat','appoint_approval','refund_approval','finally_door_time','property_activity_id'])
+            ->field(['id', 'work_sn', 'real_name', 'mobile', 'address', 'title', 'category_type', 'goods_category_ids', 'goods_category_id', 'base_service_fee', 'service_fee', 'work_status','work_pay_status', 'service_status', 'dispatch_time', 'receive_time', 'appointment_time', 'finished_images', 'finished_time', 'master_worker_id', 'work_amount', 'work_type', 'create_time', 'update_time','lon', 'lat','appoint_approval','refund_approval','finally_door_time','property_activity_id','order_effective_id'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()

app/api/logic/HomeSpecialLogic.php

@@ -40,8 +40,12 @@ class HomeSpecialLogic extends BaseLogic
                    $item->vue_param = 'id='.$item->id;
                }
                if($item->vue_web=='pages/web_view/index'){
-                   $token = !empty($userInfo['token'])?$userInfo['token']:'';
-                   $item->vue_param = 'hrefUrl='.rawurlencode($domain.'/static/wxapp/H5/adver6/index.html?property_activity_id=5&token='.$token);
+//                   $token = !empty($userInfo['token'])?$userInfo['token']:'';
+//                   $property_activity_id = !empty($item->vue_param)?$item->vue_param:5;
+//                   $item->vue_param = 'hrefUrl='.rawurlencode($domain.'/static/wxapp/H5/adver6/index.html?property_activity_id='.$property_activity_id.'&token='.$token);
+//
+                   $item->vue_param = '';
+                   $item->vue_web = '';
                }
            })
             ->toArray();

app/common/model/orders/OrderEffectiveLog.php

@@ -2,6 +2,7 @@
 namespace app\common\model\orders;
 use app\common\model\BaseModel;
 use app\common\model\goods\Goods;
+use app\common\model\user\User;
 use app\common\model\works\ServiceWork;
 
 /**
@@ -23,8 +24,10 @@ class OrderEffectiveLog extends BaseModel
     {
         return $this->hasOne(ServiceWork::class, 'id', 'work_id');
     }
-
-
+    public function userInfo()
+    {
+        return $this->hasOne(User::class, 'id', 'user_id');
+    }
     public function serviceWork()
     {
         return $this->hasOne(ServiceWork::class, 'order_effective_id', 'id');