1.优化提单批量推送包裹状态 2.增加3次重试机制

ccs_connect_tiktok/models/cc_bill_loading.py

@@ -247,14 +247,13 @@ class CcBl(models.Model):
 
     # 定义一个方法, 获取提单下的所有未同步的小包,并回传小包状态
     def callback_track(self):
-        for item in self:
-            ship_packages = self.env['cc.ship.package'].search([('bl_id', '=', item.id), ('is_sync', '=', False)])
+        ship_packages = self.env['cc.ship.package'].search([('bl_id', 'in', self.ids), ('is_sync', '=', False)])
         # for package in ship_packages:
         #     package.callback_track()
         tt_api_obj = self.env["ao.tt.api"].sudo()
         async def perform_requests():
             ssl_context = ssl.create_default_context(cafile=certifi.where())
-                async with aiohttp.ClientSession(connector=aiohttp.TCPConnector(ssl=ssl_context)) as session:
+            async with aiohttp.ClientSession(connector=aiohttp.TCPConnector(ssl=ssl_context), timeout=aiohttp.ClientTimeout(total=60)) as session:
                 tasks = []
                 for index, package in enumerate(ship_packages):
                     if not package.is_sync and package.state and package.state.tk_code:
@@ -288,7 +287,6 @@ class CcBl(models.Model):
                 request_id = response_data['requestID']
                 self.env['ao.tt.api.log'].sudo().create_api_log(
                     package_order.tracking_no or '', '', data, 0, request_id, source='推出')
-        return True
 
     def deal_ship_package_state(self):
         for item in self:

ccs_connect_tiktok/models/tt_api.py

 # coding=utf-8
+import asyncio
 
+import aiohttp
 import requests
 import json
 import datetime, time
@@ -127,11 +129,19 @@ class TT(models.Model):
         request_url = tt_url + url
         logging.info('request_url: %s' % request_url)
         logging.info('request_data: %s' % parameter)
+        for i in range(3):  # 尝试最多3次
+            try:
                 async with session.post(request_url, headers=headers, data=parameter) as response:
                     response_data = await response.json()
                     logging.info('response: %s', response_data)
                     # print(response.json())
                     return response_data
+            except Exception as e:
+                if i < 2:  # 如果不是最后一次尝试，等待后重试
+                    await asyncio.sleep(2 ** i)  # 指数退避策略
+                else:
+                    logging.warning('request error:%s' % str(e))
+                    return {'code': 500, 'requestID': 'request error timeout', 'msg': '超时，请重试'}  # 如果重试次数用尽，抛出异常
 
     async def async_callback_track_callback(self, session, push_data, package_id):
         """包裹轨迹回传"""