From 925da4711818f308f2ab3f492fd7f9a13903cb6d Mon Sep 17 00:00:00 2001
From: 24024 <240241002@qq.com>
Date: Wed, 14 Jan 2026 20:29:31 +0800
Subject: [PATCH] =?UTF-8?q?fix(timezone):=20=E8=B0=83=E6=95=B4=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E4=B8=BA=E5=8C=97?=
 =?UTF-8?q?=E4=BA=AC=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在订单创建时间和支付时间上统一加上8小时的时差偏移
- 修改get_orders和api_payment_history中时间的格式化逻辑，确保时间正确转换
- buy.html和recharge_history.html模板中调整paid_at时间显示，增加时差处理
- auth.py中buy_page接口支持支付成功提示和订单信息传递
- payment.py中同步支付回调改为重定向至充值页并传递成功参数
---
 blueprints/__pycache__/admin.cpython-312.pyc  | Bin 12424 -> 12554 bytes
 blueprints/__pycache__/auth.cpython-312.pyc   | Bin 13108 -> 13564 bytes
 .../__pycache__/payment.cpython-312.pyc       | Bin 9571 -> 9792 bytes
 blueprints/admin.py                           |   5 +++--
 blueprints/auth.py                            |  16 +++++++++++++++-
 blueprints/payment.py                         |  12 +++++++-----
 templates/buy.html                            |   8 +++++++-
 templates/recharge_history.html               |   8 +++++++-
 8 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/blueprints/__pycache__/admin.cpython-312.pyc b/blueprints/__pycache__/admin.cpython-312.pyc
index 883a16b32e594d09c22ed8d3f93c33d91f936907..f8db394bf71e517831ff2faffce9bae0ca608123 100644
GIT binary patch
delta 710
zcmeB3>`LN2&CAQh00hsw(lhfm@*daV76S5^f%tP4)8q-VN|WD8icI!YNYF`POkv7l
z%Vn=+WMn821nB{R6y_QR7lwYOWTte6WTx1Y3=FkQHB6HaYKpMbFlC8Mb`%ztX37$S
zC`KlW#DMZ*lNmXLCktr_8{{#ju#`x{6ab}UU~B}vni0YV%F2NZW@gG#fYM4JnvrR;
zqN0cx6GIJS3hNp+nDQ#1t}NBb2c?94*<oTpBh(NE!&pVC*u`<1C=E9e=mCZljyaqY
znR-sM0E42IX>y{Xuq9JDgC?h65fjh~O~zZCC7HRYDXBRniMQDDi&9dHic8smGSB9$
zdOm;YOAd%4){OkpqT<QA+Nt#-MLa;UB1sV82O?rYgg=Oo0ur}4QW8s2L1q?Zfy7ur
zgeZu}0}&1&!Wu~2Vol4*Pb?`a00|U=h$0YC3?kw{L<x}4WG>1Eu|X!?V$3fFrU3;8
z1qFp7S&#r%dTL2L#K}b!K!JlmT>O5rjE*t$T^6Ou{yLE^(lYaHX4<UO+@W|y%jTlA
z&2=fai&AbE+@mf_Mc;^wx*nNyDKcpW<9yDUoC`fSI9^dPyC`9HUEJZKxWfg<kSpS$
z7cz1tU(-=#m2&2DF_@%#fU#ooL0u`v#?5zhr!tB2GqQhXW?)hS5jr1PfZQS@pd$d`
C6rAAz

delta 467
zcmeB5>PX~0&CAQh00fM6>6tPcd5>#w3j%q}K>XQ^Y4QYFrO9t4MJ9VHRI+bnV5nuR
zVVoQ&Ei(D8f(}cO7?872Q$#IG1Y`gz$YV@lDiMc?)i7pBOqSP@W@gNin*2~flu-su
z%7MtqN{S+rA8`t+r7*8%glGUNSAuCp&_&W9@yU!F!XV{h2<1S#7*bf~a86|E**^Jz
zpsXmX-z~QMqLkF4;!-xC{%3PmJ)ggHa-()CqtN8%+HyQatU%EsQ4o<mSwTnCD;LDf
z0}=Tkq5wq1frvsNp~+N~1*C2<<`**oX$6HMSrC^iJ+&krVoOm8P~adC7hjv)s$)EP
zw@##<l=OU^nL5{{^e;;3UoddKEah^;$@#eEA<YSe(<>)dUKiKAD6V-y%l3-6-G#u=
z$q~A$tRhZUE@G3LbPvdY%v;G&WCWzZmi^+e$<0qG%}KQ@s@)u?H<d}8kCFW|GXs+v
Nh|u}S0_1{K0|3`!a=`!q

diff --git a/blueprints/__pycache__/auth.cpython-312.pyc b/blueprints/__pycache__/auth.cpython-312.pyc
index 3183e55ff3dde999336c11ff9c9474d0ae30886e..c1233964c28e59994a0054647d4adf33374fd101 100644
GIT binary patch
delta 1587
zcmZuxZA@EL8189%`*quLM_bTBy0(;#%jY&k*hV%mvwVnX#u%D?bd`JC6)qIcZ5PoZ
zMCUThGDptX*e{7OhJ+<*u5mMlm>7S##8COsdb3|Mi~iUTlFc8}X*}<(tjV&I^vU~q
z?)$v&+w*n&angC);jroG30zDhe+Yf$d}Lv*R5j4wgL;EfZr!P8eGmX=%ug1}UF7z2
zE}vjoLq(%t9k0{rX3gnmgt-OVcG#>%U}vpa3$7=ZZIxu*>ULOe*tfl7HDuaV)oK+C
z0xOlz+S0p<m+N$bBWui>vW(!&+L9=1&RTDjt(lA7Asx?=*V*F-RI{8J9TjC+HKuV!
zRPCuuI-15YL5xnO26=>=X~H{}w=y%$XVMdrY7t^-F`b+cc@w$G@|CK2A|+%bQO1ol
zP-RkB5Has2ciHJVBUp?voRC!}p2Tt*w@?d)5_lH#AhQ5FD5%DaEMmMH^t}Lk0N_ro
z0{j9<kS;@tzjUyN>M9f%or)zy{1R2QxM76IXZHNuLzAwo;$vw+$~%2Ir*C;?)5)(M
z%Q;);d+xZr*E$zF^RAklt7c_z)73gZP_T3JFaK(G6*$i|c9G3<wK=Z#%gzn1c9ZMM
zbCDbu+2ndJFuxgHcUbT8{sP}o2=6Tf>kGlg)iWD`_Clbpuru_~VX}v}bS4Icl}nC)
z5Q>nCWpk*V*txb{5n5xhUxo=eAw!>lkVXZ+3Qm9{ip1?R(!|f*4XBU&;tr!8^2i-R
zy~O7kr}mFLHLP|OG!XZbTb}CvS3qnBZ~zPd*eR&&SrI4WGtto$9nc_{831hnFM`wo
z&;`&2aFqBfTKZlCQTxUbkcKo51=R}UisF<c;%=(TFjU|`&;Jv_Vj?N0=}b>iS4>&1
zc;8^sZW<zfZxtof=?$O}a>`q2>ZcJnLf-YZP=;&XrqHukJY6Yy><tA@K&D0nDDg&I
zDp;$vn{-z_&x}&vdrGwG7()Hzo9ZqmP7RlpzpF=(DG4`3$Q!=u!&=*(>WWtJ7{rWI
z;Pu+F7AfngVVkXfLc|i)my}z+4Si(~75{{`|MA7mdmmo-{rY$J)|c>U@=0Jnot_$K
zGmTIu9hoN>JX!iIECSZJm&nGz_9g(lHuyL|X|!5-&;*_-R;KY!LC_RHH@OlFG1FB1
zR9O!$All!a&{0OFhHsUXkWY_>mG8qHsBMN?cr!LZQmLR)83(CDHN~c;#7SZMTiv9w
z?htd1dVW-<>T(7aXyZwM(`2Brk2d>i<Im_{A~r=Do?NQh#JAJpq?}Am%J@74Ym7DS
zhd{kV@=Xo<=BY?u32n8XM5%U3JS$4kcv6DRx<X@Ai<C-4CAw;=flBxTa-i9d7Ria`
z8fJz1?<(h-Pa<}Sip37Lk^3zR!|+TL|7x(F7&ZjQ0bq(48it`s7}((z02hE80A8HG
pES<%N?;u{KD!k}&O!;Z|4#fFU_<=#EuiVm8Y3ndj?(gYE{{dUrbnyTH

delta 1271
zcmZ`(Z)j6j6wiIhdrAA!xYRZ2X8K1Ht8Z$OR?191v|Z<4rXv37HeF3)`x>8lZL@O|
zQK@Sg+ibQm2X_NSaEkjdaA4)R`C;s%evysJ#IeU<U#ydUD#!+cg6F)a77AXtzx>`g
z=iYmM=iHme#<k(lt-88e4-TbTFn(KcHS{Q;D){Ne`7kS4^))S0OA7_i7z&L0#+7mT
z$C}GN*Rsc>)ry|rf#8Y2p~~^(;qr*7dBxqJCTXvTNZp64{1~VCLBk(V3Bm}ruflbJ
zwe+1NSSPv~Bd_8Pxl+EMLl$i*ocw`D_(Oj#y{Eo@CObVbvoAkmmhY&Q8DGUZxa0|A
zUE+iA1Zx+6hda|<xWM-F%HW{Rx$Pa{1x`t};(!Juu<1E$M8c;<vMFZ0U*G7%T_CcC
zy(P{^+E}-^5lOHfF&8PKy)PPnllFD8hF)ZqAi{m?huP1*yg&8z?C0NU4M4}h+XU?d
zbp#v5bTrbonW#+QXipRCK(OUu19%xoB<v7#(bUQ<M4hwVA-3J|AlNljs~n7(I%Kd+
zE$Vw{-Gh^FWg>+dK4~2AD$dI7Vs6<o6r#kIH}Ap-C)t0`{xbXPx6hK591+kZHpNn?
zwGvyGSe!VnTa+#A7B^#w<$dIF#E>k_2MZ}X*=B^=^qSm{zLKRi^)c2fCYyWY0W^GU
z-DrN7O$;J+G}``r$;cJ;<F-;7Ge*l?3jkd^w}6WZ=13bNua2NeZZk5-xrFeny|y%>
z!!UlIB1aBk(sM7=aJpD6p3(jYB__B0B`zcs>tgFwDcX(h|EQA>u3Vq}bjmFe>=#Bn
zi@pCo-l<UepjZ48U(xS0)yZk0(F^T7K!MZ_pmzlO2;3V$%*mY!r^#;GPR$H*9U;hw
zgNcM(MEZ?&Dp6(FlW^N!c?1oYts`yC65DB2S8rgQ94+{cURtCL=(m-8sicn%JwGcW
z{@1$YkI?h8m3`y3S0&kSm|(w%B)4IM29m$Cd67zOUi(6&U8^4}>!aKl8|5%b!OjgK
z?Y1uu1rAf<LTXLs1R6BeRrMmw4x0K=-OLReW*J}jSF|W#jumpI!OON68JrZpbSwKp
ztW3w{bLhWg?MU}C^)ynqgemb;do@Y_0q&Ef`wn!iV1R&n3{)|oDgnuZbHeOss=b7i
e;pB%b(Gh0hdUljO^m?S|yhL<<wRLU%R`wL>PAG@~

diff --git a/blueprints/__pycache__/payment.cpython-312.pyc b/blueprints/__pycache__/payment.cpython-312.pyc
index 3190b24f0fc5727efcaeba2f4201356e0faabd39..ea928e7bd7c0901332369b31fd9304b82f2c3dcb 100644
GIT binary patch
delta 1486
zcmZuxOH3O_7~a`kukn-ECbnzyFa;YeL?F>XT4d2Y?2uPU6VkMXCipQfxB-l2*P=wG
zRWFq)MM|5wBx)*}OGN~SR9vWXX_Z8&)K*%GB`S-aP^DJtfhbZBIraZ-EYc_=&G&!v
z&A&6A-`~vksUOZbe|9*m0<_?@iQKW^cg`DD^2_QS>k1(~eAqtFpts;GHd;q5MR~=#
zEb%L@0RPLrpMP)nk`OoSJ*4f1!{>6Y)Gv$GWFpXgI*P5X55$a^5U6`W`B)j*jdNs9
z_()0!b42y<q+_eakt*nu-RZ*o_-tw-Tb6ZJ$f{!5tQ9hutfq0Bvyo3bN67{L*x5_m
z{F!q?F~L?$;pzGaiSf_t4_Ze+coVwT&L7v`_XKYbeRFp0qH+Fmsd0S6lQir}etlm$
z(j@%&`cYe~Nq8vx5t}UWHtAucH{L8g@)O{XnoaRG?sGL+6<AGz{xq^W=pv+(%G5Mv
zT@ZC2h?Pc_BBAD@m?JB7%a{snL{Ke!%pFr0R%4hix_y1j2^3DG<QdH}t!$po)526%
zQ|-(QGpu?TWHy9hgtPn)cla27$SeS=#2S&mi-4+z`-MUwHVCm?KbxAL&d%uLlQ~V#
zvw3z2)NxFk=L4S1E8DVX%N8(#y=(nHoig4_8mChwTiTG*eAyGSxgfD}($7TRE%k9*
z!vjhcYM!!8!+D9I@16~PP$V(ox|9(ogp7FUTR~WmiqeN(Sm1>Qs{aKEhI+83!F(f6
z1_Rwdnrq@-1U0lbs<EQPjr|QBFlnzzdr=gMBDH`=NmaYbe>M3|Qd?~dUq$w^Ym9|o
zuD^7(gL|vZ5NfB6+jU=x*Op|c#e$S0wVg&_Oe)%(pgQ>hZ(O|y`&AsFlCnk5O=oF#
zN>5e(&cEwm4rJ40zQ8no)%(VYQBca}*;I~>r*yTU>Jm(Q-XJ(kAYe8dLwFyd;+Z6}
z41eNnIY*K9AY=hl`8gvcK`4{FCPM@-?V8Dxn$5vg{J)_lA>|5m%|-Z_Z$kc4eszmK
z@Wo@n#>MEZ=v{TKwbU714@Nfw$JYbLjiJ$vz}WAJ(al8qw?z6TS+v};+&OvgNU6Pl
z-QU0IJG|~YY#g~z^1WkBPVs(!*kn7}6&qYl`bQN)`Tgdv;bJFRzWO8%n+~f@YzQJd
zfq=i3bs?NaIDl{l!GZ7=f(@a1kC45M(1B1X23Dx76!gqYey&m!hIXpf#f>b3fKMYc
zb1l>sIEVB+LKGo}fL>yh-wPcwF`%EW{uBCFBtv|=t+fjuqskRzST=_9cLjDCIbPRi
zb<yezFvu2oPkZT*g=EN6Nf3K>M5H@jL9}lY*E(^1(Y@5S)L{_U2I+kwHV`wWy|#mF
Mr;`ta!!oY=AAJHrlmGw#

delta 1260
zcmZ{kUu@G=6vyxV_5c61{gq$$+dn$i;!l><Oqe>MB>jT{aRL){sMM{$(hav2Z+}gh
z>D&u3hM;sD5|KYaAAB$yL9+)5BxVT2n7x#^1k*>|roPpX5aW~gv@|s&-sJbW-+Ruv
zC-<Iv+U5Pf?Q^a;99F`|*hiU(75Q7|IV-)n^rdx?(hv;U2R*7;wG<7D)&(6#5i(4m
zYVU#-`zG26zuLodfx4ZLqH%%N^(AseP%Vqj1);vCM0IKZ7uRx3NC_iEb<Y|<G!8$W
z3$#E^>PAR`DxQ1~&$4m;`r54v8y}a}PhVXxefs;wQ|qNO8`r-214@qXCG%K*rf*!E
zntV+WDyCdMl}hJwY!I?e4c46f)D4m=LoIO16{0a%aBa69;yHKoFV_iwx^6kTzZm>R
zTi&ti-CMTrh3{I%LL#~Sd{l^w<j#wJ&by)|A?xmT^e23}doIfLJ)a>V!)|wn)xh&$
zbsqYcj=3pq*L-|Y8>+rY7Y&Uv3=_o&^PYI*10PGL#z$EuogAOYX<1f3yh1C+EK}1g
zr`VW@Ct#SF84)(bD~KW3>J9oVTq*)<N6YIRIV?3ydRwh;agjvJG@SLOoNG3@+}3|%
zVAU2a>!V;3H``jcw|3q`0`%#2z<c7I0qybg5~3Q5G)~U)N6C<s@Xk3xW`&|~+`~6L
zF^U4X+eN!3HSFAQ!Y4x2YWDLTa>Lx5c|gf0qO-GUY$)!m^4+pQ45_9@EAi0oMnH3B
zZD@zvZZEVMyxW`M(-iylvUy%Ob6(GnKPyboMyg@HrZroEC{|eBl&~D;DQo3}KIw(X
zn|xI<ofw@^lcSpAsXu`kL;h2JT)u(8Xf}d4f;bA-rLJx)JPRY<<xq6Z2ddC)4r>gL
zq)uCki{t#u{Y{|DpP_4T+Mno?+phM0-uplf-<QMXXJS9g@n52`AC(`J()*vy%+EZK
zl>3rWetOrc6e%A(4BpnD!4Q?=JxjY<j~HnZE_7Yt-951R(p;S99#T5k9zL^|5PHNm
z#6CnX;$?&bu^;ioC0|9`Rz&SmPOd7(yq22I7HXGccJ$R65PO3iMc`ivGr@tt7Wn|m
zgNU7o7$Ss7!Y6^}3{zarE&UXDB+xyu+!NS_zetA7%dk2O{a+LIHtGn+KjxiNSv5bI
rj<Azp53ah+G)5olh!Cy{D61m;6_i|FYC_|)Re`JOQy_(cdd%@J1D6vv

diff --git a/blueprints/admin.py b/blueprints/admin.py
index 7e0cc41..03892a2 100644
--- a/blueprints/admin.py
+++ b/blueprints/admin.py
@@ -194,6 +194,7 @@ def delete_notification():
 @permission_required('manage_system')  # 仅限超级管理员
 def get_orders():
     orders = Order.query.order_by(Order.created_at.desc()).all()
+    from datetime import timedelta
     return jsonify({
         "orders": [{
             "id": o.id,
@@ -203,7 +204,7 @@ def get_orders():
             "points": o.points,
             "status": o.status,
             "trade_no": o.trade_no,
-            "created_at": o.created_at.strftime('%Y-%m-%d %H:%M:%S'),
-            "paid_at": o.paid_at.strftime('%Y-%m-%d %H:%M:%S') if o.paid_at else None
+            "created_at": (o.created_at + timedelta(hours=8)).strftime('%Y-%m-%d %H:%M:%S'),
+            "paid_at": (o.paid_at + timedelta(hours=8)).strftime('%Y-%m-%d %H:%M:%S') if o.paid_at else None
         } for o in orders]
     })
\ No newline at end of file
diff --git a/blueprints/auth.py b/blueprints/auth.py
index 7c85826..99c45cb 100644
--- a/blueprints/auth.py
+++ b/blueprints/auth.py
@@ -62,8 +62,22 @@ def buy_page():
     admin_orders = []
     if is_admin:
         admin_orders = Order.query.order_by(Order.created_at.desc()).limit(10).all()
+    
+    # 处理支付成功提示
+    success = request.args.get('success') == 'true'
+    out_trade_no = request.args.get('out_trade_no')
+    order = None
+    if out_trade_no:
+        order = Order.query.filter_by(out_trade_no=out_trade_no).first()
         
-    return render_template('buy.html', personal_orders=personal_orders, admin_orders=admin_orders, is_admin=is_admin)
+    import datetime
+    return render_template('buy.html', 
+                         personal_orders=personal_orders, 
+                         admin_orders=admin_orders, 
+                         is_admin=is_admin, 
+                         modules={'datetime': datetime},
+                         success=success,
+                         order=order)
 
 @auth_bp.route('/api/auth/send_code', methods=['POST'])
 def send_code():
diff --git a/blueprints/payment.py b/blueprints/payment.py
index 69f6d02..d7c294d 100644
--- a/blueprints/payment.py
+++ b/blueprints/payment.py
@@ -82,8 +82,8 @@ def payment_return():
         
         if success:
             logger.info(f"同步回调验证成功，订单号: {out_trade_no}")
-            # 同步通知仅用于页面展示，实际业务逻辑在异步通知 notify 中处理
-            return render_template('buy.html', success=True, order=order)
+            # 重定向到充值页面，并带上成功参数
+            return redirect(url_for('auth.buy_page', success='true', out_trade_no=out_trade_no))
         else:
             logger.error(f"同步回调验证失败，订单号: {out_trade_no}")
             return "支付验证失败", 400
@@ -101,7 +101,8 @@ def payment_history():
     user_id = session['user_id']
     orders = Order.query.filter_by(user_id=user_id).order_by(Order.created_at.desc()).all()
     
-    return render_template('recharge_history.html', orders=orders)
+    import datetime
+    return render_template('recharge_history.html', orders=orders, modules={'datetime': datetime})
 
 @payment_bp.route('/api/history', methods=['GET'])
 def api_payment_history():
@@ -112,6 +113,7 @@ def api_payment_history():
     user_id = session['user_id']
     orders = Order.query.filter_by(user_id=user_id).order_by(Order.created_at.desc()).all()
     
+    from datetime import timedelta
     return jsonify({
         "orders": [{
             "id": o.id,
@@ -120,8 +122,8 @@ def api_payment_history():
             "points": o.points,
             "status": o.status,
             "trade_no": o.trade_no,
-            "created_at": o.created_at.strftime('%Y-%m-%d %H:%M:%S'),
-            "paid_at": o.paid_at.strftime('%Y-%m-%d %H:%M:%S') if o.paid_at else None
+            "created_at": (o.created_at + timedelta(hours=8)).strftime('%Y-%m-%d %H:%M:%S'),
+            "paid_at": (o.paid_at + timedelta(hours=8)).strftime('%Y-%m-%d %H:%M:%S') if o.paid_at else None
         } for o in orders]
     })
 @payment_bp.route('/notify', methods=['POST'])
diff --git a/templates/buy.html b/templates/buy.html
index 1e00795..931cc68 100644
--- a/templates/buy.html
+++ b/templates/buy.html
@@ -178,7 +178,13 @@
                                         {% endif %}
                                     </td>
                                     <td class="px-8 py-5">
-                                        <span class="text-[10px] font-bold text-slate-400">{{ order.paid_at.strftime('%m-%d %H:%M') if order.paid_at else '-' }}</span>
+                                        <span class="text-[10px] font-bold text-slate-400">
+                                            {% if order.paid_at %}
+                                                {{ (order.paid_at + modules.datetime.timedelta(hours=8)).strftime('%m-%d %H:%M') }}
+                                            {% else %}
+                                                -
+                                            {% endif %}
+                                        </span>
                                     </td>
                                 </tr>
                                 {% endfor %}
diff --git a/templates/recharge_history.html b/templates/recharge_history.html
index 14d30dd..8efec48 100644
--- a/templates/recharge_history.html
+++ b/templates/recharge_history.html
@@ -64,7 +64,13 @@
                                     {% endif %}
                                 </td>
                                 <td class="px-8 py-5">
-                                    <span class="text-xs font-bold text-slate-400">{{ order.paid_at.strftime('%Y-%m-%d %H:%M') if order.paid_at else '-' }}</span>
+                                    <span class="text-xs font-bold text-slate-400">
+                                        {% if order.paid_at %}
+                                            {{ (order.paid_at + modules.datetime.timedelta(hours=8)).strftime('%Y-%m-%d %H:%M') }}
+                                        {% else %}
+                                            -
+                                        {% endif %}
+                                    </span>
                                 </td>
                             </tr>
                             {% endfor %}