0

doc/miaoguo_virtual_payment.md

@@ -14,6 +14,7 @@ WX_VIRTUAL_PAY_APP_KEY=正式环境AppKey
 WX_VIRTUAL_PAY_SANDBOX_APP_KEY=沙箱环境AppKey
 WX_VIRTUAL_PAY_ENV=1
 WX_MIAOGUO_MESSAGE_TOKEN=秒过小程序消息推送Token
+WX_VIRTUAL_PAY_POST_ACTION_TIMEOUT_MS=60000
 WX_VIRTUAL_PAY_PRODUCTS_JSON='[
   {"productId":"后台正式商品ID","payType":7,"price":19900,"goodsPrice":36500,"env":0},
   {"productId":"后台正式试用商品ID","payType":9,"price":100,"env":0},
@@ -29,6 +30,7 @@ WX_VIRTUAL_PAY_PRODUCTS_JSON='[
 - 如果微信后台商品原价与实际支付价不同，需要在配置表中加入对应售价，服务端才能正确传入 `activitySellingPrice`。
 - `WX_VIRTUAL_PAY_ENV=1` 为沙箱，`0` 为正式环境。iOS 没有沙箱，服务端会强制使用正式环境商品和正式 AppKey。
 - AppKey 只放在服务端环境变量中，不能写入小程序代码或接口响应。
+- `WX_VIRTUAL_PAY_POST_ACTION_TIMEOUT_MS` 只控制支付事务提交后的统计刷新等非关键任务，默认 60 秒；该任务失败不会回滚已经完成的订单和会员权益。
 
 ## 新接口
 

src/api/virtualPay/virtualPayController.js

@@ -66,6 +66,17 @@ function normalizePlatform(value) {
     return platform || 'unknown';
 }
 
+function parseMemberEndTime(value) {
+    if (!value || value === 'Invalid date') return null;
+    const normalized = String(value).trim().replaceAll('/', '-');
+    const parsed = moment(normalized, [
+        'YYYY-MM-DD',
+        'YYYY-MM-DD HH:mm:ss',
+        moment.ISO_8601
+    ], true);
+    return parsed.isValid() ? parsed : null;
+}
+
 function resolveEnvironment(platform) {
     if (platform === 'ios') return 0;
     const env = Number(config.virtualPay.env);
@@ -159,10 +170,8 @@ function calculateMemberUpdate(user, order, detail) {
 
     let productServiceTime;
     const requestedEndTime = detail?.EndTime;
-    const requestedMoment = requestedEndTime && requestedEndTime !== 'Invalid date'
-        ? moment(requestedEndTime)
-        : null;
-    if (requestedMoment?.isValid()) {
+    const requestedMoment = parseMemberEndTime(requestedEndTime);
+    if (requestedMoment) {
         productServiceTime = requestedMoment.format('YYYY-MM-DD HH:mm:ss');
     } else {
         const oldEndTime = moment(user.ProductServiceTime);
@@ -319,10 +328,10 @@ async function runCompatiblePostPayActions({ order, user, detail, memberUpdate }
 
     try {
         await axios.get(`http://localhost:${config.port}/api/BuildStatisticsShareUserPay`, {
-            timeout: config.virtualPay.requestTimeoutMs
+            timeout: config.virtualPay.postActionTimeoutMs
         });
     } catch (error) {
-        console.error('Miaoguo virtual pay statistics action failed:', error.message);
+        console.warn('Miaoguo virtual pay statistics refresh delayed after committed payment:', error.message);
     }
 }
 

src/config/index.js

@@ -50,7 +50,8 @@ const commonConfig = {
         env: toNumber(process.env.WX_VIRTUAL_PAY_ENV, runtimeEnv === 'production' ? 0 : 1),
         products: parseJsonArray(process.env.WX_VIRTUAL_PAY_PRODUCTS_JSON, 'WX_VIRTUAL_PAY_PRODUCTS_JSON'),
         messageToken: process.env.WX_MIAOGUO_MESSAGE_TOKEN || '',
-        requestTimeoutMs: toNumber(process.env.WX_VIRTUAL_PAY_TIMEOUT_MS, 10000)
+        requestTimeoutMs: toNumber(process.env.WX_VIRTUAL_PAY_TIMEOUT_MS, 10000),
+        postActionTimeoutMs: toNumber(process.env.WX_VIRTUAL_PAY_POST_ACTION_TIMEOUT_MS, 60000)
     },
     CDNUrl: 'https://cdn.example.com/',
     database: {

test/virtualPayFulfillment.test.js

@@ -115,6 +115,29 @@ test('测试用户的 1 元购买执行与正式购买相同的会员完成逻
     assert.ok(state.queries.some(item => item.sql.includes('Status=1')));
 });
 
+test('会员有效期兼容小程序提交的斜杠日期且不触发 Moment 回退解析', async () => {
+    const slashDateOrder = paidMemberOrder({
+        TradeNo: 'VP_TEST_SLASH_DATE',
+        Money: 100,
+        XMLPre: orderXml({
+            productId: '166_1',
+            goodsPrice: 100,
+            detail: { EndTime: '2032/05/14' }
+        })
+    });
+    const { connection } = createFakeConnection({ order: slashDateOrder, user: memberUser });
+
+    const result = await fulfillOrder('VP_TEST_SLASH_DATE', {
+        openid: 'openid-test',
+        env: 0,
+        productId: '166_1',
+        originalPrice: 100,
+        actualPrice: 100
+    }, dependencies(connection));
+
+    assert.equal(result.memberUpdate.ProductServiceTime, '2032-05-14 00:00:00');
+});
+
 test('重复发货通知不会重复增加会员有效期', async () => {
     const { connection, state } = createFakeConnection({
         order: paidMemberOrder({ Status: 1 }),