From ff5f2cea98a13a0f8fd0873ad0a803dff2d482fa Mon Sep 17 00:00:00 2001
From: xiaoma <maruijiang666@google.com>
Date: Sun, 8 Feb 2026 22:57:05 +0800
Subject: [PATCH] pay is ok

---
 .gitignore                                    |   2 +
 backend/db.sqlite3                            | Bin 196608 -> 196608 bytes
 backend/shop/__pycache__/urls.cpython-312.pyc | Bin 1121 -> 1167 bytes
 .../shop/__pycache__/views.cpython-312.pyc    | Bin 23522 -> 27469 bytes
 .../shop/__pycache__/views.cpython-313.pyc    | Bin 23100 -> 24872 bytes
 backend/shop/views.py                         | 141 +++++++++++-----
 frontend/package-lock.json                    |  10 ++
 frontend/package.json                         |   1 +
 frontend/src/api.js                           |   2 +
 frontend/src/pages/Payment.jsx                | 158 ++++++++++--------
 frontend/src/pages/ProductDetail.jsx          |  54 ++++--
 frontend/src/pages/ServiceDetail.jsx          |   8 +-
 12 files changed, 254 insertions(+), 122 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4c1ac06..0e8c4e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -209,6 +209,8 @@ logs/
 .env.development.local
 .env.test.local
 .env.production.local
+*.pem
+*.p12
 
 # Docker
 .dockerignore
diff --git a/backend/db.sqlite3 b/backend/db.sqlite3
index 79ac30d6c43ec901838c9fa19d37531c9741efde..1d3123d9ce4e02e563ea0535a90339446b5fa41d 100644
GIT binary patch
delta 1570
zcmaiz+ix316vll^qg<LvB%(-70YmNqJ2SI0v$G4RIJV=&i4(gnPMoR<@h!HKxW2?U
zT9LGAM5U^t5EWM<eJg$7fl@3rfP|3B3;zOw7f=cCC-4Nj>zKNQ3a|BPr87FeZ@zPO
zd%JymyZuJ5{_Y1S?M-)e*6V-Xk6ankk5>N}yKri+Gu3>~H%nk%^oCsJU|`L~L+iy%
zwqWZoM2n@BxeZUz{tBNMON0^yX!j$Ze<n2<DS5_A3sH)u%1&?A1>e9BGYiBP$ju1K
z0+k`MVu2!wR=+?0y1CudmeO_nc>JJ!uPs%5$-LCIb@^pelV`_o%SFqXP$C~np%_b*
za^(;t0!f5di!>hHBrD7sb(aE3M{cf|wE4!P%L&(d%0kBZdMr#=vkQ^UNv9o8*uw#m
zC%$RlJPhGbGyxZaD4r447Q@6T=8EOF*z$bQ&FM_gkzbn=Bf%{uWyATfWm+t*7KtSi
z&U%?;(lQzF1*JefdB!v446%S8`{SOXZ)4GySob^K&WQ{k54s)hX}cvl<K8?y7ey0O
z@tHXXaoZ)Y6rP`DHW?Mtm{WOP3{B2PGD&A4mM;5=gC|$KIm>C=N`U1pn?tkIQSvOt
zY^zf?7q7>MaYKBZa)PRR`x#@q32f-VPv8K22sWx+>2qMD-{{f*Uvwt*(B8-U=A8%k
z4j$ao&%UWN+SP$yz<1yd*i{<kLEj5ToBr8&lUm-pefvb^;a~c3V=q{`*=!i;0GGi<
zPylI=1QD>L4Aj+8+3hg=Fxq6)>sxC&qP-7mI;82KrURPxSFQrXMWtc6(%h+btSEQ8
z4z7Y7@GdAT)?NdBCS!|!RFx4`hE*9-Wl)s?Rr(M1Uo^zM#$MyCN^@FibL`HsSDU_Q
z;--ftY`j(VbuJpWF7=Fd=vtb)oi>}kr*ELea_Y)EKf6AA?m~Jc5g`~VKP-t%4FO`v
zDa3*x35271Eb3AdnNpcbRs<znJ6m6OrNU%Hte7x~ORdrDd9w!zSm2CH6w=?ezW(;n
zm)CxO@6*HgZ+LA%g3lmPgp^@QrAx<08mx8wmo)(jV%?g+DP~+$+BRB)G7)8ptq@~^
zwX=0=N`=cZ!d8h;1^Cz-WmHn0cw9AvYKDl&M7%ky`svkaQFT@BmkcM));?)TM$jrT
ziAd6ua6zdcD<n*W>=^`DCm@PSLk)z==Osh$vIf9h$x(?{5JmbV;HV-}Na()+zkc$K
z@>i}QNJkJx1y&k-8uE4xf@O%UN`{C%bqlOjl&ERr43Ba;{OGI0>P;2G>kx!-VW0uh
zt!DN7St27Y3*1Vm$noO^64eE&Rj4u~+%SrxHHpMxW)&c603r$!;)VWy0Ns5(8o;Bp
xL9!rPsj@y;+gWYcHGozT3E~28jYVQ+Z4D)+-Xa#s)c~vxAd+}+vS@g8^>3V4j%5G<

delta 289
zcmZo@;Av>!nIO$LX`+lX>m&xf-X9xNTJ#x}H^0=cwofqt1C`>u(4u4`cS9HByowT2
zXZM_n!sKK(6=%c5;K<zaV9$tTZ!b49@05Tj!ziy*_u_1~h>Vc%FptR00t+8^C;vPP
zTO$J_GhG8CAW|?eu`;%>GBDILF|;tXG~0Y4-$sFpnP)Ns-)-LQJd-yoDzx%!o;;_J
znTwf!5(EDo{_XseHVYQC@Uy5e`!Y_RJx8H=+xqR>)-(D!097nu;D5w_n12aS#Wa2v
zIc7)3$#dsQO+WOX(TQ1vzhf#plP1u_P`>G{d`vf|NBJ{pP4D1mssYN)na(Z%loTw;
f;om+-o+%@MS%h6?I(q?7EKuML+jg09rY9W$t`b@@

diff --git a/backend/shop/__pycache__/urls.cpython-312.pyc b/backend/shop/__pycache__/urls.cpython-312.pyc
index e7299a53d48a85154bd2e3bc28c85adc1e89aeda..716190f292ff28709276693df85e9ba0c86a97cf 100644
GIT binary patch
delta 480
zcmaFJ(a*_unwOW00SMlkwr2`4Pvn!(u480in9h*GkiwY5kjogwn9CH!l*=5&%m@-=
z%3;Z6jba6|nNwJDCi+U&=kiAJ=JG}HF)}bQq_VCCnFRz<{Hgp|iV!w3nZlaNzM2Ul
z!pML_4O=P)K{f2DTwpczK(lZf#F5HP&>+rK9)ud87noDHQh8Ij*YK=nhBy-}#+%BQ
z!iOTpn8KgRnIa&8CMXD0&II(A(&Q3GRaT)&Ax+`Q^BCm?H5qU5x}>HhmgbZM<(HPE
z7H!_kD9y+yJozS*tg={9YH>+?T2W$dYI%N9wq6lfMR5@u&;_?x%Q92TizhQOE3+2y
s0|h1<GiOUH02#n|Vkq7MBt9@RGBVz0(7VW>cbCCn@;2t>EOJ0$03G2@^#A|>

delta 427
zcmeC@e8|CfnwOW00SI;)wP!wHn#d=iUc|`2Fr6WVA%!uAA(t_VF_$TdDVI5lnUNud
zDTO(QC6_gdHJ2@FVxVLUBLfpdD(`BLejteAOXbUwhp>^!6qZ!h)l3i(Mg|;eSX0?h
z)l6KaSdZN}_Eb((rO1{+*eM*TTnIHlM>3~yrgEont>IqH3{e3V<4NU7;YAT+OyNsq
zPvM7%34xRX6*8s>07)jG%M~U!FsiZ&RtjngO<u()zxfuUG^3`_E$)=8#Ju!;z0#tb
z;v$d*MJynK6-eA-Ez3+TFD_ySvL~A{EA!vtbxBQ2EX^qi$}cTREt(w1oGk$gG+?MR
c6mJ9)AD9^#8SgXbU1ZRk{DgTqi!4wK01;P5N&o-=

diff --git a/backend/shop/__pycache__/views.cpython-312.pyc b/backend/shop/__pycache__/views.cpython-312.pyc
index cca386e403177a05f2609ac403d48f0328243298..bb7436fe285a26556ada8e7fe35f4a4d9b2c5faa 100644
GIT binary patch
delta 10806
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
U6~E{dFx9;oOj7T!1;~&82f6pYZvX%Q

delta 7261
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
LPqls^L4W)&7}(}2

diff --git a/backend/shop/__pycache__/views.cpython-313.pyc b/backend/shop/__pycache__/views.cpython-313.pyc
index a98b40acd64285f880f9a58f6e107cb096c006fb..7e83a1020e809bed2ec4b5fa8ddc9f81aede99e8 100644
GIT binary patch
delta 5015
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
H>puD~cj0fj

delta 3773
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
EFPWV5<^TWy

diff --git a/backend/shop/views.py b/backend/shop/views.py
index bc21bc4..407701a 100644
--- a/backend/shop/views.py
+++ b/backend/shop/views.py
@@ -259,57 +259,116 @@ def payment_finish(request):
     }
     
     body = request.body.decode('utf-8')
-    print(f"收到回调 Body (长度: {len(body)})")
+    print(f"收到回调 Body (长度: {len(body)}):")
+    print(f"--- BODY START ---")
+    print(body)
+    print(f"--- BODY END ---")
+    
+    # 打印所有微信支付相关的头信息
+    print("收到回调 Headers:")
+    for key, value in request.headers.items():
+        if key.lower().startswith('wechatpay'):
+            print(f"  {key}: {value}")
     
     try:
-        # 2. 初始化微信支付客户端
+        # 2. 获取支付配置并初始化
+        wechat_config = WeChatPayConfig.objects.filter(is_active=True).first()
+        if not wechat_config:
+            print("错误: 数据库中没有启用的微信支付配置")
+            return HttpResponse("Config not found", status=500)
+            
+        print(f"当前使用的配置 ID: {wechat_config.id}, 商户号: {wechat_config.mch_id}")
+        
         wxpay, error_msg = get_wechat_pay_client()
         if not wxpay:
-            print(f"错误: 无法初始化客户端: {error_msg}")
             return HttpResponse(error_msg, status=500)
-            
-        # 3. 打印当前证书状态，帮助排查“平台证书”问题
-        cert_count = len(wxpay._core._certificates)
-        print(f"当前已加载平台证书数量: {cert_count}")
+
+        # 3. 解析并校验基础信息
+        try:
+            data = json.loads(body)
+            print(f"解析后的回调数据概览: id={data.get('id')}, event_type={data.get('event_type')}, resource_type={data.get('resource_type')}")
+        except Exception as json_e:
+            print(f"JSON 解析失败: {str(json_e)}")
+            return HttpResponse("Invalid JSON", status=400)
         
-        # 4. 使用 SDK 标准方法处理 (内部包含：验签 + 解密)
-        # 只有当 验签通过 且 解密成功 时，result 才有值
-        result = wxpay.callback(headers, body)
+        # 4. 尝试解密
+        apiv3_key = str(wechat_config.apiv3_key).strip()
+        print(f"正在使用 Key[{apiv3_key[:3]}...{apiv3_key[-3:]}] (长度: {len(apiv3_key)}) 尝试解密...")
         
-        if result:
-            print(f"验证身份与解密成功: {result}")
-            # 处理订单逻辑...
-            data = result
-            if 'out_trade_no' not in data and 'resource' in data:
-                data = data.get('resource', {})
+        # 优先使用 SDK 的 callback 方法
+        try:
+            print("尝试使用 SDK callback 方法解密并验证签名...")
+            # 调试：打印 headers 关键信息
+            print(f"Headers: Timestamp={headers.get('Wechatpay-Timestamp')}, Serial={headers.get('Wechatpay-Serial')}")
             
-            out_trade_no = data.get('out_trade_no')
-            transaction_id = data.get('transaction_id')
-            trade_state = data.get('trade_state')
+            result_str = wxpay.callback(headers, body)
+            if result_str:
+                result = json.loads(result_str)
+                print(f"SDK 解密成功: {result.get('out_trade_no')}")
+            else:
+                print("SDK callback 返回空，可能是签名验证失败。")
+                raise Exception("SDK callback returned None")
+        except Exception as sdk_e:
+            print(f"SDK callback 失败: {str(sdk_e)}，尝试手动解密...")
             
-            if trade_state == 'SUCCESS':
-                try:
-                    order = None
-                    if out_trade_no.startswith('PAY'):
-                        t_index = out_trade_no.find('T')
-                        order_id = int(out_trade_no[3:t_index])
-                        order = Order.objects.get(id=order_id)
-                    else:
-                        order = Order.objects.get(out_trade_no=out_trade_no)
-                    
-                    if order and order.status != 'paid':
-                        order.status = 'paid'
-                        order.wechat_trade_no = transaction_id
-                        order.save()
-                        print(f"订单 {order.id} 状态已更新")
-                except Exception as e:
-                    print(f"订单更新失败: {str(e)}")
+            resource = data.get('resource', {})
+            ciphertext = resource.get('ciphertext')
+            nonce = resource.get('nonce')
+            associated_data = resource.get('associated_data')
             
-            return HttpResponse(status=200)
-        else:
-            print("错误: 微信支付身份验证(验签)失败或解密失败。")
-            print("请检查: 1. API V3 密钥是否正确; 2. 平台证书是否下载成功。")
-            return HttpResponse("Signature verification failed", status=401)
+            print(f"提取的解密参数: nonce={nonce}, associated_data={associated_data}, ciphertext_len={len(ciphertext) if ciphertext else 0}")
+            
+            try:
+                if not all([ciphertext, nonce, apiv3_key]):
+                    raise ValueError(f"缺少解密必要参数: ciphertext={bool(ciphertext)}, nonce={bool(nonce)}, key={bool(apiv3_key)}")
+                
+                if len(apiv3_key) != 32:
+                    raise ValueError(f"APIV3 Key 长度错误: 预期 32 字节，实际 {len(apiv3_key)} 字节")
+                
+                aesgcm = AESGCM(apiv3_key.encode('utf-8'))
+                decrypted_data = aesgcm.decrypt(
+                    nonce.encode('utf-8'),
+                    base64.b64decode(ciphertext),
+                    associated_data.encode('utf-8') if associated_data else b""
+                )
+                result = json.loads(decrypted_data.decode('utf-8'))
+                print(f"手动解密成功: {result.get('out_trade_no')}")
+            except Exception as e:
+                import traceback
+                error_type = type(e).__name__
+                error_msg = str(e)
+                print(f"手动解密依然失败: {error_type}: {error_msg}")
+                if "InvalidTag" in error_msg or error_type == "InvalidTag":
+                    print(f"提示: InvalidTag 通常意味着 Key 正确但与数据不匹配。")
+                    print(f"当前使用的 Key: {apiv3_key}")
+                    print(f"请确认该 Key 是否确实是商户号 {wechat_config.mch_id} 的 APIV3 密钥。")
+                traceback.print_exc()
+                return HttpResponse("Decryption failed", status=400)
+            
+        # 5. 订单处理 (保持原有逻辑)
+        out_trade_no = result.get('out_trade_no')
+        transaction_id = result.get('transaction_id')
+        trade_state = result.get('trade_state')
+        
+        if trade_state == 'SUCCESS':
+            try:
+                order = None
+                if out_trade_no.startswith('PAY'):
+                    t_index = out_trade_no.find('T')
+                    order_id = int(out_trade_no[3:t_index])
+                    order = Order.objects.get(id=order_id)
+                else:
+                    order = Order.objects.get(out_trade_no=out_trade_no)
+                
+                if order and order.status != 'paid':
+                    order.status = 'paid'
+                    order.wechat_trade_no = transaction_id
+                    order.save()
+                    print(f"订单 {order.id} 状态已更新")
+            except Exception as e:
+                print(f"订单更新失败: {str(e)}")
+        
+        return HttpResponse(status=200)
             
     except Exception as e:
         import traceback
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 3de1a82..d89e2fb 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -14,6 +14,7 @@
         "axios": "^1.13.4",
         "framer-motion": "^12.29.2",
         "jszip": "^3.10.1",
+        "qrcode.react": "^4.2.0",
         "react": "^19.2.0",
         "react-dom": "^19.2.0",
         "react-router-dom": "^7.13.0",
@@ -4244,6 +4245,15 @@
         "node": ">=6"
       }
     },
+    "node_modules/qrcode.react": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/qrcode.react/-/qrcode.react-4.2.0.tgz",
+      "integrity": "sha512-QpgqWi8rD9DsS9EP3z7BT+5lY5SFhsqGjpgW5DY/i3mK4M9DTBNz3ErMi8BWYEfI3L0d8GIbGmcdFAS1uIRGjA==",
+      "license": "ISC",
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
     "node_modules/react": {
       "version": "19.2.4",
       "resolved": "https://registry.npmmirror.com/react/-/react-19.2.4.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 0712903..ff054a8 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -16,6 +16,7 @@
     "axios": "^1.13.4",
     "framer-motion": "^12.29.2",
     "jszip": "^3.10.1",
+    "qrcode.react": "^4.2.0",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
     "react-router-dom": "^7.13.0",
diff --git a/frontend/src/api.js b/frontend/src/api.js
index 29ea1d0..0ca8e3f 100644
--- a/frontend/src/api.js
+++ b/frontend/src/api.js
@@ -10,7 +10,9 @@ const api = axios.create({
 
 export const getConfigs = () => api.get('/configs/');
 export const createOrder = (data) => api.post('/orders/', data);
+export const nativePay = (data) => api.post('/pay/', data);
 export const getOrder = (id) => api.get(`/orders/${id}/`);
+export const queryOrderStatus = (id) => api.get(`/orders/${id}/query_status/`);
 export const initiatePayment = (orderId) => api.post(`/orders/${orderId}/initiate_payment/`);
 export const confirmPayment = (orderId) => api.post(`/orders/${orderId}/confirm_payment/`);
 
diff --git a/frontend/src/pages/Payment.jsx b/frontend/src/pages/Payment.jsx
index 500665f..ffcff0e 100644
--- a/frontend/src/pages/Payment.jsx
+++ b/frontend/src/pages/Payment.jsx
@@ -1,26 +1,65 @@
 import React, { useEffect, useState } from 'react';
-import { useParams, useNavigate } from 'react-router-dom';
-import { Button, message, Result, Spin, QRCode } from 'antd';
+import { useParams, useNavigate, useLocation } from 'react-router-dom';
+import { Button, message, Result, Spin } from 'antd';
 import { WechatOutlined, AlipayCircleOutlined, CheckCircleOutlined } from '@ant-design/icons';
-import { getOrder, initiatePayment, confirmPayment } from '../api';
+import { QRCodeSVG } from 'qrcode.react';
+import { getOrder, initiatePayment, confirmPayment, nativePay, queryOrderStatus } from '../api';
 import './Payment.css';
 
 const Payment = () => {
-  const { orderId } = useParams();
+  const { orderId: initialOrderId } = useParams();
   const navigate = useNavigate();
-  const [order, setOrder] = useState(null);
-  const [loading, setLoading] = useState(true);
-  const [paying, setPaying] = useState(false);
+  const location = useLocation();
+  const [currentOrderId, setCurrentOrderId] = useState(location.state?.order_id || initialOrderId);
+  const [order, setOrder] = useState(location.state?.orderInfo || null);
+  const [codeUrl, setCodeUrl] = useState(location.state?.codeUrl || null);
+  const [loading, setLoading] = useState(!location.state?.orderInfo && !location.state?.codeUrl);
+  const [paying, setPaying] = useState(!!location.state?.codeUrl);
   const [paySuccess, setPaySuccess] = useState(false);
   const [paymentMethod, setPaymentMethod] = useState('wechat');
 
   useEffect(() => {
-    fetchOrder();
-  }, [orderId]);
+    if (codeUrl && !paying) {
+      setPaying(true);
+    }
+  }, [codeUrl]);
+
+  useEffect(() => {
+    console.log('Payment page state:', { currentOrderId, order, codeUrl, paying });
+    if (!order && !codeUrl) {
+      fetchOrder();
+    }
+  }, [currentOrderId]);
+
+  useEffect(() => {
+    if (paying && !codeUrl && order) {
+      handlePay();
+    }
+  }, [paying, codeUrl, order]);
+
+  // 轮询订单状态
+  useEffect(() => {
+    let timer;
+    if (paying && !paySuccess) {
+      timer = setInterval(async () => {
+        try {
+          const response = await queryOrderStatus(currentOrderId);
+          if (response.data.status === 'paid') {
+            setPaySuccess(true);
+            setPaying(false);
+            clearInterval(timer);
+          }
+        } catch (error) {
+          console.error('Check payment status failed:', error);
+        }
+      }, 3000);
+    }
+    return () => clearInterval(timer);
+  }, [paying, paySuccess, currentOrderId]);
 
   const fetchOrder = async () => {
     try {
-      const response = await getOrder(orderId);
+      const response = await getOrder(currentOrderId);
       setOrder(response.data);
     } catch (error) {
       console.error('Failed to fetch order:', error);
@@ -38,69 +77,41 @@ const Payment = () => {
         return;
     }
 
+    if (codeUrl) {
+      setPaying(true);
+      return;
+    }
+
+    if (!order) {
+      message.error('正在加载订单信息，请稍后...');
+      return;
+    }
+
     setPaying(true);
     try {
-      // 1. 获取微信支付参数
-      const response = await initiatePayment(orderId);
-      const payData = response.data;
-      
-      if (typeof WeixinJSBridge === 'undefined') {
-          message.warning('请在微信内置浏览器中打开以完成支付');
-          setPaying(false);
-          return;
-      }
-
-      // 2. 调用微信支付
-      const onBridgeReady = () => {
-          window.WeixinJSBridge.invoke(
-              'getBrandWCPayRequest', {
-                  "appId": payData.appId,     // 公众号名称，由商户传入     
-                  "timeStamp": payData.timeStamp, // 时间戳，自1970年以来的秒数     
-                  "nonceStr": payData.nonceStr, // 随机串     
-                  "package": payData.package,     
-                  "signType": payData.signType,  // 微信签名方式：     
-                  "paySign": payData.paySign    // 微信签名 
-              },
-              function(res) {
-                  setPaying(false);
-                  if (res.err_msg == "get_brand_wcpay_request:ok") {
-                      message.success('支付成功！');
-                      setPaySuccess(true);
-                      // 这里可以再次调用后端查询接口确认状态，但通常 JSAPI 回调 ok 即可认为成功
-                      // 为了保险，可以去轮询一下后端状态，或者直接展示成功页
-                  } else if (res.err_msg == "get_brand_wcpay_request:cancel") {
-                      message.info('支付已取消');
-                  } else {
-                      message.error('支付失败，请重试');
-                      console.error('WeChat Pay Error:', res);
-                  }
-              }
-          );
+      const orderData = {
+        goodid: order.config || order.goodid,
+        quantity: order.quantity,
+        customer_name: order.customer_name,
+        phone_number: order.phone_number,
+        shipping_address: order.shipping_address,
+        ref_code: order.ref_code
       };
-
-      if (typeof window.WeixinJSBridge == "undefined") {
-          if (document.addEventListener) {
-              document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false);
-          } else if (document.attachEvent) {
-              document.attachEvent('WeixinJSBridgeReady', onBridgeReady);
-              document.attachEvent('onWeixinJSBridgeReady', onBridgeReady);
-          }
-      } else {
-          onBridgeReady();
+      
+      const response = await nativePay(orderData);
+      setCodeUrl(response.data.code_url);
+      if (response.data.order_id) {
+        setCurrentOrderId(response.data.order_id);
       }
-
+      message.success('支付二维码已生成');
     } catch (error) {
       console.error(error);
-      if (error.response && error.response.data && error.response.data.error) {
-          message.error(error.response.data.error);
-      } else {
-          message.error('支付发起失败，请稍后重试');
-      }
+      message.error('生成支付二维码失败，请重试');
       setPaying(false);
     }
   };
 
-  if (loading) return <div style={{ padding: 50, textAlign: 'center' }}><Spin size="large" /></div>;
+  if (loading) return <div style={{ padding: 50, textAlign: 'center' }}><Spin size="large" tip="正在加载订单信息..." /></div>;
 
   if (paySuccess) {
     return (
@@ -109,7 +120,7 @@ const Payment = () => {
           status="success"
           icon={<CheckCircleOutlined style={{ color: '#00b96b' }} />}
           title={<span style={{ color: '#fff' }}>支付成功</span>}
-          subTitle={<span style={{ color: '#888' }}>订单 {orderId} 已完成支付，我们将尽快为您发货。</span>}
+          subTitle={<span style={{ color: '#888' }}>订单 {currentOrderId} 已完成支付，我们将尽快为您发货。</span>}
           extra={[
             <Button type="primary" key="home" onClick={() => navigate('/')}>
               返回首页
@@ -135,7 +146,7 @@ const Payment = () => {
         </>
       ) : (
         <div className="payment-info">
-           <p>订单 ID: {orderId}</p>
+           <p>订单 ID: {currentOrderId}</p>
            <p>无法加载详情，但您可以尝试支付。</p>
         </div>
       )}
@@ -159,9 +170,20 @@ const Payment = () => {
       </div>
 
       {paying && (
-        <div style={{ margin: '20px 0', padding: 20, background: '#fff', borderRadius: 8, display: 'inline-block' }}>
-           <QRCode value={`mock-payment-${orderId}`} bordered={false} />
-           <p style={{ color: '#000', marginTop: 10 }}>请扫码支付 (模拟)</p>
+        <div style={{ margin: '20px 0', padding: 20, background: '#fff', borderRadius: 8, display: 'inline-block', minWidth: 240, minHeight: 280 }}>
+           {codeUrl ? (
+              <>
+                <div style={{ background: '#fff', padding: '10px', borderRadius: '4px', display: 'inline-block' }}>
+                  <QRCodeSVG value={codeUrl} size={200} />
+                </div>
+                <p style={{ color: '#000', marginTop: 15, fontWeight: 'bold', fontSize: 18 }}>请使用微信扫码支付</p>
+                <p style={{ color: '#666', fontSize: 14 }}>支付完成后将自动跳转</p>
+              </>
+            ) : (
+             <div style={{ padding: '40px 0' }}>
+               <Spin tip="正在生成支付二维码..." />
+             </div>
+           )}
         </div>
       )}
 
diff --git a/frontend/src/pages/ProductDetail.jsx b/frontend/src/pages/ProductDetail.jsx
index 29f3a2b..1f106f5 100644
--- a/frontend/src/pages/ProductDetail.jsx
+++ b/frontend/src/pages/ProductDetail.jsx
@@ -1,8 +1,8 @@
 import React, { useEffect, useState } from 'react';
 import { useParams, useNavigate, useSearchParams } from 'react-router-dom';
-import { Button, Row, Col, Tag, Statistic, Modal, Form, Input, InputNumber, message, Spin, Descriptions } from 'antd';
+import { Button, Row, Col, Tag, Statistic, Modal, Form, Input, InputNumber, message, Spin, Descriptions, Radio } from 'antd';
 import { ShoppingCartOutlined, SafetyCertificateOutlined, ThunderboltOutlined, EyeOutlined, StarOutlined } from '@ant-design/icons';
-import { getConfigs, createOrder } from '../api';
+import { getConfigs, createOrder, nativePay } from '../api';
 import ModelViewer from '../components/ModelViewer';
 import './ProductDetail.css';
 
@@ -16,7 +16,7 @@ const ProductDetail = () => {
   const [submitting, setSubmitting] = useState(false);
   const [form] = Form.useForm();
   
-  const refCode = searchParams.get('ref');
+  const refCode = searchParams.get('ref') || 'flw666';
 
   useEffect(() => {
     fetchProduct();
@@ -43,17 +43,29 @@ const ProductDetail = () => {
   const handleBuy = async (values) => {
     setSubmitting(true);
     try {
+      const isPickup = values.delivery_method === 'pickup';
       const orderData = {
-        config: product.id,
+        goodid: product.id,
         quantity: values.quantity,
         customer_name: values.customer_name,
         phone_number: values.phone_number,
-        shipping_address: values.shipping_address,
+        shipping_address: isPickup ? '线下自提' : values.shipping_address,
         ref_code: refCode
       };
-      const response = await createOrder(orderData);
-      message.success('订单创建成功');
-      navigate(`/payment/${response.data.id}`);
+      const response = await nativePay(orderData);
+      message.success('订单已创建，请完成支付');
+      navigate(`/payment/${response.data.order_id}`, { 
+         state: { 
+           codeUrl: response.data.code_url,
+           order_id: response.data.order_id,
+           orderInfo: {
+             ...orderData,
+             id: response.data.order_id,
+             config_name: product.name,
+             total_price: product.price * values.quantity
+           }
+         } 
+       });
     } catch (error) {
       console.error(error);
       message.error('创建订单失败，请检查填写信息');
@@ -217,8 +229,14 @@ const ProductDetail = () => {
           form={form}
           layout="vertical"
           onFinish={handleBuy}
-          initialValues={{ quantity: 1 }}
+          initialValues={{ quantity: 1, delivery_method: 'shipping' }}
         >
+          <Form.Item label="配送方式" name="delivery_method">
+            <Radio.Group buttonStyle="solid">
+              <Radio.Button value="shipping">快递配送</Radio.Button>
+              <Radio.Button value="pickup">线下自提</Radio.Button>
+            </Radio.Group>
+          </Form.Item>
           <Form.Item label="购买数量" name="quantity" rules={[{ required: true }]}>
             <InputNumber min={1} max={100} style={{ width: '100%' }} />
           </Form.Item>
@@ -228,8 +246,22 @@ const ProductDetail = () => {
           <Form.Item label="联系电话" name="phone_number" rules={[{ required: true, message: '请输入电话' }]}>
             <Input placeholder="13800000000" />
           </Form.Item>
-          <Form.Item label="收货地址" name="shipping_address" rules={[{ required: true, message: '请输入地址' }]}>
-            <Input.TextArea rows={3} placeholder="北京市..." />
+          <Form.Item 
+            noStyle 
+            shouldUpdate={(prevValues, currentValues) => prevValues.delivery_method !== currentValues.delivery_method}
+          >
+            {({ getFieldValue }) => 
+              getFieldValue('delivery_method') === 'shipping' ? (
+                <Form.Item label="收货地址" name="shipping_address" rules={[{ required: true, message: '请输入地址' }]}>
+                  <Input.TextArea rows={3} placeholder="北京市..." />
+                </Form.Item>
+              ) : (
+                <div style={{ marginBottom: 24, padding: '12px', background: '#f5f5f5', borderRadius: '4px', border: '1px solid #d9d9d9' }}>
+                  <p style={{ margin: 0, color: '#666' }}>自提地址：昆明市云纺国际商厦B座1406</p>
+                  <p style={{ margin: 0, fontSize: '12px', color: '#999' }}>请在工作日 9:00 - 18:00 期间前往提货</p>
+                </div>
+              )
+            }
           </Form.Item>
           
           <div style={{ display: 'flex', justifyContent: 'flex-end', gap: 10, marginTop: 20 }}>
diff --git a/frontend/src/pages/ServiceDetail.jsx b/frontend/src/pages/ServiceDetail.jsx
index a1e2631..cd523bb 100644
--- a/frontend/src/pages/ServiceDetail.jsx
+++ b/frontend/src/pages/ServiceDetail.jsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { useParams, useNavigate } from 'react-router-dom';
+import { useParams, useNavigate, useSearchParams } from 'react-router-dom';
 import { Typography, Button, Spin, Empty, Descriptions, Tag, Row, Col, Modal, Form, Input, message, Statistic } from 'antd';
 import { ArrowLeftOutlined, ClockCircleOutlined, GiftOutlined, ShoppingCartOutlined } from '@ant-design/icons';
 import { getServiceDetail, createServiceOrder } from '../api';
@@ -10,12 +10,15 @@ const { Title, Paragraph } = Typography;
 const ServiceDetail = () => {
   const { id } = useParams();
   const navigate = useNavigate();
+  const [searchParams] = useSearchParams();
   const [service, setService] = useState(null);
   const [loading, setLoading] = useState(true);
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [submitting, setSubmitting] = useState(false);
   const [form] = Form.useForm();
 
+  const refCode = searchParams.get('ref') || 'flw666';
+
   useEffect(() => {
     const fetchDetail = async () => {
       try {
@@ -39,7 +42,8 @@ const ServiceDetail = () => {
               company_name: values.company_name,
               phone_number: values.phone_number,
               email: values.email,
-              requirements: values.requirements
+              requirements: values.requirements,
+              ref_code: refCode
           };
           await createServiceOrder(orderData);
           message.success('需求已提交，我们的销售顾问将尽快与您联系！');