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

app/adminapi/logic/group_activity/GroupActivityCategoryLogic.php

@@ -222,13 +222,17 @@ class GroupActivityCategoryLogic extends BaseLogic
         $detail['area'] = explode(",",$detail['area']);
         $detail['images'] = $detail['images'] ? explode(",",$detail['images']) : [];
         $detail['block_data'] = json_decode($detail['block_data'],true);
+        $block_data = [];
         foreach($detail['block_data'] as $key => $item) {
-            $detail['block_data'][$key]['activity'] = GroupActivity::where(['block_key' => $item['block_key'],'group_category_id' => $detail['id']])
+            $tmpKey = empty($item['sort']) ? "0_".$key : $item['sort']."_".$key;
+            $block_data[$tmpKey] = $item;
+            $block_data[$tmpKey]['activity'] = GroupActivity::where(['block_key' => $item['block_key'],'group_category_id' => $detail['id']])
                     ->field('id,id as data_id,title,image,equity_id,block_key,origin_price,price,work_amount,settlement_amount')
                     ->select()
                     ->toArray();
         }
-        
+        krsort($block_data);
+        $detail['block_data'] = array_values($block_data);
         return $detail;
     
     }

app/adminapi/logic/master_worker/MasterWorkerTemporaryLogic.php

@@ -50,7 +50,7 @@ class MasterWorkerTemporaryLogic extends BaseLogic
                 }
                 $params['category_ids'] = implode(',',$ids);
             }
-            $number = MasterWorkerTemporary::count();
+            $number = MasterWorkerTemporary::max('id');
             $number++;
             $worker_number = str_pad($number, 6, '0', STR_PAD_LEFT);
             MasterWorkerTemporary::create([

app/adminapi/logic/works/GroupServiceWorkLogic.php

@@ -56,12 +56,16 @@ class GroupServiceWorkLogic extends BaseLogic
                     'work_amount' => $params['work_amount'],
                     'settlement_amount' => $params['settlement_amount'],
                     'settlement_status' => $params['settlement_status'],
+                    'real_name' => $params['real_name'],
+                    'mobile' => $params['mobile'],
                     'address' => $params['address'],
                     'appointment_time' => strtotime($params['appointment_time']),
                     'remark' => $params['remark'],
                 ]);
             } else {
                 GroupServiceWork::where('id', $params['id'])->update([
+                    'real_name' => $params['real_name'],
+                    'mobile' => $params['mobile'],
                     'address' => $params['address'],
                     'appointment_time' => strtotime($params['appointment_time']),
                     'remark' => $params['remark'],
@@ -263,18 +267,18 @@ class GroupServiceWorkLogic extends BaseLogic
             Db::commit();
           
             // 工程师派单通知【给工程师的通知】【公众号通知，不发短信】
-            $workDetail = GroupServiceWorkLogic::detail($params);
-            $res = event('Notice',  [
-                'scene_id' => 113,
-                'params' => [
-                    'user_id' => $params['master_worker_id'],
-                    'order_id' => $params['id'],
-                    'thing9' => $workDetail['title'],
-                    'time7' => $workDetail['appointment_time'],
-                    'thing8' => (iconv_strlen($workDetail['address'])>15)?(mb_substr($workDetail['address'],0,15,'UTF-8').'...'):$workDetail['address'],
-                    'phone_number6' => asteriskString($workDetail['mobile']),
-                ]
-            ]);
+            // $workDetail = GroupServiceWorkLogic::detail($params);
+            // $res = event('Notice',  [
+            //     'scene_id' => 113,
+            //     'params' => [
+            //         'user_id' => $params['master_worker_id'],
+            //         'order_id' => $params['id'],
+            //         'thing9' => $workDetail['title'],
+            //         'time7' => $workDetail['appointment_time'],
+            //         'thing8' => (iconv_strlen($workDetail['address'])>15)?(mb_substr($workDetail['address'],0,15,'UTF-8').'...'):$workDetail['address'],
+            //         'phone_number6' => asteriskString($workDetail['mobile']),
+            //     ]
+            // ]);
             return true;
         }catch(\Exception $e){
             Db::rollback();

app/api/lists/property/PropertyGroupSettlementLists.php

@@ -30,7 +30,7 @@ class PropertyGroupSettlementLists extends BaseApiDataLists implements ListsSear
     public function queryWhere()
     {
         // 指定用户
-        $propertyHeadId = 40;//(int)PropertyHead::where('user_id',$this->userId)->value('id');
+        $propertyHeadId = (int)PropertyHead::where('user_id',$this->userId)->value('id');
         $where[] = ['property_head_id', '=', $propertyHeadId];
         if (isset($this->params['start_time']) && !empty($this->params['start_time'])) {
             $monthStart = strtotime(date("Y-m-01",strtotime($this->params['start_time'])));

app/common/model/group_activity/GroupActivity.php

@@ -81,14 +81,19 @@ class GroupActivity extends BaseModel
             $list[$item['block_key']]['activity'][] = $item;
         }
 
-        foreach($category['block_data'] as &$item) {
+        $block_data = [];
+        foreach($category['block_data'] as $key => $item) {
             if (isset($list[$item['block_key']])) {
                 $item['activity'] = $list[$item['block_key']]['activity'];
+                $tmpKey = empty($item['sort']) ? '0_'.$key : $item['sort']."_".$key;
+                $block_data[$tmpKey] = $item;
             }
             if ($block_key && $item['block_key'] == $block_key) {
                 return $item;
             }
         }
+        krsort($block_data);
+        $category['block_data'] = array_values($block_data);
         return $category;
     }
     

app/workerapi/logic/LoginLogic.php

@@ -290,8 +290,8 @@ class LoginLogic extends BaseLogic
         try {
             //手机验证码登录
             $user = MasterWorkerTemporary::where('mobile',$params['account'])->findOrEmpty();
-            if($user->isEmpty()) {
-                throw new \Exception('账号不存在');
+            if(!$user->isEmpty() && $user->is_disable == 1) {
+                throw new \Exception('账号已被禁用');
             }
 
             $smsDriver = new SmsDriver();
@@ -300,10 +300,23 @@ class LoginLogic extends BaseLogic
                 throw new \Exception('验证码错误');
             }
 
-            //更新登录信息
-            $user->login_time = time();
-            $user->login_ip = request()->ip();
-            $user->save();
+            if ($user->isEmpty()) {
+                //注册
+                $number = MasterWorkerTemporary::max('id');
+                $number++;
+                $worker_number = str_pad($number, 6, '0', STR_PAD_LEFT);
+                $user = MasterWorkerTemporary::create([
+                    'worker_number' => $worker_number,
+                    'mobile' => $params['account'],
+                    'login_time' => time(),
+                    'login_ip' => request()->ip(),
+                ]);
+            } else {
+                //更新登录信息
+                $user->login_time = time();
+                $user->login_ip = request()->ip();
+                $user->save();
+            }
 
             //设置token
             $userInfo = MasterWokerTokenService::setToken($user->id, 3, 2);