C1返回完整序列号

Controller/AiController.py

@@ -366,10 +366,11 @@ class AiView(View):
 
             ai_service_data = ai_service_qs[0]
             # 如果存在序列号返回完整序列号
-            # device_info_qs = Device_Info.objects.filter(UID=uid).values('serial_number', 'Type')
-            # serial_number = device_info_qs[0]['serial_number']
-            # if serial_number:
-            #     ai_service_data['uid'] = CommonService.get_full_serial_number(uid, serial_number, device_info_qs[0]['Type'])
+            device_info_qs = Device_Info.objects.filter(UID=uid).values('serial_number', 'Type')
+            serial_number = device_info_qs[0]['serial_number']
+            device_type = device_info_qs[0]['Type']
+            if serial_number and device_type == 101:
+                ai_service_data['uid'] = CommonService.get_full_serial_number(uid, serial_number, device_type)
 
             ai_service_data['endTime'] = sum_end_time
             return response.json(0, [ai_service_data])

Controller/CloudStorage.py

@@ -740,8 +740,13 @@ class CloudStorageView(View):
                     order_qs.update(status=1, updTime=nowTime, uid_bucket_id=uid_bucket_id, promotion_rule_id=promotion_rule_id)
                     datetime = time.strftime("%Y-%m-%d", time.localtime())
                     # 如果存在序列号,消息提示用序列号
-                    # device_name = CommonService.query_serial_with_uid(uid=UID)
-                    device_name = UID
+                    device_info_qs = Device_Info.objects.filter(UID=UID).values('serial_number', 'Type')
+                    serial_number = device_info_qs[0]['serial_number']
+                    device_type = device_info_qs[0]['Type']
+                    if serial_number and device_type == 101:
+                        device_name = CommonService.get_full_serial_number(UID, serial_number, device_type)
+                    else:
+                        device_name = UID
                     sys_msg_text_list = ['温馨提示：尊敬的客户，您的'+device_name+'设备在'+datetime+'已成功购买云存套餐', 'Dear customer,you already subscribed the cloud storage package successfully for device ' + device_name + ' on '+ time.strftime("%b %dth,%Y", time.localtime())]
                     self.do_vod_msg_Notice(UID, channel, userid, lang, sys_msg_text_list, 'SMS_219738485')
                     red_url = "{SERVER_DOMAIN_SSL}web/paid2/success.html".format(SERVER_DOMAIN_SSL=SERVER_DOMAIN_SSL)
@@ -890,8 +895,13 @@ class CloudStorageView(View):
                 order_qs.update(status=1, updTime=nowTime, uid_bucket_id=uid_bucket_id, promotion_rule_id=promotion_rule_id)
                 datetime = time.strftime("%Y-%m-%d", time.localtime())
                 # 如果存在序列号,消息提示用序列号
-                # device_name = CommonService.query_serial_with_uid(uid=UID)
-                device_name = UID
+                device_info_qs = Device_Info.objects.filter(UID=UID).values('serial_number', 'Type')
+                serial_number = device_info_qs[0]['serial_number']
+                device_type = device_info_qs[0]['Type']
+                if serial_number and device_type == 101:
+                    device_name = CommonService.get_full_serial_number(UID, serial_number, device_type)
+                else:
+                    device_name = UID
                 sys_msg_text_list = ['温馨提示：尊敬的客户，您的' + device_name + '设备在' + datetime + '已成功购买云存套餐',
                                      'Dear customer,you already subscribed the cloud storage package successfully for device ' + device_name + ' on ' + time.strftime(
                                          "%b %dth,%Y", time.localtime())]
@@ -1020,8 +1030,13 @@ class CloudStorageView(View):
                     order_qs.update(status=1, updTime=nowTime, uid_bucket_id=uid_bucket_id, promotion_rule_id=promotion_rule_id)
                     datetime = time.strftime("%Y-%m-%d", time.localtime())
                     # 如果存在序列号,消息提示用序列号
-                    # device_name = CommonService.query_serial_with_uid(uid=UID)
-                    device_name = UID
+                    device_info_qs = Device_Info.objects.filter(UID=UID).values('serial_number', 'Type')
+                    serial_number = device_info_qs[0]['serial_number']
+                    device_type = device_info_qs[0]['Type']
+                    if serial_number and device_type == 101:
+                        device_name = CommonService.get_full_serial_number(UID, serial_number, device_type)
+                    else:
+                        device_name = UID
                     sys_msg_text_list = ['温馨提示：尊敬的客户，您的' + device_name + '设备在' + datetime + '已成功购买云存套餐',
                                          'Dear customer,you already subscribed the cloud storage package successfully for device ' + device_name + ' on ' + time.strftime(
                                              "%b %dth,%Y", time.localtime())]
@@ -1369,8 +1384,13 @@ class CloudStorageView(View):
                 sms = 'SMS_219738485'
                 datetime = time.strftime("%Y-%m-%d", time.localtime())
                 # 如果存在序列号,消息提示用序列号
-                # device_name = CommonService.query_serial_with_uid(uid=uid)
-                device_name = uid
+                device_info_qs = Device_Info.objects.filter(UID=uid).values('serial_number', 'Type')
+                serial_number = device_info_qs[0]['serial_number']
+                device_type = device_info_qs[0]['Type']
+                if serial_number and device_type == 101:
+                    device_name = CommonService.get_full_serial_number(uid, serial_number, device_type)
+                else:
+                    device_name = uid
                 sys_msg_text_list = ['温馨提示：尊敬的客户，您的' + device_name + '设备在' + datetime + '已成功购买云存套餐',
                                      'Dear customer,you already subscribed the cloud storage package successfully for device ' + device_name + ' on ' + time.strftime(
                                          "%b %dth,%Y", time.localtime())]
@@ -1467,9 +1487,10 @@ class CloudStorageView(View):
 
         # 如果存在序列号返回完整序列号
         device_id = uid
-        # serial_number = dv_qs[0]['serial_number']
-        # if serial_number:
-        #     device_id = CommonService.get_full_serial_number(uid, serial_number, dv_qs[0]['Type'])
+        serial_number = dv_qs[0]['serial_number']
+        device_type = dv_qs[0]['Type']
+        if serial_number and device_type == 101:
+            device_id = CommonService.get_full_serial_number(uid, serial_number, device_type)
 
         uid_bucket[0]['uid'] = device_id
         uid_bucket[0]['storage'] = 0
@@ -1614,8 +1635,13 @@ class CloudStorageView(View):
                     S3Email().faEmail(sys_msg_text, username)
                 elif data_valid.mobile_validate(username):
                     # 如果存在序列号,消息提示用序列号
-                    # device_name = CommonService.query_serial_with_uid(uid=uid)
-                    device_name = uid
+                    device_info_qs = Device_Info.objects.filter(UID=uid).values('serial_number', 'Type')
+                    serial_number = device_info_qs[0]['serial_number']
+                    device_type = device_info_qs[0]['Type']
+                    if serial_number and device_type == 101:
+                        device_name = CommonService.get_full_serial_number(uid, serial_number, device_type)
+                    else:
+                        device_name = uid
                     params = u'{"devname":"' + device_name + '","submittime":"' + time.strftime("%Y-%m-%d",time.localtime()) + '"}'
                     self.sendMessage(username, params, sms)
 
@@ -1654,8 +1680,14 @@ class CloudStorageView(View):
             for oo in oqlist:
                 if ub['id'] == oo['uid_bucket_id']:
                     # 如果存在序列号,消息提示用序列号
-                    # device_name = CommonService.query_serial_with_uid(uid=ub['uid'])
-                    device_name = ub['uid']
+                    uid=ub['uid']
+                    device_info_qs = Device_Info.objects.filter(UID=uid).values('serial_number', 'Type')
+                    serial_number = device_info_qs[0]['serial_number']
+                    device_type = device_info_qs[0]['Type']
+                    if serial_number and device_type == 101:
+                        device_name = CommonService.get_full_serial_number(uid, serial_number, device_type)
+                    else:
+                        device_name = uid
                     if ub['bucket__area'] == 'cn':
                         sys_msg_text = "温馨提示：尊敬的客户，您" + device_name + "设备的云存套餐将在" + time.strftime("%Y-%m-%d", time.localtime(ub['endTime'])) + "到期"
                     else:

Controller/EquipmentManagerV2.py

@@ -326,8 +326,8 @@ class EquipmentManagerV2(View):
 
         for p in dvls:
             # 如果存在序列号返回完整序列号
-            # if p['serial_number']:
-            #     p['UID'] = CommonService.get_full_serial_number(p['UID'], p['serial_number'], p['Type'])
+            if p['serial_number'] and p['Type'] == 101:
+                p['UID'] = CommonService.get_full_serial_number(p['UID'], p['serial_number'], p['Type'])
             # 新增IOT
             p['iot'] = []
             for iot in iotqs:

Controller/OrderContrller.py

@@ -128,8 +128,8 @@ class OrderView(View):
                     d['did'] = did['id']
                     d['Type'] = did['Type']
                     # 如果存在序列号返回完整序列号
-                    # if did['serial_number']:
-                    #     d['UID'] = CommonService.get_full_serial_number(d['UID'], did['serial_number'], did['Type'])
+                    if did['serial_number'] and did['Type'] == 101:
+                        d['UID'] = CommonService.get_full_serial_number(d['UID'], did['serial_number'], did['Type'])
                     data.append(d)
             d['rank__content'] = d['rank__lang__content']
             del d['rank__lang__content']