update

gopowerteam · Oct 29, 2024 · 0ca7e86 · 0ca7e86
1 parent 5c02dbb
commit 0ca7e86
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/server/api/import/index.post.ts b/server/api/import/index.post.ts
@@ -25,7 +25,6 @@ export default defineEventHandler(async (event) => {
   const document = await getDocument(new Uint8Array(binaryString)).promise
 
   const data = await extractDataFromPDF(document, channel)
-
   if (data.username && data.account && data.batch && data.idNumber) {
     await importDBFromData(data)
   }

diff --git a/server/services/extract.service.ts b/server/services/extract.service.ts
@@ -47,7 +47,7 @@ async function extractUserFromAliPay(document: PDFDocumentProxy) {
   const name = nameMatch ? nameMatch[1] : ''
 
   // 提取证件号码
-  const idNumberMatch = content.match(/(?<=证件号码:)(\d{18})/)
+  const idNumberMatch = content.match(/(?<=证件号码:)(\d{18}|\d{17}[X|x])/)
   const idNumber = idNumberMatch ? idNumberMatch[1] : ''
 
   // 提取支付宝账号
@@ -128,7 +128,7 @@ async function extractUserFromWxPay(document: PDFDocumentProxy) {
   const name = nameMatch ? nameMatch[1] : ''
 
   // 提取证件号码
-  const idNumberMatch = content.match(/(?<=居民身份证：)(\d{18})/)
+  const idNumberMatch = content.match(/(?<=居民身份证：)(\d{18}|\d{17}[X|x])/)
   const idNumber = idNumberMatch ? idNumberMatch[1] : ''
 
   // 提取微信账号

diff --git a/server/services/import.service.ts b/server/services/import.service.ts
@@ -52,5 +52,7 @@ async function createTransactions(batch: string, channel: TransactionChannelEnum
       merchantNo: item.merchantNo,
       batchId: batch,
     })),
-  )
+  ).onConflictDoNothing({
+    target: TransactionSchema.transactionNo,
+  })
 }