fix(comment): fix comments

Author: hewenguang

src/pay/alipay.controller.ts

@@ -2,6 +2,7 @@ import { AlipayCallbackQuery } from 'omniboxd/pay/types';
 import { AlipayService } from 'omniboxd/pay/alipay.service';
 import { Get, Post, Param, Query, Controller } from '@nestjs/common';
 import { UserId } from 'omniboxd/decorators/user-id.decorator';
+import { Public } from 'omniboxd/auth/decorators/public.auth.decorator';
 
 @Controller('api/v1/pay/alipay')
 export class AlipayController {
@@ -17,6 +18,7 @@ export class AlipayController {
     return this.alipayService.transactions(userId, type, productId, returnUrl);
   }
 
+  @Public()
   @Post('callback')
   callback(@Query() query: AlipayCallbackQuery) {
     return this.alipayService.callback(query);

src/pay/alipay.service.ts

@@ -130,17 +130,23 @@ export class AlipayService {
 
   async query(userId: string, orderId: string) {
     const order = await this.ordersService.findById(userId, orderId);
+
+    if (order.status === OrderStatus.PAID) {
+      return order;
+    }
+
     const response = await this.pay.curl('POST', '/v3/alipay/trade/query', {
       body: {
         out_trade_no: order.orderNo,
         query_options: ['trade_settle_info'],
       },
     });
-    const alipayData = response as unknown as AlipayQueryResponse;
+    const alipayData = response.data as unknown as AlipayQueryResponse;
     if (
-      (alipayData.trade_status === AlipayTradeStatus.TRADE_SUCCESS ||
-        alipayData.trade_status === AlipayTradeStatus.TRADE_FINISHED) &&
-      order.status !== OrderStatus.PAID
+      [
+        AlipayTradeStatus.TRADE_SUCCESS,
+        AlipayTradeStatus.TRADE_FINISHED,
+      ].includes(alipayData.trade_status)
     ) {
       const orderAmountInYuan = (order.amount / 100).toFixed(2);
       if (alipayData.total_amount !== orderAmountInYuan) {
@@ -156,8 +162,7 @@ export class AlipayService {
 
     if (
       alipayData.trade_status === AlipayTradeStatus.TRADE_CLOSED &&
-      order.status !== OrderStatus.CLOSED &&
-      order.status !== OrderStatus.PAID
+      order.status !== OrderStatus.CLOSED
     ) {
       await this.ordersService.close(order.orderNo);
     }

src/pay/weixin.controller.ts

@@ -12,6 +12,7 @@ import {
   HttpStatus,
 } from '@nestjs/common';
 import { AppException } from 'omniboxd/common/exceptions/app.exception';
+import { Public } from 'omniboxd/auth/decorators/public.auth.decorator';
 import { UserId } from 'omniboxd/decorators/user-id.decorator';
 import { getClientPublicIp } from 'omniboxd/pay/utils';
 import { I18nService } from 'nestjs-i18n';
@@ -47,6 +48,7 @@ export class WeixinController {
     );
   }
 
+  @Public()
   @Post('callback')
   @HttpCode(204) // Return 204 No Content on success as per WeChat Pay V3 API docs
   callback(@Body() body: WeixinCallbackBody) {

test/jest-e2e-setup.ts

@@ -71,6 +71,10 @@ export default async () => {
   process.env.OBB_MAIL_FROM = '"Test <test@example.com>"';
   process.env.OBB_WIZARD_BASE_URL = 'http://localhost:8080';
 
+  process.env.OBB_ALIPAY_APPID = 'test-alipay-appid';
+  process.env.OBB_ALIPAY_CERT = 'test-alipay-app-cert';
+  process.env.OBB_ALIPAY_KEY = 'test-alipay-app-key';
+
   // WeChat Pay test configuration
   process.env.OBB_WECHAT_APP_KEY = 'test-wechat-app-key';
   process.env.OBB_WECHAT_PAY_APPID = 'test-wechat-pay-appid';