@be-link/pos-cli-nodejs 1.0.49 → 1.0.51-beta.0

package/{types.d.ts → dist/types.d.ts}

@@ -1,5 +1,8 @@
 import * as PosConstants from 'vitality-meta/enums/pos';
 import * as commodityConstants from 'vitality-meta/enums/commodity';
+import * as CSDto from '@be-link/cs-cli-nodejs/types';
+import * as ServiceVenueDto from '@be-link/cs-cli-nodejs/cs/modules/serviceVenue/types';
+import { CommonSaleStatus } from 'vitality-meta/enums/commodity';
 /**
  * 订单正向结构
  */
@@ -100,6 +103,8 @@ export interface IPositiveAttributes {
     groupBookingType: number;
     /** 是否班车信息需要确认 */
     isShuttleBusNeedCheck: boolean;
+    /** 是否是迁移商品订单 */
+    isMigratedItemOrder: boolean;
     /** 快照创建时间 */
     createdAt: number;
     /** 快照更新时间 */
@@ -273,6 +278,21 @@ export interface IPositiveItemInfo {
     /** 更新时间 */
     updatedAt: number;
 }
+export type IPositiveItemInfoV2 = {
+    _id: string;
+    name: string;
+    categoryOne: string;
+    categoryTwo: string;
+    venueId: string;
+    supplierId: string;
+    basicInfo: CSDto.IItemBasicInfo;
+    attributes: CSDto.IItemAttributes;
+    hotelItemInfo?: CSDto.IHotelItemInfo;
+    /** 金币信息 */
+    creditInfo: CreditInfo;
+    createdAt: number;
+    updatedAt: number;
+};
 export interface IPositiveSkuInfo {
     /** SKU ID */
     _id: string;
@@ -383,6 +403,8 @@ export interface IPositiveSkuInfo {
             settlementPrice: number;
         };
     };
+    /** sku类型 */
+    type: PosConstants.SkuTypeEnum;
     /** 剩余数量 */
     remainQuantity: number;
     /** 一级类目 */
@@ -394,6 +416,67 @@ export interface IPositiveSkuInfo {
     /** sku快照更新时间 */
     updatedAt: number;
 }
+export interface IPositiveSkuInfoV2 {
+    _id: string;
+    skuCreatedAt: number;
+    skuUpdatedAt: number;
+    categoryOne: string;
+    categoryTwo: string;
+    itemId: string;
+    comboId: string;
+    status: string;
+    stock: number;
+    departureDate: number;
+    quantity: number;
+    salePrice: number;
+    settlementPrice: number;
+    memberPrice: number;
+    memberPriceLimitCnt: number;
+    singleRoomPrice: number;
+    singleRoomSettlementPrice: number;
+    saleBeginTime: number;
+    saleEndTime: number;
+    lastUpdateStockTime: number;
+    type: PosConstants.SkuTypeEnum;
+    skuSnapShotId: string;
+    remainQuantity: number;
+    createdAt: number;
+    updatedAt: number;
+}
+export interface IPositiveShuttleBusSkuInfo {
+    itemId: string;
+    quantity: number;
+    relationInfo: {
+        id: string;
+        createdAt: number;
+        updatedAt: number;
+        deletedAt: number;
+        itemId: string;
+        supplierId: string;
+        routeId: string;
+        status: CommonSaleStatus;
+        salePrice: number;
+        settlementPrice: number;
+        saleDesc: string;
+        minOrderCount: number;
+        isLimitStock: number;
+        pickUpTime: string;
+    };
+    type: PosConstants.SkuTypeEnum;
+    skuSnapShotId: string;
+    remainQuantity: number;
+    createdAt: number;
+    updatedAt: number;
+}
+export type IPositiveOrderComboInfo = {
+    id: string;
+    createdAt: number;
+    updatedAt: number;
+    orderId: string;
+    comboInfo: CSDto.IItemCombo | CSDto.IItemComboShortcut;
+    comboId: string;
+    type: PosConstants.ComboTypeEnum;
+};
 export interface IWxPaymentInfo {
     appId: string;
     nonceStr: string;
@@ -458,6 +541,38 @@ export interface CouponSnapShotInfo {
     /** 优惠券的使用限制。 */
     usageLimit: any;
 }
+export interface IPositiveRoomInfo {
+    id: string;
+    createdAt: number;
+    updatedAt: number;
+    deletedAt: number;
+    orderId: string;
+    roomInfo: ServiceVenueDto.ServiceVenue.Response.IGetRoomTypeInfoRes;
+    roomId: string;
+}
+export interface IPositiveVenueInfo {
+    id: string;
+    createdAt: number;
+    updatedAt: number;
+    deletedAt: number;
+    orderId: string;
+    venueInfo: ServiceVenueDto.ServiceVenue.Response.IGetServiceVenueInfoRes;
+    venueId: string;
+}
+export interface IPositiveFeeDetailInfo {
+    id: string;
+    createdAt: number;
+    updatedAt: number;
+    deletedAt: number;
+    orderId: string;
+    itemId: string;
+    comboId: string;
+    skuId: string;
+    value: number;
+    quantity: number;
+    type: string;
+    desc: string;
+}
 export interface IPositivePromotionInfo {
     /** 营销记录Id */
     _id: string;
@@ -550,6 +665,13 @@ export interface TouristInfo {
     isVoiceSucceed?: boolean;
     /** 是否发送短信 */
     isSmsSucceed?: boolean;
+    cardType?: string;
+    passportInfo?: {
+        region: string;
+        birthday: number;
+        validityDate: number;
+        imageUrl: string;
+    };
 }
 /** 旅游出行信息，已不再适用，兼容旧数据 */
 export interface ItineraryInfo {
@@ -819,26 +941,18 @@ export interface IStore {
 export interface IRawOrderStructure {
     basicInfo: IPositiveOrder;
     attributes?: {
-        isMemberOrder: number;
-        isFirstTrade: number;
-        hasMergedOrder: number;
-        isMerged: number;
-        isMealInfoModified: number;
-        isMealInfoConfirmed: number;
-        isPurchasedInsurance: number;
-        buyerWxNotificationIsRead: number;
-        hasSentWXNotification: number;
-        isAuthSendItineraryInfoSubscribeMessage: number;
-        isTouristsCompletely: number;
-        isShuttleBusNeedCheck: number;
-        isGroupMainOrder: number;
-        isGroupSubOrder: number;
-        groupBookingType: number;
+        [K in keyof Omit<IPositiveAttributes, 'id' | 'createdAt' | 'updatedAt'>]: number;
     };
     commodityInfo?: (IPositiveItemInfo & {
         skus: IPositiveSkuInfo[];
         storeInfo?: IStore;
     })[];
+    itemInfo?: IPositiveItemInfoV2;
+    skuInfoList?: (IPositiveSkuInfoV2 | IPositiveShuttleBusSkuInfo)[];
+    comboInfoList?: IPositiveOrderComboInfo[];
+    roomInfoList?: IPositiveRoomInfo[];
+    venueInfo?: IPositiveVenueInfo;
+    feeDetailInfoList?: IPositiveFeeDetailInfo[];
     paymentInfo?: IPositivePaymentInfo[];
     promotionInfo?: IPositivePromotionInfo[];
 }
@@ -983,7 +1097,15 @@ export interface QueryDataBlockTypeMap {
         storeInfo: IStore;
     })[];
     /** sku快照信息 */
-    skuInfo: IPositiveSkuInfo[];
+    skuInfo: (IPositiveSkuInfo | IPositiveShuttleBusSkuInfo | IPositiveSkuInfoV2)[];
+    /** 套餐快照信息 */
+    comboInfo: IPositiveOrderComboInfo[];
+    /** 房型快照信息 */
+    roomInfo: IPositiveRoomInfo[];
+    /** 场所快照信息 */
+    venueInfo: IPositiveVenueInfo;
+    /** 费用明细信息 */
+    feeDetailInfoList: IPositiveFeeDetailInfo[];
     /** 支付信息 */
     paymentInfo: IPositivePaymentInfo[];
     /** 营销信息 */

package/jest.config.js

@@ -0,0 +1,194 @@
+/*
+ * For a detailed explanation regarding each configuration property, visit:
+ * https://jestjs.io/docs/configuration
+ */
+
+module.exports = {
+  // All imported modules in your tests should be mocked automatically
+  // automock: false,
+
+  // Stop running tests after `n` failures
+  // bail: 0,
+
+  // The directory where Jest should store its cached dependency information
+  // cacheDirectory: "/private/var/folders/dt/kcn7j7yj36n1881sqpgzqv3c0000gn/T/jest_dx",
+
+  // Automatically clear mock calls and instances between every test
+  clearMocks: true,
+
+  // Indicates whether the coverage information should be collected while executing the test
+  // collectCoverage: false,
+
+  // An array of glob patterns indicating a set of files for which coverage information should be collected
+  // collectCoverageFrom: undefined,
+
+  // The directory where Jest should output its coverage files
+  // coverageDirectory: undefined,
+
+  // An array of regexp pattern strings used to skip coverage collection
+  // coveragePathIgnorePatterns: [
+  //   "/node_modules/"
+  // ],
+
+  // Indicates which provider should be used to instrument code for coverage
+  coverageProvider: 'v8',
+
+  // A list of reporter names that Jest uses when writing coverage reports
+  // coverageReporters: [
+  //   "json",
+  //   "text",
+  //   "lcov",
+  //   "clover"
+  // ],
+
+  // An object that configures minimum threshold enforcement for coverage results
+  // coverageThreshold: undefined,
+
+  // A path to a custom dependency extractor
+  // dependencyExtractor: undefined,
+
+  // Make calling deprecated APIs throw helpful error messages
+  // errorOnDeprecated: false,
+
+  // Force coverage collection from ignored files using an array of glob patterns
+  // forceCoverageMatch: [],
+
+  // A path to a module which exports an async function that is triggered once before all test suites
+  // globalSetup: undefined,
+
+  // A path to a module which exports an async function that is triggered once after all test suites
+  // globalTeardown: undefined,
+
+  // A set of global variables that need to be available in all test environments
+  // globals: {},
+
+  // The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
+  // maxWorkers: "50%",
+
+  // An array of directory names to be searched recursively up from the requiring module's location
+  // moduleDirectories: [
+  //   "node_modules"
+  // ],
+
+  // An array of file extensions your modules use
+  moduleFileExtensions: [
+    "js",
+    "jsx",
+    "ts",
+    "tsx",
+    "json",
+    "node"
+  ],
+
+  // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
+  // moduleNameMapper: {},
+
+  // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
+  // modulePathIgnorePatterns: [],
+
+  // Activates notifications for test results
+  // notify: false,
+
+  // An enum that specifies notification mode. Requires { notify: true }
+  // notifyMode: "failure-change",
+
+  // A preset that is used as a base for Jest's configuration
+  preset: 'ts-jest',
+
+  // Run tests from one or more projects
+  // projects: undefined,
+
+  // Use this configuration option to add custom reporters to Jest
+  // reporters: undefined,
+
+  // Automatically reset mock state between every test
+  // resetMocks: false,
+
+  // Reset the module registry before running each individual test
+  // resetModules: false,
+
+  // A path to a custom resolver
+  // resolver: undefined,
+
+  // Automatically restore mock state between every test
+  // restoreMocks: false,
+
+  // The root directory that Jest should scan for tests and modules within
+  // rootDir: undefined,
+
+  // A list of paths to directories that Jest should use to search for files in
+  // roots: [
+  //   "<rootDir>"
+  // ],
+
+  // Allows you to use a custom runner instead of Jest's default test runner
+  // runner: "jest-runner",
+
+  // The paths to modules that run some code to configure or set up the testing environment before each test
+  // setupFiles: [],
+
+  // A list of paths to modules that run some code to configure or set up the testing framework before each test
+  // setupFilesAfterEnv: [],
+
+  // The number of seconds after which a test is considered as slow and reported as such in the results.
+  // slowTestThreshold: 5,
+
+  // A list of paths to snapshot serializer modules Jest should use for snapshot testing
+  // snapshotSerializers: [],
+
+  // The test environment that will be used for testing
+  // testEnvironment: "jest-environment-node",
+
+  // Options that will be passed to the testEnvironment
+  // testEnvironmentOptions: {},
+
+  // Adds a location field to test results
+  // testLocationInResults: false,
+
+  // The glob patterns Jest uses to detect test files
+  // testMatch: [
+  //   "**/__tests__/**/*.[jt]s?(x)",
+  //   "**/?(*.)+(spec|test).[tj]s?(x)"
+  // ],
+
+  // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
+  // testPathIgnorePatterns: [
+  //   "/node_modules/"
+  // ],
+
+  // The regexp pattern or array of patterns that Jest uses to detect test files
+  // testRegex: [],
+
+  // This option allows the use of a custom results processor
+  // testResultsProcessor: undefined,
+
+  // This option allows use of a custom test runner
+  // testRunner: "jest-circus/runner",
+
+  // This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
+  // testURL: "http://localhost",
+
+  // Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout"
+  // timers: "real",
+
+  // A map from regular expressions to paths to transformers
+  transform: { "^.+\\.ts?$": "ts-jest" },
+
+  // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
+  // transformIgnorePatterns: [
+  //   "/node_modules/",
+  //   "\\.pnp\\.[^\\/]+$"
+  // ],
+
+  // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
+  // unmockedModulePathPatterns: undefined,
+
+  // Indicates whether each individual test should be reported during the run
+  // verbose: undefined,
+
+  // An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
+  // watchPathIgnorePatterns: [],
+
+  // Whether to use watchman for file crawling
+  // watchman: true,
+}

package/package.json

@@ -1,18 +1,8 @@
 {
   "name": "@be-link/pos-cli-nodejs",
-  "version": "1.0.49",
+  "version": "1.0.51-beta.0",
   "description": "正向订单服务Nodejs客户端",
   "main": "index.js",
-  "scripts": {
-    "build": "rm -rf ./dist && tsc && cp package.json README.md ./dist/",
-    "test": "npx jest",
-    "gen-doc": "npx typedoc --options typedoc.json",
-    "update:major": "standard-version --release-as major",
-    "update:minor": "standard-version  --release-as minor",
-    "update:patch": "standard-version  --release-as patch",
-    "update:beta": "standard-version --prerelease beta",
-    "publish": "ts-node ./ci/index"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/snowmountain-top/pos-cli-nodejs.git"
@@ -48,6 +38,16 @@
     "axios": "0.27.2",
     "axios-retry": "^4.0.0",
     "uuid": "^9.0.1",
-    "vitality-meta": "1.0.165"
+    "vitality-meta": "1.0.165",
+    "@be-link/cs-cli-nodejs": "0.1.1"
+  },
+  "scripts": {
+    "build": "rm -rf ./dist && tsc && cp package.json README.md ./dist/",
+    "test": "npx jest",
+    "gen-doc": "npx typedoc --options typedoc.json",
+    "update:major": "standard-version --release-as major",
+    "update:minor": "standard-version  --release-as minor",
+    "update:patch": "standard-version  --release-as patch",
+    "update:beta": "standard-version --prerelease beta"
   }
-}
+}

package/src/errors/BizError.ts

@@ -0,0 +1,10 @@
+export default class BizError extends Error {
+
+  code: number
+
+  constructor(message: string, code: number = 400) {
+    super(message)
+    this.code = code
+    this.name = 'BizError'
+  }
+}

package/src/errors/SystemError.ts

@@ -0,0 +1,10 @@
+export default class SystemError extends Error {
+
+  code: number
+
+  constructor(message: string, code: number = 500) {
+    super(message)
+    this.code = code
+    this.name = 'SystemError'
+  }
+}

package/src/index.ts

@@ -0,0 +1,33 @@
+import * as PosConstants from 'vitality-meta/enums/pos'
+import * as PosDto from './types'
+import BizError from './errors/BizError'
+
+import orderCoreService from './pos/modules/orderCore/service'
+import orderFulfillService from './pos/modules/orderFulfill/service'
+import queryByCommodityService from './pos/modules/orderQuery/commodity'
+import queryByStoreService from './pos/modules/orderQuery/store'
+import queryByUserService from './pos/modules/orderQuery/user'
+import queryByWebService from './pos/modules/orderQuery/web'
+import queryBySupplierService from './pos/modules/orderQuery/supplier'
+import orderNoteService from './pos/modules/orderNote/service'
+import orderJobService from './pos/modules/orderJob/service'
+import dataMigrateService from './pos/modules/dataMigrate/service'
+
+export {
+  /** 业务模块 */
+  orderCoreService,
+  orderFulfillService,
+  queryByCommodityService,
+  queryByStoreService,
+  queryByUserService,
+  queryByWebService,
+  queryBySupplierService,
+  orderNoteService,
+  orderJobService,
+  dataMigrateService,
+  /** 枚举类 */
+  PosConstants,
+  PosDto,
+  /** 错误类 */
+  BizError
+}

package/src/pos/http.ts

@@ -0,0 +1,70 @@
+import axios, {AxiosError} from 'axios'
+import { v4 as uuidV4 } from 'uuid'
+import BizError from '../errors/BizError'
+import SystemError from '../errors/SystemError'
+import axiosRetry from 'axios-retry'
+
+const axiosInstance = axios.create(
+  {
+    timeout: 55000,
+    httpsAgent: new (require('https').Agent)({ keepAlive: true }),
+    httpAgent: new (require('http').Agent)({ keepAlive: true }),
+  }
+)
+
+axiosRetry(axiosInstance, {
+  retries: 1,
+  retryCondition(error) {
+    console.info('errorMessage', error.message)
+    console.info('errorResponse', error.response ? error.response.data : null)
+    const isSocketHangUp = error.message.includes('socket hang up')
+    return isSocketHangUp || error.message.includes('getaddrinfo ENOTFOUND') || (Boolean(error.response) && [502, 503].includes(error.response!.status))
+  },
+  retryDelay: (retryCount, error) => {
+    console.info(`retryCount: ${retryCount}, retryDelay: ${retryCount * 500}`)
+    return retryCount * 500
+  },
+  onRetry(retryCount, error, requestConfig) {
+    console.info(`retryCount: ${retryCount}, onRetry: ${error}, requestHeader: ${JSON.stringify(requestConfig.headers)}`)
+  },
+})
+
+type ResponseData = {
+  data: any
+  message: string
+}
+
+export async function callApi<T extends (args: any) => Promise<any>>(url: string, ...request: Parameters<T>)
+  : Promise<Awaited<ReturnType<T>>>
+{
+  const requestId = uuidV4()
+  try {
+    console.info(`准备发起POS请求[${requestId}]: ${url}, 参数: ${JSON.stringify(request)}`)
+    const response = await axiosInstance.post(url, request[0], {
+      headers: {
+        'X-Request-Id': requestId,
+        'x-belink-accessType': 'authorizationTokenInside',
+        'x-belink-authorization': process.env.authorizationTokenInside || ""
+      }
+    })
+    const responseData = response.data as ResponseData
+    return responseData.data
+  } catch (error: any) {
+    const axiosError = error as AxiosError
+    const ErrorClass = axiosError.response
+      ? axiosError.response.status === 400
+        ? BizError
+        : SystemError
+      : SystemError
+    if (axiosError.response) {
+      const response = axiosError.response
+      const data = response.data as ResponseData
+      console.error(`POS 异常[${requestId}]: ${axiosError.message}`)
+      console.info('响应信息', data.message)
+      console.error('异常堆栈', JSON.stringify(error.stack))
+      throw new ErrorClass(data.message || 'Pos Error', response.status)
+    }
+    console.error(`POS 未知异常[${requestId}]: ${axiosError.message}`, error.stack)
+    throw error
+  }
+}

package/src/pos/modules/dataMigrate/service.ts

@@ -0,0 +1,18 @@
+import { Service } from './types'
+import { callApi } from '../../http'
+import BaseService from '../service'
+
+class DataMigrateService extends BaseService implements Service.DataMigrateController {
+  protected prefixUrl: string = '/dataMigrate'
+
+  pos(): Promise<void> {
+    return callApi<Service.DataMigrateController['pos']>(this.getApiUrl(this.pos))
+  }
+  rev(): Promise<void> {
+    return callApi<Service.DataMigrateController['rev']>(this.getApiUrl(this.rev))
+  }
+}
+
+const dataMigrateService = new DataMigrateService()
+
+export default dataMigrateService

package/src/pos/modules/dataMigrate/types.ts

@@ -0,0 +1,11 @@
+import * as PosConstants from 'vitality-meta/enums/pos'
+import * as DTO from '../../../types'
+
+
+export namespace Service {
+
+  export interface DataMigrateController {
+    pos(): Promise<void>
+    rev(): Promise<void>
+  }
+}