地区id新增俄罗斯

Ansjer/config.py

@@ -34,6 +34,8 @@ ME_COUNTRY_ID_LIST = [31, 32, 36, 39, 48]
 # 东亚国家id列表,id: 2~16
 # 朝鲜,韩国,蒙古,日本,越南,老挝,柬埔寨,缅甸,泰国,马来西亚,文莱,新加坡,印度尼西亚,东帝汶,菲律宾
 EA_COUNTRY_ID_LIST = [i for i in range(2, 17)]
+# 俄罗斯
+RU_COUNTRY_ID_LIST = [91]
 
 # 支付类型
 PAY_TYPE_PAYPAL = 1

Service/CommonService.py

@@ -21,7 +21,7 @@ from pyipip import IPIPDatabase
 
 from Ansjer.config import BASE_DIR, SERVER_DOMAIN_SSL, CONFIG_INFO, CONFIG_TEST, CONFIG_CN, SERVER_DOMAIN_TEST, \
     SERVER_DOMAIN_CN, SERVER_DOMAIN_US, CONFIG_US, CONFIG_EUR, SERVER_DOMAIN_LIST, SERVER_DOMAIN_EUR, ALEXA_DOMAIN, \
-    ME_COUNTRY_ID_LIST, EA_COUNTRY_ID_LIST
+    ME_COUNTRY_ID_LIST, EA_COUNTRY_ID_LIST, RU_COUNTRY_ID_LIST
 from Controller.CheckUserData import RandomStr
 from Model.models import iotdeviceInfoModel, Device_Info, UIDModel, AppDeviceType, UIDCompanySerialModel, GatewayPush, \
     Device_User, UserExModel
@@ -613,6 +613,7 @@ GCqvlyw5dfxNA+EtxNE2wCW/LW7ENJlACgcfgPlBZtpLheWoZB/maw4=
         @param region_country: 用户国家id
         @return: region_id
         """
+        # region_id 为 tb_region 表的id,根据数据库的数据决定编码
         region_id = 3
         if CONFIG_INFO == CONFIG_US:  # 美洲
             # 中东地区国家id
@@ -622,7 +623,11 @@ GCqvlyw5dfxNA+EtxNE2wCW/LW7ENJlACgcfgPlBZtpLheWoZB/maw4=
             elif region_country in EA_COUNTRY_ID_LIST:
                 region_id = 2
         elif CONFIG_INFO == CONFIG_EUR:  # 欧洲
-            region_id = 4
+            # 俄罗斯
+            if region_country in RU_COUNTRY_ID_LIST:
+                region_id = 6
+            else:
+                region_id = 4
         elif CONFIG_INFO == CONFIG_CN:  # 中国
             region_id = 1
         elif CONFIG_INFO == CONFIG_TEST:  # 测试