Merge branch 'yanglei'

myapps/management/api/machine_management.py

@@ -14,28 +14,6 @@ from utils.error_code import MACHINE_NOT_EXIST_ERROR
 logger = logging.getLogger(__name__)
 # 创建蓝图
 machine_query_route = Blueprint('machine', __name__)
-# 展示机器信息
-@machine_query_route.route("show",methods=["post"])
-def machine_show():
-    json_date = request.get_json()
-    page = json_date["page"]
-    page_size = json_date["page_size"]
-    # 展示机器信息
-    m_count = Machine.query.count()
-    machine_result = Machine.query.offset((page-1)*page_size).limit(page_size).all()
-    if not machine_result:
-        return BaseResponse(data=[], page=page, page_size=page_size)
-    result_date = []
-    for result in machine_result:
-        res = {
-            "machine_no": result.machine_no,
-            "address": result.address,
-            "short_address": result.short_address,
-            "hatch_number": result.hatch_number,
-            "status": result.status
-        }
-        result_date.append(res)
-    return BaseResponse(data=result_date, page=page, page_size=page_size,page_cout=m_count//page_size+1)
 # 模糊查询到机器信息
 @machine_query_route.route("query_machine",methods=["post"])
 def query_machine():
@@ -70,23 +48,35 @@ def hatch_query():
         return MACHINE_NOT_EXIST_ERROR
     machine_result = Hatch.query.filter_by(machine_no=machine_no).all()
     result_date = []
+    hatch_having = []
     for res in machine_result:
-        result_date.append(res.hatch_no)
+        date={
+            "hatch_no": res.hatch_no,
+            "status": res.status
+        }
+        hatch_having.append(date)
+    result_date.append({"power": machine_not.power})
+    result_date.append(hatch_having)
     return BaseResponse(data=result_date)
 # 查询信息
 @machine_query_route.route("query", methods=["post"])
 def query():
     json_date = request.get_json()
-    number = str(json_date["number"])
     page = json_date["page"]
     page_size = json_date["page_size"]
-    machine_not = Machine.query.filter(Machine.machine_no.like("%"+number+"%")).first()
-    if not machine_not:
-        add_not = Machine.query.filter(Machine.address.like("%"+number+"%")).first()
-        if not add_not:
+    # 判断有没有machine_no
+    if "number" in json_date:
+        get_number =str(json_date["number"])
+    else:
+        get_number =""
+
+    machine_not = Machine.query.filter(Machine.machine_no.like("%" + get_number + "%")).first()
+    if not machine_not:  # 没有
+        add_not = Machine.query.filter(Machine.address.like("%"+get_number+"%")).first()  # 判断有没有add
+        if not add_not:  # 没有返回空
             return BaseResponse(data=[])
-        else:
-            add_result = Machine.query.filter(Machine.address.like("%"+number+"%")).offset((page-1)*page_size).limit(
+        else:  # 有返回add信息
+            add_result = Machine.query.filter(Machine.address.like("%"+get_number+"%")).offset((page-1)*page_size).limit(
                 page_size
             ).all()
             result_date = []
@@ -101,7 +91,7 @@ def query():
                 result_date.append(date)
             return BaseResponse(data=result_date, page=page, page_size=page_size)
     else:
-            machine_result = Machine.query.filter(Machine.machine_no.like("%"+number+"%")).offset((page-1)*page_size).\
+            machine_result = Machine.query.filter(Machine.machine_no.like("%"+get_number+"%")).offset((page-1)*page_size).\
                 limit(page_size).all()
             result_date = []
             for machine in machine_result:

myapps/management/api/rent_query.py

@@ -20,31 +20,41 @@ rent_query_route = Blueprint('rent', __name__) # 创建蓝图
 @rent_query_route.route("part",methods=["post"])
 def rent_query():
     json_date = request.get_json()
-    get_number =str(json_date["number"])
+    if "number" in json_date:
+        get_number = str(json_date["number"])
+    else:
+        get_number = ""
+
     # 订单状态
     is_pay = json_date["is_pay"]
-    add_time = json_date["add_time"]
-    pay_time = json_date["pay_time"]
+    if "add_time" in json_date:
+        add_time = json_date["add_time"]
+        pay_time = json_date["pay_time"]
+    else:
+        add_time = ""
+        pay_time = ""
     page = json_date["page"]
     page_size = json_date["page_size"]
     if is_pay == 1 or is_pay == 0:  # 完成或未完成订单
             if add_time == "" or pay_time == "":    # 没有时间筛选
-                machine_result = Rent.query.filter(Rent.machine_no.like("%"+get_number+"%"),is_pay=is_pay).offset((page-1)*page_size)\
-                    .limit(page_size).all()
+                query1 = "SELECT * from rent where concat(rent.machine_no,rent.user_id,rent.rent_no) like '{}' and is_pay={} limit {},{}".format(
+                    "%" + get_number + "%", is_pay, (page - 1) * page_size, page * page_size
+                )
             else:   # 开始进行模糊查询以及时间筛选
                 query1 = "SELECT * from rent where concat(rent.machine_no,rent.user_id,rent.rent_no) like '{}' and  add_time > '{}' AND pay_time < '{}' and is_pay={} limit {},{}".format(
                     "%"+get_number+"%", add_time, pay_time, is_pay, (page-1)*page_size, page*page_size
                 )
-                machine_result = db.session.execute(query1).fetchall()
+            machine_result = db.session.execute(query1).fetchall()
     else:   # 已支付或没有支付
             if add_time == "" or pay_time == "":    # 没有时间筛选
-                machine_result = Rent.query.filter(Rent.machine_no.like("%"+get_number+"%")).offset((page-1)*page_size)\
-                    .limit(page_size).all()
+                query1 = "SELECT * from rent where concat(rent.machine_no,rent.user_id,rent.rent_no) like '{}'  limit {},{}".format(
+                    "%" + get_number + "%", (page - 1) * page_size, page * page_size
+                )
             else:   # 开始进行模糊查询以及时间筛选
                 query1 = "SELECT * from rent where concat(rent.machine_no,rent.user_id,rent.rent_no) like '{}' and  add_time > '{}' AND pay_time < '{}' limit {},{}".format(
                     "%" + get_number + "%", add_time, pay_time,(page-1)*page_size, page*page_size
                 )
-                machine_result = db.session.execute(query1).fetchall()
+            machine_result = db.session.execute(query1).fetchall()
     result_date = []
     # 将数据遍历和筛选
     for i in machine_result:
@@ -59,33 +69,33 @@ def rent_query():
                 "pay_time": i.pay_time.strftime("%Y-%m-%d %H:%M:%S")
         }
         result_date.append(date)
-    return BaseResponse(date=result_date, page=page, page_size=page_size)
+    return BaseResponse(data=result_date, page=page, page_size=page_size)
 # 点击详情按钮，显示订单信息
 @rent_query_route.route("datails",methods=["post"])
 def details():
     # 根据订单号来获取信息
     json_date = request.get_json()
     rent_no = json_date["rent_no"]
-    rent_not = Rent.query.filter(rent_no=rent_no).first()
+    rent_not = Rent.query.filter_by(rent_no=rent_no).first()
     if not rent_not:
         return BaseResponse(data=[])
-    rent_result = Rent.query.filter(rent_no=rent_no).all()
+    rent_result = Rent.query.filter_by(rent_no=rent_no).all()
     result_date = []
     for result in rent_result:
-        date = {
+        data = {
             "rent_no": result.rent_no,
             "machine_no": result.machine_no,
             "user_id": result.user_id,
             "place_id": result.place_id,
             "back_money": result.back_money,
             "is_pay": result.is_pay,
-            "rent_pay": result.rent_pay,
+            "rent_type": result.rent_type,
             "add_time": result.add_time,
             "pay_time": result.pay_time,
             "over_time": result.over_time
         }
-        result_date.append(date)
-    return BaseResponse(date=result_date)
+        result_date.append(data)
+    return BaseResponse(data=result_date)
 # 进行订单修改并进行退款
 @rent_query_route.route("edit_s",methods=["post"])
 def edit_s():