Commit 359e11fd by Aeolus

update

parent 1b8aec4e
...@@ -291,6 +291,6 @@ def run_edit_openid(): ...@@ -291,6 +291,6 @@ def run_edit_openid():
def run_openid_list(): def run_openid_list():
rs = AdminOpenid.query.filter_by(user_id=g.user.id, status=1).all() rs = AdminOpenid.query.filter_by(user_id=g.user.id, status=1).all()
if rs: if rs:
return BaseResponse(data=[{"openid": x.openid, "real_name": x.real_name} for x in rs]) return BaseResponse(data={"list": [{"openid": x.openid, "real_name": x.real_name} for x in rs]})
else: else:
return BaseResponse(data=[]) return BaseResponse(data={"list": []})
...@@ -513,7 +513,7 @@ def run_approve_draw(): ...@@ -513,7 +513,7 @@ def run_approve_draw():
admin_openid = AdminOpenid.query.filter_by(user_id=admin_account.id, status=1).all() admin_openid = AdminOpenid.query.filter_by(user_id=admin_account.id, status=1).all()
if not admin_openid: if not admin_openid:
return jsonify(ADMIN_OPENID_NOT_EXIST_ERROR) return jsonify(ADMIN_OPENID_NOT_EXIST_ERROR)
openid_list = [x.openid for x in admin_openid] openid_list = [{"openid": x.openid, "real_name": x.real_name} for x in admin_openid]
draw_money = int(draw_record.real_total / len(openid_list)) draw_money = int(draw_record.real_total / len(openid_list))
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)]
...@@ -522,15 +522,17 @@ def run_approve_draw(): ...@@ -522,15 +522,17 @@ def run_approve_draw():
for i in range(len(openid_list) - 1): for i in range(len(openid_list) - 1):
draw_money = draw_money_list[i] draw_money = draw_money_list[i]
open_id = openid_list[i] open_id = openid_list[i]["openid"]
real_name = openid_list[i]["real_name"]
data = { data = {
"user_id": open_id, "user_id": open_id,
"amount": draw_money, "amount": draw_money,
"out_trade_no": RentService.create_order_no(prefix="DR"), "out_trade_no": RentService.create_order_no(prefix="DR"),
"desc": draw_record.draw_month + "月份个人提现" "desc": draw_record.draw_month + "月份个人提现",
"real_name": real_name
} }
result = WeChatPayService(app_id=platform_appid_config_list[1], result = WeChatPayService(app_id=platform_appid_config_list[2],
config_name=pay_config_list[1]).do_transfer(data) config_name=pay_config_list[1]).do_transfer(data)
if result: if result:
draw_record.status = 1 draw_record.status = 1
......
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