云存套擦转移接口 - 修复转移导致设备历史使用套餐也发生变化的问题

AdminController/ServeManagementController.py

@@ -1788,11 +1788,14 @@ class serveManagement(View):
                 return response.json(10017)
 
             # 查老设备 orderID
-            old_using_uid_bucket = UID_Bucket.objects.filter(orderId=orderID, endTime__gte=nowTime)
+            old_using_uid_bucket = UID_Bucket.objects.filter(orderId=orderID)
             old_unusing_uid_bucket = Unused_Uid_Meal.objects.filter(order_id=orderID)
-
-            if not old_using_uid_bucket.exists() and not old_unusing_uid_bucket.exists():
-                return response.json(10017)
+            if old_using_uid_bucket.exists():
+                if old_using_uid_bucket.first().endTime < nowTime:
+                    return response.json(10013)
+            else:
+                if not old_unusing_uid_bucket.exists():
+                    return response.json(10017)
 
             # 订单套餐未使用
             if old_unusing_uid_bucket.exists():
@@ -1802,8 +1805,8 @@ class serveManagement(View):
                         new_uid_set = UidSetModel.objects.filter(uid=new_uid).values('is_ai')
                         if new_uid_set[0]['is_ai'] == 2:
                             return response.json(10016)
-                    old_unusing_uid_bucket.update(uid=new_uid, addTime=nowTime)
-                    new_unused_uid_bucket = Unused_Uid_Meal.objects.filter(uid=new_uid, addTime=nowTime).values(
+                    old_unusing_uid_bucket.update(uid=new_uid)
+                    new_unused_uid_bucket = Unused_Uid_Meal.objects.filter(order_id=orderID).values(
                         'id', 'channel', 'bucket_id', 'addTime', 'expire', 'is_ai', 'order_id'
                     )
 
@@ -1825,21 +1828,24 @@ class serveManagement(View):
                             UID_Bucket.objects.filter(uid=new_uid).update(status=1, orderId=orderID, updateTime=nowTime,
                                                                           use_status=1, has_unused=0, endTime=endTime,
                                                                           bucket_id=unused['bucket_id'],
-                                                                          channel=unused['channel'],
-                                                                          addTime=unused['addTime'])
-                        data_dict = {
-                            'uid': new_uid,
-                            'channel': unused['channel'],
-                            'bucket_id': unused['bucket_id'],
-                            'addTime': unused['addTime'],
-                            'endTime': endTime,
-                            'updateTime': nowTime,
-                            'status': 1,
-                            'use_status': 1,
-                            'has_unused': 0,
-                            'orderId': unused['order_id']
-                        }
-                        UID_Bucket.objects.create(**data_dict)  # 正在使用套餐表添加数据
+                                                                          channel=unused['channel'])
+                            new_bucket_id = UID_Bucket.objects.filter(uid=new_uid).first().id
+                        else:
+                            data_dict = {
+                                'uid': new_uid,
+                                'channel': unused['channel'],
+                                'bucket_id': unused['bucket_id'],
+                                'addTime': unused['addTime'],
+                                'endTime': endTime,
+                                'updateTime': nowTime,
+                                'status': 1,
+                                'use_status': 1,
+                                'has_unused': 0,
+                                'orderId': orderID
+                            }
+                            new_bucket = UID_Bucket.objects.create(**data_dict)  # 正在使用套餐表添加数据
+                            new_bucket_id = new_bucket.id
+
                         if unused['is_ai']:  # 开通AI服务
                             new_aiservice = AiService.objects.filter(uid=new_uid)
                             if new_aiservice.filter(use_status=1 or 0).exists():
@@ -1854,10 +1860,11 @@ class serveManagement(View):
                                                          updTime=nowTime, endTime=endTime, use_status=1,
                                                          orders_id=unused['order_id'])
 
-                        Unused_Uid_Meal.objects.filter(order_id=orderID).first().delete()
+                        Unused_Uid_Meal.objects.filter(order_id=orderID).delete()
 
                     # 修改订单表
-                    Order_Model.objects.filter(orderID=orderID).update(UID=new_uid, updTime=nowTime)
+                    Order_Model.objects.filter(orderID=orderID).update(UID=new_uid, updTime=nowTime,
+                                                                       uid_bucket_id=int(new_bucket_id))
 
             # 订单套餐已使用
             else:
@@ -1867,9 +1874,6 @@ class serveManagement(View):
                                                                                                                   'detect_interval',
                                                                                                                   'detect_status',
                                                                                                                   'detect_group')
-                # new_ai_service = AiService.objects.filter(uid=new_uid, endTime__gte=nowTime, use_status=1)
-                # if new_ai_service.exists():  # 转入设备有开通AI功能，不能转
-                #     return response.json(10014)
 
                 new_uid_set = UidSetModel.objects.filter(uid=new_uid).values('is_ai')
                 if old_ai_service.exists() and new_uid_set[0]['is_ai'] == 2:  # 转出设备有开通AI，但是转入设备不支持AI，不能转
@@ -1893,8 +1897,65 @@ class serveManagement(View):
                             if ai_service:
                                 ai_service.delete()
                         new_using_uid_bucket.delete()
+
+                    # 更新正在使用套餐的uid,重置拥有未使用套餐
+                    old_using_uid_bucket_id = old_using_uid_bucket[0]['id']
+                    ord_uid_bucket = UID_Bucket.objects.filter(id=old_using_uid_bucket_id).first()
+                    # 旧套餐云存转移到新设备
+                    if ord_uid_bucket:
+                        if not UID_Bucket.objects.filter(uid=new_uid).exists():
+                            new_bucket = UID_Bucket.objects.create(
+                                uid=new_uid,
+                                channel=ord_uid_bucket.channel,
+                                bucket_id=ord_uid_bucket.bucket_id,
+                                addTime=nowTime,
+                                endTime=ord_uid_bucket.endTime,
+                                updateTime=nowTime,
+                                status=1,
+                                use_status=1,
+                                has_unused=0,
+                                orderId=orderID
+                            )
+                            new_bucket_id = new_bucket.id
+                        else:
+                            UID_Bucket.objects.filter(uid=new_uid).update(
+                                bucket_id=ord_uid_bucket.bucket_id,
+                                addTime=nowTime,
+                                endTime=ord_uid_bucket.endTime,
+                                updateTime=nowTime,
+                                status=1,
+                                use_status=1,
+                                has_unused=0,
+                                orderId=orderID
+                            )
+                            new_bucket_id = UID_Bucket.objects.filter(uid=new_uid).first().id
+                        # 修改旧设备正在使用中套餐
+                        ord_order = Order_Model.objects.filter(UID=old_uid).exclude(
+                            orderID=orderID).order_by("-addTime").first()
+                        # ord_device_has_unused 如果放在 旧套餐保存旧orderID之后 会发生改变所以提前保持变量
+                        ord_device_has_unused = old_using_uid_bucket[0]['has_unused']
+                        # 旧套餐保存旧orderID
+                        if ord_order:
+                            ord_uid_bucket.orderId = ord_order.orderID
+                            ord_uid_bucket.save()
+                        elif not ord_order and ord_uid_bucket["has_unused"] == 0:
+                            ord_uid_bucket.delete()
+                    else:
+                        return response.json(10017)
+                    StsCrdModel.objects.filter(uid=old_uid).delete()  # 删除转出设备stscrd表关联数据
+                    # 转移AI服务
+                    if old_ai_service.exists() and new_uid_set[0]['is_ai'] != 2:
+                        AiService.objects.filter(id=old_ai_service[0]['id']).update(uid=new_uid, detect_status=0,
+                                                                                    detect_group='',
+                                                                                    detect_interval=60)
+                        msg = {'commandType': 'AIDisable'}
+                        thing_name = CommonService.query_serial_with_uid(old_uid)  # 存在序列号则为使用序列号作为物品名
+                        topic_name = 'ansjer/generic/{}'.format(thing_name)
+                        req_success = CommonService.req_publish_mqtt_msg(thing_name, topic_name, msg)
+                        if not req_success:
+                            return response.json(10044)
                     # 如果转出设备有未使用套餐,更改第一个未使用套餐为正在使用
-                    if old_using_uid_bucket[0]['has_unused'] == 1:
+                    if ord_device_has_unused == 1:
                         old_unused_uid_bucket = Unused_Uid_Meal.objects.filter(uid=old_uid).values('id', 'channel',
                                                                                                    'bucket_id',
                                                                                                    'addTime', 'expire',
@@ -1904,20 +1965,14 @@ class serveManagement(View):
                         unused = old_unused_uid_bucket[0]
                         has_unused = 1 if count > 1 else 0  # 如果存在不止一个未使用套餐,has_unused=1
                         endTime = CommonService.calcMonthLater(unused['expire'])
-                        data_dict = {
-                            'uid': old_uid,
-                            'channel': unused['channel'],
-                            'bucket_id': unused['bucket_id'],
-                            'addTime': unused['addTime'],
-                            'endTime': endTime,
-                            'updateTime': nowTime,
-                            'status': 1,
-                            'use_status': 1,
-                            'has_unused': has_unused,
-                            'orderId': unused['order_id']
-                        }
-                        UID_Bucket.objects.create(**data_dict)  # 正在使用套餐表添加数据
-                        Unused_Uid_Meal.objects.filter(uid=old_uid).first().delete()  # 删除未使用套餐表中的数据
+                        UID_Bucket.objects.filter(id=old_using_uid_bucket_id).update(bucket_id=unused['bucket_id'],
+                                                                                     addTime=unused['addTime'],
+                                                                                     endTime=endTime,
+                                                                                     updateTime=nowTime, status=1,
+                                                                                     use_status=1,
+                                                                                     has_unused=has_unused,
+                                                                                     orderId=unused['order_id'])
+                        Unused_Uid_Meal.objects.filter(order_id=unused['order_id']).delete()  # 删除未使用套餐表中的数据
                         if unused['is_ai']:  # 开通AI服务
                             AiService.objects.create(uid=old_uid, channel=unused['channel'],
                                                      detect_status=old_ai_service[0]['detect_status'],
@@ -1926,23 +1981,9 @@ class serveManagement(View):
                                                      detect_group=old_ai_service[0]['detect_group'],
                                                      detect_interval=old_ai_service[0]['detect_interval'])
 
-                    # 更新正在使用套餐的uid,重置拥有未使用套餐
-                    old_using_uid_bucket_id = old_using_uid_bucket[0]['id']
-                    UID_Bucket.objects.filter(id=old_using_uid_bucket_id).update(uid=new_uid, has_unused=0)
-                    StsCrdModel.objects.filter(uid=old_uid).delete()  # 删除转出设备stscrd表关联数据
-
-                    # 转移AI服务
-                    if old_ai_service.exists() and new_uid_set[0]['is_ai'] != 2:
-                        AiService.objects.filter(id=old_ai_service[0]['id']).update(uid=new_uid, detect_status=0,
-                                                                                    detect_group='', detect_interval=60)
-                        msg = {'commandType': 'AIDisable'}
-                        thing_name = CommonService.query_serial_with_uid(old_uid)  # 存在序列号则为使用序列号作为物品名
-                        topic_name = 'ansjer/generic/{}'.format(thing_name)
-                        req_success = CommonService.req_publish_mqtt_msg(thing_name, topic_name, msg)
-                        if not req_success:
-                            return response.json(10044)
                     # 修改订单表
-                    Order_Model.objects.filter(orderID=orderID).update(UID=new_uid, updTime=nowTime)
+                    Order_Model.objects.filter(orderID=orderID).update(UID=new_uid, updTime=nowTime,
+                                                                       uid_bucket_id=int(new_bucket_id))
 
             ip = CommonService.get_ip_address(request)
             content = json.loads(json.dumps(request_dict))
@@ -1951,7 +1992,7 @@ class serveManagement(View):
                 'user_id': 1,
                 'status': 200,
                 'time': int(time.time()),
-                'url': 'cloudTransfer/mealTransfer',
+                'url': 'serveManagement/mealTransfer',
                 'content': json.dumps(content),
                 'operation': f'订单号:{orderID}套餐从设备{old_uid}转移到设备{new_uid}'
             }