Commit 7099f0e2 by Aeolus

update

parent 10efc07b
...@@ -164,7 +164,7 @@ class DrawDetail(Base): ...@@ -164,7 +164,7 @@ class DrawDetail(Base):
open_id = Column(String(40, 'utf8mb4_unicode_ci'), nullable=False) open_id = Column(String(40, 'utf8mb4_unicode_ci'), nullable=False)
draw_no = Column(VARCHAR(40), nullable=False, index=True) draw_no = Column(VARCHAR(40), nullable=False, index=True)
payment_no = Column(VARCHAR(40), nullable=False) payment_no = Column(VARCHAR(40), nullable=False)
draw_month = Column(VARCHAR(7)) bill_date = Column(VARCHAR(20))
total = Column(INTEGER(11)) total = Column(INTEGER(11))
real_total = Column(INTEGER(11)) real_total = Column(INTEGER(11))
payment_time = Column(TIMESTAMP) payment_time = Column(TIMESTAMP)
......
...@@ -668,7 +668,7 @@ def run_approve_draw(): ...@@ -668,7 +668,7 @@ def run_approve_draw():
dd.draw_no = result["partner_trade_no"] dd.draw_no = result["partner_trade_no"]
dd.payment_no = result["payment_no"] dd.payment_no = result["payment_no"]
dd.payment_time = result["payment_time"] dd.payment_time = result["payment_time"]
dd.draw_month = draw_record.draw_month dd.bill_date = draw_record.bill_date
dd.total = draw_record.real_total dd.total = draw_record.real_total
dd.real_total = draw_money dd.real_total = draw_money
dd.status = 1 dd.status = 1
...@@ -680,8 +680,7 @@ def run_approve_draw(): ...@@ -680,8 +680,7 @@ def run_approve_draw():
"open_id": dd.open_id, "open_id": dd.open_id,
"draw_no": dd.draw_no, "draw_no": dd.draw_no,
"payment_no": dd.payment_no, "payment_no": dd.payment_no,
"business_id": dd.business_id, "bill_date": dd.bill_date,
"draw_month": dd.draw_month,
"total": dd.total, "total": dd.total,
"real_total": dd.real_total, "real_total": dd.real_total,
"payment_time": dd.payment_time.strftime("%Y-%m-%d %H:%M:%S"), "payment_time": dd.payment_time.strftime("%Y-%m-%d %H:%M:%S"),
...@@ -708,8 +707,7 @@ def run_draw_detail(): ...@@ -708,8 +707,7 @@ def run_draw_detail():
"open_id": i.open_id, "open_id": i.open_id,
"draw_no": i.draw_no, "draw_no": i.draw_no,
"payment_no": i.payment_no, "payment_no": i.payment_no,
"business_id": i.business_id, "bill_date": i.bill_date,
"draw_month": i.draw_month,
"total": i.total, "total": i.total,
"real_total": i.real_total, "real_total": i.real_total,
"payment_time": i.payment_time.strftime("%Y-%m-%d %H:%M:%S"), "payment_time": i.payment_time.strftime("%Y-%m-%d %H:%M:%S"),
......
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