浏览代码

4G设备不允许购买体验云存、优化PC唤醒设备

zhangdongming 2 年之前
父节点
当前提交
5d8ca736da
共有 3 个文件被更改,包括 8 次插入2 次删除
  1. 3 1
      Controller/CloudStorage.py
  2. 3 1
      Controller/EquipmentManagerV3.py
  3. 2 0
      Object/ResponseObject.py

+ 3 - 1
Controller/CloudStorage.py

@@ -1394,7 +1394,9 @@ class CloudStorageView(View):
         device_info_qs = Device_Info.objects.filter(userID_id=user_id, UID=uid, isShare=False, isExist=1)
         if not device_info_qs.exists():
             return response.json(12)
-
+        device_vo = device_info_qs.first()
+        if device_vo.Type == 103 or device_vo.Type == 26:
+            return response.json(10064)
         order_id = CommonService.createOrderID()
         now_time = int(time.time())
         store_qs = Store_Meal.objects.filter(id=rank, lang__lang=lang, is_show=0).values("day", "bucket_id",

+ 3 - 1
Controller/EquipmentManagerV3.py

@@ -92,7 +92,9 @@ class EquipmentManagerV3(View):
             topic_name = f'/wakeup/{serial_number}_0'
             # 发布消息内容
             msg = {'payload': 'A'}
-            CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg)
+            result = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg)
+            if not result:
+                return response.json(10044)
             return response.json(0)
         except Exception as e:
             LOGGER.info('****设备唤醒发布消息异常:{},{}'.format(serial_number, repr(e)))

+ 2 - 0
Object/ResponseObject.py

@@ -127,6 +127,7 @@ class ResponseObject(object):
             10061: 'Add the limit reached',
             10062: 'This device has experienced the package',
             10063: 'Failed to claim',
+            10064: 'If the claim fails, please contact customer service',
         }
         data_cn = {
             0: '成功',
@@ -243,6 +244,7 @@ class ResponseObject(object):
             10061: '添加已达到上限',
             10062: '此设备已体验过套餐',
             10063: '领取失败',
+            10064: '领取失败,请联系客服',
         }
 
         msg = data_cn if self.lang == 'cn' or self.lang == 'zh-Hans' or self.lang == 'zh-Hant' else data_en