feat: 更新数据库配置并优化订单同步功能

2025-12-19 16:56:51 +08:00
6 changed files with 209 additions and 96 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -21,6 +21,7 @@
        "@midwayjs/swagger": "^3.20.2",
        "@midwayjs/typeorm": "^3.20.0",
        "@midwayjs/validate": "^3.20.2",
+        "@woocommerce/woocommerce-rest-api": "^1.0.2",
        "axios": "^1.7.9",
        "bcryptjs": "^2.4.3",
        "class-transformer": "^0.5.1",
@ -675,6 +676,21 @@
        "@types/superagent": "*"
      }
    },
+    "node_modules/@woocommerce/woocommerce-rest-api": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@woocommerce/woocommerce-rest-api/-/woocommerce-rest-api-1.0.2.tgz",
+      "integrity": "sha512-G+0VwM0MINF83KnT7Rg/htm9EEYADWvDPT/UWEJdZ0de1vXvsPrr4M1ksKaxgKHO8qIJViRrIHCtrui2JoVA+Q==",
+      "license": "MIT",
+      "dependencies": {
+        "axios": "^1.6.8",
+        "create-hmac": "^1.1.7",
+        "oauth-1.0a": "^2.2.6",
+        "url-parse": "^1.4.7"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
    "node_modules/accepts": {
      "version": "1.3.8",
      "resolved": "https://registry.npmmirror.com/accepts/-/accepts-1.3.8.tgz",
@ -1017,6 +1033,20 @@
        "node": ">=18"
      }
    },
+    "node_modules/cipher-base": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.7.tgz",
+      "integrity": "sha512-Mz9QMT5fJe7bKI7MH31UilT5cEK5EHHRCccw/YRFsRY47AuNgaV6HY3rscp0/I4Q+tTW/5zoqpSeRRI54TkDWA==",
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "safe-buffer": "^5.2.1",
+        "to-buffer": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
    "node_modules/class-transformer": {
      "version": "0.5.1",
      "resolved": "https://registry.npmmirror.com/class-transformer/-/class-transformer-0.5.1.tgz",
@ -1301,6 +1331,39 @@
      "integrity": "sha512-3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w==",
      "license": "MIT"
    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "license": "MIT"
+    },
+    "node_modules/create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "license": "MIT",
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "node_modules/create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "license": "MIT",
+      "dependencies": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
    "node_modules/cron": {
      "version": "3.5.0",
      "resolved": "https://registry.npmmirror.com/cron/-/cron-3.5.0.tgz",
@ -1928,6 +1991,21 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/hash-base": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.2.tgz",
+      "integrity": "sha512-Bb33KbowVTIj5s7Ked1OsqHUeCpz//tPwR+E2zJgJKo9Z5XolZ9b6bdUgjmYlwnWhoOQKoTd1TYToZGn5mAYOg==",
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^2.3.8",
+        "safe-buffer": "^5.2.1",
+        "to-buffer": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
    "node_modules/hasown": {
      "version": "2.0.2",
      "resolved": "https://registry.npmmirror.com/hasown/-/hasown-2.0.2.tgz",
@ -2487,6 +2565,17 @@
        "node": ">= 0.4"
      }
    },
+    "node_modules/md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "license": "MIT",
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
    "node_modules/media-typer": {
      "version": "0.3.0",
      "resolved": "https://registry.npmmirror.com/media-typer/-/media-typer-0.3.0.tgz",
@ -2718,6 +2807,12 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/oauth-1.0a": {
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/oauth-1.0a/-/oauth-1.0a-2.2.6.tgz",
+      "integrity": "sha512-6bkxv3N4Gu5lty4viIcIAnq5GbxECviMBeKR3WX/q87SPQ8E8aursPZUtsXDnxCs787af09WPRBLqYrf/lwoYQ==",
+      "license": "MIT"
+    },
    "node_modules/object-inspect": {
      "version": "1.13.4",
      "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.4.tgz",
@ -2853,6 +2948,12 @@
        "node": ">= 0.4"
      }
    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "license": "MIT"
+    },
    "node_modules/proxy-from-env": {
      "version": "1.1.0",
      "resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@ -2874,6 +2975,12 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "license": "MIT"
+    },
    "node_modules/queue-lit": {
      "version": "1.5.2",
      "resolved": "https://registry.npmmirror.com/queue-lit/-/queue-lit-1.5.2.tgz",
@ -2932,6 +3039,33 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "license": "MIT",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/readable-stream/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "license": "MIT"
+    },
+    "node_modules/readable-stream/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "license": "MIT"
+    },
    "node_modules/readdirp": {
      "version": "3.6.0",
      "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
@ -2960,6 +3094,12 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "license": "MIT"
+    },
    "node_modules/resolve-pkg-maps": {
      "version": "1.0.0",
      "resolved": "https://registry.npmmirror.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
@ -2981,6 +3121,19 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/ripemd160": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.3.tgz",
+      "integrity": "sha512-5Di9UC0+8h1L6ZD2d7awM7E/T4uA1fJRlx6zk/NvdCCVEoAnFqvHmCuNeIKoCeIixBX/q8uM+6ycDvF8woqosA==",
+      "license": "MIT",
+      "dependencies": {
+        "hash-base": "^3.1.2",
+        "inherits": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
    "node_modules/run-parallel": {
      "version": "1.2.0",
      "resolved": "https://registry.npmmirror.com/run-parallel/-/run-parallel-1.2.0.tgz",
@ -3305,6 +3458,21 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/string_decoder/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "license": "MIT"
+    },
    "node_modules/string-width": {
      "version": "5.1.2",
      "resolved": "https://registry.npmmirror.com/string-width/-/string-width-5.1.2.tgz",
@ -3467,9 +3635,9 @@
      }
    },
    "node_modules/to-buffer": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmmirror.com/to-buffer/-/to-buffer-1.2.1.tgz",
-      "integrity": "sha512-tB82LpAIWjhLYbqjx3X4zEeHN6M8CiuOEy2JY8SEQVdYRe3CCHOFaqrBW1doLDrfpWhplcW7BL+bO3/6S3pcDQ==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.2.2.tgz",
+      "integrity": "sha512-db0E3UJjcFhpDhAF4tLo03oli3pwl3dbnzXOUIlRKrp+ldk/VUxzpWYZENsw2SZiuBjHAk7DfB0VU7NKdpb6sw==",
      "license": "MIT",
      "dependencies": {
        "isarray": "^2.0.5",
@ -3697,6 +3865,22 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "license": "MIT",
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "license": "MIT"
+    },
    "node_modules/uuid": {
      "version": "11.1.0",
      "resolved": "https://registry.npmmirror.com/uuid/-/uuid-11.1.0.tgz",
--- a/src/config/config.local.ts
+++ b/src/config/config.local.ts
@ -1,86 +0,0 @@
-import { MidwayConfig } from '@midwayjs/core';
-export default {
-  koa: {
-    port: 7001,
-  },
-  // typeorm: {
-  //   dataSource: {
-  //     default: {
-  //       host: '13.212.62.127',
-  //       username: 'root',
-  //       password: 'Yoone!@.2025',
-  //     },
-  //   },
-  // },
-  typeorm: {
-    dataSource: {
-      default: {
-        host: 'localhost',
-        username: 'root',
-        password: '12345678',
-      },
-    },
-  },
-  cors: {
-    origin: '*', // 允许所有来源跨域请求
-    allowMethods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'], // 允许的 HTTP 方法
-    allowHeaders: ['Content-Type', 'Authorization'], // 允许的自定义请求头
-    credentials: true, // 允许携带凭据（cookies等）
-  },
-  jwt: {
-    secret: 'YOONE2024!@abc',
-    expiresIn: '7d',
-  },
-  wpSite: [
-    {
-      id: '-1',
-      siteName: 'Admin',
-      email: '2469687281@qq.com',
-    },
-    {
-      id: '2',
-      wpApiUrl: 'http://t2-shop.local/',
-      consumerKey: 'ck_a369473a6451dbaec63d19cbfd74a074b2c5f742',
-      consumerSecret: 'cs_0946bbbeea1bfefff08a69e817ac62a48412df8c',
-      siteName: 'Local',
-      email: '2469687281@qq.com',
-      emailPswd: 'lulin91.',
-    },
-    {
-      id: '3',
-      wpApiUrl: 'http://t1-shop.local/',
-      consumerKey: 'ck_a369473a6451dbaec63d19cbfd74a074b2c5f742',
-      consumerSecret: 'cs_0946bbbeea1bfefff08a69e817ac62a48412df8c',
-      siteName: 'Local-test-2',
-      email: '2469687281@qq.com',
-      emailPswd: 'lulin91.',
-    },
-    // {
-    //   id: '2',
-    //   wpApiUrl: 'http://localhost:10004',
-    //   consumerKey: 'ck_dc9e151e9048c8ed3e27f35ac79d2bf7d6840652',
-    //   consumerSecret: 'cs_d05d625d7b0ac05c6d765671d8417f41d9477e38',
-    //   siteName: 'Local',
-    //   email: 'tom@yoonevape.com',
-    //   emailPswd: 'lulin91.',
-    // },
-  ],
-  freightcom: {
-    url: 'https://customer-external-api.ssd-test.freightcom.com',
-    token: '6zGj1qPTL1jIkbLmgaiYc6SwHUIXJ2t25htUF8uuFYiCg8ILCY6xnBEbvrX1p79L',
-  },
-  canadaPost: {
-    url: 'https://ct.soa-gw.canadapost.ca',
-    username: '65d23d3a75d7baf7',
-    password: '56443bb98b68dfdd60f52e',
-    customerNumber: '0006122480',
-    contractId: '0044168528',
-  },
-  uniExpress: {
-    url: 'https://sjqa.uniexpress.org', // 测试环境url
-    // url: 'https://sj.uniexpress.ca', //正式环境url
-    clientId: '101018',
-    clientSecret: 'cbcb51bea204f3f69c47b5280064408e',
-    customerNo: 2067,
-  }
-} as MidwayConfig;
--- a/src/dto/statistics.dto.ts
+++ b/src/dto/statistics.dto.ts
@ -16,8 +16,8 @@ export class OrderStatisticsParams {
  keyword?: string;

  @ApiProperty()
-  @Rule(RuleType.string().allow(null))
-  siteId?: string;
+  @Rule(RuleType.number().allow(null))
+  siteId?: number;

  @ApiProperty({
    enum: ['all', 'first_purchase', 'repeat_purchase'],
--- a/src/service/order.service.ts
+++ b/src/service/order.service.ts
@ -103,8 +103,18 @@ export class OrderService {
  @Inject()
  siteService: SiteService;

-  async syncOrders(siteId: string) {
-    const orders = await this.wpService.getOrders(siteId); // 调用 WooCommerce API 获取订单
+async syncOrders(siteId: string) {
+const daysRange = 7;  
+    // 获取当前时间和7天前时间  
+const now = new Date();  
+const sevenDaysAgo = new Date();  
+sevenDaysAgo.setDate(now.getDate() - daysRange);  
+  
+// 格式化时间为ISO 8601  
+const after = sevenDaysAgo.toISOString();  
+const before = now.toISOString();  
+
+    const orders = await this.wpService.getOrders(siteId,after,before); // 调用 WooCommerce API 获取订单
    for (const order of orders) {
      await this.syncSingleOrder(siteId, order);
    }
--- a/src/service/site.service.ts
+++ b/src/service/site.service.ts
@ -57,7 +57,7 @@ export class SiteService {
    if (!site) return null;
    if (includeSecret) return site;
    // 默认不返回密钥，进行字段脱敏
-    const { consumerKey, consumerSecret, ...rest } = site;
+    const {  ...rest } = site;
    return rest;
  }
  
--- a/src/service/wp.service.ts
+++ b/src/service/wp.service.ts
@ -186,10 +186,15 @@ export class WPService {
    const res = await api.get(`orders/${orderId}`);
    return res.data as Record<string, any>;
  }
-  async getOrders(siteId: string): Promise<Record<string, any>[]> {
+  async getOrders(
+    siteId: string,
+    after: string,
+    before: string
+  ): Promise<Record<string, any>[]> {
    const site = await this.siteService.get(siteId);
    const api = this.createApi(site, 'wc/v3');
-    return await this.sdkGetAll<Record<string, any>>(api, 'orders');
+    return await this.sdkGetAll<Record<string, any>>(api, 'orders', { after: after,  
+  before: before });
  }

  /**