修改插座上报千瓦时、用户注销保留订单

Controller/SensorGateway/SmartSocketController.py

@@ -199,8 +199,7 @@ class SmartSocketView(View):
         """
         if watt == 0 or watt < 0.1 or minute == 0:
             return 0.00
-        hours = minute / 3600
-        kilowatt_hour = watt * hours / 1000
+        kilowatt_hour = watt / 1000
         LOGGER.info('瓦计算得到千瓦时结果{}'.format(kilowatt_hour))
         return kilowatt_hour
 

Controller/UserController.py

@@ -4617,6 +4617,15 @@ def deleteAccount(request):
         hadUnUseSevice = Unused_Uid_Meal.objects.filter(uid__in=orderUserIds)
         if hadUnUseSevice.exists():
             return response.json(10046)
+
+        try:
+            user_vo = Device_User.objects.filter(username='13800138001').values('userID')
+            Order_Model.objects.filter(userID=userID) \
+                .update(userID_id=user_vo[0]['userID'],
+                        desc=f'原:{userID},{datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")}')
+        except Exception as e:
+            print(repr(e))
+
         delUser.delete()
         # 删除云盘记录
         icloud_record = IcloudStorageRecord.objects.filter(user_id=userID).values('bucket_id')