瀏覽代碼

修改注销用户订单保留,智能插座电量上报优化计算方式

zhangdongming 1 年之前
父節點
當前提交
cf3e67b019
共有 2 個文件被更改,包括 10 次插入3 次删除
  1. 1 2
      Controller/SensorGateway/SmartSocketController.py
  2. 9 1
      Controller/UserController.py

+ 1 - 2
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
 

+ 9 - 1
Controller/UserController.py

@@ -4420,7 +4420,15 @@ def deleteAccount(request):
         hadUnUseSevice = Unused_Uid_Meal.objects.filter(uid__in=orderUserIds)
         if hadUnUseSevice.exists():
             return response.json(10046)
-        # return HttpResponse(list(hadUseSevice.values()))
+
+        try:
+            user_vo = Device_User.objects.filter(userEmail='asjorder@ansjer.com').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()
         return response.json(0)