|
@@ -80,9 +80,7 @@ class DataSend:
|
|
|
if flag:
|
|
|
self.store.set_send(item.no)
|
|
|
|
|
|
- def _get_email_by_area(
|
|
|
- self, area: str, count: int = 0, virtual_area: str = None
|
|
|
- ) -> str:
|
|
|
+ def _get_email_by_area(self, area: str, count: int = 0) -> str:
|
|
|
email = None
|
|
|
area_str = (
|
|
|
area.replace("省", "").replace("市", "").replace("区", "").replace("县", "")
|
|
@@ -90,18 +88,11 @@ class DataSend:
|
|
|
for area_item in self._email_area_arr:
|
|
|
if area_str in area_item.area:
|
|
|
email = area_item.email
|
|
|
- if virtual_area:
|
|
|
- new_area = f"{area_item.area},{virtual_area}"
|
|
|
- self.store.update_area_email_area_by_name(area_item.name, new_area)
|
|
|
- self._email_area_arr = self.store.query_all_emails()
|
|
|
break
|
|
|
- if not email and count < 3:
|
|
|
+ if not email and count <= 3:
|
|
|
area_name = self._get_email_by_area_virtual(area_str)
|
|
|
if area_name:
|
|
|
- virtual_area = (
|
|
|
- f"{area_str},{virtual_area}" if virtual_area else area_str
|
|
|
- )
|
|
|
- email = self._get_email_by_area(area_name, count + 1, virtual_area)
|
|
|
+ email = self._get_email_by_area(area_name, count + 1)
|
|
|
return email
|
|
|
|
|
|
def _get_email_by_area_virtual(self, area: str) -> str:
|