cqpCow 8 ay önce
ebeveyn
işleme
7dd3aeaff5

+ 2 - 1
app/Http/Controllers/Api/WxController.php

@@ -108,7 +108,8 @@ class WxController extends BaseController
 
     public function getTopMessage(Request $request){
         $service = new WxEmployeeService();
-        list($status, $data) = $service->getTopMessage($request->all());
+        $userData = $request->userData->toArray();
+        list($status, $data) = $service->getTopMessage($request->all(),$userData);
 
         if ($status) {
             return $this->json_return(200, '', $data);

+ 6 - 1
app/Model/SalesOrder.php

@@ -27,6 +27,7 @@ class SalesOrder extends UseScopeBaseModel
     const Model_type_four = 4; // 线上订单合同
     const Model_type_five = 5; // 二手车加装合同
     const Model_type_six = 6; // 外贸订单
+    const Model_type_seven = 7; // 补贴订单
     public static $model_type = [
         self::Model_type_one,
         self::Model_type_two,
@@ -34,6 +35,7 @@ class SalesOrder extends UseScopeBaseModel
         self::Model_type_four,
         self::Model_type_five,
         self::Model_type_six,
+        self::Model_type_seven,
     ];
     public static $model_type_title = [
         self::Model_type_one => '线下订单',
@@ -42,6 +44,7 @@ class SalesOrder extends UseScopeBaseModel
         self::Model_type_four => '线上订单',
         self::Model_type_five => '二手车加装',
         self::Model_type_six => '外贸订单',
+        self::Model_type_seven => '补贴订单',
     ];
 
     public static $model_type_title_u8 = [
@@ -51,6 +54,7 @@ class SalesOrder extends UseScopeBaseModel
         self::Model_type_four => '线上销售',
         self::Model_type_five => '二手车加装',
         self::Model_type_six => '外贸订单',
+        self::Model_type_seven => '补贴订单',
     ];
 
     //安装件
@@ -103,6 +107,7 @@ class SalesOrder extends UseScopeBaseModel
         self::Model_type_three => 'T9XX.',
         self::Model_type_four => 'T9XS.',
         self::Model_type_five => 'T9XX.',
-        self::Model_type_six => 'T9XX.',
+        self::Model_type_six => 'T9WM.',
+        self::Model_type_seven => 'T9BT.',
     ];
 }

+ 2 - 9
app/Service/Wx/WxEmployeeService.php

@@ -119,14 +119,7 @@ class WxEmployeeService extends Service
         return [true, $res];
     }
 
-    public function getTopMessage($data){
-        if($this->isEmpty($data,'openid')) return [false,'openid不能为空!'];
-
-        $employee = WxEmployee::where('openid',$data['openid'])->select('employee_id')->first();
-        if(empty($employee) || empty($employee['employee_id'])) return [false,'未找到用户信息!'];
-        $employee = $employee->toArray();
-
-        $return = EmployeeService::getLoginMessage($employee['employee_id']);
-        return [true,$return];
+    public function getTopMessage($data,$user){
+        return [true,$user['depart_top'] ?? []];
     }
 }

+ 1 - 1
config/morequery.php

@@ -68,7 +68,7 @@ return [
         35 => '/pages/ReturnExchangeOrder/detail/detail?order_number=',
         37 => '/pageA/pages/SalesOrder/detail/detail?order_number=',
         38 => '',
-        45 => '/pages/ProcureOrder/ProcureDetail/ProcureDetail?order_number=',
+        45 => '/pageA/pages/ProcureOrder/ProcureDetail/ProcureDetail?order_number=',
         48 => '/pages/PayOrder/detail/detail?order_number=',
     ],
 ];

+ 1 - 1
routes/wx.php

@@ -17,9 +17,9 @@ Route::any('wxSetMobile', 'Api\WxController@setMobile');
 Route::any('wxLogin', 'Api\WxController@login');
 Route::any('wxH5', 'Api\WxController@wxH5');
 Route::any('ttt', 'Api\WxController@ttt');
-Route::any('getTopMessage', 'Api\WxController@getTopMessage');
 
 Route::group(['middleware'=> ['checkWx']],function ($route){
+    $route->any('getTopMessage', 'Api\WxController@getTopMessage');
     $route->any('oaCheck', 'Api\OaController@oaCheck');
     $route->any('oaOrderState', 'Api\OaController@oaOrderState');
     $route->any('checkAllOver', 'Api\OaController@checkAllOver');