Merge branch 'master' of http://101.200.220.49:8001/houxiaohua/playlet

app/Http/Controllers/Admin/CallBackController.php

@@ -17,6 +17,7 @@ use App\Models\PlatformOrderConf;
 use App\RedisModel;
 use App\Service\CapacityService;
 use App\Service\DjOrderService;
+use App\Service\HttpService;
 use App\Service\MsgService;
 use App\Support\EmailQueue;
 use Illuminate\Http\Request;
@@ -324,6 +325,12 @@ class CallBackController extends Controller
 
         // 将接收到的数据保存的日志文件中
         Log::logInfo(json_encode($request->all(), JSON_UNESCAPED_UNICODE), [$platformId], 'platformOrder');
+        $taskId = $request->input('taskId', '');
+        $xurl = $request->input('xurl', '');
+        if(!empty($taskId)) {
+            # 主动同步下来的订单
+            return HttpService::httpGet('https://idea-ad.wenxingshuju.com/sunshine/orderList?'.http_build_query($request->all()));
+        }
 
         // 查询app_id对应的token
         $conf = PlatformOrderConf::getTokenByPlatformId($platformId);

app/Service/Order/FanQieService.php

@@ -66,6 +66,12 @@ class FanQieService
         ], 'FanQieOrderList');
 
         $responseData = json_decode($response, 1);
+        if(isset($responseData['code']) && $responseData['code'] == 501 && $retry < 5) {
+            sleep(1);
+            $retry++;
+            return self::getOrderList($params, $retry);
+        }
+
         if(isset($responseData['code']) && $responseData['code'] != 200) {
             EmailQueue::rPush('获取番茄平台下的订单信息返回错误', $responseData['code'].':'.$responseData['message'], ['song.shen@kuxuan-inc.com'],
                 '猎羽');

app/Service/wechatWorkService.php

@@ -404,7 +404,7 @@ class wechatWorkService
         while ($flag) {
             $accessToken = AuthorizeCorp::getAccessToken($corpid, '根据员工获取外部客户');
             try{
-                $result = wechatWorkService::getCustomerListMethod($params, $accessToken);
+                $result = wechatWorkService::getCustomerListMethod($params, $accessToken, $corpid);
 //                if($corpid == 'wwdfec0bcee287d5c5') {
 //                    Log::logInfo('同步客户', ['corpid' => $corpid, 'user_list' => $userList, 'res' =>$result], 'get_corp_customer_list');
 //                }
@@ -488,28 +488,28 @@ class wechatWorkService
     }
 
     // 根据内部员工获取外部联系客户具体方法
-    public static function getCustomerListMethod($params, $accessToken, $retry = 0)
+    public static function getCustomerListMethod($params, $accessToken, $corpid, $retry = 0)
     {
         $url = 'https://qyapi.weixin.qq.com/cgi-bin/externalcontact/batch/get_by_user?access_token='.$accessToken;
 
         $result = HttpService::httpPost($url, json_encode($params), true);
         $result = mb_convert_encoding($result, "UTF-8");
         $result = json_decode($result, 1);
-        if(empty($result) && $retry < 5) {
+        if((empty($result) || (isset($result['errcode']) && in_array($result['errcode'], [-1]))) && $retry < 5) {
             sleep(2);
             $retry++;
-            return self::getCustomerListMethod($params, $accessToken, $retry);
+            return self::getCustomerListMethod($params, $accessToken, $corpid, $retry);
         }
 
         if(isset($result['errcode']) && in_array($result['errcode'], [0, 701008, 60111])) {
             return $result;
         } else {
             // 请求失败，将响应数据写入日志
-            Log::logError('获取内部员工对应的外部联系人列表失败：URL'.$url.', 请求参数：'.json_encode($params),
+            Log::logError('获取内部员工对应的外部联系人列表失败：URL'.$url.', 请求参数：'.json_encode(array_merge($params, ['corpid' => $corpid])),
                 (array)$result, 'get_user_customer_list');
 
             EmailQueue::rPush('获取内部员工对应的外部联系人列表失败', json_encode([
-                'url' => $url, 'params' => $params, 'result' => (array)$result
+                'url' => $url, 'params' => array_merge($params, ['corpid' => $corpid]), 'result' => (array)$result
             ]), ['song.shen@kuxuan-inc.com'], '猎羽');
 
             return false;