星科源

app/Http/Controllers/Api/DingTalkController.php

@@ -27,7 +27,8 @@ class DingTalkController extends BaseController
     public function getUserByCode(Request $request)
     {
         $service = new DingService();
-        list($status,$data) = $service->getUserByCode($request->all());
+        $LoginType = $request->header('LoginType') ?? null;
+        list($status,$data) = $service->getUserByCode($request->all(), $LoginType);
 
         if($status){
             return $this->json_return(200,'',$data);

app/Http/Middleware/CheckLogin.php

@@ -19,14 +19,26 @@ class CheckLogin
      */
     public function handle($request, Closure $next)
     {
+        $LoginType = $request->header('LoginType');
+        if(empty($LoginType)) return response()->json(['code'=>1,'msg'=>'login_type类型不能为空','data'=>null]);
+        if(! isset(DDEmployee::type[$LoginType])) return response()->json(['code'=>1,'msg'=>'login_type类型不存在或错误','data'=>null]);
+        $loginUser['login_type'] = $LoginType;
+
         $loginUser = $request->header('Login');
         $loginUser = json_decode($loginUser,true);
         $loginUser['username'] = urldecode($loginUser['username']);
         if (empty($loginUser) || empty($loginUser['zt']) || empty($loginUser['username']) || empty($loginUser['userId'])) return response()->json(['code'=>1,'msg'=>'缺少登录信息','data'=>null]);
-        $user = DDEmployee::where('userid', $loginUser['userId'])->first();
+        $user = DDEmployee::where('userid', $loginUser['userId'])->where('login_type', $LoginType)->first();
         if(empty($user)) return response()->json(['code'=>1,'msg'=>'登录信息不存在或错误','data'=>null]);
         $user = $user->toArray();
-        $loginUser['qx'] = $user['qx'] ?? 1;
+        $loginUser['qx'] = $user['qx'];
+
+        //数据库账套
+        $config = config("u8.{$LoginType}");
+        if(empty($config)) return response()->json(['code'=>1,'msg'=>'用友数据库配置不能为空','data'=>null]);
+        $database = $config['zt_database'] ?? null;
+        if (!$database) return response()->json(['code'=>1,'msg'=>'用友数据库账套配置不能为空','data'=>null]);
+        $loginUser['zt_database'] = $database;
 
         //写入user信息
         $request->userData = $loginUser;

app/Model/DDEmployee.php

@@ -14,4 +14,15 @@ class DDEmployee extends Model
 
     const qx_zero = 0;
     const qx_one = 1;
+
+    const type_one = 1; //浙江
+    const type_two = 2; //杭州
+    const type = [
+        self::type_one => '浙江星科源新材料有限公司',
+        self::type_two => '杭州星科源新材料有限公司',
+    ];
+    const type_redis = [
+        self::type_one => 'ZJXKYACCESSTOKENKEY',
+        self::type_two => 'HZXKYACCESSTOKENKEY',
+    ];
 }

app/Service/DingService.php

@@ -8,15 +8,19 @@ use Illuminate\Support\Facades\Redis;
 
 class DingService extends Service
 {
-    const RedisKey = 'XKYACCESSTOKENKEY';
-
-    public function getAccessToken()
+    public function getAccessToken($type)
     {
-        $token = Redis::get(self::RedisKey);
+        $key = DDEmployee::type_redis[$type];
+        if(empty($key)) return [false, 'token名称未设置'];
+        $token = Redis::get($key);
         if(! empty($token)) return [true, ['access_token' => $token]];
+        $config = config("dingtalk.{$type}");
+        if(empty($config)) return [false, '钉钉配置信息不存在'];
+        $appKey = $config['app_key'] ?? null;
+        $appSecret = $config['app_secret'] ?? null;
+        if (!$appKey) return [false, 'AppKey 配置不完整'];
+        if (!$appSecret) return [false, 'AppSecret 配置不完整'];
 
-        $appKey = config('dingtalk.app_key');
-        $appSecret = config('dingtalk.app_secret');
         $url = "https://api.dingtalk.com/v1.0/oauth2/accessToken";
         $resp = $this->curlOpen1($url, [
             'request' => 'post',
@@ -30,7 +34,7 @@ class DingService extends Service
         $accessToken = $res['accessToken'] ?? "";
         $expires_in = $res['expires_in'] ?? 0;
         if(empty($accessToken)) return [false, 'AccessToken获取失败'];
-        Redis::setex(self::RedisKey, $expires_in, $accessToken);
+        Redis::setex($key, $expires_in, $accessToken);
 
         return [true, ['access_token' => $accessToken]];
     }
@@ -40,13 +44,16 @@ class DingService extends Service
      * @param string $code 前端 dd.getAuthCode 获取的 code
      * @return array [bool, data]  bool 表示成功与否，data 成功返回用户信息，失败返回错误信息
      */
-    public function getUserByCode($data)
+    public function getUserByCode($data, $LoginType)
     {
+        if(empty($LoginType)) return [false, 'login_type类型不能为空'];
+        if(! isset(DDEmployee::type[$LoginType])) return [false, 'login_type类型不存在或错误'];
+
         $code = $data['code'] ?? "";
         if (empty($code)) return [false, '钉钉授权code不能为空'];
 
         // 1. 获取 access_token
-        [$success, $tokenData] = $this->getAccessToken();
+        [$success, $tokenData] = $this->getAccessToken($LoginType);
         if (! $success) return [false, $tokenData]; // tokenData 是错误信息
         $accessToken = $tokenData['access_token'];
 
@@ -78,7 +85,7 @@ class DingService extends Service
 
             DDEmployee::updateOrCreate(
                 ['userid' => $result['userid']],
-                ['name' => $result['name'], 'userid' => $result['userid']]
+                ['name' => $result['name'], 'userid' => $result['userid'], 'login_type' => $LoginType]
             );
         }
 
@@ -112,13 +119,13 @@ class DingService extends Service
         if(! $success) return [false, $msg];
 
         //获取模板id
-        $code = $this->getModelCode($type);
+        $code = $this->getModelCode($type, $user);
         //获取模板数据
         [$success, $formData] = $this->getFormData($data, $user);
         if(! $success) return [false, $formData];
 
         // 1. 获取 access_token
-        [$success, $tokenData] = $this->getAccessToken();
+        [$success, $tokenData] = $this->getAccessToken($user['login_type']);
         if (!$success) return [false, $tokenData];
         $accessToken = $tokenData['access_token'];
 
@@ -141,6 +148,7 @@ class DingService extends Service
 
         Record::insert([
             'type' => $type,
+            'login_type' => $user['login_type'],
             'database' => $user['zt_database'],
             'order_number'=> $data['order_number'],
             'crt_time' => time(),
@@ -155,9 +163,11 @@ class DingService extends Service
         if(! $status) return [false,$msg];
 
         $type = $data['type'];
+        $login_type = $data['login_type'];
 
         $bool = Record::where('del_time',0)
             ->where('type', $type)
+            ->where('login_type', $login_type)
             ->where('database', $user['zt_database'])
             ->where('order_number',$data['order_number'])
             ->exists();
@@ -209,7 +219,7 @@ class DingService extends Service
      */
     public function getTodoProcessList($data, $user)
     {
-        [$success, $tokenData] = $this->getAccessToken();
+        [$success, $tokenData] = $this->getAccessToken($user['login_type']);
         if (!$success) return [false, $tokenData];
         $accessToken = $tokenData['access_token'];
 
@@ -264,7 +274,7 @@ class DingService extends Service
      */
     public function executeApproval($data, $user)
     {
-        [$success, $tokenData] = $this->getAccessToken();
+        [$success, $tokenData] = $this->getAccessToken($user['login_type']);
         if (!$success) return [false, $tokenData];
         $accessToken = $tokenData['access_token'];
 
@@ -325,25 +335,47 @@ class DingService extends Service
         return null;
     }
 
-    private function getModelCode($type){
-        if($type == 1){
-            // 采购单
-            $code = "";
-        }elseif ($type == 2){
-            // 请购单
-            $code = "";
-        }elseif ($type == 3){
-            // 采购入库单
-            $code = "";
-        }elseif ($type == 4){
-            // 存货
-            $code = "";
-        }elseif ($type == 5){
-            // 供应商
-            $code = "";
+    private function getModelCode($type, $user){
+        $login_type = $user['login_type'];
+        if($login_type == DDEmployee::type_one){
+            //浙江
+            if($type == 1){
+                // 采购单
+                $code = "";
+            }elseif ($type == 2){
+                // 请购单
+                $code = "";
+            }elseif ($type == 3){
+                // 采购入库单
+                $code = "";
+            }elseif ($type == 4){
+                // 存货
+                $code = "";
+            }elseif ($type == 5){
+                // 供应商
+                $code = "";
+            }
+        }elseif ($login_type == DDEmployee::type_two){
+            //杭州
+            if($type == 1){
+                // 采购单
+                $code = "";
+            }elseif ($type == 2){
+                // 请购单
+                $code = "";
+            }elseif ($type == 3){
+                // 采购入库单
+                $code = "";
+            }elseif ($type == 4){
+                // 存货
+                $code = "";
+            }elseif ($type == 5){
+                // 供应商
+                $code = "";
+            }
         }
 
-        return $code;
+        return $code ?? "";
     }
 
     private function getFormData($data, $user){

app/Service/U8ServerService.php

@@ -35,57 +35,56 @@ class U8ServerService extends Service
     {
         return $this->error;
     }
-
-    public function purchaseRequisition($data, $user){
+    public function purchaseOrder($data, $user){
         $qx = $user['qx'];
         $order_date = $data['order_date'] ?? [];
         $order_date = array_filter($order_date);
         $order_number = $data['order_number'] ?? "";
 
-        $model = $this->databaseService->table('PU_AppVouch as a')
-            ->leftJoin('Person as c', 'c.cPersonCode', 'a.cPersonCode')
+        $model = $this->databaseService->table('PO_Pomain as a')
+            ->leftJoin('Vendor as c', 'c.cVenCode', 'a.cVenCode')
             ->when(empty($qx), function ($query) use($user){
                 return $query->where('a.cMaker',$user['username']);
             })
             ->when(! empty($order_number), function ($query) use($order_number){
-                return $query->where('a.cCode','LIKE', '%'.$order_number.'%');
+                return $query->where('a.cPOID','LIKE', '%'.$order_number.'%');
             })
             ->when(! empty($order_date), function ($query) use($order_date){
                 $start = date('Y-m-d H:i:s.000', $order_date[0]);
                 $end = date('Y-m-d H:i:s.000', $order_date[1]);
-                return $query->whereBetween('a.dDate', [$start, $end]);
+                return $query->whereBetween('a.dPODate', [$start, $end]);
             })
             ->where(function ($query) {
                 $query->where('a.iverifystateex', 0)
                     ->OrwhereNull('a.iverifystateex');
             })
-            ->select('a.cMaker as crt_name', DB::raw("COALESCE(c.cPersonName, '') as purchase_name"),'a.cBusType as business_type','a.cCode as order_number',DB::raw("CONVERT(varchar(10), a.dDate, 120) as order_date"))
-            ->orderBy('a.ID','desc');
+            ->select('a.cMaker as crt_name', 'a.cBusType as business_type','a.cPOID as order_number',DB::raw("CONVERT(varchar(10), a.dPODate, 120) as order_date"),'c.cVenName as supplier_title')
+            ->orderBy('a.POID','desc');
 
         $list = $this->limit($model,'',$data);
-        $list = $this->fillAll($list, 2);
+        $list = $this->fillAll($list, 1, $user['login_type']);
 
-       return [true , $list];
+        return [true , $list];
     }
 
-    public function purchaseRequisitionDetail($data, $user){
-        if(empty($data['order_number'])) return [false, '采购请购单号不能为空'];
+    public function purchaseOrderDetail($data, $user){
+        if(empty($data['order_number'])) return [false, '采购单号不能为空'];
 
-        $order = $this->databaseService->table('PU_AppVouch as a')
-            ->leftJoin('Person as c', 'c.cPersonCode', 'a.cPersonCode')
+        $order = $this->databaseService->table('PO_Pomain as a')
+            ->leftJoin('Vendor as c', 'c.cVenCode', 'a.cVenCode')
+            ->where('cPOID', $data['order_number'])
 //            ->where('a.cMaker',$user['username'])
 //            ->where('a.iverifystateex',0)
-            ->where('cCode', $data['order_number'])
-            ->select('a.cMaker as crt_name', DB::raw("COALESCE(c.cPersonName, '') as purchase_name"),'a.cBusType as business_type','a.cCode as order_number',DB::raw("CONVERT(varchar(10), a.dDate, 120) as order_date"),'a.ID as id')
+            ->select('a.cMaker as crt_name', 'a.cBusType as business_type','a.cPOID as order_number',DB::raw("CONVERT(varchar(10), a.dPODate, 120) as order_date"),'c.cVenName as supplier_title','a.POID as id')
             ->first();
-        if(empty($order)) return [false, '采购请购单不存在'];
+        if(empty($order)) return [false, '采购单不存在'];
         $order = (array) $order;
 
-        $detail = $this->databaseService->table('PU_AppVouchs as a')
+        $detail = $this->databaseService->table('PO_Podetails as a')
             ->leftJoin('Inventory as b', 'b.cInvCode', 'a.cInvCode')
             ->leftJoin('ComputationUnit as c', 'c.cComunitCode', 'b.cComUnitCode')
-            ->where('a.ID', $order['id'])
-            ->select('b.cInvName as product_title','b.cInvCode as product_code','c.cComUnitName as unit_title',DB::raw("CONVERT(varchar(10), a.dRequirDate, 120) as need_arrived_date"),DB::raw("LTRIM(STR(a.fQuantity, 20, 2)) as quantity"))
+            ->where('a.POID', $order['id'])
+            ->select('b.cInvName as product_title','b.cInvCode as product_code','c.cComUnitName as unit_title',DB::raw("LTRIM(STR(a.iQuantity, 20, 2)) as quantity"),DB::raw("LTRIM(STR(a.iSum, 20, 2)) as amount"))
             ->get();
         // 转为数组的数组
         $detail = array_map(function ($item) {
@@ -96,56 +95,56 @@ class U8ServerService extends Service
         return [true, $order];
     }
 
-    public function purchaseOrder($data, $user){
+    public function purchaseRequisition($data, $user){
         $qx = $user['qx'];
         $order_date = $data['order_date'] ?? [];
         $order_date = array_filter($order_date);
         $order_number = $data['order_number'] ?? "";
 
-        $model = $this->databaseService->table('PO_Pomain as a')
-            ->leftJoin('Vendor as c', 'c.cVenCode', 'a.cVenCode')
+        $model = $this->databaseService->table('PU_AppVouch as a')
+            ->leftJoin('Person as c', 'c.cPersonCode', 'a.cPersonCode')
             ->when(empty($qx), function ($query) use($user){
                 return $query->where('a.cMaker',$user['username']);
             })
             ->when(! empty($order_number), function ($query) use($order_number){
-                return $query->where('a.cPOID','LIKE', '%'.$order_number.'%');
+                return $query->where('a.cCode','LIKE', '%'.$order_number.'%');
             })
             ->when(! empty($order_date), function ($query) use($order_date){
                 $start = date('Y-m-d H:i:s.000', $order_date[0]);
                 $end = date('Y-m-d H:i:s.000', $order_date[1]);
-                return $query->whereBetween('a.dPODate', [$start, $end]);
+                return $query->whereBetween('a.dDate', [$start, $end]);
             })
             ->where(function ($query) {
                 $query->where('a.iverifystateex', 0)
                     ->OrwhereNull('a.iverifystateex');
             })
-            ->select('a.cMaker as crt_name', 'a.cBusType as business_type','a.cPOID as order_number',DB::raw("CONVERT(varchar(10), a.dPODate, 120) as order_date"),'c.cVenName as supplier_title')
-            ->orderBy('a.POID','desc');
+            ->select('a.cMaker as crt_name', DB::raw("COALESCE(c.cPersonName, '') as purchase_name"),'a.cBusType as business_type','a.cCode as order_number',DB::raw("CONVERT(varchar(10), a.dDate, 120) as order_date"))
+            ->orderBy('a.ID','desc');
 
         $list = $this->limit($model,'',$data);
-        $list = $this->fillAll($list, 1);
+        $list = $this->fillAll($list, 2, $user['login_type']);
 
-        return [true , $list];
+       return [true , $list];
     }
 
-    public function purchaseOrderDetail($data, $user){
-        if(empty($data['order_number'])) return [false, '采购单号不能为空'];
+    public function purchaseRequisitionDetail($data, $user){
+        if(empty($data['order_number'])) return [false, '采购请购单号不能为空'];
 
-        $order = $this->databaseService->table('PO_Pomain as a')
-            ->leftJoin('Vendor as c', 'c.cVenCode', 'a.cVenCode')
-            ->where('cPOID', $data['order_number'])
+        $order = $this->databaseService->table('PU_AppVouch as a')
+            ->leftJoin('Person as c', 'c.cPersonCode', 'a.cPersonCode')
 //            ->where('a.cMaker',$user['username'])
 //            ->where('a.iverifystateex',0)
-            ->select('a.cMaker as crt_name', 'a.cBusType as business_type','a.cPOID as order_number',DB::raw("CONVERT(varchar(10), a.dPODate, 120) as order_date"),'c.cVenName as supplier_title','a.POID as id')
+            ->where('cCode', $data['order_number'])
+            ->select('a.cMaker as crt_name', DB::raw("COALESCE(c.cPersonName, '') as purchase_name"),'a.cBusType as business_type','a.cCode as order_number',DB::raw("CONVERT(varchar(10), a.dDate, 120) as order_date"),'a.ID as id')
             ->first();
-        if(empty($order)) return [false, '采购单不存在'];
+        if(empty($order)) return [false, '采购请购单不存在'];
         $order = (array) $order;
 
-        $detail = $this->databaseService->table('PO_Podetails as a')
+        $detail = $this->databaseService->table('PU_AppVouchs as a')
             ->leftJoin('Inventory as b', 'b.cInvCode', 'a.cInvCode')
             ->leftJoin('ComputationUnit as c', 'c.cComunitCode', 'b.cComUnitCode')
-            ->where('a.POID', $order['id'])
-            ->select('b.cInvName as product_title','b.cInvCode as product_code','c.cComUnitName as unit_title',DB::raw("LTRIM(STR(a.iQuantity, 20, 2)) as quantity"),DB::raw("LTRIM(STR(a.iSum, 20, 2)) as amount"))
+            ->where('a.ID', $order['id'])
+            ->select('b.cInvName as product_title','b.cInvCode as product_code','c.cComUnitName as unit_title',DB::raw("CONVERT(varchar(10), a.dRequirDate, 120) as need_arrived_date"),DB::raw("LTRIM(STR(a.fQuantity, 20, 2)) as quantity"))
             ->get();
         // 转为数组的数组
         $detail = array_map(function ($item) {
@@ -180,7 +179,7 @@ class U8ServerService extends Service
             ->orderBy('a.ID','desc');
 
         $list = $this->limit($model,'',$data);
-        $list = $this->fillAll($list, 3);
+        $list = $this->fillAll($list, 3, $user['login_type']);
 
         return [true , $list];
     }
@@ -261,11 +260,12 @@ class U8ServerService extends Service
         return [$success, $order];
     }
 
-    private function fillAll($list, $type){
+    private function fillAll($list, $type, $login_type){
         if(empty($list['data'])) return $list;
 
         $map = Record::where('del_time',0)
             ->where('type', $type)
+            ->where('login_type', $login_type)
             ->whereIn('order_number',array_column($list['data'],'order_number'))
             ->pluck('id','order_number')
             ->toArray();

config/dingtalk.php

@@ -1,12 +1,23 @@
 <?php
 
 return [
-    'app_key' => env('DD_APPKEY'),
-    'app_secret' => env('DD_APPSECRET'),
-    'corpid' => env('DD_CORPID'),
-    'SSOsecret' => '',
-    'apitoken' => env('DD_APITOEKN'),
-    'aes_key' => env('DD_AESKEY'),
-    'token' => env('DD_TOKEN')
+    \App\Model\DDEmployee::type_one => [
+        'app_key' => env('DD_APPKEY'),
+        'app_secret' => env('DD_APPSECRET'),
+        'corpid' => env('DD_CORPID'),
+        'SSOsecret' => '',
+        'apitoken' => env('DD_APITOEKN'),
+        'aes_key' => env('DD_AESKEY'),
+        'token' => env('DD_TOKEN')
+    ],
+    \App\Model\DDEmployee::type_two => [
+        'app_key' => env('DD_APPKEY_HZ'),
+        'app_secret' => env('DD_APPSECRET_HZ'),
+        'corpid' => env('DD_CORPID_HZ'),
+        'SSOsecret' => '',
+        'apitoken' => env('DD_APITOEKN_HZ'),
+        'aes_key' => env('DD_AESKEY_HZ'),
+        'token' => env('DD_TOKEN_HZ')
+    ]
 ];
 

config/u8_database.php

@@ -0,0 +1,11 @@
+<?php
+
+return [
+    \App\Model\DDEmployee::type_one => [
+        'zt_database' => env('DATABASE_ZJ'),
+    ],
+    \App\Model\DDEmployee::type_two => [
+        'zt_database' => env('DATABASE_HZ'),
+    ]
+];
+

routes/api.php

@@ -23,8 +23,9 @@ Route::any('uploadFiles/{file_name}', 'Api\FileUploadController@getFile');
 //获取导出规则
 Route::any('getExport/{file_name}','Api\SysMenuController@getExport');
 
-Route::any('getAccessToken','Api\DingTalkController@getAccessToken');
+//钉钉登录
 Route::any('getUserByCode','Api\DingTalkController@getUserByCode');
+Route::any('getAccessToken','Api\DingTalkController@getAccessToken');
 Route::any('getTemplateFields','Api\DingTalkController@getTemplateFields');
 
 Route::any('dinCallback','Api\DingTalkController@dinCallback');