feat(pay): complete pay module

Author: hewenguang

.gitignore

@@ -3,8 +3,6 @@
 /node_modules
 /build
 
-/cert
-
 # Logs
 logs
 *.log

example.env

@@ -34,13 +34,12 @@ OBB_GOOGLE_CLIENT_SECRET=
 OBB_GOOGLE_REDIRECT_URI=
 
 OBB_ALIPAY_APPID=
-OBB_ALIPAY_CERT_PATH=
-OBB_ALIPAY_KEY_PATH=
-OBB_ALIPAY_RETURN_URL=
+OBB_ALIPAY_CERT=
+OBB_ALIPAY_KEY=
 
 OBB_WECHAT_APP_KEY=
 OBB_WECHAT_PAY_APPID=
 OBB_WECHAT_PAY_MCHID=
 OBB_WECHAT_PAY_SERIAL=
-OBB_WECHAT_PAY_CERT_PATH=
-OBB_WECHAT_PAY_KEY_PATH=
+OBB_WECHAT_PAY_CERT=
+OBB_WECHAT_PAY_KEY=

package.json

@@ -95,6 +95,7 @@
     "meilisearch": "^0.50.0",
     "minio": "^8.0.6",
     "nanoid": "^5.1.6",
+    "nest-wechatpay-node-v3": "^1.0.2",
     "nestjs-i18n": "^10.5.1",
     "nestjs-otel": "^7.0.1",
     "nodemailer": "^6.10.1",

pnpm-lock.yaml

@@ -76,6 +76,9 @@ import { isEmpty } from 'omniboxd/utils/is-empty';
 import { Files1761556143000 } from 'omniboxd/migrations/1761556143000-files';
 import { FilesModule } from 'omniboxd/files/files.module';
 import { AddFileIdToResources1761726974942 } from 'omniboxd/migrations/1761726974942-add-file-id-to-resources';
+import { Products1762847077000 } from 'omniboxd/migrations/1762847077000-products';
+import { Orders1762847078000 } from 'omniboxd/migrations/1762847078000-orders';
+import { AddMetadataToUserBindings1762847685000 } from 'omniboxd/migrations/1762847685000-add-metadata-to-user-bindings';
 
 @Module({})
 export class AppModule implements NestModule {
@@ -206,6 +209,9 @@ export class AppModule implements NestModule {
               ShareUser1760171824000,
               Files1761556143000,
               AddFileIdToResources1761726974942,
+              Products1762847077000,
+              Orders1762847078000,
+              AddMetadataToUserBindings1762847685000,
               ...extraMigrations,
             ],
             migrationsRun: true,

src/app/app.module.ts

@@ -200,6 +200,7 @@ export class GoogleService {
         userId,
         loginType: 'google',
         loginId: userData.sub,
+        metadata: userData,
       });
       const returnValue = {
         id: existingUser.id,
@@ -231,6 +232,7 @@ export class GoogleService {
         userId: linkedAccount.id,
         loginType: 'google',
         loginId: userData.sub,
+        metadata: userData,
       });
       const returnValue = {
         id: existingUser.id,
@@ -266,6 +268,7 @@ export class GoogleService {
           loginId: userData.sub,
           email: userData.email,
           lang,
+          metadata: userData,
         } as CreateUserBindingDto,
         manager,
       );

src/auth/google/google.service.ts

@@ -10,9 +10,15 @@ import { AppException } from 'omniboxd/common/exceptions/app.exception';
 import { I18nService } from 'nestjs-i18n';
 
 export interface WechatUserInfo {
-  unionid: string;
-  nickname: string;
   openid: string;
+  nickname: string;
+  sex: number;
+  province: string;
+  city: string;
+  country: string;
+  headimgurl: string;
+  privilege: Array<string>;
+  unionid: string;
 }
 
 @Injectable()
@@ -200,6 +206,7 @@ export class WechatService {
         userId,
         loginType: 'wechat',
         loginId: userData.unionid,
+        metadata: userData,
       });
       const returnValue = {
         id: existingUser.id,
@@ -236,6 +243,7 @@ export class WechatService {
           loginType: 'wechat',
           loginId: userData.unionid,
           lang,
+          metadata: userData,
         } as CreateUserBindingDto,
         manager,
       );

src/auth/wechat/wechat.service.ts

@@ -1,9 +1,7 @@
 {
   "errors": {
     "invalidParameter": "Invalid parameter",
-    "signatureVerificationFailed": "Signature verification failed",
-    "missingRequiredParameters": "Missing required parameters",
-    "orderAmountMismatch": "Order amount mismatch",
-    "cannotGetUserIP": "Cannot get user's valid IP, unable to create order"
+    "cannotGetUserIP": "Cannot get user's valid IP, unable to create order",
+    "wechatNotBound": "WeChat account is not bound or missing openid"
   }
 }

src/i18n/en/pay.json

@@ -1,5 +1,6 @@
 {
   "errors": {
-    "productNotFound": "Product not found"
+    "productNotFound": "Product not found",
+    "productNotAvailable": "Product not available"
   }
 }

src/i18n/en/product.json

@@ -1,9 +1,7 @@
 {
   "errors": {
     "invalidParameter": "参数错误",
-    "signatureVerificationFailed": "签名验证失败",
-    "missingRequiredParameters": "缺少必要参数",
-    "orderAmountMismatch": "订单金额不匹配",
-    "cannotGetUserIP": "无法获取用户有效IP，无法创建订单"
+    "cannotGetUserIP": "无法获取用户有效IP，无法创建订单",
+    "wechatNotBound": "微信账号未绑定或缺少openid"
   }
 }