|
@@ -29,7 +29,7 @@ from Model.models import Device_User, Device_Info, UidSetModel, UID_Bucket, Unus
|
|
CountryModel, DeviceTypeModel, OrdersSummary, DeviceInfoSummary, CompanySerialModel, \
|
|
CountryModel, DeviceTypeModel, OrdersSummary, DeviceInfoSummary, CompanySerialModel, \
|
|
CloudLogModel, UidCloudStorageCount, UserExModel, DeviceDomainRegionModel, VodHlsTag, VodHlsTagType, IcloudService, \
|
|
CloudLogModel, UidCloudStorageCount, UserExModel, DeviceDomainRegionModel, VodHlsTag, VodHlsTagType, IcloudService, \
|
|
Store_Meal, Lang, VodBucketModel, UnicomComboOrderInfo, UnicomDeviceInfo, AbnormalOrder, DailyReconciliation, \
|
|
Store_Meal, Lang, VodBucketModel, UnicomComboOrderInfo, UnicomDeviceInfo, AbnormalOrder, DailyReconciliation, \
|
|
- CustomizedPush, UIDCompanySerialModel, UIDModel, LogModel, OperatingCosts, UidBucketStatistics
|
|
|
|
|
|
+ CustomizedPush, UIDCompanySerialModel, UIDModel, LogModel, OperatingCosts, UidBucketStatistics, AppScannedSerial
|
|
from Object.AWS.AmazonS3Util import AmazonS3Util
|
|
from Object.AWS.AmazonS3Util import AmazonS3Util
|
|
from Object.RedisObject import RedisObject
|
|
from Object.RedisObject import RedisObject
|
|
from Object.ResponseObject import ResponseObject
|
|
from Object.ResponseObject import ResponseObject
|
|
@@ -622,12 +622,17 @@ class CronUpdateDataView(View):
|
|
requests_failed_flag = True
|
|
requests_failed_flag = True
|
|
break
|
|
break
|
|
|
|
|
|
- # 状态为未使用,重置美洲服的地区id
|
|
|
|
- if status == 1: # 美洲服直接更新
|
|
|
|
|
|
+ # 状态为未使用,重置扫码记录和美洲服的地区id
|
|
|
|
+ if status == 1:
|
|
|
|
+ # 扫码记录
|
|
|
|
+ AppScannedSerial.objects.filter(serial__in=serial_redis_list).delete()
|
|
|
|
+ # 地区id
|
|
|
|
+ # 美洲服直接更新
|
|
if CONFIG_INFO == CONFIG_US:
|
|
if CONFIG_INFO == CONFIG_US:
|
|
DeviceDomainRegionModel.objects.filter(~Q(region_id=0), serial_number__in=serial_redis_list). \
|
|
DeviceDomainRegionModel.objects.filter(~Q(region_id=0), serial_number__in=serial_redis_list). \
|
|
update(region_id=0)
|
|
update(region_id=0)
|
|
- else: # 其他服请求到美洲服更新
|
|
|
|
|
|
+ # 其他服请求到美洲服更新
|
|
|
|
+ else:
|
|
req_url = 'https://www.dvema.com/cron/update/reset-region-id'
|
|
req_url = 'https://www.dvema.com/cron/update/reset-region-id'
|
|
req_data = {
|
|
req_data = {
|
|
'serial_redis_list': str(serial_redis_list)
|
|
'serial_redis_list': str(serial_redis_list)
|