Merge remote-tracking branch 'origin/test' into dev_aeolus

Controller/RentController.py

@@ -363,7 +363,10 @@ def rent_money_refund():
     production = rent_info.Production
 
     new_total = int(time_price[-1])
-    refund_money = production.total - new_total
+    if production.is_return:
+        refund_money = production.total - new_total
+    else:
+        refund_money = rent.deposit - new_total
     if refund_money <= 0:
         return jsonify(REFUND_MONEY_IS_ZERO)