Commit a6e5136d by Aeolus

update

parent 3fbf5dc0
...@@ -519,7 +519,7 @@ def run_approve_draw(): ...@@ -519,7 +519,7 @@ def run_approve_draw():
draw_money_list = [draw_money for i in range(len(openid_list) - 1)] draw_money_list = [draw_money for i in range(len(openid_list) - 1)]
draw_money_list.append(draw_record.real_total - draw_money * (len(openid_list) - 1)) draw_money_list.append(draw_record.real_total - draw_money * (len(openid_list) - 1))
random.shuffle(draw_money_list) random.shuffle(draw_money_list)
return_data = []
for i in range(len(openid_list)): for i in range(len(openid_list)):
draw_money = draw_money_list[i] draw_money = draw_money_list[i]
open_id = openid_list[i]["openid"] open_id = openid_list[i]["openid"]
...@@ -555,4 +555,44 @@ def run_approve_draw(): ...@@ -555,4 +555,44 @@ def run_approve_draw():
db.session.add(dd) db.session.add(dd)
db.session.commit() db.session.commit()
return BaseResponse(data=draw_money_list) return_data.append({"id": i.id,
"draw_id": i.draw_id,
"open_id": i.open_id,
"draw_no": i.draw_no,
"payment_no": i.payment_no,
"business_id": i.business_id,
"draw_month": i.draw_month,
"total": i.total,
"real_total": i.real_total,
"payment_time": i.payment_time.strftime("%Y-%m-%d %H:%M:%S"),
"status": i.status,
})
return BaseResponse(data={"list": return_data})
@rent_route.route("draw_detail", methods=["POST"])
def run_draw_detail():
"""
:return:
"""
json_data = request.get_json()
draw_id = json_data["draw_id"]
return_data = []
draw_detail = DrawDetail.query.filter_by(draw_id=draw_id, status=1).all()
for i in draw_detail:
return_data.append({"id": i.id,
"draw_id": i.draw_id,
"open_id": i.open_id,
"draw_no": i.draw_no,
"payment_no": i.payment_no,
"business_id": i.business_id,
"draw_month": i.draw_month,
"total": i.total,
"real_total": i.real_total,
"payment_time": i.payment_time.strftime("%Y-%m-%d %H:%M:%S"),
"status": i.status,
})
return BaseResponse(data={"list": return_data})
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment