Compare commits
No commits in common. "f1fb6a7e194fbd107f511e7edead37afff1162da" and "a5a6ea4a93305a7c42e1317fbde69278b02ac336" have entirely different histories.
f1fb6a7e19
...
a5a6ea4a93
@ -38,17 +38,10 @@ is_background: false
|
||||
- 公共请求头变化
|
||||
- 鉴权方式变化
|
||||
- 每次 API 接口变更(新增 / 修改 / 删除 method、参数、响应、错误码、header、鉴权等)后,除了更新 `methods/*.json` / `docs/*.md`,**还必须追加一条变更记录到对应的 `methods/changes/<docName>.json` 数组**
|
||||
- **system.json 已库表化维护(2026-09-23)**:维护源为 `wms_api_method_doc`(方法表)+ `wms_method_doc_meta`(文档元信息),`methods/system.json` 是导出产物(docs 页面仍读该文件)
|
||||
- 新建:`node script/method-doc-create.cjs --method <m> --module <模块> --group <分组名> --description "说明" [--login 1] [--auth 0] [--params @p.json] [--response @r.json] [--errors @e.json] [--headers @h.json] [--bump]`
|
||||
- 更新:`node script/method-doc-update.cjs --method <m> [--description ...] [--login 1|0] [--auth 1|0] [--status 1|0] [--params @p.json] ... [--bump]`
|
||||
- 查询:`node script/method-doc-get.cjs --method <m>`;列表:`node script/method-doc-list.cjs [--module <模块>] [--search <关键词>]`
|
||||
- 下线/删除:`node script/method-doc-delete.cjs --method <m> --yes [--hard] [--bump]`(默认软删 status=0,导出时排除;--hard 真删)
|
||||
- JSON 字段(headers/params/response/errors)支持内联 JSON 或 `@文件路径`
|
||||
- **改完库必须回写文件**:`node script/method-doc-export.cjs`(原子写入 methods/system.json);首次使用先 `node script/method-doc-import.cjs` 全量导入
|
||||
- 生产库操作加 `--env production`(慎用)
|
||||
- 变更记录仍走原流程:先按 `docs/api-doc-update-workflow.md` 生成固定 spec,再执行 `npm run doc:api:update -- --spec=<path>`,写入前先执行 `--dry-run`;禁止直接手写 `methods/changes/*.json`
|
||||
- 默认禁止直接手写 `methods/*.json` / `methods/changes/*.json`,必须先按 `docs/api-doc-update-workflow.md` 生成固定 spec,再执行 `npm run doc:api:update -- --spec=<path>`
|
||||
- 正式写入前必须先执行 `npm run doc:api:update -- --spec=<path> --dry-run`
|
||||
- 修补 JSON 文件时必须强校验 JSON 格式正确性,确保不会引入无法解析的问题
|
||||
- `wms_api_method_doc` 是维护源,`methods/system.json` 是导出产物,`methods/changes/*.json` 仅记录差异历史
|
||||
- `methods/*.json` 仍是 SSOT,`methods/changes/*.json` 仅记录差异历史
|
||||
- 变更记录建议字段至少包含:`version`、`date`、`summary`、`methods`、`notes`
|
||||
5. 如 system 入参有变化,可执行:
|
||||
|
||||
|
||||
14
.github/agents/文档.agent.md
vendored
14
.github/agents/文档.agent.md
vendored
@ -38,17 +38,11 @@ model: DeepSeek V4 Pro (deepseek)
|
||||
- 公共请求头变化
|
||||
- 鉴权方式变化
|
||||
- 每次 API 接口变更(新增 / 修改 / 删除 method、参数、响应、错误码、header、鉴权等)后,除了更新 `methods/*.json`,**还必须追加一条变更记录到对应的 `methods/changes/<docName>.json` 数组**
|
||||
- **system.json 已库表化维护(2026-09-23)**:维护源为 `wms_api_method_doc`(方法表)+ `wms_method_doc_meta`(文档元信息),`methods/system.json` 是导出产物(docs 页面仍读该文件)
|
||||
- 新建:`node script/method-doc-create.cjs --method <m> --module <模块> --group <分组名> --description "说明" [--login 1] [--auth 0] [--params @p.json] [--response @r.json] [--errors @e.json] [--headers @h.json] [--bump]`
|
||||
- 更新:`node script/method-doc-update.cjs --method <m> [--description ...] [--login 1|0] [--auth 1|0] [--status 1|0] [--params @p.json] ... [--bump]`
|
||||
- 查询:`node script/method-doc-get.cjs --method <m>`;列表:`node script/method-doc-list.cjs [--module <模块>] [--search <关键词>]`
|
||||
- 下线/删除:`node script/method-doc-delete.cjs --method <m> --yes [--hard] [--bump]`(默认软删 status=0,导出时排除;--hard 真删)
|
||||
- JSON 字段(headers/params/response/errors)支持内联 JSON 或 `@文件路径`
|
||||
- **改完库必须回写文件**:`node script/method-doc-export.cjs`(原子写入 methods/system.json);首次使用先 `node script/method-doc-import.cjs` 全量导入
|
||||
- 生产库操作加 `--env production`(慎用)
|
||||
- 变更记录仍走原流程(不可绕过):先按 `docs/api-doc-update-workflow.md` 生成固定 spec,`npm run doc:api:update -- --spec=<path>` 写入前先执行 `--dry-run` 验证;禁止直接手写 `methods/changes/*.json`
|
||||
- 明确禁止直接手动编辑或提交 `methods/*.json` 与 `methods/changes/*.json` 文件。
|
||||
- 任何 PR 中直接修改这类文件的变更将被视为违规并可能被退回。所有对 methods JSON 的写入必须通过脚本完成,命令为 `npm run doc:api:update -- --spec=<path>`(不可绕过)。
|
||||
- 正式写入前**必须**先执行 `npm run doc:api:update -- --spec=<path> --dry-run` 进行验证;dry-run 不做写入,仅输出差异和校验结果。
|
||||
- 修补 JSON 文件时必须强校验 JSON 格式正确性,确保不会引入无法解析或破坏结构的问题
|
||||
- `wms_api_method_doc` 是维护源,`methods/system.json` 是导出产物,`methods/changes/*.json` 仅记录差异历史
|
||||
- `methods/*.json` 仍是 SSOT,`methods/changes/*.json` 仅记录差异历史
|
||||
- 变更记录建议字段至少包含:`version`、`date`、`summary`、`methods`、`notes`
|
||||
5. 如 system 入参有变化,可执行:
|
||||
|
||||
|
||||
@ -305,10 +305,10 @@ rg "class .*Service|module.exports" app/service/qimenMethods
|
||||
- 临时清单输出:temp/tmp-service-method-inventory.md
|
||||
|
||||
<!-- SERVICE_METHOD_INVENTORY:BEGIN -->
|
||||
自动生成时间: 2026-09-23T17:34:46.974Z
|
||||
自动生成时间: 2026-09-20T17:48:36.671Z
|
||||
|
||||
扫描范围: app/service/**/*.js
|
||||
文件数: 219
|
||||
文件数: 216
|
||||
|
||||
- app/service/api.js (1)
|
||||
- callMethod
|
||||
@ -406,14 +406,14 @@ rg "class .*Service|module.exports" app/service/qimenMethods
|
||||
- list, create, update, delete, search
|
||||
- app/service/systemMethods/config.js (1)
|
||||
- list
|
||||
- app/service/systemMethods/dashboard.js (28)
|
||||
- storeStats, storeSideStoreStats, queryWarehouseStats, mergeStoreStats, emptyStoreStats, warehouseStats, hot_order_rank, storeSideHotOrderRank, queryWarehouseHotOrderRank, queryHotOrderRankWindowRows, buildHotOrderRankMap, buildHotOrderRankKeyFilter, mergeHotOrderRank, loadHotOrderRankStockInfo, resolveHotOrderRankProduct, maskHotOrderRankName, formatHotOrderRank, emptyHotOrderRank, express_ratio, storeSideExpressRatio, queryWarehouseExpressRatio, mergeChartData, formatChartData, emptyChartData, platform_distribution, storeSidePlatformDistribution, queryWarehousePlatformDistribution, order_trend
|
||||
- app/service/systemMethods/frontConfig.js (9)
|
||||
- getFrontConfigService, getByDomain, getInfo, getCert, saveInfo, saveCert, setDomain, getDomain, checkDomain
|
||||
- app/service/systemMethods/dashboard.js (17)
|
||||
- storeStats, storeSideStoreStats, queryWarehouseStats, mergeStoreStats, emptyStoreStats, warehouseStats, hot_order_rank, express_ratio, storeSideExpressRatio, queryWarehouseExpressRatio, mergeChartData, formatChartData, emptyChartData, platform_distribution, storeSidePlatformDistribution, queryWarehousePlatformDistribution, order_trend
|
||||
- app/service/systemMethods/frontConfig.js (1)
|
||||
- getByDomain
|
||||
- app/service/systemMethods/inbox.js (14)
|
||||
- group, message, v2, after_sales, bindCode, groupList, groupQuickList, groupMembers, groupDisable, groupUpdate, groupReset, groupMessages, retry, reply
|
||||
- app/service/systemMethods/index.js (59)
|
||||
- fastWhereTree, loadStores, loadWarehouses, loadExpressInterfaces, getCOSUploadConfig, getImages, uploadSuccessNotify, recognizeLicensePlate, ReferenceFile, getMessageDetail, test, getI18nMessage, putI18nCollect, extractModule, tryAutoTranslateNewKeys, searchSpace, searchSpaces, listInterfaceTypes, getLocationTypeList, getQimenAppList, getExpressList, getExpressProductTypeList, getPlatformList, getPrintPlatformList, ensureShopPrintPlatformExists, buildShopPrintPlatformInclude, getShopList, requestPddWaybillSearch, requestPddStdTemplates, requestTbWaybillSearch, requestTbCainiaoStdTemplates, requestPolyStdTemplates, getShopExpressList, getCainiaoStfTemplates, normalizeTemplatePlatformCode, normalizeTemplateExpressCode, getExpressPlatformFieldName, getTemplateAllowedExpressCodeSet, filterPrintPlatformTemplateResponseData, getPrintPlatformTemplateCacheKey, requestPrintPlatformTemplateList, resolvePddTemplateWpCodeCandidates, requestPddTemplateSourceList, getPrintPlatformTemplateList, isPlatformOauthReservationDuplicateError, getPlatformOauthReservationCodePrefix, hasPlatformOauthReservationCodePrefix, normalizePlatformOauthReservationCode, generatePlatformOauthReservationCode, createPlatformOauthReservation, getPlatformOauthLink, listenPlatformOauthBind, loginToIm, polyapiAuthorizeUrl, toOrder, getWorkbenchBindCode, LoginWorkbenchByCode, queryUserByToken, parseWechatBadgeCode
|
||||
- app/service/systemMethods/index.js (58)
|
||||
- fastWhereTree, loadStores, loadWarehouses, loadExpressInterfaces, getCOSUploadConfig, getImages, uploadSuccessNotify, recognizeLicensePlate, ReferenceFile, getMessageDetail, test, getI18nMessage, putI18nCollect, extractModule, tryAutoTranslateNewKeys, searchSpace, searchSpaces, listInterfaceTypes, getLocationTypeList, getQimenAppList, getExpressList, getExpressProductTypeList, getPlatformList, getPrintPlatformList, ensureShopPrintPlatformExists, buildShopPrintPlatformInclude, getShopList, requestPddWaybillSearch, requestPddStdTemplates, requestTbWaybillSearch, requestTbCainiaoStdTemplates, requestPolyStdTemplates, getShopExpressList, getCainiaoStfTemplates, normalizeTemplatePlatformCode, normalizeTemplateExpressCode, getExpressPlatformFieldName, getTemplateAllowedExpressCodeSet, filterPrintPlatformTemplateResponseData, getPrintPlatformTemplateCacheKey, requestPrintPlatformTemplateList, resolvePddTemplateWpCodeCandidates, requestPddTemplateSourceList, getPrintPlatformTemplateList, isPlatformOauthReservationDuplicateError, getPlatformOauthReservationCodePrefix, hasPlatformOauthReservationCodePrefix, normalizePlatformOauthReservationCode, generatePlatformOauthReservationCode, createPlatformOauthReservation, getPlatformOauthLink, listenPlatformOauthBind, loginToIm, polyapiAuthorizeUrl, toOrder, getWorkbenchBindCode, LoginWorkbenchByCode, queryUserByToken
|
||||
- app/service/systemMethods/order/archiveOrder.js (2)
|
||||
- list, detail
|
||||
- app/service/systemMethods/order/base.js (56)
|
||||
@ -432,8 +432,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods
|
||||
- list, manualOutboundOrder
|
||||
- app/service/systemMethods/order/packing.js (11)
|
||||
- list, get, setEndTime, forceRecord, export, exportTaskProgress, generateExportTaskId, normalizeExportTaskId, getExportTaskCacheKey, setExportTaskProgress, getExportTaskProgress
|
||||
- app/service/systemMethods/order/pendingOrder.js (90)
|
||||
- list, detail, reverseReviewOrder, assertOrdersWithoutWaybill, syncWavesAfterReverseReview, allocateStorage, allocateStorageProgress, normalizeAllocateStorageTaskProgress, normalizeAllocateStorageTaskCount, normalizeAllocateStorageTaskCounts, normalizeAllocateStorageRequestId, getAllocateStorageTaskCacheKey, setAllocateStorageTaskProgress, getAllocateStorageTaskProgress, getAllocateExpressTaskCacheKey, normalizeAllocateExpressTaskId, setAllocateExpressTaskProgress, getAllocateExpressTaskProgress, getSyncOrderIdsTaskCacheKey, normalizeSyncOrderIdsRequestId, setSyncOrderIdsTaskProgress, getSyncOrderIdsTaskProgress, cancelAllocateStorage, syncOrderIds, syncOrderIdsProgress, allocateExpressCode, allocateExpressCodeTaskProgress, markPendingOutboundOrder, cancelOrder, normalizePendingOutboundOrderIds, normalizePendingCancelOrderIds, isCancelablePendingOrder, updateOrderPlatform, updateOrderExpress, updateAddress, updateRemark, cloneOrder, parseAddress, parseAddressLocal, createOrder, downloadCreateTemplate, normalizeIdsInput, batchIntercept, batchInterceptTaskProgress, generateBatchInterceptTaskId, normalizeBatchInterceptTaskId, normalizeBatchInterceptOrderIds, getBatchInterceptTaskCacheKey, setBatchInterceptTaskProgress, getBatchInterceptTaskProgress, runBatchInterceptTask, batchLock, batchLockTaskProgress, generateBatchLockTaskId, normalizeBatchLockTaskId, normalizeBatchLockOrderIds, getBatchLockTaskCacheKey, setBatchLockTaskProgress, getBatchLockTaskProgress, runBatchLockTask, batchUnlock, batchUnlockTaskProgress, generateBatchUnlockTaskId, normalizeBatchUnlockTaskId, normalizeBatchUnlockOrderIds, getBatchUnlockTaskCacheKey, setBatchUnlockTaskProgress, getBatchUnlockTaskProgress, runBatchUnlockTask, batchUnintercept, batchUninterceptTaskProgress, generateBatchUninterceptTaskId, normalizeBatchUninterceptTaskId, normalizeBatchUninterceptOrderIds, getBatchUninterceptTaskCacheKey, setBatchUninterceptTaskProgress, getBatchUninterceptTaskProgress, runBatchUninterceptTask, manualWaybill, releaseCreationLockForCancel, UNIQUE, allocateSubOrderNumber, writeAllocateSubOrderErrorFlag, writeAllocateSubOrderLog, allocateSubOrderNumberProgress, getAllocateSubOrderTaskCacheKey, setAllocateSubOrderTaskProgress, getAllocateSubOrderTaskProgress, buildSubOrderDetails, batchMarkPrinted
|
||||
- app/service/systemMethods/order/pendingOrder.js (40)
|
||||
- list, detail, reverseReviewOrder, assertOrdersWithoutWaybill, syncWavesAfterReverseReview, allocateStorage, allocateStorageProgress, normalizeAllocateStorageTaskProgress, normalizeAllocateStorageTaskCount, normalizeAllocateStorageTaskCounts, normalizeAllocateStorageRequestId, getAllocateStorageTaskCacheKey, setAllocateStorageTaskProgress, getAllocateStorageTaskProgress, getAllocateExpressTaskCacheKey, normalizeAllocateExpressTaskId, setAllocateExpressTaskProgress, getAllocateExpressTaskProgress, getSyncOrderIdsTaskCacheKey, normalizeSyncOrderIdsRequestId, setSyncOrderIdsTaskProgress, getSyncOrderIdsTaskProgress, cancelAllocateStorage, syncOrderIds, syncOrderIdsProgress, allocateExpressCode, allocateExpressCodeTaskProgress, markPendingOutboundOrder, cancelOrder, normalizePendingOutboundOrderIds, normalizePendingCancelOrderIds, isCancelablePendingOrder, updateOrderPlatform, updateOrderExpress, updateAddress, updateRemark, cloneOrder, parseAddress, parseAddressLocal, catch
|
||||
- app/service/systemMethods/order/print.js (4)
|
||||
- getWavePlatformPrintData, getOrderPrintData, getPrintDataByWaybillCodes, unlockWavePlatformPrintDataByGroup
|
||||
- app/service/systemMethods/order/recheckOrder.js (60)
|
||||
@ -490,8 +490,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods
|
||||
- callSystemRole, list, permission, add, delete, update
|
||||
- app/service/systemMethods/setting/store_warehouse.js (0)
|
||||
- <no-class-method-found>
|
||||
- app/service/systemMethods/setting/warehouse.js (4)
|
||||
- getSettings, getFieldMeta, saveSettings, getweChatApp
|
||||
- app/service/systemMethods/setting/warehouse.js (6)
|
||||
- getSettings, getFieldMeta, saveSettings, getFrontConfig, saveFrontConfig, saveFrontCert
|
||||
- app/service/systemMethods/shops.js (6)
|
||||
- callShopsSystem, list, add, del, edit, GetAuthorizeSessionKey
|
||||
- app/service/systemMethods/stock/combo.js (0)
|
||||
@ -538,8 +538,6 @@ rg "class .*Service|module.exports" app/service/qimenMethods
|
||||
- getWarehouseZones, getWarehouseTree, getChildren, create, update, delete, detail, checkBarcodeUnique, toggleActive, getPath, getPickPath, updateRackPosition, recalculatePickPath, updateNeighbors, getAreaRacks, getSpacesByRack, createRackWithSpaces, getSpaceInfo, updateSpaceInfo, getBatchFieldValue, hasBatchField, normalizeBatchString, getCurrentWarehouseCode, batchUpdateSpaceInfo, exportRackSpaces
|
||||
- app/service/systemMethods/waybill/warehouse.js (9)
|
||||
- list, detail, export, exportTaskProgress, generateExportTaskId, normalizeExportTaskId, getExportTaskCacheKey, setExportTaskProgress, getExportTaskProgress
|
||||
- app/service/systemMethods/wechat.js (21)
|
||||
- getMyLoginCode, getAuthUrl, loginByCode, bindUser, bindByEmployee, getUserAgreementText, getUserAgreement, setUserAgreement, getAgreementVersion, pushLoginCode, queryauth, wxaauth, getAuthorizerInfo, registerMiniprogram, updateInfo, uploadHeadimg, getTemplateList, commit, getTrialQRCode, submitAudit, userList
|
||||
- app/service/systemMethods/workbench.js (17)
|
||||
- list, detail, create, update, delete, business, bindCamera, bind, getWorkbenchInfo, resetLoginCode, removeMember, bindMember, packOrder, finishPack, sendWeight, queryOrder, getWorkbenchCount
|
||||
- app/service/systems/account_platform.js (11)
|
||||
@ -552,8 +550,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods
|
||||
- generateAppKey, generateAppSecret, getDefaultInterfaceTypeId, list, create, update, delete, regenerateSecret
|
||||
- app/service/systems/auth/role_permission.js (7)
|
||||
- normalizeTypeFilter, normalizePermissionSet, toApiPermissionIds, serializePermissionSet, getPermissionIdsForRoles, assignPermissions, removePermissionsFromAllRoles
|
||||
- app/service/systems/auth/user.js (67)
|
||||
- getMenuTypeWhereByPlatform, getCurrentAccountId, getWechatBindCacheKey, getWechatBindCodeCacheKey, getWechatBindScanCacheKey, getWechatLoginClientCacheKey, getWechatLoginCodeCacheKey, getWechatLoginEventChannel, createWechatBindCodeCandidate, createUniqueSixCode, createWechatBindCode, createWechatLoginCode, createWechatLoginClientCode, parseWechatBindCode, formatBindWechatData, formatLoginWechatData, getRemainingSecondsByExpiresAt, setWechatBindCache, setWechatBindCodeCache, setWechatBindScanCache, getWechatBindScanCache, setWechatLoginClientCache, setWechatLoginCodeCache, findYe4sBindingByAccountId, getWechatBindEventChannel, getWechatLongPollTimeoutMs, shouldUseWechatBindLongPoll, publishWechatBindEvent, publishWechatLoginEvent, waitForWechatBindEvent, refreshWechatBindState, login, loginByYe4sCode, waitForLoginCodeRefresh, isTransientWechatLoginError, extractYe4sUserIdFromLoginEvent, waitForWechatLoginEvent, loginByYe4sUserId, tryBuildWechatLoginTokenFromState, refreshWechatLoginState, getLoginWechatCode, getBindWechatCode, getBindWechatCodeByAccountId, getUserByTempCode, bindAccountByTempCode, unbindWechat, unbindWechatByAccountId, buildLoginResult, changeRole, info, getRoles, findById, setUserCache, getAvatarByEmployeeId, clearUserCache, clearRelatedCache, getPermissions, getMenus, convertToRoutes, findUserByIdentifier, checkUserStatus, verifyPassword, encryptPassword, generateSalt, updateLastLoginTime, ensurePlatformActiveRole, register
|
||||
- app/service/systems/auth/user.js (66)
|
||||
- getMenuTypeWhereByPlatform, getCurrentAccountId, getWechatBindCacheKey, getWechatBindCodeCacheKey, getWechatBindScanCacheKey, getWechatLoginClientCacheKey, getWechatLoginCodeCacheKey, getWechatLoginEventChannel, createWechatBindCodeCandidate, createUniqueSixCode, createWechatBindCode, createWechatLoginCode, createWechatLoginClientCode, parseWechatBindCode, formatBindWechatData, formatLoginWechatData, getRemainingSecondsByExpiresAt, setWechatBindCache, setWechatBindCodeCache, setWechatBindScanCache, getWechatBindScanCache, setWechatLoginClientCache, setWechatLoginCodeCache, findYe4sBindingByAccountId, getWechatBindEventChannel, getWechatLongPollTimeoutMs, shouldUseWechatBindLongPoll, publishWechatBindEvent, waitForWechatBindEvent, refreshWechatBindState, login, loginByYe4sCode, waitForLoginCodeRefresh, isTransientWechatLoginError, extractYe4sUserIdFromLoginEvent, waitForWechatLoginEvent, loginByYe4sUserId, tryBuildWechatLoginTokenFromState, refreshWechatLoginState, getLoginWechatCode, getBindWechatCode, getBindWechatCodeByAccountId, getUserByTempCode, bindAccountByTempCode, unbindWechat, unbindWechatByAccountId, buildLoginResult, changeRole, info, getRoles, findById, setUserCache, getAvatarByEmployeeId, clearUserCache, clearRelatedCache, getPermissions, getMenus, convertToRoutes, findUserByIdentifier, checkUserStatus, verifyPassword, encryptPassword, generateSalt, updateLastLoginTime, ensurePlatformActiveRole, register
|
||||
- app/service/systems/camera.js (12)
|
||||
- list, detail, create, update, setOsd, _findCameraForControl, _assertPtzSuccess, ptzControl, ptzStop, ptzPresetGoto, ptzPresetSet, delete
|
||||
- app/service/systems/cameraServer.js (5)
|
||||
@ -576,8 +574,6 @@ rg "class .*Service|module.exports" app/service/qimenMethods
|
||||
- buildTree, getTreeByType, buildSubTree, getWithChildrenByType, getAllChildren, getByType, getGroups, getChildrenByPid, getTreeChildrenByPid, create, update, findById, delete
|
||||
- app/service/systems/file.js (2)
|
||||
- getImages, ReferenceFile
|
||||
- app/service/systems/frontConfig.js (42)
|
||||
- createError, getCurrentWarehouseId, deleteCacheByKey, normalizeText, normalizeTheme, assertDomainUnique, getRecordField, sanitizeErrorText, getDomainVerifyConfig, getCnameTarget, buildDomainVerifyCode, parseTxtAnswerData, extractTxtValuesFromAnswers, resolveTxtByDoh, resolveTxtBySystem, resolveTxtValues, verifyDomainRecord, isUnknownColumnError, findVerifiedDomainRecord, verifyPendingDomains, buildInfoOutput, buildCertOutput, getInfo, getCert, getDomain, setDomain, checkDomain, buildDomainOutput, describeDomainStatus, getDomainCacheKey, buildPublicOutput, clearDomainCache, getByDomain, normalizePem, parseCertPem, assertCertValid, collectCertNames, certCoversDomain, validateKeyPem, assertWarehouseSubject, saveInfo, saveCert
|
||||
- app/service/systems/inbound_direct_log.js (15)
|
||||
- getItems, _addSingleItem, _bindReceivingDetail, addItem, removeItem, commit, notifyEntryOrderCompleted, _queryCompletedEntryItems, _buildCompletedItemLines, buildEntryOrderConfirmRequest, _sendOpenApiCallback, operationLog, qimenEntrySync, _syncReceivingStorageStatus, _applyReceivingStockOccupancy
|
||||
- app/service/systems/inbox/group.js (11)
|
||||
@ -604,8 +600,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods
|
||||
- buildOperationLogData, buildBusinessLogWhere, formatOperationLogRows, createOperationLog, createOperationLogs, queryLogsByBusinessType, queryStockLogs, queryOrderLogs, queryAllOrderLogs, queryAllLogsByBusinessType, queryReceivingLogs, queryEntryOrderLogs, queryStockoutLogs, getMessageDetail
|
||||
- app/service/systems/order_async.js (9)
|
||||
- finalizeSuccessfulQimenSync, syncQmOrders, syncManualOrders, flushDeferredOrderSyncNotices, syncApiOrders, syncStockoutOrders, buildStockoutConfirmRequest, notifyStockoutExternal, resolveOpenApiAppByStore
|
||||
- app/service/systems/order_auto_outbound.js (12)
|
||||
- getEnabledAutoOutboundWarehouses, normalizeSubjectConfigForAutoOutbound, buildAutoOutboundWhere, findAutoOutboundOrders, Date, buildSameDayOutboundCutoffUtc, resolveSameDayTime, resolveSameDayReleaseTime, buildSameDayReleaseUtc, findOrderIdsWithWeigh, processWarehouseAutoOutbound, executeAutoOutbound
|
||||
- app/service/systems/order_auto_outbound.js (7)
|
||||
- getEnabledAutoOutboundWarehouses, normalizeSubjectConfigForAutoOutbound, buildAutoOutboundWhere, findAutoOutboundOrders, findOrderIdsWithWeigh, processWarehouseAutoOutbound, executeAutoOutbound
|
||||
- app/service/systems/order_delivery_archive.js (17)
|
||||
- getArchiveDefaults, buildArchiveOptions, NOW, buildArchiveThresholds, normalizeWarehouseIds, listDispatchWarehouseIds, getArchiveModels, buildCandidateWhere, buildQueryOptions, buildHistoryOrderRow, buildHistoryItemRow, getArchiveErrorInfo, rollbackQuietly, archiveDispatchBatch, archiveDispatchOrdersForWarehouse, resolveFailureCursor, archiveDispatchOrdersToHistory
|
||||
- app/service/systems/order_delivery_migration.js (15)
|
||||
@ -648,8 +644,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods
|
||||
- qimenClient, send, sendRequest
|
||||
- app/service/systems/receiving_entry_match.js (29)
|
||||
- matchAfterEntryCompleted, _bindEntryOrderReceiving, bindEntryOrderReceiving, _bindReceivingsWithStorageSync, _bindOneReceivingAndSyncStorage, max, _syncReceivingStorageByEntryItems, _parseLedgerMap, _serializeLedgerMap, min, _buildLegacyBaselineLedger, _bindingAllocationByStock, _recalcReceivingStorageStatus, _reconcileEntryReceivedQuantity, recordLedgerAllocation, setLedgerAllocation, rollbackEntryOrderBindings, _rollbackOneBindingStorage, _getRecentReceivingOrders, _findReceivingByRemark, _compareDetails, _queryEntryOrderLines, buildEntryOrderConfirmRequest, _sendCallback, _sendQimenCallback, _sendOpenApiCallback, _markReceivingPartialStorage, _commitBinding, unbindEntryOrderReceiving
|
||||
- app/service/systems/receiving_pending_notice.js (16)
|
||||
- getMemoryDailyLocks, getWarehouseNoticeConfigs, findPendingReceivings, groupByStore, buildRowLine, formatDateOnly, buildTemplateVariables, buildContent, resolveNoticeSendMethod, sendPendingNotice, sendCustomerServiceFallback, notifyWarehouse, getRedisClient, acquireDailyLock, releaseDailyLock, execute
|
||||
- app/service/systems/receiving_pending_notice.js (14)
|
||||
- getWarehouseNoticeConfigs, findPendingReceivings, groupByStore, buildRowLine, formatDateOnly, buildTemplateVariables, buildContent, resolveNoticeSendMethod, sendPendingNotice, notifyWarehouse, getRedisClient, acquireDailyLock, releaseDailyLock, execute
|
||||
- app/service/systems/report.js (17)
|
||||
- getDefinition, parseFieldsField, definitionToView, resolveTypeEntry, resolveQuerier, listRegisteredTypes, validateTypeFields, resolveOrderedFields, Date, buildFilename, buildWorkbookSheets, generate, generateBuffer, saveDefinition, findDefinitionById, listDefinitions, deleteDefinition
|
||||
- app/service/systems/report/queries/index.js (0)
|
||||
@ -660,8 +656,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods
|
||||
- <no-class-method-found>
|
||||
- app/service/systems/reportDelivery.js (29)
|
||||
- normalizeScheduleTimes, parseJsonArray, readJsonArray, readJsonObject, normalizeNotifyTemplate, normalizePlanName, normalizeNotifyGroupIds, normalizeNotifyMemberIds, validateNotifyGroupExists, savePlan, copyPlan, planToView, listPlans, listLogs, hitTimePoints, bizDateOfTrigger, bizDateOfTimePoint, resolveStoreWarehouse, markDelivered, markFailed, markExporting, buildMessageContent, resolveNotifyGroups, Date, deliverByChannel, sendNotifyIfConfigured, processOne, parseScheduleTimes, dispatch
|
||||
- app/service/systems/return_received.js (19)
|
||||
- createBusinessError, create, _isUrgentReturnQuery, notifyPending, _handleInterceptAfterSale, _updateOrderInterceptStatus, list, exportList, _generateExportExcel, detail, delete, _findByIdChecked, _enrichReturn, _resolveStoreRemark, _resolveStoreRemarkMap, _buildListWhere, _resolveConditionValue, _extractConditionValue, _buildListOrder
|
||||
- app/service/systems/return_received.js (18)
|
||||
- createBusinessError, create, notifyPending, _handleInterceptAfterSale, _updateOrderInterceptStatus, list, exportList, _generateExportExcel, detail, delete, _findByIdChecked, _enrichReturn, _resolveStoreRemark, _resolveStoreRemarkMap, _buildListWhere, _resolveConditionValue, _extractConditionValue, _buildListOrder
|
||||
- app/service/systems/return_unpack.js (50)
|
||||
- _getRecordingComputerId, _buildVideoUrl, createBusinessError, create, transferByWaybills, addDetail, updateDetail, removeDetail, cancel, _resolveSubmitEndTime, submit, _notifyUnpacked, forceRecord, list, detailList, videoList, exportUnpack, _resolveStoreNameMap, _resolveExpressNameMap, _extractDetailColor, detail, _buildWaybillMatch, _findWaybillFlexible, queryByWaybill, _resolveWarehouseName, _resolveStoreIdByWaybill, _resolveReturnOrderInfo, delete, _insertMainWithRetry, _transferOneWaybill, _backfillDetailsFromOrder, _countDetails, _resolveReturnReceivedId, _buildTransferDetailRows, _findByIdChecked, _assertUnpacking, _findDetailChecked, _recalcMain, _enrichRow, _flattenVideos, _enrichDetailsWithStock, _resolveStoreRemark, VALUES, _generateUnpackNo, _buildListWhere, _buildDetailListWhere, _buildVideoListWhere, _buildVideoListOrder, _resolveConditionValue, _buildListOrder
|
||||
- app/service/systems/return_waybill.js (12)
|
||||
@ -686,8 +682,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods
|
||||
- createError, getCurrentStoreId, getCurrentEmployeeId, toPositiveNumber, getEmployee, normalizeRoleIds, findAssignableRoles, clearEmployeeCache, getCurrentEmployeeRoleIds, collectDescendantRoleIds, buildRolePermissionMap, buildRoleTree, normalizeStoreScope, isRoleVisibleInScope, normalizePermissionIds, normalizePid, getManageableRole, validatePermissionSet, replaceRolePermissions, clearRoleUsersCache, list, permission, add, delete, update
|
||||
- app/service/systems/setting/store_warehouse.js (35)
|
||||
- createError, getCurrentStoreId, getCurrentAccountId, toPositiveNumber, normalizePage, normalizeStatusFlag, normalizeAuthStatus, normalizeNonNegativeInteger, normalizeText, normalizeDate, normalizeSignAction, normalizeTempCode, getTempCodeCacheKey, createTempCode, pickRemaskField, resolveRemaskValue, buildCurrentRemaskPatch, requireCurrentRemaskPatch, saveTempSignPayload, getTempSignPayload, clearTempSignPayload, buildTempSignView, getCurrentSubject, getCounterparty, buildListWhere, getRelationIncludes, resolvePairIds, serializeRelation, findScopedRelation, list, sign, trimContract, confirmSign, rename, unbind
|
||||
- app/service/systems/setting/warehouse.js (13)
|
||||
- getDefaultCodeFieldOptionsMap, normalizeWaveStrategyVersion, normalizeSubjectConfigInternalFields, sanitizeSubjectConfigForOutput, createError, getCurrentWarehouseId, deleteCacheByKey, clearWarehouseSettingCache, getFieldMeta, getSettings, validateDefaultLocation, saveSettings, getWechatApp
|
||||
- app/service/systems/setting/warehouse.js (30)
|
||||
- getDefaultCodeFieldOptionsMap, normalizeWaveStrategyVersion, normalizeSubjectConfigInternalFields, sanitizeSubjectConfigForOutput, createError, getCurrentWarehouseId, deleteCacheByKey, clearWarehouseSettingCache, getFieldMeta, getSettings, validateDefaultLocation, saveSettings, normalizeFrontConfigText, normalizeFrontConfigTheme, assertFrontConfigDomainUnique, buildFrontConfigOutput, getFrontConfig, getFrontConfigDomainCacheKey, buildFrontConfigPublicOutput, clearFrontConfigDomainCache, getFrontConfigByDomain, normalizeFrontConfigPem, parseFrontConfigCertPem, assertFrontConfigCertValid, collectFrontConfigCertNames, frontConfigCertCoversDomain, validateFrontConfigKeyPem, assertFrontConfigWarehouseSubject, saveFrontConfig, saveFrontCert
|
||||
- app/service/systems/shops.js (20)
|
||||
- generatePendingShopName, createError, getCurrentWarehouseId, normalizeText, normalizeInteger, ensureShopPrintPlatformExists, getListWhereSpecialFieldMap, buildListWhere, normalizePagination, buildShopPrintPlatformInclude, formatShopRow, list, ensureShopNameUnique, add, findShopById, del, edit, generateAuthorizeRandomCode, createOrReuseAuthorizeReservation, getAuthorizeSessionKey
|
||||
- app/service/systems/sign.js (10)
|
||||
@ -726,8 +722,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods
|
||||
- normalizeSubjectConfigInput, validateStoreData, checkCompanyNameExists, findByAccountId, findAllEnabled, findAllWarehouses, getStoreName, getStoreRemaskName, createStore, createWarehouse, joinStore, joinWarehouse, ensureEmployeeRoleBinding, assignAdminRoleToCreator, generateJoinToken, sendNotification, sendNotificationToAdmins, getStoreRoles, auditApply, loadStores, loadWarehouses, bindCode
|
||||
- app/service/systems/system_log.js (3)
|
||||
- findCleanupBoundaryId, deleteSystemLogsBatch, cleanupExpiredSystemLogs
|
||||
- app/service/systems/upload.js (19)
|
||||
- getTencentCloudConfig, getCosConfig, initCOS, getUploadParams, hash_hmac, generatePolicyAndSignature, resolveUploadMaxSizeBytes, validateFileInfo, generateFileName, parseSizeToBytes, formatFileSize, getFrontendConfig, uploadFile, uploadBuffer, validateFile, uploadSuccessNotify, getMimeType, createFileReference, handleUploadCallback
|
||||
- app/service/systems/upload.js (18)
|
||||
- getTencentCloudConfig, getCosConfig, initCOS, getUploadParams, hash_hmac, generatePolicyAndSignature, resolveUploadMaxSizeBytes, validateFileInfo, generateFileName, parseSizeToBytes, formatFileSize, getFrontendConfig, uploadFile, validateFile, uploadSuccessNotify, getMimeType, createFileReference, handleUploadCallback
|
||||
- app/service/systems/video_record_request.js (15)
|
||||
- _getRecordingComputer, _isComputerOnline, _resetVideoRecords, _withinReuseWindow, _markFailed, requestPackVideo, requestUnpackVideo, requestFor, syncByVideos, settleStatuses, notifyResults, queryPackVideo, _buildResultMessage, _notifyManualHandling, _replyResult
|
||||
- app/service/systems/warehouseNotify.js (7)
|
||||
@ -736,8 +732,6 @@ rg "class .*Service|module.exports" app/service/qimenMethods
|
||||
- closeFinishedWaves, normalizeConfirmIntervalMs, readEmptyConfirmState, writeEmptyConfirmState
|
||||
- app/service/systems/waybill.js (5)
|
||||
- toOrder, list, detail, export, buildWaybillExportFile
|
||||
- app/service/systems/wechat.js (35)
|
||||
- getAuthUrl, getAccountInfoSync, resolveWechatApp, loginByCode, getMyLoginCode, bindUser, buildBindResult, bindByEmployee, getUserAgreementText, getUserAgreement, setUserAgreement, findWarehouseWechatApp, findLatestAgreementVersion, getAgreementVersion, cleanupUnusedAgreementVersions, pushLoginCode, queryauth, wxaauth, resolveBodyMedia, resolveMediaValue, downloadFromUrl, resolveMediaFilename, registerMiniprogram, updateInfo, buildHeadimgKey, uploadHeadimg, getTemplateList, hasFuncScope, buildAuthorizerPatch, getAuthorizerInfo, commit, submitAudit, buildTrialQrCodeKey, getTrialQRCode, userList
|
||||
- app/service/systems/workbench.js (73)
|
||||
- list, detail, create, update, delete, bindCamera, business, _loadPackCtx, _countWaveOrders, _countWaveOrdersCached, SUM, _sumWaveItemsTotal, _sumWaveItemsTotalCached, _getWaveOrderIds, Set, _buildPackChangeSummary, _writePackOperationLog, _updateOrderPackStatus, _packOrder, resolvePackTaskEndTime, _finishPack, _resetPackOsd, _sendWeight, _writeWeighOpLog, _aggregateWaveItems, _fetchWaveItemsSummary, _fetchOrderItemsDetail, _queryOrder, generatePackCtxKey, getWorkbenchPackCtxCacheKey, getWorkbenchBindClientCacheKey, getWorkbenchBindCodeCacheKey, getWorkbenchTokenCacheKey, generateRandomChars, generateWorkbenchToken, generateWorkbenchLoginCode, normalizeWorkbenchBindCode, generateUniqueWorkbenchLoginCode, createUniqueWorkbenchClientCode, createUniqueWorkbenchBindCode, buildWorkbenchBindState, getWorkbenchBindRemainingSeconds, setWorkbenchBindState, createWorkbenchBindSession, refreshWorkbenchBindCode, formatWorkbenchBindData, waitForWorkbenchBindComplete, getWorkbenchBindCode, formatWorkbenchTokenInfo, listWorkbenchMembers, listCurrentPackTasks, buildCurrentPackingInfo, invalidateWorkbenchTokenCacheByWorkbenchId, buildWorkbenchTokenInfo, bindWorkbench, getWorkbenchInfoByToken, _round2, _formatPackCountTime, buildWorkbenchPackCountTimeRange, getWorkbenchCountByToken, loginWorkbenchByCode, resetLoginCode, clearExpiredWorkbenchTokens, resolveWorkbenchContext, resolveWorkbenchByToken, packOrderByToken, finishPackByToken, sendWeightByToken, queryOrderByToken, normalizeWorkbenchMemberIds, _finishAllPackTasksByMemberLogout, removeWorkbenchMember, bindWorkbenchMember
|
||||
- app/service/warehouse.js (7)
|
||||
@ -798,10 +792,6 @@ rg "class .*Service|module.exports" app/service/qimenMethods
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -146,7 +146,7 @@ Redis 相关能力文档已统一移交给 `wms-redis-agent`。
|
||||
- 测试相关问题:写单元测试、补回归、接口验证、TDD、验证修复、审查 mock / 断言
|
||||
- 统一转给 `wms-test-agent` 处理
|
||||
|
||||
- 文档相关问题:API 文档、README、`methods/system.json`(已库表化:`wms_api_method_doc` + `script/method-doc-*.cjs` 维护并导出回写)、`docs/*.md`、使用说明
|
||||
- 文档相关问题:API 文档、README、`methods/system.json`、`docs/*.md`、使用说明
|
||||
- 统一转给 `wms-doc-agent` 处理
|
||||
|
||||
- 不确定该用哪个 agent,或问题横跨数据库 / Redis / 发布 / 代码 / 测试 / 文档
|
||||
|
||||
@ -301,21 +301,20 @@ class WechatOpenClient {
|
||||
}
|
||||
|
||||
/**
|
||||
* 发起小程序认证(POST wxa/sec/wxaauth,使用 authorizer_access_token 代商家调用,权限集 18)。
|
||||
* 发起小程序认证(wxa/sec/wxaapi/wxaauth,使用 authorizer_access_token 代商家调用,权限集 18)。
|
||||
*
|
||||
* ⚠ 微信已下线旧接口 /wxa/sec/wxaapi/wxaauth(调用返回 40066 invalid url);
|
||||
* 现行接口路径为 /wxa/sec/wxaauth,请求体为 { auth_data: {...} }(由业务层组装)。
|
||||
* 材料图片由前端上传换取 media_id 后一步提交;请求体字段白名单由业务层透传。
|
||||
*
|
||||
* @param {string} appid 小程序 AppID。
|
||||
* @param {string} [refreshToken] 授权方刷新令牌(缺省从缓存/DB 读)。
|
||||
* @param {object} body 认证请求体({ auth_data: {...} },字段见业务层白名单)。
|
||||
* @return {Promise<object>} 微信原始响应(errcode/errmsg/taskid/auth_url)。
|
||||
* @param {object} body 认证请求体(contact_type/contact_name/各 media_id 材料等)。
|
||||
* @return {Promise<object>} 微信原始响应(errcode/errmsg/taskid/auth_url/apply_status)。
|
||||
*/
|
||||
async wxaauth(appid, refreshToken, body) {
|
||||
const request = async () => {
|
||||
const { authorizerAccessToken } = await this.getAuthorizerAccessToken(appid, refreshToken);
|
||||
const base = this.config.api_base || DEFAULT_API_BASE;
|
||||
const url = `${base.replace(/\/$/, '')}/wxa/sec/wxaauth`
|
||||
const url = `${base.replace(/\/$/, '')}/wxa/sec/wxaapi/wxaauth`
|
||||
+ `?access_token=${encodeURIComponent(authorizerAccessToken)}`;
|
||||
const response = await this.ctx.curl(url, {
|
||||
method: 'POST',
|
||||
@ -331,7 +330,7 @@ class WechatOpenClient {
|
||||
// authorizer_access_token 失效(40001/40014)时清缓存重试一次
|
||||
if (result && [ 40001, 40014 ].includes(Number(result.errcode))) {
|
||||
if (this.ctx && this.ctx.logger) {
|
||||
this.ctx.logger.warn(`[wechatOpen] wxa/sec/wxaauth token 失效(errcode=${result.errcode}),清除 authorizer token 缓存重试`);
|
||||
this.ctx.logger.warn(`[wechatOpen] wxa/sec/wxaapi/wxaauth token 失效(errcode=${result.errcode}),清除 authorizer token 缓存重试`);
|
||||
}
|
||||
await this.cacheDel(`App:${appid}:AuthorizerAccessToken`);
|
||||
result = await request();
|
||||
@ -340,18 +339,17 @@ class WechatOpenClient {
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传认证材料图片到微信换取 mediaid(POST wxa/sec/uploadauthmaterial,
|
||||
* 上传认证材料图片到微信换取 media_id(wxa/sec/wxaapi/uploadmedia,
|
||||
* authorizer_access_token 代商家调用,权限集 18)。
|
||||
*
|
||||
* ⚠ 微信已下线旧接口 /wxa/sec/wxaapi/uploadmedia;现行接口为 /wxa/sec/uploadauthmaterial,
|
||||
* 仅 media 一个 multipart 字段(图片 ≤2M,PNG/JPEG/JPG/GIF),成功返回 mediaid
|
||||
* (本方法归一化为 media_id 供上层使用)。
|
||||
* 采用 multipart/form-data:media=图片文件(写入临时文件后按路径上传,保证文件名带扩展名)、
|
||||
* media_type=image;成功后返回 media_id(3 天内有效,供 wxaauth 提交)。
|
||||
*
|
||||
* @param {string} appid 小程序 AppID。
|
||||
* @param {string} [refreshToken] 授权方刷新令牌(缺省从缓存/DB 读)。
|
||||
* @param {Buffer} buffer 图片内容。
|
||||
* @param {string} filename 文件名(含扩展名,如 idcard.jpg)。
|
||||
* @return {Promise<object>} 微信原始响应(errcode/errmsg/media_id/mediaid)。
|
||||
* @return {Promise<object>} 微信原始响应(errcode/errmsg/media_id/media_md5)。
|
||||
*/
|
||||
async uploadAuthMedia(appid, refreshToken, buffer, filename) {
|
||||
const fs = require('node:fs');
|
||||
@ -367,12 +365,13 @@ class WechatOpenClient {
|
||||
const request = async () => {
|
||||
const { authorizerAccessToken } = await this.getAuthorizerAccessToken(appid, refreshToken);
|
||||
const base = this.config.api_base || DEFAULT_API_BASE;
|
||||
const url = `${base.replace(/\/$/, '')}/wxa/sec/uploadauthmaterial`
|
||||
const url = `${base.replace(/\/$/, '')}/wxa/sec/wxaapi/uploadmedia`
|
||||
+ `?access_token=${encodeURIComponent(authorizerAccessToken)}`;
|
||||
const response = await this.ctx.curl(url, {
|
||||
method: 'POST',
|
||||
dataType: 'json',
|
||||
timeout: 60000,
|
||||
data: { media_type: 'image' },
|
||||
files: { media: tmpFile },
|
||||
});
|
||||
return response && response.data !== undefined ? response.data : response;
|
||||
@ -383,15 +382,11 @@ class WechatOpenClient {
|
||||
// authorizer_access_token 失效(40001/40014)时清缓存重试一次
|
||||
if (result && [ 40001, 40014 ].includes(Number(result.errcode))) {
|
||||
if (this.ctx && this.ctx.logger) {
|
||||
this.ctx.logger.warn(`[wechatOpen] wxa/sec/uploadauthmaterial token 失效(errcode=${result.errcode}),清除 authorizer token 缓存重试`);
|
||||
this.ctx.logger.warn(`[wechatOpen] wxa/sec/wxaapi/uploadmedia token 失效(errcode=${result.errcode}),清除 authorizer token 缓存重试`);
|
||||
}
|
||||
await this.cacheDel(`App:${appid}:AuthorizerAccessToken`);
|
||||
result = await request();
|
||||
}
|
||||
// 现行接口成功返回字段为 mediaid,归一化为 media_id 供上层使用
|
||||
if (result && Number(result.errcode) === 0 && !result.media_id && result.mediaid) {
|
||||
result = { ...result, media_id: result.mediaid };
|
||||
}
|
||||
return result;
|
||||
} finally {
|
||||
await fs.promises.unlink(tmpFile).catch(() => {});
|
||||
|
||||
@ -37,12 +37,6 @@ module.exports = app => {
|
||||
allowNull: true,
|
||||
comment: '波次号',
|
||||
},
|
||||
wave_scope: {
|
||||
type: TINYINT(4),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '波次范围:0未分配波次 1大团购 2散单 3小团购 4单品单件',
|
||||
},
|
||||
waybill_code: {
|
||||
type: STRING(50),
|
||||
allowNull: true,
|
||||
|
||||
@ -76,7 +76,6 @@ module.exports = app => {
|
||||
indexes: [
|
||||
{ name: 'idx_warehouse_waybill_scan_date', fields: [ 'warehouse_id', 'waybill_code', 'scan_date' ] },
|
||||
{ name: 'idx_warehouse_scan_date', fields: [ 'warehouse_id', 'scan_date' ] },
|
||||
{ name: 'idx_warehouse_created_at', fields: [ 'warehouse_id', 'created_at' ] },
|
||||
{ name: 'idx_scanner_id', fields: [ 'scanner_id' ] },
|
||||
{ name: 'idx_order_express_id', fields: [ 'order_express_id' ] },
|
||||
{ name: 'idx_store_id', fields: [ 'store_id' ] },
|
||||
|
||||
@ -96,7 +96,6 @@ module.exports = app => {
|
||||
default_location_id: null,
|
||||
single_order_pack_max_minutes: 3,
|
||||
group_order_pack_max_minutes: 40,
|
||||
big_group_pack_coefficient: 3,
|
||||
return_unpack_max_record_minutes: 5,
|
||||
inventory_warning_rules: DEFAULT_INVENTORY_WARNING_RULES,
|
||||
auto_outbound_rules: DEFAULT_AUTO_OUTBOUND_RULES,
|
||||
@ -520,17 +519,6 @@ module.exports = app => {
|
||||
normalized.group_order_pack_max_minutes = groupOrderPackMaxMinutes;
|
||||
}
|
||||
|
||||
const rawBigGroupPackCoefficient = parsed.big_group_pack_coefficient;
|
||||
if (rawBigGroupPackCoefficient === undefined || rawBigGroupPackCoefficient === null || rawBigGroupPackCoefficient === '') {
|
||||
normalized.big_group_pack_coefficient = DEFAULT_SUBJECT_CONFIG.big_group_pack_coefficient;
|
||||
} else {
|
||||
const bigGroupPackCoefficient = Number(rawBigGroupPackCoefficient);
|
||||
if (!Number.isFinite(bigGroupPackCoefficient) || bigGroupPackCoefficient <= 0) {
|
||||
throw new Error('subject_config.big_group_pack_coefficient 必须是大于 0 的数字');
|
||||
}
|
||||
normalized.big_group_pack_coefficient = bigGroupPackCoefficient;
|
||||
}
|
||||
|
||||
const rawReturnUnpackMaxRecordMinutes = parsed.return_unpack_max_record_minutes;
|
||||
if (rawReturnUnpackMaxRecordMinutes === undefined || rawReturnUnpackMaxRecordMinutes === null || rawReturnUnpackMaxRecordMinutes === '') {
|
||||
normalized.return_unpack_max_record_minutes = DEFAULT_SUBJECT_CONFIG.return_unpack_max_record_minutes;
|
||||
|
||||
@ -118,12 +118,6 @@ module.exports = app => {
|
||||
allowNull: true,
|
||||
comment: '登录码({uuid,id_6} JSON 的 base64,一次性消费)',
|
||||
},
|
||||
agreement_version_id: {
|
||||
type: BIGINT(20).UNSIGNED,
|
||||
allowNull: true,
|
||||
defaultValue: null,
|
||||
comment: '协议版本ID(关联 wms_wechat_agreement_version.id,loginByCode 时自动更新到最新)',
|
||||
},
|
||||
created_at: {
|
||||
type: DATE,
|
||||
comment: '创建时间',
|
||||
|
||||
@ -9,8 +9,6 @@
|
||||
* 管理后台保存后置为待同步,由定时任务同步到 nginx 后回写状态。
|
||||
* - 证书启用/停用由整行删除或 sync_status 表达;证书到期由 cert_expire_at
|
||||
* 判断,不单独保留证书 status 列。
|
||||
* - domain_status 状态机:0-未验证,1-已验证(DNS TXT 校验通过),2-验证失败;
|
||||
* 未验证/验证失败的域名禁止上传证书与对外公共拉取,管理后台设置域名后回落到 0。
|
||||
* - domain 唯一索引(uk_domain)为 MySQL 可空列唯一索引:允许多个 NULL,
|
||||
* 应用层在写入非空 domain 前必须做唯一性校验,不能依赖数据库约束报错。
|
||||
* - store_id 唯一索引(uk_store_id):每仓一行,由数据库层保证。
|
||||
@ -45,44 +43,6 @@ module.exports = app => {
|
||||
allowNull: true,
|
||||
comment: '仓库自持域名;可空列唯一索引允许多个 NULL,非空值唯一性需应用层校验',
|
||||
},
|
||||
domain_status: {
|
||||
type: TINYINT,
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
validate: {
|
||||
isIn: {
|
||||
args: [[ 0, 1, 2 ]],
|
||||
msg: '域名验证状态不合法:0-未验证,1-已验证,2-验证失败',
|
||||
},
|
||||
},
|
||||
comment: '域名验证状态:0-未验证,1-已验证,2-验证失败',
|
||||
},
|
||||
domain_verify_host: {
|
||||
type: STRING(255),
|
||||
allowNull: true,
|
||||
comment: '待校验 TXT 记录主机名(wmsv-<随机码>.<域名>)',
|
||||
},
|
||||
domain_verify_token: {
|
||||
type: STRING(64),
|
||||
allowNull: true,
|
||||
comment: '待校验 TXT 记录值(32 位 hex)',
|
||||
},
|
||||
domain_verified_at: {
|
||||
type: DATE,
|
||||
allowNull: true,
|
||||
comment: '域名验证通过时间',
|
||||
},
|
||||
domain_verify_attempts: {
|
||||
type: INTEGER(11),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '域名验证尝试次数',
|
||||
},
|
||||
domain_last_error: {
|
||||
type: STRING(500),
|
||||
allowNull: true,
|
||||
comment: '最近一次域名验证失败原因',
|
||||
},
|
||||
title: {
|
||||
type: STRING(100),
|
||||
allowNull: true,
|
||||
@ -198,10 +158,6 @@ module.exports = app => {
|
||||
name: 'idx_sync_status',
|
||||
fields: [ 'sync_status' ],
|
||||
},
|
||||
{
|
||||
name: 'idx_domain_status',
|
||||
fields: [ 'domain_status' ],
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 微信用户须知版本表模型(副表)。
|
||||
* 提交一次自动新增版本:version 为数字、同一 appid 内自动 +1;拉取只取最新版本。
|
||||
* @param {import('egg').Application} app Egg 应用实例。
|
||||
* @return {import('sequelize').ModelCtor<import('sequelize').Model>} Sequelize 模型。
|
||||
*/
|
||||
module.exports = app => {
|
||||
const { BIGINT, STRING, TEXT, DATE } = app.Sequelize;
|
||||
|
||||
const WechatAgreementVersion = app.model.define('wechatAgreementVersion', {
|
||||
id: {
|
||||
type: BIGINT(20).UNSIGNED,
|
||||
primaryKey: true,
|
||||
autoIncrement: true,
|
||||
allowNull: false,
|
||||
comment: '主键',
|
||||
},
|
||||
appid: {
|
||||
type: STRING(64),
|
||||
allowNull: false,
|
||||
comment: '小程序AppID(关联 wms_wechat_app.appid)',
|
||||
},
|
||||
content: {
|
||||
type: TEXT('long'),
|
||||
allowNull: true,
|
||||
defaultValue: null,
|
||||
comment: '用户须知富文本内容',
|
||||
},
|
||||
created_at: {
|
||||
type: DATE,
|
||||
comment: '创建时间',
|
||||
},
|
||||
updated_at: {
|
||||
type: DATE,
|
||||
comment: '更新时间',
|
||||
},
|
||||
}, {
|
||||
tableName: 'wms_wechat_agreement_version',
|
||||
freezeTableName: true,
|
||||
underscored: true,
|
||||
timestamps: true,
|
||||
createdAt: 'created_at',
|
||||
updatedAt: 'updated_at',
|
||||
paranoid: false,
|
||||
comment: '微信用户须知版本表(副表,提交一次新增一个版本)',
|
||||
indexes: [
|
||||
{
|
||||
fields: [ 'appid' ],
|
||||
name: 'idx_appid',
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
return WechatAgreementVersion;
|
||||
};
|
||||
@ -1,183 +0,0 @@
|
||||
// app/schedule/domain_verify_scan.js
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 域名验证扫描定时任务。
|
||||
*
|
||||
* 按 config.frontConfig.domainVerify.interval 周期性触发(默认 10m),
|
||||
* 扫描 wms_warehouse_front_config 中「已生成待校验 TXT 记录、且尚未通过验证」的行,
|
||||
* 逐行解析 DNS TXT 记录并回写 domain_status / domain_verified_at /
|
||||
* domain_verify_attempts / domain_last_error;只有通过验证的域名才会被公共拉取接口
|
||||
* 与 nginx server 块生成流程放行。
|
||||
*
|
||||
* 并发控制(双保险):
|
||||
* 1. 进程内重入标志 ctx.app._domainVerifyScanRunning:上一轮未结束时跳过本轮;
|
||||
* 2. Redis 跨进程互斥锁 SET NX EX:多实例部署时同一轮只有一个实例执行,
|
||||
* TTL 取 config.frontConfig.domainVerify.lockTtlSeconds(默认 600s);
|
||||
* Redis 不可用或抛错时降级为「仅进程内防重入」并 WARN,
|
||||
* 不因缓存故障中断域名验证。
|
||||
*
|
||||
* 业务逻辑全部委托 service.systems.frontConfig.verifyPendingDomains(本文件不写 SQL);
|
||||
* 任务失败只记录错误日志,不向上抛出,避免 schedule 崩溃。
|
||||
*
|
||||
* 关闭方式:config.frontConfig.domainVerify.enable = false,此时 schedule
|
||||
* 标记为 disable,Egg 不注册本任务(进程内不会执行)。
|
||||
*/
|
||||
|
||||
/** @type {string} 跨进程互斥锁 key */
|
||||
const LOCK_CACHE_KEY = 'schedule:domain_verify_scan:lock';
|
||||
/** @type {string} 日志前缀 tag */
|
||||
const LOG_TAG = '[domain_verify_scan]';
|
||||
/** @type {number} 锁 TTL 兜底值(秒) */
|
||||
const DEFAULT_LOCK_TTL_SECONDS = 600;
|
||||
/** @type {string} 扫描间隔兜底值 */
|
||||
const DEFAULT_INTERVAL = '10m';
|
||||
|
||||
/**
|
||||
* 获取 Redis cache 客户端。
|
||||
*
|
||||
* @param {Object} app Egg 应用实例。
|
||||
* @return {Object|null} Redis 客户端或 null。
|
||||
*/
|
||||
function getCacheRedisClient(app) {
|
||||
if (!app || !app.redis || typeof app.redis.get !== 'function') {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
return app.redis.get('cache') || null;
|
||||
} catch (error) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取跨进程互斥锁(SET NX EX)。
|
||||
*
|
||||
* @param {Object} ctx Egg 上下文。
|
||||
* @param {number} ttlSeconds 锁 TTL(秒)。
|
||||
* @param {string} lockValue 锁持有者标识(pid + 时间戳)。
|
||||
* @return {Promise<boolean>} 是否获取成功;Redis 不可用时返回 true(退化为进程内防重入)。
|
||||
*/
|
||||
async function acquireLock(ctx, ttlSeconds, lockValue) {
|
||||
const redis = getCacheRedisClient(ctx.app);
|
||||
|
||||
if (!redis || typeof redis.set !== 'function') {
|
||||
ctx.logger.warn(`${LOG_TAG} Redis 不可用,跨进程互斥降级为进程内防重入`);
|
||||
return true;
|
||||
}
|
||||
|
||||
try {
|
||||
const result = await redis.set(LOCK_CACHE_KEY, lockValue, 'EX', ttlSeconds, 'NX');
|
||||
return result === 'OK';
|
||||
} catch (error) {
|
||||
ctx.logger.warn(`${LOG_TAG} 获取互斥锁失败(按未加锁继续): ${error.message}`);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 释放跨进程互斥锁(GET 比对 value 后再 DEL,避免误删他人锁)。
|
||||
*
|
||||
* 仍存在极小竞态窗口:本进程 GET 到自己的 value 后、DEL 之前锁恰好 TTL 到期
|
||||
* 并被其它实例抢到(value 为 pid + 时间戳,重复概率极低),最坏结果是提前释放
|
||||
* 一次锁,不会造成数据错误(service 层 update 自带 id + domain 防并发守卫),
|
||||
* 因此接受该窗口而不引入 Lua 脚本。
|
||||
*
|
||||
* @param {Object} ctx Egg 上下文。
|
||||
* @param {string} lockValue 锁持有者标识(与获取时一致)。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
async function releaseLock(ctx, lockValue) {
|
||||
const redis = getCacheRedisClient(ctx.app);
|
||||
|
||||
if (!redis || typeof redis.get !== 'function' || typeof redis.del !== 'function') {
|
||||
// Redis 不可用则跳过释放,等待 TTL 自然过期
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const current = await redis.get(LOCK_CACHE_KEY);
|
||||
if (current !== lockValue) {
|
||||
return;
|
||||
}
|
||||
await redis.del(LOCK_CACHE_KEY);
|
||||
} catch (error) {
|
||||
ctx.logger.warn(`${LOG_TAG} 释放互斥锁失败(等待 TTL 过期): ${error.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 域名验证扫描定时任务。
|
||||
*
|
||||
* @param {Object} app Egg 应用实例。
|
||||
* @return {Object} 定时任务定义(含 schedule 与 task)。
|
||||
*/
|
||||
module.exports = app => {
|
||||
// 工厂内动态读取配置:interval / lockTtlSeconds / enable 变更后无需改代码
|
||||
const frontConfig = (app.config && app.config.frontConfig) || {};
|
||||
const domainVerify = frontConfig.domainVerify || {};
|
||||
const interval = typeof domainVerify.interval === 'string' && domainVerify.interval
|
||||
? domainVerify.interval
|
||||
: DEFAULT_INTERVAL;
|
||||
const lockTtlSeconds = Number(domainVerify.lockTtlSeconds) > 0
|
||||
? Math.floor(Number(domainVerify.lockTtlSeconds))
|
||||
: DEFAULT_LOCK_TTL_SECONDS;
|
||||
|
||||
return {
|
||||
schedule: {
|
||||
// 固定间隔触发;domainVerify.enable === false 时 disable 为 true,
|
||||
// Egg 直接不注册本任务(不会进入 task,也不会占用 worker 周期)
|
||||
interval,
|
||||
type: 'worker',
|
||||
immediate: false,
|
||||
disable: domainVerify.enable === false,
|
||||
},
|
||||
|
||||
/**
|
||||
* 执行一轮域名验证扫描。
|
||||
*
|
||||
* @param {Object} ctx Egg 上下文。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
async task(ctx) {
|
||||
// 进程内防重入:单实例上一轮未结束时不再叠加下一轮
|
||||
if (ctx.app._domainVerifyScanRunning) {
|
||||
ctx.logger.info(`${LOG_TAG} 本轮任务跳过,上一轮尚未结束`);
|
||||
return;
|
||||
}
|
||||
|
||||
const lockValue = `${process.pid}-${Date.now()}`;
|
||||
const locked = await acquireLock(ctx, lockTtlSeconds, lockValue);
|
||||
if (!locked) {
|
||||
ctx.logger.info(`${LOG_TAG} 未获取到跨进程互斥锁,本轮跳过(其它实例正在执行)`);
|
||||
return;
|
||||
}
|
||||
|
||||
ctx.app._domainVerifyScanRunning = true;
|
||||
const startedAt = Date.now();
|
||||
|
||||
try {
|
||||
// 业务逻辑一律委托 service,schedule 内不写 SQL
|
||||
const summary = await ctx.service.systems.frontConfig.verifyPendingDomains({});
|
||||
|
||||
ctx.logger.info(
|
||||
`${LOG_TAG} 本轮完成 scanned=${summary.scanned} verified=${summary.verified}`
|
||||
+ ` failed=${summary.failed} skipped=${summary.skipped}`
|
||||
+ ` errors=${summary.errors.length} duration=${Date.now() - startedAt}ms`
|
||||
);
|
||||
|
||||
if (summary.errors.length > 0) {
|
||||
ctx.logger.warn(`${LOG_TAG} 本轮错误摘要: ${summary.errors.slice(0, 5).join(' | ')}`);
|
||||
}
|
||||
} catch (error) {
|
||||
// service 层已 fail-soft(迁移未执行时返回零统计),此处为最后兜底:
|
||||
// 只记日志不上抛,避免 schedule 崩溃
|
||||
ctx.logger.error(`${LOG_TAG} 本轮执行异常: ${error && error.message ? error.message : String(error)}`);
|
||||
} finally {
|
||||
ctx.app._domainVerifyScanRunning = false;
|
||||
await releaseLock(ctx, lockValue);
|
||||
}
|
||||
},
|
||||
};
|
||||
};
|
||||
@ -42,7 +42,7 @@ module.exports = {
|
||||
ctx.logger.info(
|
||||
`[receiving-pending-notice] 本轮提醒完成:开启仓库 ${summary.checkedWarehouseCount},`
|
||||
+ `执行 ${summary.executedWarehouseCount},未入库 ${summary.pendingCount} 单,`
|
||||
+ `发送 ${summary.sentCount},失败 ${summary.failedCount},回退客服群 ${summary.fallbackCount || 0}`
|
||||
+ `发送 ${summary.sentCount},失败 ${summary.failedCount}`
|
||||
);
|
||||
}
|
||||
} catch (error) {
|
||||
|
||||
@ -1,71 +0,0 @@
|
||||
// app/schedule/wechat_agreement_cleanup.js
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 微信用户须知版本清理定时任务。
|
||||
*
|
||||
* 默认每 1 小时整点(cron:秒 分 时 日 月 周 = 0 0 * * * *)在单 worker 中执行一次,
|
||||
* 真实删除 wms_wechat_agreement_version 中「未被使用且不是对应 appid 最终版」的历史版本,
|
||||
* 释放 MySQL 磁盘空间。保留规则:各 appid 最终版(version 最大)+ 被
|
||||
* wms_user_oauth.agreement_version_id 引用的版本。
|
||||
* cron 从 config.wechatAgreementCleanup.cron 读取(config.default.js 提供默认值),
|
||||
* 本地环境可在 config.local.js 覆盖为短间隔以便快速验证;enable=false 时不注册本任务;
|
||||
* 实际清理逻辑收敛在 service.systems.wechat.cleanupUnusedAgreementVersions。
|
||||
*
|
||||
* @param {Object} app Egg 应用实例。
|
||||
* @return {Object} 定时任务定义(含 schedule 与 task)。
|
||||
*/
|
||||
module.exports = app => {
|
||||
const cleanupConfig = (app.config && app.config.wechatAgreementCleanup) || {};
|
||||
const cleanupCron = typeof cleanupConfig.cron === 'string' && cleanupConfig.cron
|
||||
? cleanupConfig.cron
|
||||
: '0 0 * * * *';
|
||||
|
||||
return {
|
||||
schedule: {
|
||||
cron: cleanupCron,
|
||||
type: 'worker',
|
||||
immediate: false,
|
||||
disable: cleanupConfig.enable === false,
|
||||
},
|
||||
|
||||
/**
|
||||
* 执行用户须知历史版本清理。
|
||||
*
|
||||
* 采用单 worker 防重入:上一轮未结束时跳过本轮;
|
||||
* 任务失败只记录错误日志,不向上抛出,避免导致 schedule 崩溃。
|
||||
*
|
||||
* @param {Object} ctx Egg 上下文。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
async task(ctx) {
|
||||
const scheduleName = 'wechat_agreement_cleanup';
|
||||
|
||||
if (ctx.app._wechatAgreementCleanupRunning) {
|
||||
ctx.logger.info(`[${scheduleName}] 本轮任务跳过,上一轮尚未结束`);
|
||||
return;
|
||||
}
|
||||
|
||||
ctx.app._wechatAgreementCleanupRunning = true;
|
||||
const startedAt = Date.now();
|
||||
try {
|
||||
const config = ctx.app.config.wechatAgreementCleanup || {};
|
||||
const batchSize = Number(config.batchSize) > 0
|
||||
? Math.floor(Number(config.batchSize))
|
||||
: 500;
|
||||
|
||||
const summary = await ctx.service.systems.wechat.cleanupUnusedAgreementVersions(batchSize);
|
||||
|
||||
ctx.logger.info(
|
||||
`[${scheduleName}] 本轮完成 deleted=${summary.deleted} kept_latest=${summary.kept_latest}`
|
||||
+ ` kept_in_use=${summary.kept_in_use} total=${summary.total}`
|
||||
+ ` duration=${Date.now() - startedAt}ms`
|
||||
);
|
||||
} catch (error) {
|
||||
ctx.logger.error(`[${scheduleName}] 执行失败: ${error.message}`);
|
||||
} finally {
|
||||
ctx.app._wechatAgreementCleanupRunning = false;
|
||||
}
|
||||
},
|
||||
};
|
||||
};
|
||||
@ -1656,24 +1656,15 @@ class InboxFunctionsService extends Service {
|
||||
weight: 90,
|
||||
keywords: [ '查退回', '查退件', '退回查询', '退回明细', '查拆包', '退件查询', '退回进度' ],
|
||||
params: {
|
||||
waybill_code: { type: 'string', required: true, description: '退回包裹运单号,支持多个(换行/逗号/空格分隔),如"查退回 465570943491370\nSF123456";v2 规则引擎将运单号归并进 keyword 键,函数内兼容两键读取' },
|
||||
waybill_code: { type: 'string', required: true, description: '退回包裹运单号,支持多个(换行/逗号/空格分隔),如"查退回 465570943491370\nSF123456"' },
|
||||
},
|
||||
groups: [ GROUP.COMMON ],
|
||||
/**
|
||||
* 查退回处理器:按运单号查询退回收到/退回拆包/未退回登记状态,
|
||||
* 已拆包返回拆包明细与录像地址,未退回自动登记到退回查询表。
|
||||
* v2 规则引擎会把取号结果写入 params.keyword(waybill_no → keyword 归并),
|
||||
* 故入参键兼容 waybill_code 与 keyword 两种来源。
|
||||
* @param {Object} params 入参,包含 waybill_code 或 keyword(退回包裹运单号,可多单号)。
|
||||
* @return {Promise<Object>} 处理结果,包含 success 与 data(message/messages/direct_reply)。
|
||||
*/
|
||||
handler: async (params = {}) => {
|
||||
const { ctx } = this;
|
||||
const warehouseId = Number(ctx.inboxContext?.warehouse_id || 0);
|
||||
const storeId = Number(ctx.inboxContext?.store_id || 0);
|
||||
|
||||
// v2 引擎兼容:取号结果可能落在 keyword 键(v1/AI 路径使用 waybill_code)
|
||||
let raw = String(params.waybill_code || params.keyword || '').trim();
|
||||
let raw = String(params.waybill_code || '').trim();
|
||||
if (!raw) return { success: false, error: '请提供退回包裹运单号' };
|
||||
|
||||
// 兼容把"查退回 123456"整体传入的情况
|
||||
|
||||
@ -82,8 +82,6 @@ class dashboardService extends MainService {
|
||||
todayOutbound,
|
||||
interceptedOrders,
|
||||
exceptionOrders,
|
||||
recheckedOrders,
|
||||
packedOrders,
|
||||
] = await Promise.all([
|
||||
model.count({ where: pendingBase }),
|
||||
model.count({ where: { ...pendingBase, create_at: { [Op.gte]: todayStart, [Op.lt]: todayEnd } } }),
|
||||
@ -95,8 +93,6 @@ class dashboardService extends MainService {
|
||||
model.count({ where: { step: 4, outbound_status: 'fin', status: { [Op.ne]: 'cancel' }, delivery_time: { [Op.gte]: todayStart, [Op.lt]: todayEnd }, ...(storeId ? { store_id: storeId } : {}) } }),
|
||||
model.count({ where: { ...pendingBase, intercept_status: { [Op.not]: null, [Op.ne]: 'none' } } }),
|
||||
model.count({ where: { ...pendingBase, step: 3 } }),
|
||||
model.count({ where: { ...pendingBase, recheck_status: 'fin' } }),
|
||||
model.count({ where: { ...pendingBase, pack_status: 'fin' } }),
|
||||
]);
|
||||
|
||||
return {
|
||||
@ -111,8 +107,6 @@ class dashboardService extends MainService {
|
||||
todayOutbound,
|
||||
interceptedOrders,
|
||||
exceptionOrders,
|
||||
recheckedOrders,
|
||||
packedOrders,
|
||||
};
|
||||
}
|
||||
|
||||
@ -121,7 +115,6 @@ class dashboardService extends MainService {
|
||||
totalPending: 0, todayNew: 0, yesterdayNew: 0,
|
||||
unassignedOrders: 0, unprintedOrders: 0, unpickedOrders: 0,
|
||||
pendingShipments: 0, todayOutbound: 0, interceptedOrders: 0, exceptionOrders: 0,
|
||||
recheckedOrders: 0, packedOrders: 0,
|
||||
};
|
||||
|
||||
for (const r of results) {
|
||||
@ -135,8 +128,6 @@ class dashboardService extends MainService {
|
||||
merged.todayOutbound += r.todayOutbound || 0;
|
||||
merged.interceptedOrders += r.interceptedOrders || 0;
|
||||
merged.exceptionOrders += r.exceptionOrders || 0;
|
||||
merged.recheckedOrders += r.recheckedOrders || 0;
|
||||
merged.packedOrders += r.packedOrders || 0;
|
||||
}
|
||||
|
||||
const orderTrend = merged.yesterdayNew > 0
|
||||
@ -167,8 +158,6 @@ class dashboardService extends MainService {
|
||||
outboundRate,
|
||||
interceptedOrders: merged.interceptedOrders,
|
||||
exceptionOrders: merged.exceptionOrders,
|
||||
recheckedOrders: merged.recheckedOrders,
|
||||
packedOrders: merged.packedOrders,
|
||||
},
|
||||
};
|
||||
}
|
||||
@ -183,7 +172,6 @@ class dashboardService extends MainService {
|
||||
pendingShipments: 0, shipmentProgress: 0,
|
||||
todayOutbound: 0, outboundRate: 0,
|
||||
interceptedOrders: 0, exceptionOrders: 0,
|
||||
recheckedOrders: 0, packedOrders: 0,
|
||||
},
|
||||
};
|
||||
}
|
||||
@ -215,396 +203,84 @@ class dashboardService extends MainService {
|
||||
};
|
||||
return this.success('ok', data);
|
||||
}
|
||||
/**
|
||||
* 热销商品排行:统计仓库端/货主端范围内今日热销商品 Top 10。
|
||||
*
|
||||
* 口径说明:
|
||||
* - 今日窗口为 [今日 00:00, 当前时刻),昨日窗口为 [昨日 00:00, 今日 00:00);
|
||||
* - value 为窗口内非取消、非异常、未删除订单的商品计划数量(plan_qty)合计;
|
||||
* - trend 为今日销量相对昨日销量的环比百分比(保留一位小数),昨日为 0 且今日大于 0 时按 100 处理;
|
||||
* - 已出库订单会从常用表迁移到配送表,因此常用表与配送表均参与统计。
|
||||
*
|
||||
* 仓库端使用 ctx.user.store_id 作为仓库ID,单仓统计;
|
||||
* 货主端(store_type 为 store)跨所有签约仓库并行统计并按商品聚合。
|
||||
*
|
||||
* @return {Promise<Object>} 热销商品排行响应,data 为最多 10 条的排行数组。
|
||||
*/
|
||||
async hot_order_rank() {
|
||||
const { ctx } = this;
|
||||
const storeType = String(ctx.user?.store_type || '').trim();
|
||||
|
||||
if (storeType === 'store') {
|
||||
return await this.storeSideHotOrderRank();
|
||||
}
|
||||
|
||||
const warehouseId = Number(ctx.user?.store_id);
|
||||
if (!warehouseId) {
|
||||
return this.fail('缺少仓库上下文');
|
||||
}
|
||||
const rankMap = await this.queryWarehouseHotOrderRank(warehouseId);
|
||||
return this.success('ok', await this.formatHotOrderRank(rankMap));
|
||||
}
|
||||
|
||||
/**
|
||||
* 货主端热销商品排行:跨所有已签约仓库并行统计并按商品聚合。
|
||||
*
|
||||
* @return {Promise<Object>} 热销商品排行响应。
|
||||
*/
|
||||
async storeSideHotOrderRank() {
|
||||
const { ctx } = this;
|
||||
const storeId = Number(ctx.user?.store_id);
|
||||
if (!storeId) {
|
||||
return this.fail('缺少货主上下文');
|
||||
}
|
||||
|
||||
// 获取签约仓库
|
||||
const contracts = await ctx.model.StoreWarehouse.findAll({
|
||||
where: { store_id: storeId, auth_status: 2 },
|
||||
attributes: [ 'warehouse_id' ],
|
||||
raw: true,
|
||||
});
|
||||
const warehouseIds = (contracts || []).map(c => Number(c.warehouse_id)).filter(id => id > 0);
|
||||
if (!warehouseIds.length) {
|
||||
return this.success('ok', this.emptyHotOrderRank());
|
||||
}
|
||||
|
||||
// 跨仓并行查询并汇总
|
||||
const results = await Promise.all(warehouseIds.map(wid => this.queryWarehouseHotOrderRank(wid, storeId).catch(() => null)));
|
||||
return this.success('ok', await this.formatHotOrderRank(this.mergeHotOrderRank(results.filter(Boolean))));
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询单个仓库的热销商品聚合结果。
|
||||
*
|
||||
* 今日窗口同时覆盖订单常用表与配送表(已出库订单会迁移到配送表);
|
||||
* 昨日窗口仅统计今日候选商品的销量作为环比基线,避免全量扫描。
|
||||
*
|
||||
* @param {number} warehouseId 仓库ID。
|
||||
* @param {number|null} [storeId=null] 货主ID,货主端传值以限定统计范围。
|
||||
* @return {Promise<Map<string, Object>>} 商品键到 { name, currentValue, previousValue } 的映射,
|
||||
* 商品键规则:有编码时为 code:商品编码,无编码时为 stock:库存商品ID。
|
||||
*/
|
||||
async queryWarehouseHotOrderRank(warehouseId, storeId = null) {
|
||||
const now = new Date();
|
||||
const todayStart = new Date(now.getFullYear(), now.getMonth(), now.getDate());
|
||||
const yesterdayStart = new Date(todayStart.getTime() - 86400000);
|
||||
|
||||
// 今日窗口:常用表与配送表并行聚合
|
||||
const [ currentRows, dispatchRows ] = await Promise.all([
|
||||
this.queryHotOrderRankWindowRows(warehouseId, 'current', todayStart, now, storeId),
|
||||
this.queryHotOrderRankWindowRows(warehouseId, 'dispatch', todayStart, now, storeId),
|
||||
]);
|
||||
const currentMap = this.buildHotOrderRankMap(currentRows.concat(dispatchRows));
|
||||
if (currentMap.size === 0) {
|
||||
return currentMap;
|
||||
}
|
||||
|
||||
// 昨日窗口:仅统计今日候选商品的销量作为环比基线
|
||||
const keyFilter = this.buildHotOrderRankKeyFilter(currentMap);
|
||||
const [ prevCurrentRows, prevDispatchRows ] = await Promise.all([
|
||||
this.queryHotOrderRankWindowRows(warehouseId, 'current', yesterdayStart, todayStart, storeId, keyFilter),
|
||||
this.queryHotOrderRankWindowRows(warehouseId, 'dispatch', yesterdayStart, todayStart, storeId, keyFilter),
|
||||
]);
|
||||
|
||||
const rankMap = new Map();
|
||||
for (const [ key, entry ] of currentMap.entries()) {
|
||||
rankMap.set(key, { ...entry, previousValue: 0 });
|
||||
}
|
||||
const previousMap = this.buildHotOrderRankMap(prevCurrentRows.concat(prevDispatchRows));
|
||||
for (const [ key, prevEntry ] of previousMap.entries()) {
|
||||
const target = rankMap.get(key);
|
||||
if (target) {
|
||||
target.previousValue = prevEntry.currentValue;
|
||||
}
|
||||
}
|
||||
return rankMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询单个订单分表在指定时间窗口内的商品销量分组。
|
||||
*
|
||||
* @param {number} warehouseId 仓库ID。
|
||||
* @param {string} tableType 表类型:current(常用表)或 dispatch(配送表)。
|
||||
* @param {Date} startTime 窗口开始时间(含)。
|
||||
* @param {Date} endTime 窗口结束时间(不含)。
|
||||
* @param {number|null} [storeId=null] 货主ID,货主端传值以限定统计范围。
|
||||
* @param {Object|null} [keyFilter=null] 候选商品键过滤:{ itemCodes, stockIds },为空则统计全部商品。
|
||||
* @return {Promise<Array<Object>>} 分组行数组 [{ item_code, stock_id, item_name, total_qty }]。
|
||||
*/
|
||||
async queryHotOrderRankWindowRows(warehouseId, tableType, startTime, endTime, storeId = null, keyFilter = null) {
|
||||
const { ctx } = this;
|
||||
const isDispatch = tableType === 'dispatch';
|
||||
const orderModel = isDispatch
|
||||
? await ctx.model.OrderDeliveryFactory.getDispatchModel(warehouseId)
|
||||
: await ctx.model.OrderDeliveryFactory.getCurrentModel(warehouseId);
|
||||
const itemsModel = isDispatch
|
||||
? await ctx.model.OrderItemsFactory.getDispatchModel(warehouseId)
|
||||
: await ctx.model.OrderItemsFactory.getCurrentModel(warehouseId);
|
||||
|
||||
const orderTableName = orderModel.getTableName();
|
||||
const itemsTableName = itemsModel.getTableName();
|
||||
const whereClauses = [
|
||||
'o.status NOT IN (\'cancel\', \'error\')',
|
||||
'o.delete_at IS NULL',
|
||||
'o.create_at >= :startTime',
|
||||
'o.create_at < :endTime',
|
||||
];
|
||||
const replacements = { startTime, endTime };
|
||||
if (storeId) {
|
||||
whereClauses.push('o.store_id = :storeId');
|
||||
replacements.storeId = storeId;
|
||||
}
|
||||
if (keyFilter) {
|
||||
const keyParts = [];
|
||||
if (Array.isArray(keyFilter.itemCodes) && keyFilter.itemCodes.length > 0) {
|
||||
keyParts.push('i.item_code IN (:itemCodes)');
|
||||
replacements.itemCodes = keyFilter.itemCodes;
|
||||
}
|
||||
if (Array.isArray(keyFilter.stockIds) && keyFilter.stockIds.length > 0) {
|
||||
keyParts.push('i.stock_id IN (:stockIds)');
|
||||
replacements.stockIds = keyFilter.stockIds;
|
||||
}
|
||||
if (keyParts.length > 0) {
|
||||
whereClauses.push(`(${keyParts.join(' OR ')})`);
|
||||
}
|
||||
}
|
||||
|
||||
const rows = await ctx.model.query(`
|
||||
SELECT
|
||||
i.item_code,
|
||||
i.stock_id,
|
||||
MAX(i.item_name) AS item_name,
|
||||
SUM(i.plan_qty) AS total_qty
|
||||
FROM \`${itemsTableName}\` AS i
|
||||
INNER JOIN \`${orderTableName}\` AS o ON o.id = i.order_id
|
||||
WHERE ${whereClauses.join('\n AND ')}
|
||||
GROUP BY i.item_code, i.stock_id
|
||||
`, {
|
||||
replacements,
|
||||
type: ctx.app.Sequelize.QueryTypes.SELECT,
|
||||
});
|
||||
|
||||
return Array.isArray(rows) ? rows : [];
|
||||
}
|
||||
|
||||
/**
|
||||
* 将分组行转换为商品键到销量聚合的映射。
|
||||
*
|
||||
* 商品键规则:优先使用商品编码(code:商品编码);无编码时使用库存商品ID(stock:库存商品ID);
|
||||
* 编码与库存ID均缺失或销量不大于 0 的行会被跳过。
|
||||
*
|
||||
* @param {Array<Object>} rows 分组行数组 [{ item_code, stock_id, item_name, total_qty }]。
|
||||
* @return {Map<string, Object>} 商品键到 { name, stockId, currentValue } 的映射,
|
||||
* stockId 为库存商品ID(stock_warehouse.id)。
|
||||
*/
|
||||
buildHotOrderRankMap(rows) {
|
||||
const rankMap = new Map();
|
||||
for (const row of Array.isArray(rows) ? rows : []) {
|
||||
const itemCode = String(row.item_code || '').trim();
|
||||
const stockId = Number(row.stock_id) || 0;
|
||||
const totalQty = Number(row.total_qty) || 0;
|
||||
if (totalQty <= 0) {
|
||||
continue;
|
||||
}
|
||||
const key = itemCode ? `code:${itemCode}` : `stock:${stockId}`;
|
||||
if (key === 'stock:0') {
|
||||
continue;
|
||||
}
|
||||
const itemName = String(row.item_name || '').trim();
|
||||
const existing = rankMap.get(key);
|
||||
if (existing) {
|
||||
existing.currentValue += totalQty;
|
||||
if (!existing.name && itemName) {
|
||||
existing.name = itemName;
|
||||
}
|
||||
if (!existing.stockId && stockId > 0) {
|
||||
existing.stockId = stockId;
|
||||
}
|
||||
} else {
|
||||
rankMap.set(key, { name: itemName, stockId, currentValue: totalQty });
|
||||
}
|
||||
}
|
||||
return rankMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据商品键映射构造昨日窗口的候选键过滤条件。
|
||||
*
|
||||
* @param {Map<string, Object>} rankMap 商品键映射。
|
||||
* @return {Object} { itemCodes, stockIds } 候选商品编码与库存商品ID数组。
|
||||
*/
|
||||
buildHotOrderRankKeyFilter(rankMap) {
|
||||
const itemCodes = [];
|
||||
const stockIds = [];
|
||||
for (const key of rankMap.keys()) {
|
||||
if (key.startsWith('code:')) {
|
||||
itemCodes.push(key.slice(5));
|
||||
} else if (key.startsWith('stock:')) {
|
||||
const stockId = Number(key.slice(6));
|
||||
if (stockId > 0) {
|
||||
stockIds.push(stockId);
|
||||
}
|
||||
}
|
||||
}
|
||||
return { itemCodes, stockIds };
|
||||
}
|
||||
|
||||
/**
|
||||
* 合并多个仓库的热销商品聚合映射(货主端跨仓汇总)。
|
||||
*
|
||||
* @param {Array<Map<string, Object>>} results 各仓库的聚合映射数组。
|
||||
* @return {Map<string, Object>} 合并后的商品键到聚合数据(含 stockId)的映射。
|
||||
*/
|
||||
mergeHotOrderRank(results) {
|
||||
const merged = new Map();
|
||||
for (const rankMap of Array.isArray(results) ? results : []) {
|
||||
if (!(rankMap instanceof Map)) {
|
||||
continue;
|
||||
}
|
||||
for (const [ key, entry ] of rankMap.entries()) {
|
||||
const existing = merged.get(key);
|
||||
if (existing) {
|
||||
existing.currentValue += entry.currentValue || 0;
|
||||
existing.previousValue += entry.previousValue || 0;
|
||||
if (!existing.name && entry.name) {
|
||||
existing.name = entry.name;
|
||||
}
|
||||
if (!existing.stockId && entry.stockId) {
|
||||
existing.stockId = entry.stockId;
|
||||
}
|
||||
} else {
|
||||
merged.set(key, {
|
||||
name: entry.name || '',
|
||||
stockId: entry.stockId || 0,
|
||||
currentValue: entry.currentValue || 0,
|
||||
previousValue: entry.previousValue || 0,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
return merged;
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量查询库存商品信息,用于补充无编码商品的名称与编码。
|
||||
*
|
||||
* @param {Array<number>} stockIds 库存商品ID数组。
|
||||
* @return {Promise<Map<number, Object>>} 库存商品ID到 { item_code, item_name } 的映射。
|
||||
*/
|
||||
async loadHotOrderRankStockInfo(stockIds) {
|
||||
const { ctx } = this;
|
||||
const uniqueStockIds = [ ...new Set((Array.isArray(stockIds) ? stockIds : []).filter(id => Number(id) > 0)) ];
|
||||
if (uniqueStockIds.length === 0) {
|
||||
return new Map();
|
||||
}
|
||||
const { Op } = ctx.app.Sequelize;
|
||||
const rows = await ctx.model.StockWarehouse.findAll({
|
||||
where: { id: { [Op.in]: uniqueStockIds }, deleted_at: null },
|
||||
attributes: [ 'id', 'item_code', 'item_name' ],
|
||||
raw: true,
|
||||
});
|
||||
const stockInfoMap = new Map();
|
||||
for (const row of Array.isArray(rows) ? rows : []) {
|
||||
stockInfoMap.set(Number(row.id), {
|
||||
item_code: String(row.item_code || '').trim(),
|
||||
item_name: String(row.item_name || '').trim(),
|
||||
});
|
||||
}
|
||||
return stockInfoMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* 解析商品键对应的商品名称与库存商品ID。
|
||||
*
|
||||
* sku 统一取库存商品ID(stock_warehouse.id):库存键(stock:库存商品ID)直接取键内ID,
|
||||
* 编码键(code:商品编码)取聚合条目携带的 stockId;均缺失时回退商品编码字符串。
|
||||
* 名称为聚合行携带的商品名,库存键无名称时回退库存主表信息或 商品+库存ID 兜底。
|
||||
*
|
||||
* @param {string} key 商品键。
|
||||
* @param {Object} entry 聚合数据 { name, stockId, currentValue, previousValue }。
|
||||
* @param {Map<number, Object>} stockInfoMap 库存商品信息映射。
|
||||
* @return {Object} { name, sku } 商品展示信息(sku 为库存商品ID,缺失时回退商品编码字符串)。
|
||||
*/
|
||||
resolveHotOrderRankProduct(key, entry, stockInfoMap) {
|
||||
const stockId = key.startsWith('stock:')
|
||||
? Number(key.slice(6))
|
||||
: (Number(entry && entry.stockId) || 0);
|
||||
if (stockId > 0) {
|
||||
const stockInfo = stockInfoMap.get(stockId) || {};
|
||||
return {
|
||||
name: entry.name || stockInfo.item_name || `商品${stockId}`,
|
||||
sku: stockId,
|
||||
};
|
||||
}
|
||||
const itemCode = key.startsWith('code:') ? key.slice(5) : '';
|
||||
return { name: entry.name || itemCode, sku: itemCode };
|
||||
}
|
||||
|
||||
/**
|
||||
* 对商品名称做脱敏处理:保留前两个字符与后两个字符,中间以三个星号替代。
|
||||
* 名称长度不足 4 个字符时无法按规则脱敏,统一返回 ***。
|
||||
*
|
||||
* @param {string} name 原始商品名称。
|
||||
* @return {string} 脱敏后的商品名称。
|
||||
*/
|
||||
maskHotOrderRankName(name) {
|
||||
const value = String(name || '').trim();
|
||||
if (value.length >= 4) {
|
||||
return `${value.slice(0, 2)}***${value.slice(-2)}`;
|
||||
}
|
||||
return '***';
|
||||
}
|
||||
|
||||
/**
|
||||
* 将聚合映射格式化为热销商品排行响应数据。
|
||||
*
|
||||
* 按今日销量降序取前 10 条;trend 为今日销量相对昨日的环比百分比(保留一位小数),
|
||||
* 昨日为 0 且今日大于 0 时按 100 处理;name 做脱敏处理(前2字符+***+后2字符,
|
||||
* 长度不足 4 字符时返回 ***),sku 为库存商品ID(stock_warehouse.id)。
|
||||
*
|
||||
* @param {Map<string, Object>} rankMap 商品键到聚合数据的映射。
|
||||
* @return {Promise<Object>} { code: 200, message: '成功', data: [{ id, name, sku, value, trend }] }。
|
||||
*/
|
||||
async formatHotOrderRank(rankMap) {
|
||||
if (!rankMap || rankMap.size === 0) {
|
||||
return this.emptyHotOrderRank();
|
||||
}
|
||||
|
||||
const stockIds = [];
|
||||
for (const key of rankMap.keys()) {
|
||||
if (key.startsWith('stock:')) {
|
||||
const stockId = Number(key.slice(6));
|
||||
if (stockId > 0) {
|
||||
stockIds.push(stockId);
|
||||
}
|
||||
}
|
||||
}
|
||||
const stockInfoMap = await this.loadHotOrderRankStockInfo(stockIds);
|
||||
|
||||
const sorted = [ ...rankMap.entries() ].sort((left, right) => right[1].currentValue - left[1].currentValue);
|
||||
return {
|
||||
const data = {
|
||||
code: 200,
|
||||
message: '成功',
|
||||
data: sorted.slice(0, 10).map(([ key, entry ], index) => {
|
||||
const { name, sku } = this.resolveHotOrderRankProduct(key, entry, stockInfoMap);
|
||||
const previousValue = entry.previousValue || 0;
|
||||
const trend = previousValue > 0
|
||||
? parseFloat((((entry.currentValue - previousValue) / previousValue) * 100).toFixed(1))
|
||||
: (entry.currentValue > 0 ? 100 : 0);
|
||||
return { id: index + 1, name: this.maskHotOrderRankName(name), sku, value: entry.currentValue, trend };
|
||||
}),
|
||||
data: [{
|
||||
id: 1,
|
||||
name: '新***盒1',
|
||||
sku: 'SKU202510081',
|
||||
value: 51516,
|
||||
trend: 18.5,
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
name: '天***g',
|
||||
sku: 'SKU202401002',
|
||||
value: 43132,
|
||||
trend: 12.3,
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
name: '定****l',
|
||||
sku: 'SKU202401003',
|
||||
value: 39098,
|
||||
trend: -2.5,
|
||||
},
|
||||
{
|
||||
id: 4,
|
||||
name: '奥*****膜',
|
||||
sku: 'SKU202401004',
|
||||
value: 39087,
|
||||
trend: 8.7,
|
||||
},
|
||||
{
|
||||
id: 5,
|
||||
name: '美*****液',
|
||||
sku: 'SKU202401005',
|
||||
value: 25776,
|
||||
trend: 15.2,
|
||||
},
|
||||
{
|
||||
id: 6,
|
||||
name: '荣耀Magic6 Pro 1TB',
|
||||
sku: 'SKU202401006',
|
||||
value: 65,
|
||||
trend: 5.4,
|
||||
},
|
||||
{
|
||||
id: 7,
|
||||
name: '三星Galaxy S24 Ultra 512GB',
|
||||
sku: 'SKU202401007',
|
||||
value: 54,
|
||||
trend: -3.8,
|
||||
},
|
||||
{
|
||||
id: 8,
|
||||
name: '一加12 512GB',
|
||||
sku: 'SKU202401008',
|
||||
value: 43,
|
||||
trend: 22.1,
|
||||
},
|
||||
{
|
||||
id: 9,
|
||||
name: '真我GT5 Pro 1TB',
|
||||
sku: 'SKU202401009',
|
||||
value: 38,
|
||||
trend: 9.6,
|
||||
},
|
||||
{
|
||||
id: 10,
|
||||
name: '魅族21 Pro 512GB',
|
||||
sku: 'SKU202401010',
|
||||
value: 29,
|
||||
trend: 4.2,
|
||||
},
|
||||
],
|
||||
};
|
||||
return this.success('ok', data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 构造热销商品排行的空响应数据。
|
||||
*
|
||||
* @return {Object} { code: 200, message: '成功', data: [] }。
|
||||
*/
|
||||
emptyHotOrderRank() {
|
||||
return { code: 200, message: '成功', data: [] };
|
||||
}
|
||||
|
||||
async express_ratio() {
|
||||
const { ctx } = this;
|
||||
const storeType = String(ctx.user?.store_type || '').trim();
|
||||
@ -775,15 +451,6 @@ class dashboardService extends MainService {
|
||||
}
|
||||
/**
|
||||
* 订单趋势统计:按小时统计当日订单数与发货数
|
||||
*
|
||||
* 口径说明:
|
||||
* - orders:待处理表订单按创建时间(create_at)小时分组统计;
|
||||
* - shipments:配送表与待处理表两表汇总——
|
||||
* - 配送表记录按发货时间(delivery_time)小时分组统计;
|
||||
* - 待处理表已复核记录(recheck_status 为 fin)视为已发货,优先按复核时间(recheck_time)小时分组统计,
|
||||
* recheck_time 为空时回退使用 create_at;
|
||||
* - 配送表记录由待处理表迁移并同步删除源记录,两表数据无重叠,直接汇总不会重复计数。
|
||||
*
|
||||
* @return {Object} 包含 categories(时段)、orders(订单数)、shipments(发货数)和 summary(汇总)的响应数据
|
||||
*/
|
||||
async order_trend() {
|
||||
@ -835,8 +502,8 @@ class dashboardService extends MainService {
|
||||
raw: true,
|
||||
});
|
||||
|
||||
// 查询配送表发货数按发货小时分组(已进入配送流程的记录按 delivery_time 统计)
|
||||
const dispatchShipmentRows = await dispatchModel.findAll({
|
||||
// 查询发货数按发货小时分组
|
||||
const shipmentRows = await dispatchModel.findAll({
|
||||
attributes: [
|
||||
[ Sequelize.fn('HOUR', Sequelize.col('delivery_time')), 'hour' ],
|
||||
[ Sequelize.fn('COUNT', Sequelize.col('id')), 'cnt' ],
|
||||
@ -849,36 +516,12 @@ class dashboardService extends MainService {
|
||||
raw: true,
|
||||
});
|
||||
|
||||
// 查询待处理表已复核发货数按复核小时分组(已复核视为已发货,优先按 recheck_time 统计,为空时回退 create_at)
|
||||
const recheckTimeAttr = Sequelize.fn('COALESCE', Sequelize.col('recheck_time'), Sequelize.col('create_at'));
|
||||
const recheckShipmentRows = await model.findAll({
|
||||
attributes: [
|
||||
[ Sequelize.fn('HOUR', recheckTimeAttr), 'hour' ],
|
||||
[ Sequelize.fn('COUNT', Sequelize.col('id')), 'cnt' ],
|
||||
],
|
||||
where: {
|
||||
step: { [Op.in]: [ 1, 2, 3 ] },
|
||||
outbound_status: { [Op.ne]: 'padding' },
|
||||
status: { [Op.ne]: 'cancel' },
|
||||
recheck_status: 'fin',
|
||||
[Op.or]: [
|
||||
{ recheck_time: { [Op.gte]: todayStart, [Op.lte]: now } },
|
||||
{ recheck_time: null, create_at: { [Op.gte]: todayStart, [Op.lte]: now } },
|
||||
],
|
||||
},
|
||||
group: [ Sequelize.fn('HOUR', recheckTimeAttr) ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
// 将查询结果填充到小时映射(发货数为配送表与待处理表两表汇总)
|
||||
// 将查询结果填充到小时映射
|
||||
for (const row of orderRows) {
|
||||
orderMap[row.hour] = Number(row.cnt);
|
||||
}
|
||||
for (const row of dispatchShipmentRows) {
|
||||
shipmentMap[row.hour] = (shipmentMap[row.hour] || 0) + Number(row.cnt);
|
||||
}
|
||||
for (const row of recheckShipmentRows) {
|
||||
shipmentMap[row.hour] = (shipmentMap[row.hour] || 0) + Number(row.cnt);
|
||||
for (const row of shipmentRows) {
|
||||
shipmentMap[row.hour] = Number(row.cnt);
|
||||
}
|
||||
|
||||
// 按 categories 顺序构建 orders / shipments 数组
|
||||
|
||||
@ -2,39 +2,22 @@
|
||||
|
||||
const MainService = require('../main');
|
||||
|
||||
/**
|
||||
* 系统方法层:frontConfig(前端独立部署配置接口包装层)。
|
||||
*
|
||||
* 业务实现全部委托 ctx.service.systems.frontConfig:本层只做参数白名单过滤、
|
||||
* 鉴权出口与统一成功/失败包装。
|
||||
*/
|
||||
class FrontConfigMethodsService extends MainService {
|
||||
constructor(ctx) {
|
||||
super(ctx);
|
||||
// 公共按域名拉取:免登录、免权限、免鉴权(保留系统日志,与 workbench 公共接口口径一致)
|
||||
// 注意:getByDomain 是唯一免登录接口;域名验证接口(setDomain/getDomain/checkDomain)一律需登录
|
||||
// 公共按域名拉取前端配置:免登录、免权限、免鉴权(保留系统日志,与 workbench 公共接口口径一致)
|
||||
const _noNeedLogin = 'getByDomain';
|
||||
// settings 页配置接口:需登录、免权限、免鉴权(权限由业务层 isWarehouse 判定),不记系统日志
|
||||
const _noNeedRight = 'getByDomain,getInfo,getCert,saveInfo,saveCert,setDomain,getDomain,checkDomain';
|
||||
const _noNeedLog = 'getInfo,getCert,saveInfo,saveCert,setDomain,getDomain,checkDomain';
|
||||
const _noNeedAuth = 'getByDomain,getInfo,getCert,saveInfo,saveCert,setDomain,getDomain,checkDomain';
|
||||
const _noNeedRight = 'getByDomain';
|
||||
const _noNeedLog = '';
|
||||
const _noNeedAuth = 'getByDomain';
|
||||
this.systemInit(_noNeedLogin, _noNeedRight, _noNeedLog, _noNeedAuth);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取前端独立部署业务服务(systems/frontConfig)。
|
||||
*
|
||||
* @return {Object|null} 业务服务实例;不可用时返回 null。
|
||||
*/
|
||||
getFrontConfigService() {
|
||||
return (this.service && this.service.systems && this.service.systems.frontConfig) || null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 按域名拉取仓库前端公开配置(公共无鉴权接口)。
|
||||
*
|
||||
* 安全红线:响应仅含公开字段(domain/title/logo_url/login_bg_url/favicon_url/theme),
|
||||
* 不含 cert_pem/key_pem/cert_path/key_path/sync_status/sync_attempts/last_sync_error 等内部字段。
|
||||
* 不含 cert_path、key_path、sync_status、sync_attempts、last_sync_error 等内部字段。
|
||||
*
|
||||
* @param {Object} [data={}] 请求参数。
|
||||
* @param {string} data.domain 待查询域名(必填,非空)。
|
||||
@ -44,13 +27,13 @@ class FrontConfigMethodsService extends MainService {
|
||||
async getByDomain(data = {}) {
|
||||
const { domain } = data || {};
|
||||
|
||||
const targetService = this.getFrontConfigService();
|
||||
if (!targetService || typeof targetService.getByDomain !== 'function') {
|
||||
const targetService = this.service && this.service.systems && this.service.systems.setting && this.service.systems.setting.warehouse;
|
||||
if (!targetService || typeof targetService.getFrontConfigByDomain !== 'function') {
|
||||
return this.fail('获取前端配置失败', { code: 500 });
|
||||
}
|
||||
|
||||
try {
|
||||
const result = await targetService.getByDomain(domain);
|
||||
const result = await targetService.getFrontConfigByDomain(domain);
|
||||
return this.success('获取成功', { ...result, code: 200 });
|
||||
} catch (error) {
|
||||
return this.fail(error.message || '获取前端配置失败', {
|
||||
@ -58,209 +41,6 @@ class FrontConfigMethodsService extends MainService {
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询当前仓库前端独立部署品牌配置(settings 页回显,需登录)。
|
||||
*
|
||||
* 仅返回品牌与基础字段(warehouse_id/domain/title/logo_url/favicon_url/login_bg_url/theme/updated_at),
|
||||
* 不含证书/私钥原文与同步状态等内部字段(证书回显走 frontConfig.getCert)。
|
||||
*
|
||||
* @return {Promise<Object>} 统一响应结果。
|
||||
*/
|
||||
async getInfo() {
|
||||
const targetService = this.getFrontConfigService();
|
||||
if (!targetService || typeof targetService.getInfo !== 'function') {
|
||||
return this.fail('获取前端配置失败', { code: 500 });
|
||||
}
|
||||
|
||||
try {
|
||||
const result = await targetService.getInfo();
|
||||
return this.success('ok', result);
|
||||
} catch (error) {
|
||||
return this.fail(error.message || '获取前端配置失败', {
|
||||
code: Number(error.code) || 500,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询当前仓库前端独立部署证书配置(settings 页回显,需登录)。
|
||||
*
|
||||
* 响应含证书原文(cert_pem)与私钥原文(key_pem,取自 cert_key 列),
|
||||
* 仅供仓库主体登录后的 settings 页回显,公共无鉴权接口 frontConfig.getByDomain
|
||||
* 仍只返回公开字段白名单。
|
||||
*
|
||||
* @return {Promise<Object>} 统一响应结果。
|
||||
*/
|
||||
async getCert() {
|
||||
const targetService = this.getFrontConfigService();
|
||||
if (!targetService || typeof targetService.getCert !== 'function') {
|
||||
return this.fail('获取前端证书配置失败', { code: 500 });
|
||||
}
|
||||
|
||||
try {
|
||||
const result = await targetService.getCert();
|
||||
return this.success('ok', result);
|
||||
} catch (error) {
|
||||
return this.fail(error.message || '获取前端证书配置失败', {
|
||||
code: Number(error.code) || 500,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存当前仓库前端独立部署品牌配置(upsert,一仓一行,仅品牌字段部分更新,需登录)。
|
||||
*
|
||||
* domain 与证书字段不再受理:domain 变更必须走 frontConfig.setDomain(域名验证通过后方可上传证书);
|
||||
* cert_pem/key_pem/cert_path/key_path/cert_expire_at 一律被白名单过滤忽略。
|
||||
*
|
||||
* @param {Object} data 请求参数。
|
||||
* @param {string} [data.title] 站点标题(≤100 字符,空值清空)。
|
||||
* @param {string} [data.logo_url] Logo 地址(≤255 字符,空值清空)。
|
||||
* @param {string} [data.favicon_url] 站点 favicon 图标地址(≤255 字符,空值清空)。
|
||||
* @param {string} [data.login_bg_url] 登录页背景图地址(≤255 字符,空值清空)。
|
||||
* @param {Object|string} [data.theme] 主题配置(合法 JSON 对象或 JSON 字符串,空值清空)。
|
||||
* @return {Promise<Object>} 统一响应结果。
|
||||
*/
|
||||
async saveInfo(data = {}) {
|
||||
const targetService = this.getFrontConfigService();
|
||||
if (!targetService || typeof targetService.saveInfo !== 'function') {
|
||||
return this.fail('保存前端配置失败', { code: 500 });
|
||||
}
|
||||
|
||||
try {
|
||||
const source = data || {};
|
||||
const params = {};
|
||||
|
||||
// domain/cert_path/key_path/cert_pem/key_pem/cert_expire_at 均不受理:
|
||||
// domain 变更走 setDomain,证书与有效期字段由后端权威维护,前端传值直接忽略
|
||||
for (const key of [ 'title', 'logo_url', 'favicon_url', 'login_bg_url', 'theme' ]) {
|
||||
if (Object.prototype.hasOwnProperty.call(source, key)) {
|
||||
params[key] = source[key];
|
||||
}
|
||||
}
|
||||
|
||||
const result = await targetService.saveInfo(params);
|
||||
return this.success('ok', result);
|
||||
} catch (error) {
|
||||
return this.fail(error.message || '保存前端配置失败', {
|
||||
code: Number(error.code) || 500,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传当前仓库前端独立部署证书(需登录、仅仓库主体)。
|
||||
*
|
||||
* domain 不再受理:域名一律取库内已设置且验证通过的值(前端若仍传 data.domain 一律忽略),
|
||||
* 未设置域名或域名未通过 TXT 验证时由业务层返回 400。
|
||||
* 后端自动写入 cert_expire_at(证书 validTo 权威值),证书/私钥内容直接入库(不落盘),
|
||||
* 保存后清理该域名的公共拉取缓存并返回证书配置输出
|
||||
* (响应含证书/私钥原文回显,13 字段,口径与 frontConfig.getCert 一致)。
|
||||
*
|
||||
* @param {Object} data 请求参数。
|
||||
* @param {string} data.pem 证书 PEM 文本(必填)。
|
||||
* @param {string} data.key 私钥 PEM 文本(必填,与证书成对)。
|
||||
* @return {Promise<Object>} 统一响应结果。
|
||||
*/
|
||||
async saveCert(data = {}) {
|
||||
const targetService = this.getFrontConfigService();
|
||||
if (!targetService || typeof targetService.saveCert !== 'function') {
|
||||
return this.fail('上传前端证书失败', { code: 500 });
|
||||
}
|
||||
|
||||
try {
|
||||
const source = data || {};
|
||||
const { pem, key } = source;
|
||||
|
||||
// data.domain 不再受理:域名只认库内已设置并验证通过的值,前端若仍传 domain 一律忽略
|
||||
const result = await targetService.saveCert({
|
||||
pem,
|
||||
key,
|
||||
});
|
||||
return this.success('ok', result);
|
||||
} catch (error) {
|
||||
return this.fail(error.message || '上传前端证书失败', {
|
||||
code: Number(error.code) || 500,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置当前仓库前端独立部署域名(需登录、仅仓库主体)。
|
||||
*
|
||||
* 设置成功会下发一次性 DNS TXT 校验记录(verify_host/verify_value)与 CNAME 目标(cname);
|
||||
* 域名发生变更时会同时清空既有证书并重置同步状态(旧证书不覆盖新域名)。
|
||||
*
|
||||
* @param {Object} data 请求参数。
|
||||
* @param {string} data.domain 仓库自持域名(必填,非空,≤100 字符,全局唯一)。
|
||||
* @return {Promise<Object>} 统一响应结果(code=1);data 含
|
||||
* warehouse_id/domain/domain_status/verify_host/verify_value/cname/verified_at/attempts/last_error。
|
||||
*/
|
||||
async setDomain(data = {}) {
|
||||
const targetService = this.getFrontConfigService();
|
||||
if (!targetService || typeof targetService.setDomain !== 'function') {
|
||||
return this.fail('设置域名失败', { code: 500 });
|
||||
}
|
||||
|
||||
try {
|
||||
const result = await targetService.setDomain(data || {});
|
||||
return this.success('ok', result);
|
||||
} catch (error) {
|
||||
return this.fail(error.message || '设置域名失败', {
|
||||
code: Number(error.code) || 500,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询当前仓库前端独立部署域名与验证状态(需登录、仅仓库主体)。
|
||||
*
|
||||
* 返回待校验的 verify_host/verify_value 与 cname;domain_status=1(已验证)时
|
||||
* verify_host/verify_value 返回空串(校验令牌已无用途);无记录时返回空值默认。
|
||||
*
|
||||
* @return {Promise<Object>} 统一响应结果(code=1);data 含
|
||||
* warehouse_id/domain/domain_status/verify_host/verify_value/cname/verified_at/attempts/last_error。
|
||||
*/
|
||||
async getDomain() {
|
||||
const targetService = this.getFrontConfigService();
|
||||
if (!targetService || typeof targetService.getDomain !== 'function') {
|
||||
return this.fail('获取域名配置失败', { code: 500 });
|
||||
}
|
||||
|
||||
try {
|
||||
const result = await targetService.getDomain();
|
||||
return this.success('ok', result);
|
||||
} catch (error) {
|
||||
return this.fail(error.message || '获取域名配置失败', {
|
||||
code: Number(error.code) || 500,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 主动校验当前仓库前端独立部署域名的 DNS TXT 记录(需登录、仅仓库主体)。
|
||||
*
|
||||
* 校验结果会回写 domain_status/domain_verified_at/attempts/last_error;
|
||||
* 响应额外含 verified(本次是否通过)与 resolved_values(本次解析到的 TXT 值,最多 5 条)。
|
||||
*
|
||||
* @return {Promise<Object>} 统一响应结果(code=1);未设置域名时 code=400。
|
||||
*/
|
||||
async checkDomain() {
|
||||
const targetService = this.getFrontConfigService();
|
||||
if (!targetService || typeof targetService.checkDomain !== 'function') {
|
||||
return this.fail('校验域名失败', { code: 500 });
|
||||
}
|
||||
|
||||
try {
|
||||
const result = await targetService.checkDomain();
|
||||
return this.success('ok', result);
|
||||
} catch (error) {
|
||||
return this.fail(error.message || '校验域名失败', {
|
||||
code: Number(error.code) || 500,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = FrontConfigMethodsService;
|
||||
|
||||
@ -6,9 +6,9 @@ class SettingWarehouseMethodsService extends MainService {
|
||||
constructor(ctx) {
|
||||
super(ctx);
|
||||
const _noNeedLogin = '';
|
||||
const _noNeedRight = 'getSettings,getFieldMeta,saveSettings,getweChatApp';
|
||||
const _noNeedRight = 'getSettings,getFieldMeta,saveSettings,getFrontConfig,saveFrontConfig,saveFrontCert,getweChatApp';
|
||||
const _noNeedLog = '*';
|
||||
const _noNeedAuth = 'getSettings,getFieldMeta,saveSettings,getweChatApp';
|
||||
const _noNeedAuth = 'getSettings,getFieldMeta,saveSettings,getFrontConfig,saveFrontConfig,saveFrontCert,getweChatApp';
|
||||
this.systemInit(_noNeedLogin, _noNeedRight, _noNeedLog, _noNeedAuth);
|
||||
}
|
||||
|
||||
@ -80,6 +80,109 @@ class SettingWarehouseMethodsService extends MainService {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询当前仓库前端独立部署配置(settings 页回显)。
|
||||
*
|
||||
* 响应含证书原文(cert_pem)与私钥原文(key_pem)回显,
|
||||
* 仅限登录用户查询其仓库上下文绑定的配置,供仓库主体 settings 页回显;
|
||||
* 公共无鉴权接口 frontConfig.getByDomain 不经过本出口,仍只返回公开字段白名单。
|
||||
*
|
||||
* @return {Promise<Object>} 统一响应结果。
|
||||
*/
|
||||
async getFrontConfig() {
|
||||
const targetService = this.service && this.service.systems && this.service.systems.setting && this.service.systems.setting.warehouse;
|
||||
|
||||
if (!targetService || typeof targetService.getFrontConfig !== 'function') {
|
||||
return this.fail('获取仓库前端配置失败', { code: 500 });
|
||||
}
|
||||
|
||||
try {
|
||||
const result = await targetService.getFrontConfig();
|
||||
return this.success('ok', result);
|
||||
} catch (error) {
|
||||
return this.fail(error.message || '获取仓库前端配置失败', {
|
||||
code: Number(error.code) || 500,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存当前仓库前端独立部署品牌配置(upsert,一仓一行,仅品牌字段部分更新)。
|
||||
*
|
||||
* domain 与证书字段不再受理:domain 变更必须走 saveFrontCert 重新校验证书;
|
||||
* cert_pem/key_pem/cert_path/key_path/cert_expire_at 一律被白名单过滤忽略。
|
||||
*
|
||||
* @param {Object} data 请求参数。
|
||||
* @param {string} [data.title] 站点标题(≤100 字符,空值清空)。
|
||||
* @param {string} [data.logo_url] Logo 地址(≤255 字符,空值清空)。
|
||||
* @param {string} [data.favicon_url] 站点 favicon 图标地址(≤255 字符,空值清空)。
|
||||
* @param {string} [data.login_bg_url] 登录页背景图地址(≤255 字符,空值清空)。
|
||||
* @param {Object|string} [data.theme] 主题配置(合法 JSON 对象或 JSON 字符串,空值清空)。
|
||||
* @return {Promise<Object>} 统一响应结果。
|
||||
*/
|
||||
async saveFrontConfig(data = {}) {
|
||||
const targetService = this.service && this.service.systems && this.service.systems.setting && this.service.systems.setting.warehouse;
|
||||
|
||||
if (!targetService || typeof targetService.saveFrontConfig !== 'function') {
|
||||
return this.fail('保存仓库前端配置失败', { code: 500 });
|
||||
}
|
||||
|
||||
try {
|
||||
const source = data || {};
|
||||
const params = {};
|
||||
|
||||
// domain/cert_path/key_path/cert_pem/key_pem/cert_expire_at 均不受理:
|
||||
// domain 变更走 saveFrontCert,证书与有效期字段由后端权威维护,前端传值直接忽略
|
||||
for (const key of [ 'title', 'logo_url', 'favicon_url', 'login_bg_url', 'theme' ]) {
|
||||
if (Object.prototype.hasOwnProperty.call(source, key)) {
|
||||
params[key] = source[key];
|
||||
}
|
||||
}
|
||||
|
||||
const result = await targetService.saveFrontConfig(params);
|
||||
return this.success('ok', result);
|
||||
} catch (error) {
|
||||
return this.fail(error.message || '保存仓库前端配置失败', {
|
||||
code: Number(error.code) || 500,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传当前仓库前端独立部署证书(domain + 证书/私钥成对,需登录、仅仓库主体)。
|
||||
*
|
||||
* 后端自动写入 cert_expire_at(证书 validTo 权威值),证书/私钥内容直接入库(不落盘),
|
||||
* 保存后清理新旧 domain 的公共拉取缓存并返回完整配置输出
|
||||
* (响应含证书/私钥原文回显,口径与 getFrontConfig 一致)。
|
||||
*
|
||||
* @param {Object} data 请求参数。
|
||||
* @param {string} data.domain 仓库自持域名(必填,非空,≤100 字符,全局唯一)。
|
||||
* @param {string} data.pem 证书 PEM 文本(必填)。
|
||||
* @param {string} data.key 私钥 PEM 文本(必填,与证书成对)。
|
||||
* @return {Promise<Object>} 统一响应结果。
|
||||
*/
|
||||
async saveFrontCert(data = {}) {
|
||||
const targetService = this.service && this.service.systems && this.service.systems.setting && this.service.systems.setting.warehouse;
|
||||
|
||||
if (!targetService || typeof targetService.saveFrontCert !== 'function') {
|
||||
return this.fail('上传前端证书失败', { code: 500 });
|
||||
}
|
||||
|
||||
try {
|
||||
const source = data || {};
|
||||
const { domain, pem, key } = source;
|
||||
const result = await targetService.saveFrontCert({
|
||||
domain,
|
||||
pem,
|
||||
key,
|
||||
});
|
||||
return this.success('ok', result);
|
||||
} catch (error) {
|
||||
return this.fail(error.message || '上传前端证书失败', {
|
||||
code: Number(error.code) || 500,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取当前仓库启用的微信小程序授权配置(wms_wechat_app)。
|
||||
|
||||
@ -8,10 +8,10 @@ const MainService = require('../main');
|
||||
class WechatService extends MainService {
|
||||
constructor(ctx) {
|
||||
super(ctx);
|
||||
// getAuthUrl:需登录、免权限、不记系统日志;loginByCode/getUserAgreementText:免登录、免权限、免鉴权;
|
||||
// pushLoginCode/queryauth/wxaauth/registerMiniprogram/getTemplateList/commit/getTrialQRCode/submitAudit/userList/getUserAgreement/setUserAgreement/getAgreementVersion:需登录、免权限(PC 已登录用户操作);
|
||||
// getAuthUrl:需登录、免权限、不记系统日志;loginByCode:免登录、免权限、免鉴权;
|
||||
// pushLoginCode/queryauth/registerMiniprogram/getTemplateList/commit/getTrialQRCode/submitAudit/userList:需登录、免权限(PC 已登录用户操作);
|
||||
// bindUser/updateInfo/uploadHeadimg/getMyLoginCode:微信登录态中间层(_noNeedBind),未绑定真实用户也可访问
|
||||
this.systemInit('loginByCode,getUserAgreementText', 'getAuthUrl,pushLoginCode,queryauth,wxaauth,registerMiniprogram,getTemplateList,commit,getTrialQRCode,submitAudit,userList,getAuthorizerInfo,getUserAgreement,setUserAgreement,getAgreementVersion', '*', 'getAuthUrl,pushLoginCode,queryauth,wxaauth,registerMiniprogram,getTemplateList,commit,getTrialQRCode,submitAudit,userList,getAuthorizerInfo,getUserAgreement,setUserAgreement,getAgreementVersion', 'bindUser,updateInfo,uploadHeadimg,getMyLoginCode');
|
||||
this.systemInit('loginByCode', 'getAuthUrl,pushLoginCode,queryauth,wxaauth,registerMiniprogram,getTemplateList,commit,getTrialQRCode,submitAudit,userList,getAuthorizerInfo', '*', 'getAuthUrl,pushLoginCode,queryauth,wxaauth,registerMiniprogram,getTemplateList,commit,getTrialQRCode,submitAudit,userList,getAuthorizerInfo', 'bindUser,updateInfo,uploadHeadimg,getMyLoginCode');
|
||||
}
|
||||
|
||||
/**
|
||||
@ -76,97 +76,6 @@ class WechatService extends MainService {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 按工号绑定微信(需登录需权限,PC 管理员操作):传工号 id 与微信绑定记录 id,
|
||||
* 查工号的账号 id 写入 wms_user_oauth.user_id。
|
||||
*
|
||||
* @param {Object} data 请求参数(id 工号id、oauth_id 微信绑定记录id)。
|
||||
* @return {Promise<Object>} 统一响应结果。
|
||||
*/
|
||||
async bindByEmployee(data) {
|
||||
try {
|
||||
const result = await this.service.systems.wechat.bindByEmployee(data || {});
|
||||
if (result.code) {
|
||||
return this.success(result.message || '绑定成功', result);
|
||||
}
|
||||
return this.fail(result.message, result);
|
||||
} catch (e) {
|
||||
return this.fail('绑定失败:' + e.message);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取小程序用户须知富文本(免登录):传入 appId,24h 缓存。
|
||||
*
|
||||
* @param {Object} data 请求参数(appId)。
|
||||
* @return {Promise<Object>} 统一响应结果。
|
||||
*/
|
||||
async getUserAgreementText(data) {
|
||||
try {
|
||||
const result = await this.service.systems.wechat.getUserAgreementText(data || {});
|
||||
if (result.code) {
|
||||
return this.success(result.message || '获取成功', result);
|
||||
}
|
||||
return this.fail(result.message, result);
|
||||
} catch (e) {
|
||||
return this.fail('获取用户须知失败:' + e.message);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取当前仓库小程序用户须知(需登录)。
|
||||
*
|
||||
* @param {Object} data 请求参数(无)。
|
||||
* @return {Promise<Object>} 统一响应结果。
|
||||
*/
|
||||
async getUserAgreement(data) {
|
||||
try {
|
||||
const result = await this.service.systems.wechat.getUserAgreement(data || {});
|
||||
if (result.code) {
|
||||
return this.success(result.message || '获取成功', result);
|
||||
}
|
||||
return this.fail(result.message, result);
|
||||
} catch (e) {
|
||||
return this.fail('获取用户须知失败:' + e.message);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置当前仓库小程序用户须知(需登录)。
|
||||
*
|
||||
* @param {Object} data 请求参数(text 富文本)。
|
||||
* @return {Promise<Object>} 统一响应结果。
|
||||
*/
|
||||
async setUserAgreement(data) {
|
||||
try {
|
||||
const result = await this.service.systems.wechat.setUserAgreement(data || {});
|
||||
if (result.code) {
|
||||
return this.success(result.message || '设置成功', result);
|
||||
}
|
||||
return this.fail(result.message, result);
|
||||
} catch (e) {
|
||||
return this.fail('设置用户须知失败:' + e.message);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取指定协议版本内容(需登录免权限):传版本记录 id,校验仓库后返回协议内容。
|
||||
*
|
||||
* @param {Object} data 请求参数(id 协议版本记录id)。
|
||||
* @return {Promise<Object>} 统一响应结果。
|
||||
*/
|
||||
async getAgreementVersion(data) {
|
||||
try {
|
||||
const result = await this.service.systems.wechat.getAgreementVersion(data || {});
|
||||
if (result.code) {
|
||||
return this.success(result.message || '获取成功', result);
|
||||
}
|
||||
return this.fail(result.message, result);
|
||||
} catch (e) {
|
||||
return this.fail('获取协议版本失败:' + e.message);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 确认登录码(需登录,PC 已登录用户确认小程序登录)。
|
||||
*
|
||||
@ -204,10 +113,9 @@ class WechatService extends MainService {
|
||||
}
|
||||
|
||||
/**
|
||||
* 发起小程序认证(需登录):后端分步——图片字段传 COS 文件 URL,后端下载 →
|
||||
* wxa/sec/uploadauthmaterial 换 mediaid → { auth_data } 包裹提交 wxa/sec/wxaauth。
|
||||
* 发起小程序认证(需登录):前端上传材料换取 media_id 后一步提交。
|
||||
*
|
||||
* @param {Object} data 请求参数(新版 auth_data 字段白名单透传,详见 methods/system.json)。
|
||||
* @param {Object} data 请求参数(contact_type/contact_name 必填,其余白名单字段透传)。
|
||||
* @return {Promise<Object>} 统一响应结果。
|
||||
*/
|
||||
async wxaauth(data) {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -893,9 +893,7 @@ class InboundDirectLogService extends Service {
|
||||
const detailById = new Map(details.map(d => [ d.id, d ]));
|
||||
for (const b of pendingBindings) {
|
||||
const d = detailById.get(b.receiving_detail_id);
|
||||
if (!d) continue;
|
||||
// 多条绑定取最后一条明细信息,用于批次/生产日期/到期日期等展示字段
|
||||
bindingDetailMap.set(b.entry_item_id, d);
|
||||
if (d) bindingDetailMap.set(b.entry_item_id, d);
|
||||
}
|
||||
}
|
||||
|
||||
@ -925,14 +923,21 @@ class InboundDirectLogService extends Service {
|
||||
: (stockSummary[String(stockId)] || 0);
|
||||
if (inboundQty <= 0) continue;
|
||||
|
||||
// 判断是否为绑定模式:比较收货明细数量合计与入库记录数量
|
||||
// 判断是否为绑定模式:比较收货明细数量与入库记录数量
|
||||
const bindInfo = bindingDetailMap.get(item.id);
|
||||
let itemReceivedQty = inboundQty;
|
||||
if (bindInfo) {
|
||||
// 绑定模式下 received_quantity 与库存流水保持一致:
|
||||
// 统一按实际入库记录量(inboundQty,绑定模式下即 itemDirectQty)写入,
|
||||
// 不再因收货明细 actual_quantity 较小而缩减
|
||||
itemReceivedQty = inboundQty;
|
||||
// 收货明细的实际数量
|
||||
const rdQty = Number(bindInfo.actual_quantity) || 0;
|
||||
// 该 entry_item 对应的入库记录汇总数量
|
||||
const logSumQty = itemDirectLogQtyMap[String(item.id)] || 0;
|
||||
if (rdQty > logSumQty) {
|
||||
// 收货明细数量 > 入库记录数量 → 部分入库,仅入库实际记录的数量
|
||||
itemReceivedQty = logSumQty;
|
||||
} else {
|
||||
// 收货明细数量 <= 入库记录数量 → 全部入库
|
||||
itemReceivedQty = rdQty;
|
||||
}
|
||||
}
|
||||
|
||||
// 非绑定模式:同一 stock_id 只对第一个 entryItem 写入 received_quantity,后续写 0
|
||||
|
||||
@ -239,24 +239,9 @@ function formatDateTime(ctx, value) {
|
||||
* 通知时间(notice_time)与超时区间(min_hours / max_hours)均可在仓库设置中配置。
|
||||
*/
|
||||
class ReceivingPendingNoticeService extends MainService {
|
||||
/**
|
||||
* 获取进程内当日锁集合(挂在 app 上,跨 ctx/service 实例共享)。
|
||||
*
|
||||
* 定时任务每轮都会创建新的 service 实例,实例级 Set 无法阻挡后续轮次再次执行,
|
||||
* 因此进程内降级锁必须使用 app 级共享集合(仅用于 Redis 命令失败/不可用时的降级场景)。
|
||||
*
|
||||
* @return {Set<string>} 进程内当日锁 key 集合
|
||||
*/
|
||||
getMemoryDailyLocks() {
|
||||
const { app } = this;
|
||||
if (!app) {
|
||||
return new Set();
|
||||
}
|
||||
|
||||
if (!(app._receivingPendingDailyLocks instanceof Set)) {
|
||||
app._receivingPendingDailyLocks = new Set();
|
||||
}
|
||||
return app._receivingPendingDailyLocks;
|
||||
constructor(ctx) {
|
||||
super(ctx);
|
||||
this.memoryDailyLocks = new Set();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -524,9 +509,6 @@ class ReceivingPendingNoticeService extends MainService {
|
||||
/**
|
||||
* 发送单个货主批次(或未绑定货主批次)的未入库提醒。
|
||||
*
|
||||
* 货主批次主推其收货群;主推失败(含异常)时自动回退到仓库客服群
|
||||
* (见 sendCustomerServiceFallback),保证个别群发送失败不影响其他货主群的通知。
|
||||
*
|
||||
* @param {Object} options 发送参数
|
||||
* @param {number} options.warehouseId 仓库 ID
|
||||
* @param {string} options.warehouseName 仓库名称
|
||||
@ -535,12 +517,11 @@ class ReceivingPendingNoticeService extends MainService {
|
||||
* @param {Array<Object>} options.rows 该货主的收货单列表
|
||||
* @param {Object} options.config 规范化后的提醒配置
|
||||
* @param {Date} options.now 当前时刻
|
||||
* @return {Promise<Object|null>} 通知结果(主推结果 + 可选 fallback 回退结果)
|
||||
* @return {Promise<Object|null>} 通知结果
|
||||
*/
|
||||
async sendPendingNotice({ warehouseId, warehouseName, storeId, storeName, rows, config, now }) {
|
||||
const { ctx, app } = this;
|
||||
const sendMethod = this.resolveNoticeSendMethod();
|
||||
const hasStore = Number(storeId) > 0;
|
||||
if (typeof sendMethod !== 'function') {
|
||||
ctx.logger.warn('[receiving-pending-notice] 通知服务不可用,跳过发送');
|
||||
return null;
|
||||
@ -548,6 +529,7 @@ class ReceivingPendingNoticeService extends MainService {
|
||||
|
||||
const warehouseFrontendUrl = String(app.config.frontendUrl || '').trim();
|
||||
const storeFrontendUrl = String(app.config.storeFrontendUrl || app.config.frontendUrl || '').trim();
|
||||
const hasStore = Number(storeId) > 0;
|
||||
const content = this.buildContent({
|
||||
rows,
|
||||
config,
|
||||
@ -575,150 +557,44 @@ class ReceivingPendingNoticeService extends MainService {
|
||||
})
|
||||
: undefined;
|
||||
|
||||
// 主推发送:单批次异常只影响本批次(记录失败并尝试回退),不向上抛出中断其他货主群
|
||||
let sendResult = null;
|
||||
try {
|
||||
sendResult = await sendMethod({
|
||||
warehouseId,
|
||||
// 未绑定货主时不带 storeId,由 notice 固定订阅回退到仓库客服群
|
||||
storeId: hasStore ? Number(storeId) : undefined,
|
||||
messageType: 'text',
|
||||
businessName: 'receiving',
|
||||
event: NOTICE_EVENT,
|
||||
channel: 'warehouse',
|
||||
title: `收货未入库提醒(${rows.length} 单)`,
|
||||
content,
|
||||
...(storeContent ? { storeContent } : {}),
|
||||
// 幂等键:同仓库+同货主+同一天只落一条消息记录
|
||||
businessId: `receiving-pending:${warehouseId}:${hasStore ? Number(storeId) : 0}:${buildDateKey(now)}`,
|
||||
subject: {
|
||||
id: warehouseId,
|
||||
type: 'warehouse',
|
||||
name: warehouseName,
|
||||
},
|
||||
sender: {
|
||||
id: null,
|
||||
name: '系统提醒',
|
||||
},
|
||||
metadata: {
|
||||
warehouseId,
|
||||
warehouseName,
|
||||
storeId: hasStore ? Number(storeId) : null,
|
||||
storeName: String(storeName || '').trim(),
|
||||
minHours: config.minHours,
|
||||
maxHours: config.maxHours,
|
||||
receivingIds: rows.map(row => Number(row.id)).filter(id => id > 0),
|
||||
receivingNumbers: rows.map(row => String(row.receiving_number || '')).filter(Boolean),
|
||||
},
|
||||
});
|
||||
} catch (error) {
|
||||
ctx.logger.error(`[receiving-pending-notice] 仓库 ${warehouseId} 货主 ${storeId} 批次发送异常: ${error.message}`);
|
||||
sendResult = { success: false, message: `发送异常: ${error.message}` };
|
||||
}
|
||||
|
||||
// 货主收货群主推失败(含异常)时回退仓库客服群,保证部分群失败不遗漏人工跟进
|
||||
let fallbackResult = null;
|
||||
if (hasStore && (!sendResult || sendResult.success !== true)) {
|
||||
fallbackResult = await this.sendCustomerServiceFallback({
|
||||
return await sendMethod({
|
||||
warehouseId,
|
||||
// 未绑定货主时不带 storeId,由 notice 固定订阅回退到仓库客服群
|
||||
storeId: hasStore ? Number(storeId) : undefined,
|
||||
messageType: 'text',
|
||||
businessName: 'receiving',
|
||||
event: NOTICE_EVENT,
|
||||
channel: 'warehouse',
|
||||
title: `收货未入库提醒(${rows.length} 单)`,
|
||||
content,
|
||||
...(storeContent ? { storeContent } : {}),
|
||||
// 幂等键:同仓库+同货主+同一天只落一条消息记录
|
||||
businessId: `receiving-pending:${warehouseId}:${hasStore ? Number(storeId) : 0}:${buildDateKey(now)}`,
|
||||
subject: {
|
||||
id: warehouseId,
|
||||
type: 'warehouse',
|
||||
name: warehouseName,
|
||||
},
|
||||
sender: {
|
||||
id: null,
|
||||
name: '系统提醒',
|
||||
},
|
||||
metadata: {
|
||||
warehouseId,
|
||||
warehouseName,
|
||||
storeId,
|
||||
storeName,
|
||||
rows,
|
||||
config,
|
||||
now,
|
||||
});
|
||||
}
|
||||
|
||||
return {
|
||||
...(sendResult || { success: false, message: '通知发送无结果' }),
|
||||
...(fallbackResult ? { fallback: fallbackResult } : {}),
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 货主收货群主推失败时,回退通知仓库客服群人工跟进。
|
||||
*
|
||||
* 复用 notice 固定订阅回退链:不带 storeId 时 receiving_pending_inbound 的
|
||||
* store:receiving 目标被跳过,fallbackTargets 命中 warehouse:customer_service。
|
||||
* 幂等键使用独立前缀(receiving-pending-fallback),与主推送、其他货主的回退互不干扰。
|
||||
*
|
||||
* @param {Object} options 回退参数
|
||||
* @param {number} options.warehouseId 仓库 ID
|
||||
* @param {string} options.warehouseName 仓库名称
|
||||
* @param {number} options.storeId 货主 ID
|
||||
* @param {string} options.storeName 货主名称
|
||||
* @param {Array<Object>} options.rows 该货主的收货单列表
|
||||
* @param {Object} options.config 规范化后的提醒配置
|
||||
* @param {Date} options.now 当前时刻
|
||||
* @return {Promise<Object|null>} 回退通知结果(通知服务不可用时返回 null)
|
||||
*/
|
||||
async sendCustomerServiceFallback({ warehouseId, warehouseName, storeId, storeName, rows, config, now }) {
|
||||
const { ctx, app } = this;
|
||||
const sendMethod = this.resolveNoticeSendMethod();
|
||||
if (typeof sendMethod !== 'function') {
|
||||
return null;
|
||||
}
|
||||
|
||||
const storeLabel = String(storeName || '').trim() || `货主${storeId}`;
|
||||
const warehouseFrontendUrl = String(app.config.frontendUrl || '').trim();
|
||||
const content = this.buildContent({
|
||||
rows,
|
||||
config,
|
||||
warehouseName,
|
||||
warehouseId,
|
||||
storeId,
|
||||
storeName,
|
||||
forStore: false,
|
||||
viewUrl: `${warehouseFrontendUrl}/storage/receiving`,
|
||||
now,
|
||||
ctx,
|
||||
storeId: hasStore ? Number(storeId) : null,
|
||||
storeName: String(storeName || '').trim(),
|
||||
minHours: config.minHours,
|
||||
maxHours: config.maxHours,
|
||||
receivingIds: rows.map(row => Number(row.id)).filter(id => id > 0),
|
||||
receivingNumbers: rows.map(row => String(row.receiving_number || '')).filter(Boolean),
|
||||
},
|
||||
});
|
||||
|
||||
try {
|
||||
return await sendMethod({
|
||||
warehouseId,
|
||||
// 不带 storeId:固定订阅 store:receiving 被跳过,回退链命中仓库客服群
|
||||
storeId: undefined,
|
||||
messageType: 'text',
|
||||
businessName: 'receiving',
|
||||
event: NOTICE_EVENT,
|
||||
channel: 'warehouse',
|
||||
title: `收货未入库提醒·货主群发送失败(${storeLabel})`,
|
||||
content: `通知货主【${storeLabel}】收货群推送失败,请人工跟进:\n${content}`,
|
||||
// 回退幂等键独立于主推送:同一货主同日只回退一条,且互不影响
|
||||
businessId: `receiving-pending-fallback:${warehouseId}:${Number(storeId)}:${buildDateKey(now)}`,
|
||||
subject: {
|
||||
id: warehouseId,
|
||||
type: 'warehouse',
|
||||
name: warehouseName,
|
||||
},
|
||||
sender: {
|
||||
id: null,
|
||||
name: '系统提醒',
|
||||
},
|
||||
metadata: {
|
||||
warehouseId,
|
||||
warehouseName,
|
||||
storeId: Number(storeId),
|
||||
storeName: storeLabel,
|
||||
fallbackReason: '货主收货群推送失败回退',
|
||||
receivingIds: rows.map(row => Number(row.id)).filter(id => id > 0),
|
||||
receivingNumbers: rows.map(row => String(row.receiving_number || '')).filter(Boolean),
|
||||
},
|
||||
});
|
||||
} catch (error) {
|
||||
ctx.logger.error(`[receiving-pending-notice] 仓库 ${warehouseId} 货主 ${storeId} 回退客服群发送异常: ${error.message}`);
|
||||
return { success: false, message: `回退发送异常: ${error.message}` };
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 扫描并通知单个仓库的超时未入库收货单。
|
||||
*
|
||||
* 各货主群独立发送:单个批次异常/失败只影响该批次(失败自动回退客服群),
|
||||
* 不中断后续货主群的遍历与通知。
|
||||
*
|
||||
* @param {Object} options 执行参数
|
||||
* @param {number} options.warehouseId 仓库 ID
|
||||
* @param {string} options.warehouseName 仓库名称
|
||||
@ -736,7 +612,6 @@ class ReceivingPendingNoticeService extends MainService {
|
||||
groupCount: 0,
|
||||
sentCount: 0,
|
||||
failedCount: 0,
|
||||
fallbackCount: 0,
|
||||
};
|
||||
|
||||
if (rows.length === 0) {
|
||||
@ -746,41 +621,22 @@ class ReceivingPendingNoticeService extends MainService {
|
||||
|
||||
const groups = this.groupByStore(rows);
|
||||
for (const group of groups) {
|
||||
const result = await this.sendPendingNotice({
|
||||
warehouseId,
|
||||
warehouseName,
|
||||
storeId: group.storeId,
|
||||
storeName: group.storeName,
|
||||
rows: group.rows,
|
||||
config,
|
||||
now,
|
||||
});
|
||||
|
||||
summary.groupCount += 1;
|
||||
|
||||
let result = null;
|
||||
try {
|
||||
result = await this.sendPendingNotice({
|
||||
warehouseId,
|
||||
warehouseName,
|
||||
storeId: group.storeId,
|
||||
storeName: group.storeName,
|
||||
rows: group.rows,
|
||||
config,
|
||||
now,
|
||||
});
|
||||
} catch (error) {
|
||||
// 单个货主批次异常不允许中断整仓遍历:该批次计入失败,继续通知其他货主群
|
||||
ctx.logger.error(
|
||||
`[receiving-pending-notice] 仓库 ${warehouseId} 货主 ${group.storeId} 批次异常,`
|
||||
+ `跳过并继续后续货主: ${error.message}`
|
||||
);
|
||||
summary.failedCount += 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (result && result.success) {
|
||||
summary.sentCount += 1;
|
||||
} else {
|
||||
summary.failedCount += 1;
|
||||
}
|
||||
|
||||
if (result && result.fallback && result.fallback.success) {
|
||||
summary.fallbackCount += 1;
|
||||
ctx.logger.warn(
|
||||
`[receiving-pending-notice] 仓库 ${warehouseId} 货主 ${group.storeId} 收货群发送失败,已回退仓库客服群人工跟进`
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
ctx.logger.info(
|
||||
@ -806,11 +662,7 @@ class ReceivingPendingNoticeService extends MainService {
|
||||
}
|
||||
|
||||
/**
|
||||
* 申请当日执行锁(Redis SET NX;Redis 命令失败/不可用时降级为 app 级进程内集合)。
|
||||
*
|
||||
* SET NX 语义:返回 'OK' 表示抢锁成功;返回 null 表示键已存在(当日锁已被本进程或
|
||||
* 其他实例持有),必须直接判定为「未抢到锁」,不能落入进程内兜底——兜底仅用于 Redis
|
||||
* 不可用的场景,否则每轮调度都会重新获得锁,导致宽限窗口内重复发送。
|
||||
* 申请当日执行锁(Redis NX;Redis 不可用时降级为进程内集合)。
|
||||
*
|
||||
* @param {string} lockKey 锁 key
|
||||
* @return {Promise<boolean>} 是否申请成功
|
||||
@ -825,19 +677,19 @@ class ReceivingPendingNoticeService extends MainService {
|
||||
if (result === 'OK') {
|
||||
return true;
|
||||
}
|
||||
// null(键已存在)及其他异常返回值一律视为未抢到锁,禁止落入进程内兜底
|
||||
return false;
|
||||
if (result !== null && result !== undefined) {
|
||||
return false;
|
||||
}
|
||||
} catch (error) {
|
||||
ctx.logger.warn(`[receiving-pending-notice] 当日锁申请失败,降级进程内锁: ${error.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
const memoryLocks = this.getMemoryDailyLocks();
|
||||
if (memoryLocks.has(lockKey)) {
|
||||
if (this.memoryDailyLocks.has(lockKey)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
memoryLocks.add(lockKey);
|
||||
this.memoryDailyLocks.add(lockKey);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -849,7 +701,7 @@ class ReceivingPendingNoticeService extends MainService {
|
||||
*/
|
||||
async releaseDailyLock(lockKey) {
|
||||
const { ctx } = this;
|
||||
this.getMemoryDailyLocks().delete(lockKey);
|
||||
this.memoryDailyLocks.delete(lockKey);
|
||||
|
||||
const redisClient = this.getRedisClient();
|
||||
if (redisClient && typeof redisClient.del === 'function') {
|
||||
@ -887,7 +739,6 @@ class ReceivingPendingNoticeService extends MainService {
|
||||
pendingCount: 0,
|
||||
sentCount: 0,
|
||||
failedCount: 0,
|
||||
fallbackCount: 0,
|
||||
results: [],
|
||||
};
|
||||
|
||||
@ -913,7 +764,6 @@ class ReceivingPendingNoticeService extends MainService {
|
||||
summary.pendingCount += result.pendingCount;
|
||||
summary.sentCount += result.sentCount;
|
||||
summary.failedCount += result.failedCount;
|
||||
summary.fallbackCount += result.fallbackCount || 0;
|
||||
summary.results.push(result);
|
||||
} catch (error) {
|
||||
// 执行失败释放锁,宽限窗口内的下一轮仍可重试
|
||||
|
||||
@ -37,7 +37,7 @@ class ReturnReceivedService extends Service {
|
||||
* @param {Object} params 登记参数。
|
||||
* @param {string} params.waybill_code 退回收件运单号。
|
||||
* @param {string} [params.remark] 备注。
|
||||
* @return {Promise<Object>} 登记结果,含 record、is_original_return、store_remark、is_urgent、duplicated。
|
||||
* @return {Promise<Object>} 登记结果,含 record、is_original_return、store_remark、duplicated。
|
||||
*/
|
||||
async create({ waybill_code, remark }) {
|
||||
const { ctx, app } = this;
|
||||
@ -69,9 +69,6 @@ class ReturnReceivedService extends Service {
|
||||
const scanDate = app.formatDate(now, 'YYYY-MM-DD');
|
||||
const windowStart = app.formatDate(thirtyDaysAgo, 'YYYY-MM-DD');
|
||||
|
||||
// 加急标记:独立查询退回查询记录(wms_return_query_log),与货主归属匹配查询互不影响
|
||||
const isUrgent = await this._isUrgentReturnQuery(waybillCode, warehouseId);
|
||||
|
||||
const existing = await ctx.model.ReturnReceived.findOne({
|
||||
where: {
|
||||
warehouse_id: warehouseId,
|
||||
@ -88,7 +85,6 @@ class ReturnReceivedService extends Service {
|
||||
record: enriched,
|
||||
is_original_return: Boolean(enriched.order_express_id),
|
||||
store_remark: enriched.store_remark || '',
|
||||
is_urgent: isUrgent,
|
||||
duplicated: true,
|
||||
};
|
||||
}
|
||||
@ -184,38 +180,10 @@ class ReturnReceivedService extends Service {
|
||||
record: enriched,
|
||||
is_original_return: Boolean(enriched.order_express_id),
|
||||
store_remark: enriched.store_remark || '',
|
||||
is_urgent: isUrgent,
|
||||
duplicated: false,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断运单是否存在退回查询记录(加急标记判定口径)。
|
||||
* 判定标准:wms_return_query_log 中存在 warehouse_id = 当前仓库 且 waybill_code = 登记运单号(精确匹配)的记录。
|
||||
* 查询失败时降级返回 false,不影响登记主流程。
|
||||
*
|
||||
* @param {string} waybillCode 登记运单号。
|
||||
* @param {number} warehouseId 当前仓库ID。
|
||||
* @return {Promise<boolean>} 存在退回查询记录返回 true,否则 false。
|
||||
*/
|
||||
async _isUrgentReturnQuery(waybillCode, warehouseId) {
|
||||
const { ctx } = this;
|
||||
try {
|
||||
const queryLog = await ctx.model.ReturnQueryLog.findOne({
|
||||
where: {
|
||||
warehouse_id: Number(warehouseId),
|
||||
waybill_code: waybillCode,
|
||||
},
|
||||
attributes: [ 'id' ],
|
||||
raw: true,
|
||||
});
|
||||
return Boolean(queryLog);
|
||||
} catch (err) {
|
||||
ctx.logger.warn(`[returnReceived.create] 判断退回查询加急标记失败: ${err.message}`);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 聚合通知待通知的登记(定时任务调用)。
|
||||
* 规则:
|
||||
@ -923,7 +891,7 @@ class ReturnReceivedService extends Service {
|
||||
|
||||
const directFields = [
|
||||
'warehouse_id', 'scanner_id', 'store_id', 'order_express_id', 'order_id',
|
||||
'waybill_code', 'scan_date', 'created_at', 'updated_at', 'scanner_name',
|
||||
'waybill_code', 'scan_date', 'scanner_name',
|
||||
];
|
||||
|
||||
for (const field of directFields) {
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
'use strict';
|
||||
|
||||
const crypto = require('node:crypto');
|
||||
|
||||
const { Service } = require('egg');
|
||||
|
||||
const INTERNAL_WAVE_STRATEGY_VERSION_KEY = 'wave_strategy_version';
|
||||
@ -337,15 +339,6 @@ const WAREHOUSE_SETTING_FIELDS = Object.freeze([
|
||||
description: '团购打包最大时长,单位:分钟,默认 40',
|
||||
min: 1,
|
||||
}),
|
||||
Object.freeze({
|
||||
key: 'big_group_pack_coefficient',
|
||||
name: '大团购打包系数',
|
||||
type: 'number',
|
||||
default: 3,
|
||||
required: false,
|
||||
description: '大团购波次(wave_scope=1)打包中,扫描其他波次订单至少需等待「当前波次打包数 × 系数」秒,单位:秒/单,默认 3,必须大于 0',
|
||||
min: 0.1,
|
||||
}),
|
||||
Object.freeze({
|
||||
key: 'return_unpack_max_record_minutes',
|
||||
name: '拆包最大录制时长(分钟)',
|
||||
@ -448,6 +441,33 @@ const WAREHOUSE_SETTING_FIELDS = Object.freeze([
|
||||
}),
|
||||
]);
|
||||
|
||||
// 仓库前端配置品牌文本字段元信息(对应 wms_warehouse_front_config,一仓一行)。
|
||||
// 域名与证书字段不在此列:domain/cert_pem/cert_key/cert_path/key_path 只能通过证书上传接口(saveFrontCert)变更。
|
||||
const FRONT_CONFIG_TEXT_FIELDS = Object.freeze([
|
||||
Object.freeze({ key: 'title', name: 'title', maxLength: 100 }),
|
||||
Object.freeze({ key: 'logo_url', name: 'logo_url', maxLength: 255 }),
|
||||
Object.freeze({ key: 'favicon_url', name: 'favicon_url', maxLength: 255 }),
|
||||
Object.freeze({ key: 'login_bg_url', name: 'login_bg_url', maxLength: 255 }),
|
||||
]);
|
||||
|
||||
// 公共按域名拉取接口对外输出的字段白名单(安全红线:严禁输出证书/私钥内容与证书路径、同步状态等内部字段)
|
||||
const FRONT_CONFIG_PUBLIC_FIELDS = Object.freeze([
|
||||
'domain',
|
||||
'title',
|
||||
'logo_url',
|
||||
'login_bg_url',
|
||||
'favicon_url',
|
||||
'theme',
|
||||
]);
|
||||
|
||||
// 公共按域名拉取接口缓存 TTL(秒)
|
||||
const FRONT_CONFIG_PUBLIC_CACHE_TTL_SECONDS = 600;
|
||||
// 未登记域名空缓存 TTL(秒):短缓存兜底防穿透,域名登记后由保存流程主动失效
|
||||
const FRONT_CONFIG_PUBLIC_MISS_CACHE_TTL_SECONDS = 60;
|
||||
|
||||
// 证书/私钥 PEM 文本最大长度(正常 RSA/ECC 证书远小于该值,防止异常大报文)
|
||||
const FRONT_CONFIG_PEM_MAX_LENGTH = 64 * 1024;
|
||||
|
||||
class SettingWarehouseService extends Service {
|
||||
/**
|
||||
* 读取默认快递与平台编码选项,查询失败时自动降级为空列表。
|
||||
@ -814,6 +834,152 @@ class SettingWarehouseService extends Service {
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并规范化仓库前端配置的字符串字段。
|
||||
*
|
||||
* @param {*} value 原始值。
|
||||
* @param {string} fieldName 字段名。
|
||||
* @param {number} maxLength 字段最大长度。
|
||||
* @return {string|null} 规范化后的字符串;空值返回 null(表示清空)。
|
||||
* @throws {Error} 超长时抛出,状态码 400。
|
||||
*/
|
||||
normalizeFrontConfigText(value, fieldName, maxLength) {
|
||||
if (value === undefined || value === null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const normalized = String(value).trim();
|
||||
if (!normalized) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (normalized.length > maxLength) {
|
||||
throw this.createError(`${fieldName} 长度不能超过 ${maxLength} 字符`, 400);
|
||||
}
|
||||
|
||||
return normalized;
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并规范化仓库前端配置的 theme 字段。
|
||||
*
|
||||
* @param {*} value 原始值(对象或 JSON 字符串)。
|
||||
* @return {Object|null} 规范化后的主题对象;空值返回 null(表示清空)。
|
||||
* @throws {Error} 非合法 JSON 对象时抛出,状态码 400。
|
||||
*/
|
||||
normalizeFrontConfigTheme(value) {
|
||||
if (value === undefined || value === null || value === '') {
|
||||
return null;
|
||||
}
|
||||
|
||||
let parsed = value;
|
||||
if (typeof value === 'string') {
|
||||
try {
|
||||
parsed = JSON.parse(value.trim());
|
||||
} catch (error) {
|
||||
throw this.createError('theme 必须是合法的 JSON 对象', 400);
|
||||
}
|
||||
}
|
||||
|
||||
if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
|
||||
throw this.createError('theme 必须是合法的 JSON 对象', 400);
|
||||
}
|
||||
|
||||
return parsed;
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验非空 domain 的全局唯一性(可空列唯一索引允许多 NULL,数据库不兜底)。
|
||||
*
|
||||
* @param {string} domain 待校验域名(非空)。
|
||||
* @param {number} excludeWarehouseId 排除的仓库 ID(当前仓库自身)。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
* @throws {Error} domain 已被其他仓库使用时抛出,状态码 409。
|
||||
*/
|
||||
async assertFrontConfigDomainUnique(domain, excludeWarehouseId) {
|
||||
const configModel = this.ctx.model && this.ctx.model.WarehouseFrontConfig;
|
||||
if (!configModel || typeof configModel.findOne !== 'function') {
|
||||
throw this.createError('WarehouseFrontConfig model 不可用', 500);
|
||||
}
|
||||
|
||||
const { Op } = this.app.Sequelize;
|
||||
const existing = await configModel.findOne({
|
||||
where: {
|
||||
domain,
|
||||
store_id: { [Op.ne]: excludeWarehouseId },
|
||||
},
|
||||
attributes: [ 'store_id', 'domain' ],
|
||||
});
|
||||
|
||||
if (existing) {
|
||||
throw this.createError(`域名 ${domain} 已被其他仓库使用`, 409);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建仓库前端配置的输出对象(无记录时返回默认空配置)。
|
||||
*
|
||||
* 证书回显:输出证书原文(cert_pem)与私钥原文(key_pem,取自 cert_key 列),
|
||||
* 不再输出 cert_path/key_path 路径字段(保存时已置空,尚无真实路径)。
|
||||
* 安全说明:私钥原文回显仅限仓库主体登录后的 settings 页
|
||||
* (getFrontConfig/saveFrontConfig/saveFrontCert 三个需登录接口复用本输出);
|
||||
* 公共无鉴权接口 getFrontConfigByDomain 走 buildFrontConfigPublicOutput 白名单,
|
||||
* 不经过本方法,仍不暴露证书/私钥内容与同步状态等内部字段。
|
||||
*
|
||||
* @param {Object|null} record 配置记录实例(可为 null)。
|
||||
* @param {number} warehouseId 当前仓库 ID。
|
||||
* @return {Object} 规范化输出对象。
|
||||
*/
|
||||
buildFrontConfigOutput(record, warehouseId) {
|
||||
const hasRecord = !!(record && typeof record.get === 'function');
|
||||
const getValue = key => (hasRecord ? record.get(key) : null);
|
||||
|
||||
return {
|
||||
warehouse_id: Number(warehouseId || 0),
|
||||
domain: hasRecord ? (getValue('domain') || '') : '',
|
||||
title: hasRecord ? (getValue('title') || '') : '',
|
||||
logo_url: hasRecord ? (getValue('logo_url') || '') : '',
|
||||
favicon_url: hasRecord ? (getValue('favicon_url') || '') : '',
|
||||
login_bg_url: hasRecord ? (getValue('login_bg_url') || '') : '',
|
||||
theme: hasRecord ? (getValue('theme') || null) : null,
|
||||
cert_pem: hasRecord ? (getValue('cert_pem') || '') : '',
|
||||
key_pem: hasRecord ? (getValue('cert_key') || '') : '',
|
||||
cert_expire_at: hasRecord ? (getValue('cert_expire_at') || null) : null,
|
||||
sync_status: hasRecord ? Number(getValue('sync_status') || 0) : 0,
|
||||
sync_attempts: hasRecord ? Number(getValue('sync_attempts') || 0) : 0,
|
||||
last_sync_error: hasRecord ? (getValue('last_sync_error') || '') : '',
|
||||
last_synced_at: hasRecord ? (getValue('last_synced_at') || null) : null,
|
||||
updated_at: hasRecord ? (getValue('updated_at') || null) : null,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询当前仓库的前端独立部署配置(settings 页回显)。
|
||||
*
|
||||
* 需登录(token 绑定仓库上下文,只能查到自己仓库的配置),
|
||||
* 响应含证书原文(cert_pem)与私钥原文(key_pem),供仓库主体 settings 页回显;
|
||||
* 公共无鉴权接口 getFrontConfigByDomain 仍只返回公开字段白名单。
|
||||
*
|
||||
* @return {Promise<Object>} 配置输出对象;无记录时返回默认空配置。
|
||||
* @throws {Error} 未识别到当前仓库时抛出,状态码 400。
|
||||
*/
|
||||
async getFrontConfig() {
|
||||
const warehouseId = this.getCurrentWarehouseId();
|
||||
|
||||
const configModel = this.ctx.model && this.ctx.model.WarehouseFrontConfig;
|
||||
if (!configModel || typeof configModel.findOne !== 'function') {
|
||||
throw this.createError('WarehouseFrontConfig model 不可用', 500);
|
||||
}
|
||||
|
||||
const record = await configModel.findOne({
|
||||
where: {
|
||||
store_id: warehouseId,
|
||||
},
|
||||
});
|
||||
|
||||
return this.buildFrontConfigOutput(record, warehouseId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取当前仓库启用的微信小程序授权配置(wms_wechat_app)。
|
||||
*
|
||||
@ -859,6 +1025,512 @@ class SettingWarehouseService extends Service {
|
||||
updated_at: plain.updated_at,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建前端配置公共拉取接口的缓存键(按域名)。
|
||||
*
|
||||
* @param {string} domain 域名(内部会 trim 规范化)。
|
||||
* @return {string} Redis 缓存键。
|
||||
*/
|
||||
getFrontConfigDomainCacheKey(domain) {
|
||||
return `front:config:domain:${String(domain || '').trim()}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建前端配置公共拉取接口的输出对象(仅公开字段白名单)。
|
||||
*
|
||||
* 安全红线:只输出 FRONT_CONFIG_PUBLIC_FIELDS 白名单字段,
|
||||
* 严禁输出 cert_pem/cert_key 证书与私钥内容,以及 cert_path、key_path、
|
||||
* sync_status、sync_attempts、last_sync_error 等内部字段。
|
||||
*
|
||||
* @param {Object} record 配置记录实例。
|
||||
* @return {Object} 仅含公开字段的输出对象。
|
||||
*/
|
||||
buildFrontConfigPublicOutput(record) {
|
||||
const hasRecord = !!(record && typeof record.get === 'function');
|
||||
const getValue = key => (hasRecord ? record.get(key) : null);
|
||||
|
||||
const output = {};
|
||||
for (const key of FRONT_CONFIG_PUBLIC_FIELDS) {
|
||||
const value = hasRecord ? getValue(key) : null;
|
||||
output[key] = key === 'theme' ? (value || null) : (value || '');
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
/**
|
||||
* 清理指定域名的前端配置公共拉取缓存(空域名跳过)。
|
||||
*
|
||||
* @param {string} domain 待清理的域名。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
async clearFrontConfigDomainCache(domain) {
|
||||
const normalizedDomain = String(domain || '').trim();
|
||||
if (!normalizedDomain) {
|
||||
return;
|
||||
}
|
||||
|
||||
await this.deleteCacheByKey(this.getFrontConfigDomainCacheKey(normalizedDomain));
|
||||
}
|
||||
|
||||
/**
|
||||
* 按域名查询前端配置(公共无鉴权接口业务实现,Redis 缓存 + 查库兜底)。
|
||||
*
|
||||
* 安全红线:只返回公开字段(domain/title/logo_url/login_bg_url/favicon_url/theme),
|
||||
* 严禁返回 cert_pem/cert_key 证书与私钥内容,以及 cert_path/key_path/
|
||||
* sync_status/sync_attempts/last_sync_error 等内部字段。
|
||||
*
|
||||
* @param {string} domain 待查询域名。
|
||||
* @return {Promise<Object>} 仅含公开字段的配置对象。
|
||||
* @throws {Error} domain 为空时抛出 400;未登记域名抛出 404;数据库异常抛出 500。
|
||||
*/
|
||||
async getFrontConfigByDomain(domain) {
|
||||
const normalizedDomain = String(domain || '').trim();
|
||||
|
||||
if (!normalizedDomain) {
|
||||
throw this.createError('domain 不能为空', 400);
|
||||
}
|
||||
|
||||
if (normalizedDomain.length > 100) {
|
||||
throw this.createError('domain 长度不能超过 100 字符', 400);
|
||||
}
|
||||
|
||||
const cacheKey = this.getFrontConfigDomainCacheKey(normalizedDomain);
|
||||
|
||||
// 优先读缓存;Redis 异常时降级查库(getCacheAsync 内部已做 Redis 降级处理)
|
||||
if (this.app && typeof this.app.getCacheAsync === 'function') {
|
||||
try {
|
||||
const cached = await this.app.getCacheAsync(cacheKey);
|
||||
|
||||
// 未登记域名空缓存标记:直接按未配置返回,防穿透
|
||||
if (cached && typeof cached === 'object' && cached.configured === false) {
|
||||
throw this.createError('域名未配置', 404);
|
||||
}
|
||||
|
||||
if (cached && typeof cached === 'object' && typeof cached.domain === 'string' && cached.domain) {
|
||||
return cached;
|
||||
}
|
||||
} catch (error) {
|
||||
if (Number(error.code) === 404) {
|
||||
throw error;
|
||||
}
|
||||
this.ctx.logger.warn('[SettingWarehouseService.getFrontConfigByDomain] 读取缓存失败,降级查库: %s', error.message);
|
||||
}
|
||||
}
|
||||
|
||||
const configModel = this.ctx.model && this.ctx.model.WarehouseFrontConfig;
|
||||
if (!configModel || typeof configModel.findOne !== 'function') {
|
||||
throw this.createError('WarehouseFrontConfig model 不可用', 500);
|
||||
}
|
||||
|
||||
const record = await configModel.findOne({
|
||||
where: {
|
||||
domain: normalizedDomain,
|
||||
},
|
||||
});
|
||||
|
||||
if (!record) {
|
||||
// 缓存穿透兜底:未登记域名写短 TTL 空缓存,防止高频探测打穿数据库
|
||||
if (this.app && typeof this.app.setCacheAsync === 'function') {
|
||||
try {
|
||||
await this.app.setCacheAsync(cacheKey, { configured: false }, FRONT_CONFIG_PUBLIC_MISS_CACHE_TTL_SECONDS);
|
||||
} catch (error) {
|
||||
this.ctx.logger.warn('[SettingWarehouseService.getFrontConfigByDomain] 写入未命中空缓存失败: %s', error.message);
|
||||
}
|
||||
}
|
||||
throw this.createError('域名未配置', 404);
|
||||
}
|
||||
|
||||
const output = this.buildFrontConfigPublicOutput(record);
|
||||
|
||||
if (this.app && typeof this.app.setCacheAsync === 'function') {
|
||||
try {
|
||||
await this.app.setCacheAsync(cacheKey, output, FRONT_CONFIG_PUBLIC_CACHE_TTL_SECONDS);
|
||||
} catch (error) {
|
||||
this.ctx.logger.warn('[SettingWarehouseService.getFrontConfigByDomain] 写入缓存失败: %s', error.message);
|
||||
}
|
||||
}
|
||||
|
||||
return output;
|
||||
}
|
||||
|
||||
/**
|
||||
* 规范化证书/私钥 PEM 文本:去首尾空白,空值返回 null(表示未提供)。
|
||||
*
|
||||
* @param {*} value 原始值(PEM 文本)。
|
||||
* @param {string} fieldName 字段名(用于错误提示)。
|
||||
* @return {string|null} 规范化后的 PEM 文本;空值返回 null。
|
||||
* @throws {Error} 内容超过长度上限时抛出,状态码 400。
|
||||
*/
|
||||
normalizeFrontConfigPem(value, fieldName) {
|
||||
if (value === undefined || value === null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const normalized = String(value).trim();
|
||||
if (!normalized) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (normalized.length > FRONT_CONFIG_PEM_MAX_LENGTH) {
|
||||
throw this.createError(`${fieldName} 内容长度不能超过 ${FRONT_CONFIG_PEM_MAX_LENGTH} 字符`, 400);
|
||||
}
|
||||
|
||||
return normalized;
|
||||
}
|
||||
|
||||
/**
|
||||
* 用 Node 内置 crypto.X509Certificate 解析证书 PEM 文本。
|
||||
*
|
||||
* @param {string} certPem 证书 PEM 文本。
|
||||
* @return {Object} 解析成功后的 X509Certificate 实例。
|
||||
* @throws {Error} 证书无法解析时抛出,状态码 400,统一文案“证书不合法”。
|
||||
*/
|
||||
parseFrontConfigCertPem(certPem) {
|
||||
try {
|
||||
return new crypto.X509Certificate(certPem);
|
||||
} catch (error) {
|
||||
throw this.createError('证书不合法', 400);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验证书有效期:未生效或已过期的证书禁止提交。
|
||||
*
|
||||
* @param {Object} cert 已解析的 X509Certificate 实例。
|
||||
* @return {void} 无返回值。
|
||||
* @throws {Error} 证书未生效或已过期时抛出,状态码 400,统一文案“证书不合法”。
|
||||
*/
|
||||
assertFrontConfigCertValid(cert) {
|
||||
const now = Date.now();
|
||||
const validFrom = new Date(cert.validFrom);
|
||||
const validTo = new Date(cert.validTo);
|
||||
|
||||
if (Number.isNaN(validFrom.getTime())) {
|
||||
throw this.createError('证书不合法', 400);
|
||||
}
|
||||
|
||||
if (validFrom.getTime() > now) {
|
||||
throw this.createError('证书不合法', 400);
|
||||
}
|
||||
|
||||
if (Number.isNaN(validTo.getTime())) {
|
||||
throw this.createError('证书不合法', 400);
|
||||
}
|
||||
|
||||
if (validTo.getTime() <= now) {
|
||||
throw this.createError('证书不合法', 400);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 收集证书可覆盖的域名列表:SAN 中的 DNS 项与 CN,统一转小写。
|
||||
*
|
||||
* @param {Object} cert 已解析的 X509Certificate 实例。
|
||||
* @return {string[]} 小写域名列表。
|
||||
*/
|
||||
collectFrontConfigCertNames(cert) {
|
||||
const names = [];
|
||||
|
||||
const sanText = cert.subjectAltName || '';
|
||||
for (const part of String(sanText).split(',')) {
|
||||
const entry = String(part).trim();
|
||||
if (entry.startsWith('DNS:')) {
|
||||
const dnsName = entry.slice(4).trim();
|
||||
if (dnsName) {
|
||||
names.push(dnsName.toLowerCase());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const subjectText = cert.subject || '';
|
||||
const cnMatch = /CN\s*=\s*([^,\n]+)/i.exec(String(subjectText));
|
||||
if (cnMatch && cnMatch[1]) {
|
||||
names.push(cnMatch[1].trim().toLowerCase());
|
||||
}
|
||||
|
||||
return names;
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断证书域名列表是否覆盖目标域名(支持精确匹配与通配符 *.example.com)。
|
||||
*
|
||||
* @param {string[]} names 证书 SAN/CN 域名列表(小写)。
|
||||
* @param {string} domain 待校验域名。
|
||||
* @return {boolean} 是否覆盖。
|
||||
*/
|
||||
frontConfigCertCoversDomain(names, domain) {
|
||||
const target = String(domain).toLowerCase();
|
||||
if (!target) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return names.some(name => {
|
||||
const normalized = String(name).toLowerCase();
|
||||
if (normalized === target) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (normalized.startsWith('*.')) {
|
||||
const suffix = normalized.slice(1);
|
||||
return target.endsWith(suffix) && target.length > suffix.length;
|
||||
}
|
||||
|
||||
return false;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验私钥与证书是否成对:对比两者的 SPKI DER 公钥指纹。
|
||||
*
|
||||
* @param {string} keyPem 私钥 PEM 文本。
|
||||
* @param {Object} cert 已解析的 X509Certificate 实例。
|
||||
* @return {void} 无返回值。
|
||||
* @throws {Error} 私钥无法解析或与证书不匹配时抛出,状态码 400,统一文案“证书不合法”。
|
||||
*/
|
||||
validateFrontConfigKeyPem(keyPem, cert) {
|
||||
let publicKey;
|
||||
try {
|
||||
publicKey = crypto.createPublicKey(keyPem);
|
||||
} catch (error) {
|
||||
throw this.createError('证书不合法', 400);
|
||||
}
|
||||
|
||||
const keySpki = publicKey.export({ type: 'spki', format: 'der' });
|
||||
const certSpki = cert.publicKey.export({ type: 'spki', format: 'der' });
|
||||
if (Buffer.compare(keySpki, certSpki) !== 0) {
|
||||
throw this.createError('证书不合法', 400);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验当前主体为仓库主体(前端独立部署配置仅仓库主体可操作)。
|
||||
*
|
||||
* @return {Promise<Object>} 当前主体对象(含 id/company_name/project/isWarehouse/status)。
|
||||
* @throws {Error} 签约关系服务不可用时抛出 500;非仓库主体时抛出 403。
|
||||
*/
|
||||
async assertFrontConfigWarehouseSubject() {
|
||||
const storeWarehouseService = this.ctx.service && this.ctx.service.systems && this.ctx.service.systems.storeWarehouse;
|
||||
if (!storeWarehouseService || typeof storeWarehouseService.getCurrentSubject !== 'function') {
|
||||
throw this.createError('签约关系服务不可用', 500);
|
||||
}
|
||||
|
||||
const currentSubject = await storeWarehouseService.getCurrentSubject();
|
||||
if (!currentSubject || !currentSubject.isWarehouse) {
|
||||
throw this.createError('仅仓库主体可配置前端独立部署', 403);
|
||||
}
|
||||
|
||||
return currentSubject;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存当前仓库前端独立部署品牌配置(upsert,一仓一行,仅品牌字段部分更新)。
|
||||
*
|
||||
* 域名与证书不在本接口受理范围:domain 变更必须走 saveFrontCert 重新校验证书;
|
||||
* cert_pem/key_pem/cert_path/key_path/cert_expire_at 一律不受理(方法层白名单过滤)。
|
||||
* 保存仍视为一次配置变更:同步状态重置为待同步,写库成功后清理当前 domain 的公共拉取缓存。
|
||||
*
|
||||
* @param {Object} [data={}] 请求参数。
|
||||
* @param {string} [data.title] 站点标题(≤100 字符,空值清空)。
|
||||
* @param {string} [data.logo_url] Logo 地址(≤255 字符,空值清空)。
|
||||
* @param {string} [data.favicon_url] 站点 favicon 图标地址(≤255 字符,空值清空)。
|
||||
* @param {string} [data.login_bg_url] 登录页背景图地址(≤255 字符,空值清空)。
|
||||
* @param {Object|string} [data.theme] 主题配置(合法 JSON 对象或 JSON 字符串,空值清空)。
|
||||
* @return {Promise<Object>} 保存后的配置输出对象(同步状态已重置为待同步;证书回显口径与 getFrontConfig 一致)。
|
||||
* @throws {Error} 非仓库主体时抛出 403;参数非法时抛出 400。
|
||||
*/
|
||||
async saveFrontConfig(data = {}) {
|
||||
const warehouseId = this.getCurrentWarehouseId();
|
||||
|
||||
// 仅仓库主体管理员可配置前端独立部署(isWarehouse 判定)
|
||||
await this.assertFrontConfigWarehouseSubject();
|
||||
|
||||
const configModel = this.ctx.model && this.ctx.model.WarehouseFrontConfig;
|
||||
if (!configModel || typeof configModel.findOne !== 'function') {
|
||||
throw this.createError('WarehouseFrontConfig model 不可用', 500);
|
||||
}
|
||||
|
||||
const patch = {};
|
||||
|
||||
for (const field of FRONT_CONFIG_TEXT_FIELDS) {
|
||||
if (Object.prototype.hasOwnProperty.call(data, field.key)) {
|
||||
patch[field.key] = this.normalizeFrontConfigText(data[field.key], field.name, field.maxLength);
|
||||
}
|
||||
}
|
||||
|
||||
if (Object.prototype.hasOwnProperty.call(data, 'theme')) {
|
||||
patch.theme = this.normalizeFrontConfigTheme(data.theme);
|
||||
}
|
||||
|
||||
// 保存即重置同步状态:本次保存待同步
|
||||
patch.sync_status = 0;
|
||||
patch.sync_attempts = 0;
|
||||
patch.last_sync_error = null;
|
||||
patch.last_synced_at = null;
|
||||
|
||||
let record = await configModel.findOne({
|
||||
where: {
|
||||
store_id: warehouseId,
|
||||
},
|
||||
});
|
||||
|
||||
// 品牌字段不改变 domain:写库成功后清理当前 domain 的公共拉取缓存即可
|
||||
const previousDomain = record ? String(record.get('domain') || '').trim() : '';
|
||||
|
||||
try {
|
||||
if (record) {
|
||||
await record.update(patch);
|
||||
} else {
|
||||
record = await configModel.create({
|
||||
store_id: warehouseId,
|
||||
...patch,
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
// 并发写入兜底:唯一索引冲突统一转为业务错误
|
||||
if (error && error.name === 'SequelizeUniqueConstraintError') {
|
||||
const conflictFields = error.fields || {};
|
||||
if (Object.prototype.hasOwnProperty.call(conflictFields, 'domain')) {
|
||||
throw this.createError(`域名 ${patch.domain || ''} 已被其他仓库使用`, 409);
|
||||
}
|
||||
throw this.createError('仓库前端配置保存冲突,请稍后重试', 409);
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
|
||||
// 回查一次再输出,避免实例上残留 CURRENT_TIMESTAMP 等字面量
|
||||
const savedRecord = await configModel.findByPk(record.id);
|
||||
|
||||
// 写库成功后清理公共拉取缓存(先写库后清缓存);清缓存失败仅记日志,不影响保存结果
|
||||
if (previousDomain) {
|
||||
await this.clearFrontConfigDomainCache(previousDomain)
|
||||
.catch(error => {
|
||||
this.ctx.logger.warn('[SettingWarehouseService.saveFrontConfig] 清理前端配置缓存失败: %s', error.message);
|
||||
});
|
||||
}
|
||||
|
||||
return this.buildFrontConfigOutput(savedRecord, warehouseId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传当前仓库前端独立部署证书(domain + 证书/私钥成对,upsert 该仓库行的证书与域名信息)。
|
||||
*
|
||||
* 校验链:证书可解析 → 未生效拒绝 → 已过期拒绝 → 私钥与证书成对 →
|
||||
* 证书 SAN/CN 覆盖 domain(支持 *.example.com 通配,不覆盖返回 400)→
|
||||
* domain 全局唯一(非空,409)。
|
||||
* 证书校验链任一失败均返回统一文案“证书不合法”(400),不返回细节。
|
||||
* 通过后自动写入 cert_expire_at(证书 validTo 权威值,不接受前端传值),
|
||||
* 证书/私钥 PEM 内容直接写入 cert_pem/cert_key 列(内容仅定时任务读取,
|
||||
* 不写暂存文件);cert_path/key_path 保存时置空,避免内容已换而路径陈旧,
|
||||
* 等待未来定时任务部署后回填真实路径;同时更新该仓库行的 domain/cert_expire_at
|
||||
* 并重置同步状态;写库成功后清理旧域名与新域名的公共拉取缓存(先写库后清缓存)。
|
||||
*
|
||||
* @param {Object} [data={}] 请求参数。
|
||||
* @param {string} data.domain 仓库自持域名(必填,非空,≤100 字符,全局唯一)。
|
||||
* @param {string} data.pem 证书 PEM 文本(必填)。
|
||||
* @param {string} data.key 私钥 PEM 文本(必填,与证书成对)。
|
||||
* @return {Promise<Object>} 保存后的完整配置输出对象(含证书/私钥原文回显,口径与 getFrontConfig 一致)。
|
||||
* @throws {Error} 非仓库主体时抛出 403;参数非法/证书不合法时抛出 400(证书校验失败统一文案“证书不合法”);域名重复时抛出 409。
|
||||
*/
|
||||
async saveFrontCert(data = {}) {
|
||||
const warehouseId = this.getCurrentWarehouseId();
|
||||
|
||||
// 仅仓库主体管理员可上传前端独立部署证书(isWarehouse 判定)
|
||||
await this.assertFrontConfigWarehouseSubject();
|
||||
|
||||
const configModel = this.ctx.model && this.ctx.model.WarehouseFrontConfig;
|
||||
if (!configModel || typeof configModel.findOne !== 'function') {
|
||||
throw this.createError('WarehouseFrontConfig model 不可用', 500);
|
||||
}
|
||||
|
||||
// 入参必填校验:domain 非空且 ≤100;pem/key 必填(nginx 起 HTTPS 需要成对)
|
||||
const domain = this.normalizeFrontConfigText(data.domain, 'domain', 100);
|
||||
if (!domain) {
|
||||
throw this.createError('domain 不能为空', 400);
|
||||
}
|
||||
|
||||
const certPem = this.normalizeFrontConfigPem(data.pem, 'pem');
|
||||
if (!certPem) {
|
||||
throw this.createError('pem 不能为空', 400);
|
||||
}
|
||||
|
||||
const keyPem = this.normalizeFrontConfigPem(data.key, 'key');
|
||||
if (!keyPem) {
|
||||
throw this.createError('key 不能为空', 400);
|
||||
}
|
||||
|
||||
// 校验链:证书可解析 → 未生效/已过期拒绝 → 私钥匹配 → SAN/CN 覆盖 domain → domain 全局唯一
|
||||
const cert = this.parseFrontConfigCertPem(certPem);
|
||||
this.assertFrontConfigCertValid(cert);
|
||||
this.validateFrontConfigKeyPem(keyPem, cert);
|
||||
|
||||
const certNames = this.collectFrontConfigCertNames(cert);
|
||||
if (!this.frontConfigCertCoversDomain(certNames, domain)) {
|
||||
throw this.createError('证书不合法', 400);
|
||||
}
|
||||
|
||||
await this.assertFrontConfigDomainUnique(domain, warehouseId);
|
||||
|
||||
// 证书/私钥内容直接入库(不再写暂存文件),有效期以证书 validTo 权威写入。
|
||||
// cert_path/key_path 保存时置空:内容已换而路径陈旧,避免 nginx 误读;
|
||||
// 等待未来定时任务(Egg schedule/外部 crontab)部署后回填真实路径。
|
||||
const patch = {
|
||||
domain,
|
||||
cert_pem: certPem,
|
||||
cert_key: keyPem,
|
||||
cert_path: null,
|
||||
key_path: null,
|
||||
cert_expire_at: new Date(cert.validTo),
|
||||
// 保存即重置同步状态:本次上传待同步
|
||||
sync_status: 0,
|
||||
sync_attempts: 0,
|
||||
last_sync_error: null,
|
||||
last_synced_at: null,
|
||||
};
|
||||
|
||||
let record = await configModel.findOne({
|
||||
where: {
|
||||
store_id: warehouseId,
|
||||
},
|
||||
});
|
||||
|
||||
// 记录更新前的域名,写库成功后用于清理旧域名公共拉取缓存
|
||||
const previousDomain = record ? String(record.get('domain') || '').trim() : '';
|
||||
|
||||
try {
|
||||
if (record) {
|
||||
await record.update(patch);
|
||||
} else {
|
||||
record = await configModel.create({
|
||||
store_id: warehouseId,
|
||||
...patch,
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
// 并发写入兜底:唯一索引冲突统一转为业务错误
|
||||
if (error && error.name === 'SequelizeUniqueConstraintError') {
|
||||
const conflictFields = error.fields || {};
|
||||
if (Object.prototype.hasOwnProperty.call(conflictFields, 'domain')) {
|
||||
throw this.createError(`域名 ${domain} 已被其他仓库使用`, 409);
|
||||
}
|
||||
throw this.createError('仓库前端配置保存冲突,请稍后重试', 409);
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
|
||||
// 回查一次再输出,避免实例上残留 CURRENT_TIMESTAMP 等字面量
|
||||
const savedRecord = await configModel.findByPk(record.id);
|
||||
|
||||
// 写库成功后清理公共拉取缓存(先写库后清缓存:避免先清后写时并发读把旧值重新写回缓存)。
|
||||
// 需同时清理旧域名(更新前记录)与新域名(本次上传)两个 key;清缓存失败仅记日志,不影响保存结果。
|
||||
const affectedDomains = [ ...new Set([ previousDomain, domain ].filter(item => item)) ];
|
||||
await Promise.all(affectedDomains.map(affectedDomain => this.clearFrontConfigDomainCache(affectedDomain)
|
||||
.catch(error => {
|
||||
this.ctx.logger.warn('[SettingWarehouseService.saveFrontCert] 清理前端配置缓存失败: %s', error.message);
|
||||
})));
|
||||
|
||||
return this.buildFrontConfigOutput(savedRecord, warehouseId);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = SettingWarehouseService;
|
||||
|
||||
@ -230,9 +230,6 @@ class WarehouseNotifyService extends Service {
|
||||
* type / content / ext_id / group_id / group_name / user_id / timestamp。
|
||||
* 推送前写入 wms_inbox_message(direction=outbound,source_type=system),
|
||||
* 推送后按结果回写 push_status(2=已送达 / 3=失败)与 push_response。
|
||||
* 幂等去重:同 ext_id 的消息已送达(push_status=2)时直接跳过推送,
|
||||
* 避免定时任务宽限窗口重复执行/多实例并发导致同一群重复收到相同通知;
|
||||
* 未送达(0/1/3)时复用同一消息记录重推。
|
||||
*
|
||||
* 向后兼容:不传 userIds 且传入 group 时,行为与旧版本完全一致
|
||||
* (校验、幂等 ext_id、落库字段、推送体均不变)。
|
||||
@ -309,24 +306,11 @@ class WarehouseNotifyService extends Service {
|
||||
try {
|
||||
const existing = await InboxMessage.findOne({
|
||||
where: { ext_id: uniqueExtId },
|
||||
attributes: [ 'id', 'push_status' ],
|
||||
attributes: [ 'id' ],
|
||||
paranoid: false,
|
||||
});
|
||||
if (existing) {
|
||||
messageId = Number(existing.id);
|
||||
// 幂等去重:同 ext_id 消息已送达(push_status=2)时跳过推送,
|
||||
// 防止重复轮次/多实例并发导致同一群重复收到相同通知;
|
||||
// 未送达(0/1/3)时保留重推机会(复用同一消息记录回写推送结果)
|
||||
if (Number(existing.push_status) === 2) {
|
||||
return {
|
||||
success: true,
|
||||
skipped: true,
|
||||
reason: '消息已送达,跳过重复推送',
|
||||
warehouseId,
|
||||
method: 'notify.reply',
|
||||
messageId,
|
||||
};
|
||||
}
|
||||
} else {
|
||||
const created = await InboxMessage.create({
|
||||
ext_id: uniqueExtId,
|
||||
|
||||
@ -146,16 +146,6 @@ class WechatSystemsService extends Service {
|
||||
|
||||
const nowSec = Math.floor(Date.now() / 1000);
|
||||
const where = { app_id: appId, provider: 'wechat', openid: session.openid };
|
||||
|
||||
// 协议版本:loginByCode 时自动更新到该小程序最新协议版本 id(无需前端传入)
|
||||
const latestAgreement = await ctx.model.WechatAgreementVersion.findOne({
|
||||
where: { appid: wechatApp.appid },
|
||||
order: [[ 'id', 'DESC' ]],
|
||||
attributes: [ 'id' ],
|
||||
raw: true,
|
||||
});
|
||||
const latestAgreementVersionId = latestAgreement ? Number(latestAgreement.id) : null;
|
||||
|
||||
let oauth = await ctx.model.UserOauth.findOne({ where });
|
||||
if (oauth) {
|
||||
await oauth.update({
|
||||
@ -163,7 +153,6 @@ class WechatSystemsService extends Service {
|
||||
session_key: session.session_key || oauth.session_key || null,
|
||||
login_time: nowSec,
|
||||
login_count: (Number(oauth.login_count) || 0) + 1,
|
||||
agreement_version_id: latestAgreementVersionId,
|
||||
});
|
||||
} else {
|
||||
oauth = await ctx.model.UserOauth.create({
|
||||
@ -176,7 +165,6 @@ class WechatSystemsService extends Service {
|
||||
session_key: session.session_key || null,
|
||||
login_time: nowSec,
|
||||
login_count: 1,
|
||||
agreement_version_id: latestAgreementVersionId,
|
||||
});
|
||||
// 用主键 id 生成登录码并回写
|
||||
await oauth.update({ login_code: buildLoginCode(oauth.id) });
|
||||
@ -348,404 +336,6 @@ class WechatSystemsService extends Service {
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 按工号绑定微信(需登录需权限,PC 管理员操作):传入工号 id(wms_account_store_employee.id)
|
||||
* 与微信绑定记录 id(wms_user_oauth.id),查工号关联的账号 id(account_id),校验后写入
|
||||
* wms_user_oauth.user_id 完成绑定;不签发 token(不改变当前登录态)。
|
||||
*
|
||||
* 已绑定同一账号时幂等返回成功;已绑定其他账号、工号已解除/不属于当前仓库、
|
||||
* 微信记录非 wechat 或不属于当前仓库小程序、账号被禁用时拒绝。
|
||||
*
|
||||
* @param {object} data 入参。
|
||||
* @param {number} data.id 工号 id(wms_account_store_employee.id)。
|
||||
* @param {number} data.oauth_id 微信绑定记录 id(wms_user_oauth.id,来自 wechat.userList 结果)。
|
||||
* @return {Promise<{success: boolean, data: object|null, code: number, message: string}>} 绑定结果。
|
||||
*/
|
||||
async bindByEmployee(data = {}) {
|
||||
const { ctx } = this;
|
||||
|
||||
const employeeId = Number(data.id);
|
||||
const oauthId = Number(data.oauth_id);
|
||||
if (!Number.isInteger(employeeId) || employeeId <= 0) {
|
||||
return { success: false, data: null, code: 0, message: 'id(工号 id)为必填' };
|
||||
}
|
||||
if (!Number.isInteger(oauthId) || oauthId <= 0) {
|
||||
return { success: false, data: null, code: 0, message: 'oauth_id(微信绑定记录 id)为必填' };
|
||||
}
|
||||
|
||||
// 工号存在且有效
|
||||
const employee = await ctx.model.AccountStoreEmployee.findByPk(employeeId, { raw: true });
|
||||
if (!employee) {
|
||||
return { success: false, data: null, code: 0, message: '工号不存在' };
|
||||
}
|
||||
if (Number(employee.status) !== 1) {
|
||||
return { success: false, data: null, code: 0, message: '工号已解除,无法绑定' };
|
||||
}
|
||||
const accountId = Number(employee.account_id);
|
||||
if (!Number.isInteger(accountId) || accountId <= 0) {
|
||||
return { success: false, data: null, code: 0, message: '工号未关联账号' };
|
||||
}
|
||||
|
||||
// 只能操作当前仓库的工号
|
||||
const warehouseId = Number(ctx.user && ctx.user.store_id);
|
||||
if (Number.isInteger(warehouseId) && warehouseId > 0 && Number(employee.store_id) !== warehouseId) {
|
||||
return { success: false, data: null, code: 0, message: '工号不属于当前仓库' };
|
||||
}
|
||||
|
||||
// 微信绑定记录
|
||||
const oauth = await ctx.model.UserOauth.findByPk(oauthId, { raw: true });
|
||||
if (!oauth) {
|
||||
return { success: false, data: null, code: 0, message: '微信绑定记录不存在' };
|
||||
}
|
||||
if (String(oauth.provider || '').trim() !== 'wechat') {
|
||||
return { success: false, data: null, code: 0, message: '该记录不是微信登录记录' };
|
||||
}
|
||||
if (Number(oauth.user_id) > 0 && Number(oauth.user_id) !== accountId) {
|
||||
return { success: false, data: null, code: 0, message: '该微信已绑定其他账号,无法更换绑定' };
|
||||
}
|
||||
|
||||
// 微信记录所属应用须为当前仓库启用的小程序(oauth.app_id 关联 wms_wechat_app.id)
|
||||
if (Number(oauth.app_id) > 0 && Number.isInteger(warehouseId) && warehouseId > 0) {
|
||||
const wechatApp = await ctx.model.WechatApp.findOne({
|
||||
where: { id: Number(oauth.app_id) },
|
||||
attributes: [ 'id', 'warehouse_id' ],
|
||||
raw: true,
|
||||
});
|
||||
if (!wechatApp) {
|
||||
return { success: false, data: null, code: 0, message: '微信记录关联的应用不存在' };
|
||||
}
|
||||
if (Number(wechatApp.warehouse_id) > 0 && Number(wechatApp.warehouse_id) !== warehouseId) {
|
||||
return { success: false, data: null, code: 0, message: '微信记录不属于当前仓库的小程序' };
|
||||
}
|
||||
}
|
||||
|
||||
// 账号存在且未禁用
|
||||
const account = await ctx.model.Account.findByPk(accountId, { raw: true });
|
||||
if (!account) {
|
||||
return { success: false, data: null, code: 0, message: '工号关联的账号不存在' };
|
||||
}
|
||||
if (Number(account.status) !== 1) {
|
||||
return { success: false, data: null, code: 0, message: '工号关联的账号已被禁用' };
|
||||
}
|
||||
|
||||
// 写绑定(幂等:已绑定同一账号直接返回成功)
|
||||
const alreadyBound = Number(oauth.user_id) === accountId;
|
||||
if (!alreadyBound) {
|
||||
await ctx.model.UserOauth.update(
|
||||
{ user_id: accountId },
|
||||
{ where: { id: oauthId } }
|
||||
);
|
||||
}
|
||||
|
||||
return {
|
||||
success: true,
|
||||
data: {
|
||||
oauth_id: oauthId,
|
||||
openid: oauth.openid,
|
||||
unionid: oauth.unionid || '',
|
||||
nickname: oauth.nickname || '',
|
||||
already_bound: alreadyBound,
|
||||
employee: {
|
||||
id: Number(employee.id),
|
||||
account_id: accountId,
|
||||
store_id: Number(employee.store_id),
|
||||
real_name: employee.real_name || '',
|
||||
},
|
||||
account: {
|
||||
id: Number(account.id),
|
||||
username: account.username || '',
|
||||
real_name: account.real_name || '',
|
||||
},
|
||||
},
|
||||
code: 200,
|
||||
message: alreadyBound ? '该微信已绑定此工号账号' : '绑定成功',
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取小程序用户须知富文本(免登录):传入 appId(小程序 AppID),按 appid 查询
|
||||
* wms_wechat_app.user_agreement 返回;Redis 缓存 24 小时(key wechat:userAgreement:{appid}),
|
||||
* 有缓存直接使用缓存。
|
||||
*
|
||||
* @param {object} data 入参。
|
||||
* @param {string} data.appId 小程序 AppID(wx...)。
|
||||
* @return {Promise<{success: boolean, data: object|null, code: number, message: string}>} 结果。
|
||||
*/
|
||||
async getUserAgreementText(data = {}) {
|
||||
const { ctx } = this;
|
||||
|
||||
const appid = typeof data.appId === 'string' ? data.appId.trim() : '';
|
||||
if (!appid) {
|
||||
return { success: false, data: null, code: 0, message: 'appId(小程序 AppID)为必填' };
|
||||
}
|
||||
|
||||
const client = new WechatOpenClient(ctx);
|
||||
const CACHE_KEY = `wechat:userAgreement:${appid}`;
|
||||
const CACHE_TTL_SECONDS = 24 * 3600;
|
||||
|
||||
const cached = await client.cacheGet(CACHE_KEY);
|
||||
if (cached !== null && cached !== undefined) {
|
||||
try {
|
||||
const parsed = JSON.parse(cached);
|
||||
if (parsed && typeof parsed === 'object' && parsed.version_id !== undefined) {
|
||||
return { success: true, data: { appid, ...parsed, from_cache: true }, code: 200, message: '获取成功' };
|
||||
}
|
||||
} catch (e) {
|
||||
// 缓存格式异常,忽略并重新查库
|
||||
}
|
||||
}
|
||||
|
||||
// 拉取只拉最新版本(副表 wms_wechat_agreement_version,id 自增即最新)
|
||||
const record = await ctx.model.WechatAgreementVersion.findOne({
|
||||
where: { appid },
|
||||
order: [[ 'id', 'DESC' ]],
|
||||
raw: true,
|
||||
});
|
||||
if (!record) {
|
||||
return { success: false, data: null, code: 0, message: '未找到对应小程序或该小程序暂无用户须知' };
|
||||
}
|
||||
|
||||
const payload = {
|
||||
version_id: Number(record.id),
|
||||
text: record.content || '',
|
||||
};
|
||||
await client.cacheSet(CACHE_KEY, JSON.stringify(payload), CACHE_TTL_SECONDS);
|
||||
|
||||
return { success: true, data: { appid, ...payload, from_cache: false }, code: 200, message: '获取成功' };
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取当前仓库小程序用户须知(需登录):按 ctx.user.store_id 取启用小程序,
|
||||
* 无小程序时提示「无小程序,需要先绑定」。
|
||||
*
|
||||
* @return {Promise<{success: boolean, data: object|null, code: number, message: string}>} 结果。
|
||||
*/
|
||||
async getUserAgreement() {
|
||||
const { ctx } = this;
|
||||
|
||||
const record = await this.findWarehouseWechatApp(ctx);
|
||||
if (!record) {
|
||||
return { success: false, data: null, code: 0, message: '无小程序,需要先绑定' };
|
||||
}
|
||||
|
||||
const latest = await this.findLatestAgreementVersion(ctx, record.appid);
|
||||
if (!latest) {
|
||||
return { success: false, data: null, code: 0, message: '该小程序暂无用户须知' };
|
||||
}
|
||||
|
||||
return {
|
||||
success: true,
|
||||
data: {
|
||||
appid: record.appid,
|
||||
nickname: record.nickname || '',
|
||||
version_id: Number(latest.id),
|
||||
text: latest.content || '',
|
||||
},
|
||||
code: 200,
|
||||
message: '获取成功',
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置当前仓库小程序用户须知(需登录):提交一次自动新增版本(直接插入,id 自增即最新),
|
||||
* 并清除 getUserAgreementText 的 24h 缓存;无小程序时提示「无小程序,需要先绑定」。
|
||||
*
|
||||
* @param {object} data 入参。
|
||||
* @param {string} data.text 用户须知富文本(可传空字符串)。
|
||||
* @return {Promise<{success: boolean, data: object|null, code: number, message: string}>} 结果。
|
||||
*/
|
||||
async setUserAgreement(data = {}) {
|
||||
const { ctx } = this;
|
||||
|
||||
if (!Object.prototype.hasOwnProperty.call(data, 'text') || typeof data.text !== 'string') {
|
||||
return { success: false, data: null, code: 0, message: 'text(用户须知富文本)为必填且须为字符串' };
|
||||
}
|
||||
|
||||
const record = await this.findWarehouseWechatApp(ctx);
|
||||
if (!record) {
|
||||
return { success: false, data: null, code: 0, message: '无小程序,需要先绑定' };
|
||||
}
|
||||
|
||||
const appid = record.appid;
|
||||
|
||||
// 提交一次自动新增版本:直接插入新行,id 自增即最新(无需维护版本号)
|
||||
const created = await ctx.model.WechatAgreementVersion.create({
|
||||
appid,
|
||||
content: data.text,
|
||||
});
|
||||
|
||||
// 清除 24h 缓存,避免 getUserAgreementText 拉到旧内容
|
||||
const client = new WechatOpenClient(ctx);
|
||||
await client.cacheDel(`wechat:userAgreement:${appid}`);
|
||||
|
||||
return {
|
||||
success: true,
|
||||
data: {
|
||||
appid,
|
||||
nickname: record.nickname || '',
|
||||
version_id: Number(created.id),
|
||||
text: data.text,
|
||||
},
|
||||
code: 200,
|
||||
message: '设置成功',
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 按当前登录仓库取启用的小程序(供 getUserAgreement/setUserAgreement 复用)。
|
||||
*
|
||||
* @param {object} ctx Egg 上下文。
|
||||
* @return {Promise<object|null>} wms_wechat_app 行(raw);未识别仓库或无小程序返回 null。
|
||||
*/
|
||||
async findWarehouseWechatApp(ctx) {
|
||||
const warehouseId = Number(ctx.user && ctx.user.store_id);
|
||||
if (!Number.isInteger(warehouseId) || warehouseId <= 0) {
|
||||
return null;
|
||||
}
|
||||
return ctx.model.WechatApp.findOne({
|
||||
where: { warehouse_id: warehouseId, is_enabled: 1 },
|
||||
order: [[ 'id', 'ASC' ]],
|
||||
raw: true,
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 取指定 appid 的最新协议版本(副表 wms_wechat_agreement_version,id 自增即最新,
|
||||
* ORDER BY id DESC)。
|
||||
*
|
||||
* @param {object} ctx Egg 上下文。
|
||||
* @param {string} appid 小程序 AppID。
|
||||
* @return {Promise<object|null>} 版本行(raw);无版本返回 null。
|
||||
*/
|
||||
async findLatestAgreementVersion(ctx, appid) {
|
||||
return ctx.model.WechatAgreementVersion.findOne({
|
||||
where: { appid },
|
||||
order: [[ 'id', 'DESC' ]],
|
||||
raw: true,
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取指定协议版本内容(需登录免权限):传入版本记录 id(wms_wechat_agreement_version.id,
|
||||
* 可在 wechat.userList 的 agreement_version_id 获取),校验该版本对应 appid 属于当前仓库的
|
||||
* 启用小程序后返回协议内容。
|
||||
*
|
||||
* @param {object} data 入参。
|
||||
* @param {number} data.id 协议版本记录 id。
|
||||
* @return {Promise<{success: boolean, data: object|null, code: number, message: string}>} 结果。
|
||||
*/
|
||||
async getAgreementVersion(data = {}) {
|
||||
const { ctx } = this;
|
||||
|
||||
const versionId = Number(data.id);
|
||||
if (!Number.isInteger(versionId) || versionId <= 0) {
|
||||
return { success: false, data: null, code: 0, message: 'id(协议版本记录 id)为必填' };
|
||||
}
|
||||
|
||||
const version = await ctx.model.WechatAgreementVersion.findByPk(versionId, { raw: true });
|
||||
if (!version) {
|
||||
return { success: false, data: null, code: 0, message: '协议版本不存在' };
|
||||
}
|
||||
|
||||
// 校验仓库:该版本的 appid 必须属于当前仓库的启用小程序
|
||||
const warehouseId = Number(ctx.user && ctx.user.store_id);
|
||||
if (!Number.isInteger(warehouseId) || warehouseId <= 0) {
|
||||
return { success: false, data: null, code: 0, message: '未识别到当前仓库' };
|
||||
}
|
||||
const app = await ctx.model.WechatApp.findOne({
|
||||
where: { appid: version.appid, warehouse_id: warehouseId, is_enabled: 1 },
|
||||
attributes: [ 'id', 'appid', 'nickname' ],
|
||||
raw: true,
|
||||
});
|
||||
if (!app) {
|
||||
return { success: false, data: null, code: 0, message: '该协议版本不属于当前仓库的小程序' };
|
||||
}
|
||||
|
||||
return {
|
||||
success: true,
|
||||
data: {
|
||||
id: Number(version.id),
|
||||
appid: version.appid,
|
||||
nickname: app.nickname || '',
|
||||
text: version.content || '',
|
||||
created_at: version.created_at || null,
|
||||
},
|
||||
code: 200,
|
||||
message: '获取成功',
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 清理未使用且非最终版的用户须知历史版本(真实删除,释放 MySQL 磁盘空间)。
|
||||
*
|
||||
* 保留规则:① 各 appid 的最终版(id 最大);② 被 wms_user_oauth.agreement_version_id
|
||||
* 引用的版本(老用户可能仍停留在旧协议)。其余版本真实删除(模型 paranoid=false)。
|
||||
* 由定时任务 app/schedule/wechat_agreement_cleanup.js 每 1 小时调用一次。
|
||||
*
|
||||
* @param {number} [batchSize] 单批删除条数(默认 500)。
|
||||
* @return {Promise<{deleted: number, kept_latest: number, kept_in_use: number, total: number}>} 清理统计。
|
||||
*/
|
||||
async cleanupUnusedAgreementVersions(batchSize = 500) {
|
||||
const { ctx } = this;
|
||||
const { Op } = this.app.Sequelize;
|
||||
|
||||
const versions = await ctx.model.WechatAgreementVersion.findAll({
|
||||
attributes: [ 'id', 'appid' ],
|
||||
raw: true,
|
||||
});
|
||||
if (versions.length === 0) {
|
||||
return { deleted: 0, kept_latest: 0, kept_in_use: 0, total: 0 };
|
||||
}
|
||||
|
||||
// 各 appid 最终版(id 最大)
|
||||
const latestIdByAppid = new Map();
|
||||
for (const v of versions) {
|
||||
const cur = latestIdByAppid.get(v.appid);
|
||||
if (!cur || Number(v.id) > cur.id) {
|
||||
latestIdByAppid.set(v.appid, { id: Number(v.id) });
|
||||
}
|
||||
}
|
||||
|
||||
// 被 oauth 引用的版本(正在使用)
|
||||
const oauthRows = await ctx.model.UserOauth.findAll({
|
||||
where: { agreement_version_id: { [Op.ne]: null } },
|
||||
attributes: [ 'agreement_version_id' ],
|
||||
raw: true,
|
||||
});
|
||||
const usedIds = new Set();
|
||||
for (const row of oauthRows) {
|
||||
usedIds.add(Number(row.agreement_version_id));
|
||||
}
|
||||
|
||||
// 未使用且非最终版 → 真实删除
|
||||
const deleteIds = [];
|
||||
for (const v of versions) {
|
||||
const id = Number(v.id);
|
||||
const latest = latestIdByAppid.get(v.appid);
|
||||
if (usedIds.has(id) || (latest && latest.id === id)) {
|
||||
continue;
|
||||
}
|
||||
deleteIds.push(id);
|
||||
}
|
||||
|
||||
let deleted = 0;
|
||||
const chunkSize = Number(batchSize) > 0 ? Math.floor(Number(batchSize)) : 500;
|
||||
for (let i = 0; i < deleteIds.length; i += chunkSize) {
|
||||
const chunk = deleteIds.slice(i, i + chunkSize);
|
||||
const destroyed = await ctx.model.WechatAgreementVersion.destroy({
|
||||
where: { id: chunk },
|
||||
});
|
||||
deleted += Number(destroyed) || 0;
|
||||
}
|
||||
|
||||
return {
|
||||
deleted,
|
||||
kept_latest: latestIdByAppid.size,
|
||||
kept_in_use: usedIds.size,
|
||||
total: versions.length,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 确认登录码(需登录,PC/Web 端已登录用户),复用旧 user.getLoginWechatCode 生成的码。
|
||||
*
|
||||
@ -921,18 +511,17 @@ class WechatSystemsService extends Service {
|
||||
}
|
||||
|
||||
/**
|
||||
* 发起小程序认证(需登录,wxa/sec/wxaauth 新版接口,代商家调用需权限集 18)。
|
||||
* 发起小程序认证(需登录,wxa/sec/wxaapi/wxaauth,代商家调用需权限集 18)。
|
||||
*
|
||||
* 后端分步:图片字段传 COS 文件 URL(http/https),后端下载文件 → wxa/sec/uploadauthmaterial
|
||||
* 换 mediaid → 替换请求体 → 以 { auth_data } 包裹调 wxaauth 一步提交。
|
||||
* 后端分步:图片字段传 COS 文件 URL(http/https),后端下载文件 → wxa/sec/wxaapi/uploadmedia
|
||||
* 换 media_id → 替换请求体 → 调 wxaauth 一步提交。
|
||||
* 成功后回写 wms_wechat_app.auth_task_id/auth_apply_status,返回 taskid/auth_url。
|
||||
*
|
||||
* @param {object} data 入参(新版 wxaauth auth_data 字段白名单:
|
||||
* customer_type/account_name/account_name_type/pay_type/third_party_phone 与
|
||||
* contact_info{name,email} 必填;invoice_info/qualification/qualification_other/
|
||||
* account_supplemental/auth_identification/auth_ident_material/service_appid/taskid 可选;
|
||||
* 图片字段 qualification、qualification_other[]、account_supplemental[]、
|
||||
* auth_ident_material[] 支持传 COS URL,后端自动换 mediaid;其余字段透传)。
|
||||
* @param {object} data 入参(微信 wxaauth 请求体字段白名单:
|
||||
* contact_type/contact_name 必填;图片字段 contact_cert_photo/business_license_copy/
|
||||
* legal_persona_idcard_copy/legal_persona_media/pic_list(项 pic_url)/qualification_list(项
|
||||
* licence_list|certificate_list 的 value)/statement_list(项 value) 支持传 COS URL,
|
||||
* 后端自动换 media_id;其余字段透传)。
|
||||
* @return {Promise<{success: boolean, data: object|null, code: number, message: string}>} 结果。
|
||||
*/
|
||||
async wxaauth(data = {}) {
|
||||
@ -964,52 +553,39 @@ class WechatSystemsService extends Service {
|
||||
return { success: false, data: null, code: 0, message: '小程序未授权代码管理权限(权限集 18),请重新授权' };
|
||||
}
|
||||
|
||||
// 新版 auth_data 字段白名单透传(2024 版小程序认证接口)
|
||||
// 白名单透传微信请求体字段
|
||||
const ALLOWED_KEYS = [
|
||||
'customer_type', 'taskid', 'contact_info', 'invoice_info',
|
||||
'qualification', 'qualification_other', 'account_name', 'account_name_type',
|
||||
'account_supplemental', 'pay_type', 'auth_identification', 'auth_ident_material',
|
||||
'third_party_phone', 'service_appid',
|
||||
'contact_type', 'contact_name', 'contact_idcard_number', 'contact_mobile',
|
||||
'contact_cert_photo', 'contact_nationality', 'contact_address', 'contact_email',
|
||||
'business_license_copy', 'business_license_number', 'business_license_address',
|
||||
'business_license_expiration_date', 'legal_persona_media', 'legal_persona_idcard_copy',
|
||||
'legal_persona_name', 'legal_persona_idcard_number', 'legal_persona_address',
|
||||
'legal_persona_idcard_expiration_date', 'business_license_type', 'apply_type',
|
||||
'extra_wxa_secure_info', 'nickname', 'pic_list', 'qualification_list',
|
||||
'qualification_extra', 'license_list', 'statement_list', 'store_name',
|
||||
'store_main_industry', 'store_scale', 'store_floor', 'store_address', 'open_type', 'pay_type',
|
||||
];
|
||||
const authData = {};
|
||||
const body = {};
|
||||
for (const key of ALLOWED_KEYS) {
|
||||
if (Object.prototype.hasOwnProperty.call(data, key)) {
|
||||
authData[key] = data[key];
|
||||
body[key] = data[key];
|
||||
}
|
||||
}
|
||||
|
||||
// 必填校验
|
||||
if (authData.customer_type === undefined || authData.customer_type === null || authData.customer_type === '') {
|
||||
return { success: false, data: null, code: 0, message: 'customer_type 为必填(1 企业 / 12 个体工商户 / 15 个人)' };
|
||||
}
|
||||
if (!authData.account_name) {
|
||||
return { success: false, data: null, code: 0, message: 'account_name(小程序账号名称)为必填' };
|
||||
}
|
||||
if (authData.account_name_type === undefined || authData.account_name_type === null || authData.account_name_type === '') {
|
||||
return { success: false, data: null, code: 0, message: 'account_name_type 为必填(1 基于自选词汇 / 2 基于商标)' };
|
||||
}
|
||||
if (authData.pay_type === undefined || authData.pay_type === null || authData.pay_type === '') {
|
||||
return { success: false, data: null, code: 0, message: 'pay_type 为必填(1 消耗服务商预购包 / 2 小程序开发者自行支付)' };
|
||||
}
|
||||
if (!authData.third_party_phone) {
|
||||
return { success: false, data: null, code: 0, message: 'third_party_phone(第三方联系电话)为必填' };
|
||||
}
|
||||
const contactInfo = authData.contact_info;
|
||||
if (!contactInfo || typeof contactInfo !== 'object' || !contactInfo.name || !contactInfo.email) {
|
||||
return { success: false, data: null, code: 0, message: 'contact_info.name / contact_info.email 为必填' };
|
||||
if (body.contact_type === undefined || body.contact_name === undefined) {
|
||||
return { success: false, data: null, code: 0, message: 'contact_type/contact_name 为必填' };
|
||||
}
|
||||
|
||||
const client = new WechatOpenClient(ctx);
|
||||
|
||||
// 分步①:图片字段传 COS URL 时,后端下载并上传微信换 mediaid
|
||||
// 分步①:图片字段传 COS URL 时,后端下载并上传微信换 media_id
|
||||
try {
|
||||
await this.resolveBodyMedia(authData, client, record);
|
||||
await this.resolveBodyMedia(body, client, record);
|
||||
} catch (e) {
|
||||
return { success: false, data: null, code: 0, message: e.message || '上传认证材料失败' };
|
||||
}
|
||||
|
||||
// 分步②:发起认证(请求体为 { auth_data } 包裹)
|
||||
const result = await client.wxaauth(record.appid, record.authorizer_refresh_token, { auth_data: authData });
|
||||
// 分步②:发起认证
|
||||
const result = await client.wxaauth(record.appid, record.authorizer_refresh_token, body);
|
||||
if (!result || Number(result.errcode) !== 0) {
|
||||
const errmsg = result && result.errmsg ? result.errmsg : (result ? JSON.stringify(result) : '无响应');
|
||||
return { success: false, data: result || null, code: 0, message: `发起认证失败: ${errmsg}` };
|
||||
@ -1031,43 +607,67 @@ class WechatSystemsService extends Service {
|
||||
}
|
||||
|
||||
/**
|
||||
* 将请求体中的图片字段从 COS URL 替换为微信 mediaid(http/https 开头的值视为 COS URL,
|
||||
* 其余值视为已是 mediaid 原样保留)。
|
||||
* 将请求体中的图片字段从 COS URL 替换为微信 media_id(http/https 开头的值视为 COS URL,
|
||||
* 其余值视为已是 media_id 原样保留)。
|
||||
*
|
||||
* 新版字段:qualification(单张字符串)、qualification_other/account_supplemental/
|
||||
* auth_ident_material(字符串数组)。
|
||||
*
|
||||
* @param {object} body wxaauth auth_data 请求体(就地修改)。
|
||||
* @param {object} body wxaauth 请求体(就地修改)。
|
||||
* @param {WechatOpenClient} client 微信客户端。
|
||||
* @param {object} record wms_wechat_app 记录。
|
||||
* @return {Promise<void>}
|
||||
*/
|
||||
async resolveBodyMedia(body, client, record) {
|
||||
// 单张字符串图片字段
|
||||
if (typeof body.qualification === 'string' && body.qualification) {
|
||||
body.qualification = await this.resolveMediaValue(body.qualification, client, record);
|
||||
// 顶层字符串图片字段
|
||||
const IMAGE_STRING_FIELDS = [ 'contact_cert_photo', 'business_license_copy', 'legal_persona_idcard_copy', 'legal_persona_media' ];
|
||||
for (const key of IMAGE_STRING_FIELDS) {
|
||||
if (typeof body[key] === 'string' && body[key]) {
|
||||
body[key] = await this.resolveMediaValue(body[key], client, record);
|
||||
}
|
||||
}
|
||||
|
||||
// 字符串数组图片字段
|
||||
for (const key of [ 'qualification_other', 'account_supplemental', 'auth_ident_material' ]) {
|
||||
if (Array.isArray(body[key])) {
|
||||
for (let i = 0; i < body[key].length; i++) {
|
||||
if (typeof body[key][i] === 'string' && body[key][i]) {
|
||||
body[key][i] = await this.resolveMediaValue(body[key][i], client, record);
|
||||
// pic_list:[{ pic_url }]
|
||||
if (Array.isArray(body.pic_list)) {
|
||||
for (const item of body.pic_list) {
|
||||
if (item && typeof item === 'object' && typeof item.pic_url === 'string') {
|
||||
item.pic_url = await this.resolveMediaValue(item.pic_url, client, record);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// qualification_list:[{ licence_list: [{ value }], certificate_list: [{ value }] }]
|
||||
if (Array.isArray(body.qualification_list)) {
|
||||
for (const q of body.qualification_list) {
|
||||
if (q && typeof q === 'object') {
|
||||
for (const subKey of [ 'licence_list', 'certificate_list' ]) {
|
||||
if (Array.isArray(q[subKey])) {
|
||||
for (const item of q[subKey]) {
|
||||
if (item && typeof item === 'object' && typeof item.value === 'string') {
|
||||
item.value = await this.resolveMediaValue(item.value, client, record);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// statement_list:[{ value }]
|
||||
if (Array.isArray(body.statement_list)) {
|
||||
for (const item of body.statement_list) {
|
||||
if (item && typeof item === 'object' && typeof item.value === 'string') {
|
||||
item.value = await this.resolveMediaValue(item.value, client, record);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 单个图片字段解析:http/https 开头(COS URL)→ 下载 → uploadauthmaterial 换 mediaid;
|
||||
* 其他值视为已传 mediaid 原样返回。
|
||||
* 单个图片字段解析:http/https 开头(COS URL)→ 下载 → uploadmedia 换 media_id;
|
||||
* 其他值视为已传 media_id 原样返回。
|
||||
*
|
||||
* @param {string} value 字段值。
|
||||
* @param {WechatOpenClient} client 微信客户端。
|
||||
* @param {object} record wms_wechat_app 记录。
|
||||
* @return {Promise<string>} mediaid。
|
||||
* @return {Promise<string>} media_id。
|
||||
*/
|
||||
async resolveMediaValue(value, client, record) {
|
||||
const trimmed = String(value).trim();
|
||||
@ -1076,10 +676,6 @@ class WechatSystemsService extends Service {
|
||||
}
|
||||
|
||||
const buffer = await this.downloadFromUrl(trimmed);
|
||||
// 新版 uploadauthmaterial 限制:图片 ≤2M
|
||||
if (buffer.length > 2 * 1024 * 1024) {
|
||||
throw new Error(`上传认证材料失败(${trimmed}): 图片超过 2M 限制`);
|
||||
}
|
||||
const filename = this.resolveMediaFilename(trimmed);
|
||||
const result = await client.uploadAuthMedia(record.appid, record.authorizer_refresh_token, buffer, filename);
|
||||
if (!result || Number(result.errcode) !== 0) {
|
||||
@ -1087,7 +683,7 @@ class WechatSystemsService extends Service {
|
||||
throw new Error(`上传认证材料失败(${filename}): ${errmsg}`);
|
||||
}
|
||||
if (!result.media_id) {
|
||||
throw new Error(`上传认证材料失败(${filename}): 微信未返回 mediaid`);
|
||||
throw new Error(`上传认证材料失败(${filename}): 微信未返回 media_id`);
|
||||
}
|
||||
return result.media_id;
|
||||
}
|
||||
@ -1727,8 +1323,7 @@ class WechatSystemsService extends Service {
|
||||
* 可选 app_id 指定单个应用(须属于当前仓库且启用,否则报错)。
|
||||
* 支持 where(operator 结构,由 method 层 prepareWhereContext 解析)、
|
||||
* pagination(page/pageSize)、sort(sortField/sortOrder 白名单)。
|
||||
* 响应排除 session_key/access_token/refresh_token 等敏感字段,并附 is_bound(user_id>0);
|
||||
* 并附 agreement_version_id(协议版本id,loginByCode 自动回写,可供 getAgreementVersion 拉取协议内容)。
|
||||
* 响应排除 session_key/access_token/refresh_token 等敏感字段,并附 is_bound(user_id>0)。
|
||||
*
|
||||
* @param {object} data 入参。
|
||||
* @param {number} [data.app_id] 指定 wms_wechat_app.id(可选)。
|
||||
@ -1804,7 +1399,6 @@ class WechatSystemsService extends Service {
|
||||
'sex',
|
||||
'login_time',
|
||||
'login_count',
|
||||
'agreement_version_id',
|
||||
'created_at',
|
||||
'updated_at',
|
||||
];
|
||||
@ -1830,9 +1424,6 @@ class WechatSystemsService extends Service {
|
||||
id: Number(row.id),
|
||||
user_id: Number(row.user_id),
|
||||
app_id: Number(row.app_id),
|
||||
agreement_version_id: row.agreement_version_id === null || row.agreement_version_id === undefined
|
||||
? null
|
||||
: Number(row.agreement_version_id),
|
||||
is_bound: Number(row.user_id) > 0,
|
||||
}));
|
||||
|
||||
|
||||
@ -258,7 +258,6 @@ class WorkbenchService extends Service {
|
||||
return await this._packOrder({
|
||||
delivery_order_code: cachedCtx.delivery_order_code,
|
||||
wave_no: cachedCtx.wave_no,
|
||||
wave_scope: cachedCtx.wave_scope,
|
||||
waybill_code: cachedCtx.waybill_code,
|
||||
warehouse_id: Number(cachedCtx.warehouse_id || 0),
|
||||
workbench_id: cachedCtx.workbench_id != null ? Number(cachedCtx.workbench_id) : null,
|
||||
@ -280,7 +279,7 @@ class WorkbenchService extends Service {
|
||||
* 凭打包上下文 key 从缓存拉取打包参数(queryOrder 扫码时写入,20 分钟有效)。
|
||||
* 只信任后端缓存内容,body 其它字段一律忽略(防篡改)。
|
||||
* @param {Object} data - { key }
|
||||
* @return {Promise<Object>} 缓存内容(warehouse_id/workbench_id/order_id/delivery_order_code/wave_no/wave_scope/waybill_code/is_sandan)
|
||||
* @return {Promise<Object>} 缓存内容(warehouse_id/workbench_id/order_id/delivery_order_code/wave_no/waybill_code/is_sandan)
|
||||
* @throws {Error} key 缺失或上下文过期
|
||||
*/
|
||||
async _loadPackCtx(data = {}) {
|
||||
@ -780,19 +779,13 @@ class WorkbenchService extends Service {
|
||||
* 兼容一单多号(主单号/子单号):传入 waybill_code 时按「订单 + 运单号」维度
|
||||
* 记录打包流水与去重,主/子单号流水互不覆盖;未传时保持订单维度(兼容旧设备端)。
|
||||
* 打包人:上报了 users(business 旧链路)以上报为准,未上报(token+key 新链路)自动回填工作台绑定成员。
|
||||
* 波次范围(wave_scope):优先取上报值(0-4 整数),非法/缺省时兜底取订单行 wave_scope,
|
||||
* 服务端复查落库,防止前端失真;写入 wms_pack_task.wave_scope。
|
||||
* 响应附大团购倒计时字段:wave_scope=1 时下发 pack_wait_seconds(当前波次打包数 × 大团购打包系数,秒)
|
||||
* 与 pack_start_time(开始打包时间,毫秒时间戳)供前端倒计时;其他波次两字段均为 0。
|
||||
* @param {Object} params - { delivery_order_code, wave_no, wave_scope, warehouse_id, workbench_id, status, pack_time, waybill_code, users }
|
||||
* @param {Object} params - { delivery_order_code, wave_no, warehouse_id, workbench_id, status, pack_time, waybill_code, users }
|
||||
* @param {string} [params.waybill_code] 扫描打包的运单号(可选,用于运单维度记录流水)
|
||||
* @param {number} [params.wave_scope] 波次范围(0未分配 1大团购 2散单 3小团购 4单品单件,可选)
|
||||
* @returns {Promise<Object>} 打包结果 { task_id, order_id, delivery_order_code, wave_no, isSandan, pack_mode, status, pack_wait_seconds, pack_start_time, batch? }
|
||||
* @returns {Promise<Object>}
|
||||
*/
|
||||
async _packOrder(params) {
|
||||
const { ctx } = this;
|
||||
const { delivery_order_code: deliveryOrderCode, wave_no: waveNo,
|
||||
wave_scope: waveScopeParam,
|
||||
warehouse_id: inputWarehouseId, workbench_id: workbenchIdRaw,
|
||||
status: packStatus, pack_time: packTime,
|
||||
wave_total_orders: waveTotalOrders,
|
||||
@ -875,8 +868,6 @@ class WorkbenchService extends Service {
|
||||
isSandan: 0,
|
||||
pack_mode: 2,
|
||||
status: 2,
|
||||
pack_wait_seconds: 0,
|
||||
pack_start_time: 0,
|
||||
batch: { wave_id: waveId, wave_no: actualWaveNo, wave_type: waveType, total_orders: totalOrders },
|
||||
};
|
||||
}
|
||||
@ -1076,20 +1067,12 @@ class WorkbenchService extends Service {
|
||||
orderId, waveId, deviceItemsCount, packSkuCount);
|
||||
}
|
||||
|
||||
// 波次范围(wave_scope)服务端复查:优先取上报值(0-4 整数),非法/缺省时兜底取订单行值
|
||||
const parsedWaveScope = Number.parseInt(waveScopeParam, 10);
|
||||
const orderWaveScope = Number(orderRow.wave_scope) || 0;
|
||||
const normalizedWaveScope = Number.isFinite(parsedWaveScope) && parsedWaveScope >= 0 && parsedWaveScope <= 4
|
||||
? parsedWaveScope
|
||||
: (orderWaveScope >= 0 && orderWaveScope <= 4 ? orderWaveScope : 0);
|
||||
|
||||
const packData = {
|
||||
order_id: orderId,
|
||||
warehouse_id: warehouseId,
|
||||
workbench_id: validWorkbenchId,
|
||||
wave_id: waveId,
|
||||
wave_no: actualWaveNo,
|
||||
wave_scope: normalizedWaveScope,
|
||||
waybill_code: packWaybillCode, // 散单运单维度打包时记录运单号;未传运单号(旧设备端)或团购保持 null
|
||||
pack_mode: isSandan === 0 ? 2 : 1, // 1=散单 2=团购
|
||||
status: normalizedPackStatus,
|
||||
@ -1268,19 +1251,6 @@ class WorkbenchService extends Service {
|
||||
status: packData.status,
|
||||
};
|
||||
|
||||
// 大团购波次(wave_scope=1)下发倒计时字段供前端展示:
|
||||
// pack_wait_seconds = 当前波次打包数 × 大团购打包系数(秒),pack_start_time = 开始打包时间(毫秒时间戳);
|
||||
// 其他波次一律下发 0(不参与倒计时)。
|
||||
let packWaitSeconds = 0;
|
||||
let packStartTime = 0;
|
||||
if (normalizedWaveScope === 1) {
|
||||
const coefficient = await this._getBigGroupPackCoefficient(warehouseId);
|
||||
packWaitSeconds = packQuantity * coefficient;
|
||||
packStartTime = packTimeMs;
|
||||
}
|
||||
result.pack_wait_seconds = packWaitSeconds;
|
||||
result.pack_start_time = packStartTime;
|
||||
|
||||
// 团购单附加波次总量
|
||||
if (isSandan === 0) {
|
||||
result.batch = { wave_id: waveId, wave_no: actualWaveNo, wave_type: waveType, total_orders: totalOrders };
|
||||
@ -2066,32 +2036,6 @@ class WorkbenchService extends Service {
|
||||
return items;
|
||||
}
|
||||
|
||||
/**
|
||||
* 读取仓库「大团购打包系数」配置(wms_store.subject_config.big_group_pack_coefficient)。
|
||||
* 走 deliveryOrder.getStoreSubjectConfig 公共读取链路(带缓存);配置读取失败
|
||||
* 或值非法时降级为默认系数 3(秒/单),保证时间闸门兜底可用。
|
||||
* @param {number} warehouseId 仓库ID
|
||||
* @return {Promise<number>} 大团购打包系数(秒/单),大于 0
|
||||
*/
|
||||
async _getBigGroupPackCoefficient(warehouseId) {
|
||||
const DEFAULT_COEFFICIENT = 3;
|
||||
try {
|
||||
const deliveryOrderService = this.ctx.service
|
||||
&& this.ctx.service.systems
|
||||
&& this.ctx.service.systems.deliveryOrder;
|
||||
if (deliveryOrderService && typeof deliveryOrderService.getStoreSubjectConfig === 'function') {
|
||||
const subjectConfig = await deliveryOrderService.getStoreSubjectConfig(warehouseId);
|
||||
const coefficient = Number(subjectConfig && subjectConfig.big_group_pack_coefficient);
|
||||
if (Number.isFinite(coefficient) && coefficient > 0) {
|
||||
return coefficient;
|
||||
}
|
||||
}
|
||||
} catch (configErr) {
|
||||
this.ctx.logger.warn('[Workbench._getBigGroupPackCoefficient] 读取仓库配置失败,使用默认系数: %s', configErr.message);
|
||||
}
|
||||
return DEFAULT_COEFFICIENT;
|
||||
}
|
||||
|
||||
/**
|
||||
* 条码查订单:条码 → wms_order_express → 待处理/配送订单详情。
|
||||
* 散单(isSandan=1)时在响应 order 对象中额外返回 intercept_flag / pack_flag 两个 0/1 标志:
|
||||
@ -2099,9 +2043,6 @@ class WorkbenchService extends Service {
|
||||
* pack_flag 按运单维度判定(该运单号已有打包流水为 1,主/子单号互不影响)。
|
||||
* order 对象始终包含 picker_id / picker_name:通过 wave_id 关联拣货任务取拣货人,
|
||||
* 散单无波次或未分配拣货人时为 null / 空串。
|
||||
* 大团购打包时长闸门:当前工作台存在进行中的大团购打包任务时,判断是否已到
|
||||
* 「当前波次打包数 × 大团购打包系数」秒:未到时仅允许查询本波次订单,
|
||||
* 其他波次订单返回「打包时长不足」错误;已到时不受限制。
|
||||
* 查询成功时生成一次性打包上下文 key(20 分钟有效)写入 Redis,
|
||||
* 响应附 key 供 workbench.packOrder 消费,打包参数由后端维护防篡改。
|
||||
* @param {Object} params - { barcode, warehouseId, workbenchId }
|
||||
@ -2222,52 +2163,6 @@ class WorkbenchService extends Service {
|
||||
}
|
||||
}
|
||||
|
||||
// 步骤3.5:大团购打包时长闸门。
|
||||
// 打包任务已落库 wave_scope,直接按 wave_scope=1 快捷判定当前工作台是否有
|
||||
// 进行中的大团购任务需要限制下一个任务的开始时间:
|
||||
// - 未到「当前波次打包数 × 大团购打包系数」秒时:仅允许查询本波次订单,其他波次订单返回「打包时长不足」错误;
|
||||
// - 已到时:不受限制,正常下发。
|
||||
if (validQueryWorkbenchId) {
|
||||
let packTimeGateNotReached = false;
|
||||
let currentTaskWaveId = 0;
|
||||
try {
|
||||
const currentPackTask = await ctx.model.PackTask.findOne({
|
||||
where: {
|
||||
workbench_id: validQueryWorkbenchId,
|
||||
warehouse_id: warehouseId,
|
||||
status: { [ctx.app.Sequelize.Op.lt]: 2 },
|
||||
wave_scope: 1,
|
||||
wave_id: { [ctx.app.Sequelize.Op.gt]: 0 },
|
||||
},
|
||||
attributes: [ 'id', 'wave_id', 'pack_quantity', 'start_time', 'create_time' ],
|
||||
order: [[ 'id', 'DESC' ]],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
if (currentPackTask) {
|
||||
const coefficient = await this._getBigGroupPackCoefficient(warehouseId);
|
||||
const startMs = currentPackTask.start_time
|
||||
? new Date(currentPackTask.start_time).getTime()
|
||||
: (currentPackTask.create_time ? new Date(currentPackTask.create_time).getTime() : Date.now());
|
||||
const currentPackQuantity = Number(currentPackTask.pack_quantity) > 0
|
||||
? Number(currentPackTask.pack_quantity)
|
||||
: 1;
|
||||
const requiredSeconds = currentPackQuantity * coefficient;
|
||||
const elapsedSeconds = Math.floor((Date.now() - startMs) / 1000);
|
||||
if (elapsedSeconds < requiredSeconds) {
|
||||
packTimeGateNotReached = true;
|
||||
currentTaskWaveId = Number(currentPackTask.wave_id) || 0;
|
||||
}
|
||||
}
|
||||
} catch (timeGateErr) {
|
||||
ctx.logger.warn('[Workbench._queryOrder] 大团购打包时长闸门检查失败: %s', timeGateErr && timeGateErr.message);
|
||||
}
|
||||
|
||||
if (packTimeGateNotReached && Number(waveId) !== currentTaskWaveId) {
|
||||
throw new Error('打包时长不足');
|
||||
}
|
||||
}
|
||||
|
||||
// 步骤4:查询订单商品明细 + 关联 stock 详情(带缓存,公共方法 _fetchOrderItemsDetail)
|
||||
const items = await this._fetchOrderItemsDetail(orderId, warehouseId, sourceTable);
|
||||
|
||||
@ -2371,7 +2266,6 @@ class WorkbenchService extends Service {
|
||||
step: orderRow.step,
|
||||
wave_id: orderRow.wave_id,
|
||||
wave_no: orderRow.wave_no,
|
||||
wave_scope: orderRow.wave_scope,
|
||||
post_status: orderRow.post_status,
|
||||
pick_status: orderRow.pick_status,
|
||||
pack_status: orderRow.pack_status,
|
||||
@ -2418,7 +2312,6 @@ class WorkbenchService extends Service {
|
||||
order_id: orderRow.id,
|
||||
delivery_order_code: orderRow.delivery_order_code,
|
||||
wave_no: orderRow.wave_no || '',
|
||||
wave_scope: orderRow.wave_scope,
|
||||
waybill_code: waybillCode,
|
||||
is_sandan: isSandan,
|
||||
};
|
||||
|
||||
@ -258,15 +258,6 @@ module.exports = appInfo => {
|
||||
// 单轮批处理大小(按 id 升序分批)
|
||||
batchSize: 50,
|
||||
};
|
||||
// 微信用户须知版本清理定时任务配置(每 1 小时执行,真实删除未使用且非最终版的历史版本释放磁盘空间)
|
||||
config.wechatAgreementCleanup = {
|
||||
// 开关:false 时不注册本定时任务
|
||||
enable: true,
|
||||
// 触发 cron(秒 分 时 日 月 周):默认每 1 小时整点;本地环境可在 config.local.js 覆盖为短间隔
|
||||
cron: '0 0 * * * *',
|
||||
// 单批硬删除行数(按 id 分批,走主键索引)
|
||||
batchSize: 500,
|
||||
};
|
||||
// 系统日志超期清理定时任务配置(每日凌晨 03:00 执行,硬删除 wms_system_log 超期数据释放磁盘空间)
|
||||
config.systemLogCleanup = {
|
||||
enable: true,
|
||||
@ -311,17 +302,6 @@ module.exports = appInfo => {
|
||||
// 该目录保留供未来定时任务(Egg schedule 或外部 crontab)从库内 cert_pem/cert_key 读取内容后写 nginx 证书目录使用。
|
||||
config.frontConfig = {
|
||||
certStagingDir: '/data/wms/cert-staging',
|
||||
// 前端独立部署:域名验证(DNS TXT 校验)
|
||||
cname: '', // 用户把域名 CNAME 指向的目标(未验证时返回给前端展示)
|
||||
domainVerify: {
|
||||
enable: true, // 是否注册域名验证定时任务
|
||||
interval: '10m', // 扫描间隔
|
||||
lockTtlSeconds: 600, // Redis 跨进程锁 TTL(略大于 interval)
|
||||
batchSize: 50, // 单轮最多处理行数
|
||||
dohUrl: 'https://doh.pub/dns-query',
|
||||
timeoutMs: 5000, // 单次 DoH 请求超时
|
||||
maxAttempts: 20, // 超过后不再自动重试(仍可手动 checkDomain)
|
||||
},
|
||||
};
|
||||
|
||||
return {
|
||||
|
||||
@ -1,225 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 新增系统级售后类型「退回」(return)与子类型「查退回」(query_return),
|
||||
* 并补齐 v2 可配置回信引擎的完整配置链。
|
||||
*
|
||||
* 背景:
|
||||
* - v1 引擎(inbox/rules.js STORE_RULES / WAREHOUSE_RULES)与代码函数表均有
|
||||
* queryReturn(关键词:查退回/是否已退回/查退件/查件,waybill:true);
|
||||
* - v2 的 wms_after_sale_type / wms_after_sale_sub_type 中没有「退回」类型与
|
||||
* 「查退回」子类型,导致 v2 引擎无法把「查退回」类消息路由到 queryReturn 函数。
|
||||
*
|
||||
* 本次新增(幂等,先查后插):
|
||||
* 1. 系统级类型 return(退回,sort_order=5,紧跟出库单之后、帮助之前);
|
||||
* 2. 系统级子类型 return.query_return(查退回,sort_order=1);
|
||||
* 3. 关键词 8 条:查退回/查退件/退回查询/退回明细/查拆包/退件查询/退回进度/是否已退回;
|
||||
* 4. 群类型白名单:group_type='*' 全通配(queryReturn 函数 groups=[COMMON],所有群可用);
|
||||
* 5. 子类型-函数关系:queryReturn;
|
||||
* 6. 取号规则关联:运单号提取(waybill);
|
||||
* 7. 系统级回复行:reply={back_text}、is_reply=1、create_work_order=0(纯查询不建工单)、
|
||||
* no_number_hint=查退回专属引导语、is_enabled=1。
|
||||
*/
|
||||
|
||||
const TYPE_TABLE = 'wms_after_sale_type';
|
||||
const SUB_TYPE_TABLE = 'wms_after_sale_sub_type';
|
||||
const KEYWORD_TABLE = 'wms_after_sale_keyword';
|
||||
const GROUP_REL_TABLE = 'wms_after_sale_sub_type_group';
|
||||
const FUNCTION_TABLE = 'wms_after_sale_function';
|
||||
const FUNC_REL_TABLE = 'wms_after_sale_sub_type_function';
|
||||
const RULE_TABLE = 'wms_inbox_number_rule';
|
||||
const RULE_REL_TABLE = 'wms_after_sale_sub_type_rule';
|
||||
const REPLY_TABLE = 'wms_after_sale_reply';
|
||||
|
||||
const TYPE_CODE = 'return';
|
||||
const TYPE_NAME = '退回';
|
||||
const SUB_TYPE_CODE = 'query_return';
|
||||
const SUB_TYPE_NAME = '查退回';
|
||||
const KEYWORDS = [ '查退回', '查退件', '退回查询', '退回明细', '查拆包', '退件查询', '退回进度', '是否已退回' ];
|
||||
const FUNCTION_CODE = 'queryReturn';
|
||||
const RULE_NAME = '运单号提取';
|
||||
const HINT_DEFAULT = '请提供运单号(发送:查退回+运单号,多个单号用逗号或空格分隔)\n例:查退回 SF123';
|
||||
|
||||
module.exports = {
|
||||
/**
|
||||
* 新增系统级「退回」类型与「查退回」子类型配置链(幂等)。
|
||||
* @param {Object} queryInterface Sequelize QueryInterface 实例。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
up: async queryInterface => {
|
||||
const { sequelize } = queryInterface;
|
||||
const tables = await queryInterface.showAllTables();
|
||||
const exists = t => tables.some(x => (typeof x === 'string' ? x : x.tableName) === t);
|
||||
if (!exists(SUB_TYPE_TABLE)) return;
|
||||
|
||||
const q = async (sql, replacements) => {
|
||||
const [ rows ] = await sequelize.query(sql, { replacements });
|
||||
return rows;
|
||||
};
|
||||
|
||||
// ─── 1. 系统级类型 return(先查后插) ────────────────────────
|
||||
if (exists(TYPE_TABLE)) {
|
||||
const typeRows = await q(
|
||||
'SELECT id FROM `' + TYPE_TABLE + '` WHERE type = :t AND warehouse_id IS NULL LIMIT 1',
|
||||
{ t: TYPE_CODE }
|
||||
);
|
||||
if (typeRows.length === 0) {
|
||||
await sequelize.query(
|
||||
'INSERT INTO `' + TYPE_TABLE + '` '
|
||||
+ '(warehouse_id, type, name, is_system, is_enabled, sort_order, created_at, updated_at) '
|
||||
+ 'VALUES (NULL, :t, :n, 1, 1, :so, NOW(), NOW())',
|
||||
{ replacements: { t: TYPE_CODE, n: TYPE_NAME, so: 5 } }
|
||||
);
|
||||
console.log(`[MIGRATION] 类型插入 ${TYPE_CODE}(${TYPE_NAME})`);
|
||||
}
|
||||
}
|
||||
|
||||
// ─── 2. 系统级子类型 return.query_return(先查后插) ─────────
|
||||
let subRows = await q(
|
||||
'SELECT id FROM `' + SUB_TYPE_TABLE + '` '
|
||||
+ 'WHERE type = :t AND sub_type = :s AND warehouse_id IS NULL LIMIT 1',
|
||||
{ t: TYPE_CODE, s: SUB_TYPE_CODE }
|
||||
);
|
||||
if (subRows.length === 0) {
|
||||
await sequelize.query(
|
||||
'INSERT INTO `' + SUB_TYPE_TABLE + '` '
|
||||
+ '(warehouse_id, type, sub_type, name, is_system, is_enabled, sort_order, created_at, updated_at) '
|
||||
+ 'VALUES (NULL, :t, :s, :n, 1, 1, 1, NOW(), NOW())',
|
||||
{ replacements: { t: TYPE_CODE, s: SUB_TYPE_CODE, n: SUB_TYPE_NAME } }
|
||||
);
|
||||
subRows = await q(
|
||||
'SELECT id FROM `' + SUB_TYPE_TABLE + '` '
|
||||
+ 'WHERE type = :t AND sub_type = :s AND warehouse_id IS NULL LIMIT 1',
|
||||
{ t: TYPE_CODE, s: SUB_TYPE_CODE }
|
||||
);
|
||||
console.log(`[MIGRATION] 子类型插入 ${TYPE_CODE}.${SUB_TYPE_CODE}`);
|
||||
}
|
||||
if (subRows.length === 0) {
|
||||
console.warn(`[MIGRATION] 跳过:子类型 ${TYPE_CODE}.${SUB_TYPE_CODE} 缺失且插入失败`);
|
||||
return;
|
||||
}
|
||||
const subTypeId = subRows[0].id;
|
||||
|
||||
// ─── 3. 关键词(先查后插) ──────────────────────────────────
|
||||
if (exists(KEYWORD_TABLE)) {
|
||||
let kwInserted = 0;
|
||||
for (const [ idx, kw ] of KEYWORDS.entries()) {
|
||||
const kwRows = await q(
|
||||
'SELECT id FROM `' + KEYWORD_TABLE + '` WHERE keyword = :kw AND warehouse_id IS NULL LIMIT 1',
|
||||
{ kw }
|
||||
);
|
||||
if (kwRows.length === 0) {
|
||||
await sequelize.query(
|
||||
'INSERT INTO `' + KEYWORD_TABLE + '` '
|
||||
+ '(warehouse_id, sub_type_id, keyword, is_system, is_enabled, sort_order, created_at, updated_at) '
|
||||
+ 'VALUES (NULL, :sid, :kw, 1, 1, :so, NOW(), NOW())',
|
||||
{ replacements: { sid: subTypeId, kw, so: idx } }
|
||||
);
|
||||
kwInserted += 1;
|
||||
}
|
||||
}
|
||||
console.log(`[MIGRATION] 关键词插入 ${kwInserted} 条`);
|
||||
}
|
||||
|
||||
// ─── 4. 群类型白名单:全通配(函数 groups=[COMMON]) ─────────
|
||||
if (exists(GROUP_REL_TABLE)) {
|
||||
const grpRows = await q(
|
||||
'SELECT id FROM `' + GROUP_REL_TABLE + '` WHERE sub_type_id = :sid AND group_type = :g LIMIT 1',
|
||||
{ sid: subTypeId, g: '*' }
|
||||
);
|
||||
if (grpRows.length === 0) {
|
||||
await sequelize.query(
|
||||
'INSERT INTO `' + GROUP_REL_TABLE + '` '
|
||||
+ '(sub_type_id, group_type, sub_group, is_system, sort_order, created_at, updated_at) '
|
||||
+ 'VALUES (:sid, :g, :sg, 1, 0, NOW(), NOW())',
|
||||
{ replacements: { sid: subTypeId, g: '*', sg: '' } }
|
||||
);
|
||||
console.log('[MIGRATION] 群白名单插入通配行');
|
||||
}
|
||||
}
|
||||
|
||||
// ─── 5. 子类型-函数关系:queryReturn ───────────────────────
|
||||
if (exists(FUNC_REL_TABLE) && exists(FUNCTION_TABLE)) {
|
||||
const fnRows = await q(
|
||||
'SELECT id FROM `' + FUNCTION_TABLE + '` WHERE function_code = :code LIMIT 1',
|
||||
{ code: FUNCTION_CODE }
|
||||
);
|
||||
if (fnRows.length > 0) {
|
||||
await sequelize.query(
|
||||
'INSERT IGNORE INTO `' + FUNC_REL_TABLE + '` '
|
||||
+ '(sub_type_id, function_id, sort_order, created_at, updated_at) '
|
||||
+ 'VALUES (:sid, :fid, 1, NOW(), NOW())',
|
||||
{ replacements: { sid: subTypeId, fid: fnRows[0].id } }
|
||||
);
|
||||
console.log(`[MIGRATION] 函数关系插入 ${FUNCTION_CODE}`);
|
||||
} else {
|
||||
console.warn(`[MIGRATION] 跳过:未找到处理函数 ${FUNCTION_CODE}`);
|
||||
}
|
||||
}
|
||||
|
||||
// ─── 6. 运单号取号规则关联 ──────────────────────────────────
|
||||
if (exists(RULE_REL_TABLE) && exists(RULE_TABLE)) {
|
||||
const ruleRows = await q(
|
||||
'SELECT id FROM `' + RULE_TABLE + '` WHERE name = :n LIMIT 1',
|
||||
{ n: RULE_NAME }
|
||||
);
|
||||
if (ruleRows.length > 0) {
|
||||
await sequelize.query(
|
||||
'INSERT IGNORE INTO `' + RULE_REL_TABLE + '` '
|
||||
+ '(sub_type_id, number_rule_id, sort_order, created_at, updated_at) '
|
||||
+ 'VALUES (:sid, :rid, 1, NOW(), NOW())',
|
||||
{ replacements: { sid: subTypeId, rid: ruleRows[0].id } }
|
||||
);
|
||||
console.log(`[MIGRATION] 取号规则关联插入 ${RULE_NAME}`);
|
||||
} else {
|
||||
console.warn(`[MIGRATION] 跳过:未找到取号规则 ${RULE_NAME}`);
|
||||
}
|
||||
}
|
||||
|
||||
// ─── 7. 系统级回复行(先查后插;纯查询不建工单) ─────────────
|
||||
if (exists(REPLY_TABLE)) {
|
||||
const replyRows = await q(
|
||||
'SELECT id FROM `' + REPLY_TABLE + '` WHERE sub_type_id = :sid AND warehouse_id IS NULL LIMIT 1',
|
||||
{ sid: subTypeId }
|
||||
);
|
||||
if (replyRows.length === 0) {
|
||||
await sequelize.query(
|
||||
'INSERT INTO `' + REPLY_TABLE + '` '
|
||||
+ '(warehouse_id, sub_type_id, reply, is_reply, create_work_order, no_number_hint, is_enabled, created_at, updated_at) '
|
||||
+ 'VALUES (NULL, :sid, :reply, 1, 0, :hint, 1, NOW(), NOW())',
|
||||
{ replacements: { sid: subTypeId, reply: '{back_text}', hint: HINT_DEFAULT } }
|
||||
);
|
||||
console.log('[MIGRATION] 系统级回复行插入 1 行');
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* 回滚:删除「查退回」子类型的全部关联配置与子类型、类型行。
|
||||
* @param {Object} queryInterface Sequelize QueryInterface 实例。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
down: async queryInterface => {
|
||||
const { sequelize } = queryInterface;
|
||||
|
||||
const [ subRows ] = await sequelize.query(
|
||||
'SELECT id FROM `' + SUB_TYPE_TABLE + '` '
|
||||
+ 'WHERE type = :t AND sub_type = :s AND warehouse_id IS NULL LIMIT 1',
|
||||
{ replacements: { t: TYPE_CODE, s: SUB_TYPE_CODE } }
|
||||
);
|
||||
if (subRows.length === 0) return;
|
||||
const subTypeId = subRows[0].id;
|
||||
|
||||
await sequelize.query('DELETE FROM `' + REPLY_TABLE + '` WHERE sub_type_id = :sid AND warehouse_id IS NULL', { replacements: { sid: subTypeId } });
|
||||
await sequelize.query('DELETE FROM `' + KEYWORD_TABLE + '` WHERE sub_type_id = :sid AND warehouse_id IS NULL', { replacements: { sid: subTypeId } });
|
||||
await sequelize.query('DELETE FROM `' + GROUP_REL_TABLE + '` WHERE sub_type_id = :sid', { replacements: { sid: subTypeId } });
|
||||
await sequelize.query('DELETE FROM `' + FUNC_REL_TABLE + '` WHERE sub_type_id = :sid', { replacements: { sid: subTypeId } });
|
||||
await sequelize.query('DELETE FROM `' + RULE_REL_TABLE + '` WHERE sub_type_id = :sid', { replacements: { sid: subTypeId } });
|
||||
await sequelize.query('DELETE FROM `' + SUB_TYPE_TABLE + '` WHERE id = :sid', { replacements: { sid: subTypeId } });
|
||||
|
||||
await sequelize.query(
|
||||
'DELETE FROM `' + TYPE_TABLE + '` WHERE type = :t AND warehouse_id IS NULL',
|
||||
{ replacements: { t: TYPE_CODE } }
|
||||
);
|
||||
},
|
||||
};
|
||||
@ -1,24 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* wms_wechat_app 增加用户须知富文本字段(只做加字段):
|
||||
* - user_agreement:用户须知(富文本 longText),供 wechat.getUserAgreementText/
|
||||
* wechat.getUserAgreement/wechat.setUserAgreement 读写。
|
||||
*/
|
||||
|
||||
const TABLE_NAME = 'wms_wechat_app';
|
||||
|
||||
module.exports = {
|
||||
async up(queryInterface, Sequelize) {
|
||||
await queryInterface.addColumn(TABLE_NAME, 'user_agreement', {
|
||||
type: Sequelize.TEXT('long'),
|
||||
allowNull: true,
|
||||
defaultValue: null,
|
||||
comment: '用户须知(富文本 longText)',
|
||||
});
|
||||
},
|
||||
|
||||
async down(queryInterface) {
|
||||
await queryInterface.removeColumn(TABLE_NAME, 'user_agreement');
|
||||
},
|
||||
};
|
||||
@ -1,84 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 用户须知改为副表版本管理(2026-09-23):
|
||||
* 1. 移除 wms_wechat_app.user_agreement 字段(富文本改为副表存储);
|
||||
* 2. 新增副表 wms_wechat_agreement_version:appid + 数字版本号 + 富文本,
|
||||
* 提交一次自动新增版本,拉取只取最新版本;
|
||||
* 3. wms_user_oauth 增加 agreement_version_id(协议版本id),loginByCode 时自动更新到最新。
|
||||
*/
|
||||
|
||||
const APP_TABLE = 'wms_wechat_app';
|
||||
const VERSION_TABLE = 'wms_wechat_agreement_version';
|
||||
const OAUTH_TABLE = 'wms_user_oauth';
|
||||
|
||||
module.exports = {
|
||||
async up(queryInterface, Sequelize) {
|
||||
await queryInterface.removeColumn(APP_TABLE, 'user_agreement');
|
||||
|
||||
await queryInterface.createTable(VERSION_TABLE, {
|
||||
id: {
|
||||
type: Sequelize.BIGINT(20).UNSIGNED,
|
||||
primaryKey: true,
|
||||
autoIncrement: true,
|
||||
allowNull: false,
|
||||
comment: '主键',
|
||||
},
|
||||
appid: {
|
||||
type: Sequelize.STRING(64),
|
||||
allowNull: false,
|
||||
comment: '小程序AppID(关联 wms_wechat_app.appid)',
|
||||
},
|
||||
version: {
|
||||
type: Sequelize.INTEGER,
|
||||
allowNull: false,
|
||||
comment: '协议版本号(数字,同一 appid 内自动+1)',
|
||||
},
|
||||
content: {
|
||||
type: Sequelize.TEXT('long'),
|
||||
allowNull: true,
|
||||
defaultValue: null,
|
||||
comment: '用户须知富文本内容',
|
||||
},
|
||||
created_at: {
|
||||
type: Sequelize.DATE,
|
||||
allowNull: false,
|
||||
defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),
|
||||
comment: '创建时间',
|
||||
},
|
||||
updated_at: {
|
||||
type: Sequelize.DATE,
|
||||
allowNull: false,
|
||||
defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),
|
||||
comment: '更新时间',
|
||||
},
|
||||
}, {
|
||||
comment: '微信用户须知版本表(副表,提交一次新增一个版本)',
|
||||
});
|
||||
await queryInterface.addIndex(VERSION_TABLE, [ 'appid', 'version' ], {
|
||||
unique: true,
|
||||
name: 'uk_appid_version',
|
||||
});
|
||||
await queryInterface.addIndex(VERSION_TABLE, [ 'appid' ], {
|
||||
name: 'idx_appid',
|
||||
});
|
||||
|
||||
await queryInterface.addColumn(OAUTH_TABLE, 'agreement_version_id', {
|
||||
type: Sequelize.BIGINT(20).UNSIGNED,
|
||||
allowNull: true,
|
||||
defaultValue: null,
|
||||
comment: '协议版本ID(关联 wms_wechat_agreement_version.id,loginByCode 时自动更新到最新)',
|
||||
});
|
||||
},
|
||||
|
||||
async down(queryInterface, Sequelize) {
|
||||
await queryInterface.removeColumn(OAUTH_TABLE, 'agreement_version_id');
|
||||
await queryInterface.dropTable(VERSION_TABLE);
|
||||
await queryInterface.addColumn(APP_TABLE, 'user_agreement', {
|
||||
type: Sequelize.TEXT('long'),
|
||||
allowNull: true,
|
||||
defaultValue: null,
|
||||
comment: '用户须知(富文本 longText)',
|
||||
});
|
||||
},
|
||||
};
|
||||
@ -1,29 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 用户须知版本表去掉 version 数字版本号,直接用 id 自增(2026-09-23):
|
||||
* - 删除唯一索引 uk_appid_version(appid,version);
|
||||
* - 删除 version 列;最新版本判定改为 ORDER BY id DESC。
|
||||
*/
|
||||
|
||||
const TABLE_NAME = 'wms_wechat_agreement_version';
|
||||
|
||||
module.exports = {
|
||||
async up(queryInterface) {
|
||||
await queryInterface.removeIndex(TABLE_NAME, 'uk_appid_version');
|
||||
await queryInterface.removeColumn(TABLE_NAME, 'version');
|
||||
},
|
||||
|
||||
async down(queryInterface, Sequelize) {
|
||||
await queryInterface.addColumn(TABLE_NAME, 'version', {
|
||||
type: Sequelize.INTEGER,
|
||||
allowNull: true,
|
||||
defaultValue: null,
|
||||
comment: '协议版本号(数字,同一 appid 内自动+1)',
|
||||
});
|
||||
await queryInterface.addIndex(TABLE_NAME, [ 'appid', 'version' ], {
|
||||
unique: true,
|
||||
name: 'uk_appid_version',
|
||||
});
|
||||
},
|
||||
};
|
||||
@ -1,171 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* API 方法文档库表化(2026-09-23):
|
||||
* - wms_api_method_doc:方法文档表(methods/system.json 的维护源)
|
||||
* - wms_method_doc_meta:文档元信息表(docName 维度单行:描述/全局 headers/version/updatedAt)
|
||||
*
|
||||
* methods/system.json 由导出脚本 script/method-doc-export.cjs 生成,docs 页面仍读文件。
|
||||
*/
|
||||
|
||||
const DOC_TABLE = 'wms_api_method_doc';
|
||||
const META_TABLE = 'wms_method_doc_meta';
|
||||
|
||||
module.exports = {
|
||||
async up(queryInterface, Sequelize) {
|
||||
await queryInterface.createTable(DOC_TABLE, {
|
||||
id: {
|
||||
type: Sequelize.BIGINT(20).UNSIGNED,
|
||||
primaryKey: true,
|
||||
autoIncrement: true,
|
||||
allowNull: false,
|
||||
comment: '主键',
|
||||
},
|
||||
method: {
|
||||
type: Sequelize.STRING(128),
|
||||
allowNull: false,
|
||||
comment: '方法名(如 wechat.userList)',
|
||||
},
|
||||
module: {
|
||||
type: Sequelize.STRING(64),
|
||||
allowNull: false,
|
||||
comment: '模块标识(group.module,如 wechat)',
|
||||
},
|
||||
group_name: {
|
||||
type: Sequelize.STRING(128),
|
||||
allowNull: false,
|
||||
defaultValue: '',
|
||||
comment: '分组名称(groupName)',
|
||||
},
|
||||
description: {
|
||||
type: Sequelize.TEXT,
|
||||
allowNull: true,
|
||||
comment: '接口说明',
|
||||
},
|
||||
is_need_login: {
|
||||
type: Sequelize.TINYINT(1),
|
||||
allowNull: false,
|
||||
defaultValue: 1,
|
||||
comment: '是否需登录',
|
||||
},
|
||||
is_need_auth: {
|
||||
type: Sequelize.TINYINT(1),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '是否需权限鉴权',
|
||||
},
|
||||
headers: {
|
||||
type: Sequelize.TEXT('long'),
|
||||
allowNull: true,
|
||||
comment: '请求头(JSON 数组文本,LONGTEXT 保留原键序)',
|
||||
},
|
||||
params: {
|
||||
type: Sequelize.TEXT('long'),
|
||||
allowNull: true,
|
||||
comment: '入参(JSON 数组文本,LONGTEXT 保留原键序)',
|
||||
},
|
||||
response: {
|
||||
type: Sequelize.TEXT('long'),
|
||||
allowNull: true,
|
||||
comment: '响应字段(JSON 数组文本,LONGTEXT 保留原键序)',
|
||||
},
|
||||
errors: {
|
||||
type: Sequelize.TEXT('long'),
|
||||
allowNull: true,
|
||||
comment: '错误码(JSON 数组文本,LONGTEXT 保留原键序)',
|
||||
},
|
||||
group_sort: {
|
||||
type: Sequelize.INTEGER,
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '分组排序(导入时的原始顺序)',
|
||||
},
|
||||
item_sort: {
|
||||
type: Sequelize.INTEGER,
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '组内排序(导入时的原始顺序)',
|
||||
},
|
||||
status: {
|
||||
type: Sequelize.TINYINT(1),
|
||||
allowNull: false,
|
||||
defaultValue: 1,
|
||||
comment: '状态:1 启用 0 下线(导出时排除)',
|
||||
},
|
||||
created_at: {
|
||||
type: Sequelize.DATE,
|
||||
allowNull: false,
|
||||
defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),
|
||||
comment: '创建时间',
|
||||
},
|
||||
updated_at: {
|
||||
type: Sequelize.DATE,
|
||||
allowNull: false,
|
||||
defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),
|
||||
comment: '更新时间',
|
||||
},
|
||||
}, {
|
||||
comment: 'API 方法文档表(methods/system.json 的库表化维护源)',
|
||||
});
|
||||
await queryInterface.addIndex(DOC_TABLE, [ 'method' ], {
|
||||
unique: true,
|
||||
name: 'uk_method',
|
||||
});
|
||||
await queryInterface.addIndex(DOC_TABLE, [ 'module' ], {
|
||||
name: 'idx_module',
|
||||
});
|
||||
await queryInterface.addIndex(DOC_TABLE, [ 'status', 'module', 'group_sort', 'item_sort' ], {
|
||||
name: 'idx_export_order',
|
||||
});
|
||||
|
||||
await queryInterface.createTable(META_TABLE, {
|
||||
id: {
|
||||
type: Sequelize.TINYINT,
|
||||
primaryKey: true,
|
||||
allowNull: false,
|
||||
comment: '固定 1(单行)',
|
||||
},
|
||||
doc_name: {
|
||||
type: Sequelize.STRING(64),
|
||||
allowNull: false,
|
||||
unique: true,
|
||||
comment: '文档名(system/qimen...)',
|
||||
},
|
||||
module: {
|
||||
type: Sequelize.STRING(64),
|
||||
allowNull: false,
|
||||
defaultValue: 'system',
|
||||
comment: '文档顶层 module',
|
||||
},
|
||||
description: {
|
||||
type: Sequelize.TEXT,
|
||||
allowNull: true,
|
||||
comment: '文档顶层描述',
|
||||
},
|
||||
headers: {
|
||||
type: Sequelize.TEXT('long'),
|
||||
allowNull: true,
|
||||
comment: '文档全局请求头(JSON 数组文本,LONGTEXT 保留原键序)',
|
||||
},
|
||||
version: {
|
||||
type: Sequelize.STRING(32),
|
||||
allowNull: false,
|
||||
defaultValue: '0.3.0',
|
||||
comment: '文档版本(顶层 version)',
|
||||
},
|
||||
updated_at: {
|
||||
type: Sequelize.DATE,
|
||||
allowNull: false,
|
||||
defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),
|
||||
comment: '更新时间(顶层 updatedAt)',
|
||||
},
|
||||
}, {
|
||||
comment: 'API 文档元信息表(docName 维度单行)',
|
||||
});
|
||||
},
|
||||
|
||||
async down(queryInterface) {
|
||||
await queryInterface.dropTable(META_TABLE);
|
||||
await queryInterface.dropTable(DOC_TABLE);
|
||||
},
|
||||
};
|
||||
@ -1,49 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 文档表 JSON 列改为 LONGTEXT(2026-09-23):
|
||||
* MySQL JSON 列会归一化对象键序(如 value/name → name/value),导致导出 system.json
|
||||
* 与原件产生大量无意义 diff。改为 LONGTEXT 存原始 JSON 文本,导出时原样解析,保证无损往返。
|
||||
*/
|
||||
|
||||
const DOC_TABLE = 'wms_api_method_doc';
|
||||
const META_TABLE = 'wms_method_doc_meta';
|
||||
|
||||
module.exports = {
|
||||
async up(queryInterface, Sequelize) {
|
||||
const columns = [
|
||||
[ 'headers', '请求头(JSON 数组文本)' ],
|
||||
[ 'params', '入参(JSON 数组文本)' ],
|
||||
[ 'response', '响应字段(JSON 数组文本)' ],
|
||||
[ 'errors', '错误码(JSON 数组文本)' ],
|
||||
];
|
||||
for (const [ name, comment ] of columns) {
|
||||
await queryInterface.changeColumn(DOC_TABLE, name, {
|
||||
type: Sequelize.TEXT('long'),
|
||||
allowNull: true,
|
||||
comment,
|
||||
});
|
||||
}
|
||||
await queryInterface.changeColumn(META_TABLE, 'headers', {
|
||||
type: Sequelize.TEXT('long'),
|
||||
allowNull: true,
|
||||
comment: '文档全局请求头(JSON 数组文本)',
|
||||
});
|
||||
},
|
||||
|
||||
async down(queryInterface, Sequelize) {
|
||||
const columns = [ 'headers', 'params', 'response', 'errors' ];
|
||||
for (const name of columns) {
|
||||
await queryInterface.changeColumn(DOC_TABLE, name, {
|
||||
type: Sequelize.JSON,
|
||||
allowNull: true,
|
||||
comment: name,
|
||||
});
|
||||
}
|
||||
await queryInterface.changeColumn(META_TABLE, 'headers', {
|
||||
type: Sequelize.JSON,
|
||||
allowNull: true,
|
||||
comment: '文档全局请求头(JSON 数组)',
|
||||
});
|
||||
},
|
||||
};
|
||||
@ -1,25 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 方法文档表增加 payload 列(2026-09-23):
|
||||
* 原始条目含 status/notes/requestBody 等扩展字段,结构化列无法覆盖。
|
||||
* payload 存整个 method 条目的原始 JSON 文本,导入/导出按原文无损往返;
|
||||
* 结构化列(method/module/group_name/description/is_need_login/is_need_auth/headers/params/response/errors)
|
||||
* 仅用于检索过滤,导出优先使用 payload。
|
||||
*/
|
||||
|
||||
const DOC_TABLE = 'wms_api_method_doc';
|
||||
|
||||
module.exports = {
|
||||
async up(queryInterface, Sequelize) {
|
||||
await queryInterface.addColumn(DOC_TABLE, 'payload', {
|
||||
type: Sequelize.TEXT('long'),
|
||||
allowNull: true,
|
||||
comment: 'method 条目完整 JSON 文本(含 status/notes/requestBody 等扩展字段,无损往返用)',
|
||||
});
|
||||
},
|
||||
|
||||
async down(queryInterface) {
|
||||
await queryInterface.removeColumn(DOC_TABLE, 'payload');
|
||||
},
|
||||
};
|
||||
@ -1,20 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* wms_return_received 补充登记时间索引。
|
||||
* returnReceived.list 默认按 created_at desc 排序且支持 created_at 范围筛选,
|
||||
* 仓库隔离为 warehouse_id,原表仅有 (warehouse_id, scan_date) 等索引,
|
||||
* 登记时间过滤与排序会退化为全表扫描 + filesort,新增 (warehouse_id, created_at)
|
||||
* 复合索引使范围过滤与默认排序走索引。
|
||||
*/
|
||||
module.exports = {
|
||||
async up(queryInterface) {
|
||||
await queryInterface.addIndex('wms_return_received', [ 'warehouse_id', 'created_at' ], {
|
||||
name: 'idx_warehouse_created_at',
|
||||
});
|
||||
},
|
||||
|
||||
async down(queryInterface) {
|
||||
await queryInterface.removeIndex('wms_return_received', 'idx_warehouse_created_at');
|
||||
},
|
||||
};
|
||||
@ -1,201 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 订单类型新增系统级子类型「打包视频查询」(query_pack_video),并补齐 v2 配置链。
|
||||
*
|
||||
* 背景:
|
||||
* - v1 引擎(inbox/rules.js STORE_RULES / WAREHOUSE_RULES)与代码函数表均有
|
||||
* queryPackVideo(关键词:打包视频/装箱视频,waybill:true);
|
||||
* - v2 的 wms_after_sale_sub_type 中没有该子类型,导致 v2 引擎无法把
|
||||
* 「打包视频」类消息路由到 queryPackVideo 函数。
|
||||
*
|
||||
* 本次新增(幂等,先查后插):
|
||||
* 1. 系统级子类型 order.query_pack_video(打包视频查询,sort_order=20 末尾追加);
|
||||
* 2. 关键词 5 条:打包视频/打包录像/装箱视频/打包监控/录像;
|
||||
* 3. 群类型白名单:store:after_sales + warehouse:customer_service(与函数 groups 一致);
|
||||
* 4. 子类型-函数关系:queryPackVideo;
|
||||
* 5. 取号规则关联:运单号提取(waybill);
|
||||
* 6. 系统级回复行:reply={back_text}、is_reply=1、create_work_order=0(纯查询不建工单)、
|
||||
* no_number_hint=打包视频专属引导语、is_enabled=1。
|
||||
*/
|
||||
|
||||
const SUB_TYPE_TABLE = 'wms_after_sale_sub_type';
|
||||
const KEYWORD_TABLE = 'wms_after_sale_keyword';
|
||||
const GROUP_REL_TABLE = 'wms_after_sale_sub_type_group';
|
||||
const FUNCTION_TABLE = 'wms_after_sale_function';
|
||||
const FUNC_REL_TABLE = 'wms_after_sale_sub_type_function';
|
||||
const RULE_TABLE = 'wms_inbox_number_rule';
|
||||
const RULE_REL_TABLE = 'wms_after_sale_sub_type_rule';
|
||||
const REPLY_TABLE = 'wms_after_sale_reply';
|
||||
|
||||
const TYPE_CODE = 'order';
|
||||
const SUB_TYPE_CODE = 'query_pack_video';
|
||||
const SUB_TYPE_NAME = '打包视频查询';
|
||||
const KEYWORDS = [ '打包视频', '打包录像', '装箱视频', '打包监控', '录像' ];
|
||||
const GROUP_WHITELIST = [
|
||||
{ group_type: 'store', sub_group: 'after_sales' },
|
||||
{ group_type: 'warehouse', sub_group: 'customer_service' },
|
||||
];
|
||||
const FUNCTION_CODE = 'queryPackVideo';
|
||||
const RULE_NAME = '运单号提取';
|
||||
const HINT_DEFAULT = '请提供运单号(发送:打包视频+运单号,多个单号用逗号或空格分隔)\n例:打包视频 SF123';
|
||||
|
||||
module.exports = {
|
||||
/**
|
||||
* 新增系统级「打包视频查询」子类型配置链(幂等)。
|
||||
* @param {Object} queryInterface Sequelize QueryInterface 实例。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
up: async queryInterface => {
|
||||
const { sequelize } = queryInterface;
|
||||
const tables = await queryInterface.showAllTables();
|
||||
const exists = t => tables.some(x => (typeof x === 'string' ? x : x.tableName) === t);
|
||||
if (!exists(SUB_TYPE_TABLE)) return;
|
||||
|
||||
const q = async (sql, replacements) => {
|
||||
const [ rows ] = await sequelize.query(sql, { replacements });
|
||||
return rows;
|
||||
};
|
||||
|
||||
// ─── 1. 系统级子类型 order.query_pack_video(先查后插) ──────
|
||||
let subRows = await q(
|
||||
'SELECT id FROM `' + SUB_TYPE_TABLE + '` '
|
||||
+ 'WHERE type = :t AND sub_type = :s AND warehouse_id IS NULL LIMIT 1',
|
||||
{ t: TYPE_CODE, s: SUB_TYPE_CODE }
|
||||
);
|
||||
if (subRows.length === 0) {
|
||||
await sequelize.query(
|
||||
'INSERT INTO `' + SUB_TYPE_TABLE + '` '
|
||||
+ '(warehouse_id, type, sub_type, name, is_system, is_enabled, sort_order, created_at, updated_at) '
|
||||
+ 'VALUES (NULL, :t, :s, :n, 1, 1, :so, NOW(), NOW())',
|
||||
{ replacements: { t: TYPE_CODE, s: SUB_TYPE_CODE, n: SUB_TYPE_NAME, so: 20 } }
|
||||
);
|
||||
subRows = await q(
|
||||
'SELECT id FROM `' + SUB_TYPE_TABLE + '` '
|
||||
+ 'WHERE type = :t AND sub_type = :s AND warehouse_id IS NULL LIMIT 1',
|
||||
{ t: TYPE_CODE, s: SUB_TYPE_CODE }
|
||||
);
|
||||
console.log(`[MIGRATION] 子类型插入 ${TYPE_CODE}.${SUB_TYPE_CODE}`);
|
||||
}
|
||||
if (subRows.length === 0) {
|
||||
console.warn(`[MIGRATION] 跳过:子类型 ${TYPE_CODE}.${SUB_TYPE_CODE} 缺失且插入失败`);
|
||||
return;
|
||||
}
|
||||
const subTypeId = subRows[0].id;
|
||||
|
||||
// ─── 2. 关键词(先查后插) ──────────────────────────────────
|
||||
if (exists(KEYWORD_TABLE)) {
|
||||
let kwInserted = 0;
|
||||
for (const [ idx, kw ] of KEYWORDS.entries()) {
|
||||
const kwRows = await q(
|
||||
'SELECT id FROM `' + KEYWORD_TABLE + '` WHERE keyword = :kw AND warehouse_id IS NULL LIMIT 1',
|
||||
{ kw }
|
||||
);
|
||||
if (kwRows.length === 0) {
|
||||
await sequelize.query(
|
||||
'INSERT INTO `' + KEYWORD_TABLE + '` '
|
||||
+ '(warehouse_id, sub_type_id, keyword, is_system, is_enabled, sort_order, created_at, updated_at) '
|
||||
+ 'VALUES (NULL, :sid, :kw, 1, 1, :so, NOW(), NOW())',
|
||||
{ replacements: { sid: subTypeId, kw, so: idx } }
|
||||
);
|
||||
kwInserted += 1;
|
||||
}
|
||||
}
|
||||
console.log(`[MIGRATION] 关键词插入 ${kwInserted} 条`);
|
||||
}
|
||||
|
||||
// ─── 3. 群类型白名单(INSERT IGNORE,与函数 groups 一致) ────
|
||||
if (exists(GROUP_REL_TABLE)) {
|
||||
let grpInserted = 0;
|
||||
for (const [ idx, g ] of GROUP_WHITELIST.entries()) {
|
||||
await sequelize.query(
|
||||
'INSERT IGNORE INTO `' + GROUP_REL_TABLE + '` '
|
||||
+ '(sub_type_id, group_type, sub_group, is_system, sort_order, created_at, updated_at) '
|
||||
+ 'VALUES (:sid, :groupType, :subGroup, 1, :so, NOW(), NOW())',
|
||||
{ replacements: { sid: subTypeId, groupType: g.group_type, subGroup: g.sub_group, so: idx + 1 } }
|
||||
);
|
||||
grpInserted += 1;
|
||||
}
|
||||
console.log(`[MIGRATION] 群白名单插入 ${grpInserted} 条`);
|
||||
}
|
||||
|
||||
// ─── 4. 子类型-函数关系:queryPackVideo ─────────────────────
|
||||
if (exists(FUNC_REL_TABLE) && exists(FUNCTION_TABLE)) {
|
||||
const fnRows = await q(
|
||||
'SELECT id FROM `' + FUNCTION_TABLE + '` WHERE function_code = :code LIMIT 1',
|
||||
{ code: FUNCTION_CODE }
|
||||
);
|
||||
if (fnRows.length > 0) {
|
||||
await sequelize.query(
|
||||
'INSERT IGNORE INTO `' + FUNC_REL_TABLE + '` '
|
||||
+ '(sub_type_id, function_id, sort_order, created_at, updated_at) '
|
||||
+ 'VALUES (:sid, :fid, 1, NOW(), NOW())',
|
||||
{ replacements: { sid: subTypeId, fid: fnRows[0].id } }
|
||||
);
|
||||
console.log(`[MIGRATION] 函数关系插入 ${FUNCTION_CODE}`);
|
||||
} else {
|
||||
console.warn(`[MIGRATION] 跳过:未找到处理函数 ${FUNCTION_CODE}`);
|
||||
}
|
||||
}
|
||||
|
||||
// ─── 5. 运单号取号规则关联 ──────────────────────────────────
|
||||
if (exists(RULE_REL_TABLE) && exists(RULE_TABLE)) {
|
||||
const ruleRows = await q(
|
||||
'SELECT id FROM `' + RULE_TABLE + '` WHERE name = :n LIMIT 1',
|
||||
{ n: RULE_NAME }
|
||||
);
|
||||
if (ruleRows.length > 0) {
|
||||
await sequelize.query(
|
||||
'INSERT IGNORE INTO `' + RULE_REL_TABLE + '` '
|
||||
+ '(sub_type_id, number_rule_id, sort_order, created_at, updated_at) '
|
||||
+ 'VALUES (:sid, :rid, 1, NOW(), NOW())',
|
||||
{ replacements: { sid: subTypeId, rid: ruleRows[0].id } }
|
||||
);
|
||||
console.log(`[MIGRATION] 取号规则关联插入 ${RULE_NAME}`);
|
||||
} else {
|
||||
console.warn(`[MIGRATION] 跳过:未找到取号规则 ${RULE_NAME}`);
|
||||
}
|
||||
}
|
||||
|
||||
// ─── 6. 系统级回复行(先查后插;纯查询不建工单) ─────────────
|
||||
if (exists(REPLY_TABLE)) {
|
||||
const replyRows = await q(
|
||||
'SELECT id FROM `' + REPLY_TABLE + '` WHERE sub_type_id = :sid AND warehouse_id IS NULL LIMIT 1',
|
||||
{ sid: subTypeId }
|
||||
);
|
||||
if (replyRows.length === 0) {
|
||||
await sequelize.query(
|
||||
'INSERT INTO `' + REPLY_TABLE + '` '
|
||||
+ '(warehouse_id, sub_type_id, reply, is_reply, create_work_order, no_number_hint, is_enabled, created_at, updated_at) '
|
||||
+ 'VALUES (NULL, :sid, :reply, 1, 0, :hint, 1, NOW(), NOW())',
|
||||
{ replacements: { sid: subTypeId, reply: '{back_text}', hint: HINT_DEFAULT } }
|
||||
);
|
||||
console.log('[MIGRATION] 系统级回复行插入 1 行');
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* 回滚:删除「打包视频查询」子类型的全部关联配置与子类型行。
|
||||
* @param {Object} queryInterface Sequelize QueryInterface 实例。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
down: async queryInterface => {
|
||||
const { sequelize } = queryInterface;
|
||||
|
||||
const [ subRows ] = await sequelize.query(
|
||||
'SELECT id FROM `' + SUB_TYPE_TABLE + '` '
|
||||
+ 'WHERE type = :t AND sub_type = :s AND warehouse_id IS NULL LIMIT 1',
|
||||
{ replacements: { t: TYPE_CODE, s: SUB_TYPE_CODE } }
|
||||
);
|
||||
if (subRows.length === 0) return;
|
||||
const subTypeId = subRows[0].id;
|
||||
|
||||
await sequelize.query('DELETE FROM `' + REPLY_TABLE + '` WHERE sub_type_id = :sid AND warehouse_id IS NULL', { replacements: { sid: subTypeId } });
|
||||
await sequelize.query('DELETE FROM `' + KEYWORD_TABLE + '` WHERE sub_type_id = :sid AND warehouse_id IS NULL', { replacements: { sid: subTypeId } });
|
||||
await sequelize.query('DELETE FROM `' + GROUP_REL_TABLE + '` WHERE sub_type_id = :sid', { replacements: { sid: subTypeId } });
|
||||
await sequelize.query('DELETE FROM `' + FUNC_REL_TABLE + '` WHERE sub_type_id = :sid', { replacements: { sid: subTypeId } });
|
||||
await sequelize.query('DELETE FROM `' + RULE_REL_TABLE + '` WHERE sub_type_id = :sid', { replacements: { sid: subTypeId } });
|
||||
await sequelize.query('DELETE FROM `' + SUB_TYPE_TABLE + '` WHERE id = :sid', { replacements: { sid: subTypeId } });
|
||||
},
|
||||
};
|
||||
@ -1,186 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
const TABLE_NAME = 'wms_warehouse_front_config';
|
||||
const DOMAIN_STATUS_COLUMN = 'domain_status';
|
||||
const DOMAIN_STATUS_INDEX_NAME = 'idx_domain_status';
|
||||
|
||||
/**
|
||||
* Migration: 仓库前端配置表新增域名验证(DNS TXT 校验)相关列与索引。
|
||||
*
|
||||
* 背景:
|
||||
* 前端独立部署需要用户把自持域名解析到平台,必须校验域名归属,避免非自持域名
|
||||
* 被指向平台(域名误配/抢注、证书误签)。方案为 DNS TXT 校验:后端为每个仓库
|
||||
* 生成一次性校验主机名(wmsv-<10 位 hex>.<域名>)与校验值(32 位 hex),用户在
|
||||
* 该子域配置 TXT 记录,后端解析比对通过后置为已验证。未通过验证的域名不得上传
|
||||
* 证书(frontConfig.saveCert 前置闸门),公共按域名拉取同以 domain_status=1 为闸门。
|
||||
*
|
||||
* 新增列:
|
||||
* - domain_status : 域名验证状态:0-未验证,1-已验证,2-验证失败(NOT NULL,默认 0);
|
||||
* - domain_verify_host : 待校验 TXT 记录主机名(wmsv-<随机码>.<域名>);
|
||||
* - domain_verify_token : 待校验 TXT 记录值(32 位 hex);
|
||||
* - domain_verified_at : 域名验证通过时间;
|
||||
* - domain_verify_attempts : 验证尝试次数(定时任务自增,超过 maxAttempts 后停止自动重试);
|
||||
* - domain_last_error : 最近一次验证失败原因(脱敏截断,≤500 字符)。
|
||||
* 新增索引:
|
||||
* - idx_domain_status:域名验证定时任务按 domain_status 扫描待验证行的查询索引。
|
||||
*
|
||||
* ⚠ 存量数据回填(本次迁移的关键动作):
|
||||
* 升级前已写入 domain 的行,其域名在线上已生效(nginx 已在按域名提供服务),必须
|
||||
* 视为「已验证」,否则新加入的 domain_status=1 闸门会在升级瞬间把生产现有域名
|
||||
* 全部断掉(证书上传被拒、公共拉取被拒)。
|
||||
* 回填 SQL:UPDATE ... SET domain_status = 1
|
||||
* WHERE domain IS NOT NULL AND domain <> '' AND domain_status = 0。
|
||||
* 回填只在本次真正新增 domain_status 列的那一次执行:迁移允许重复执行,若列已存在
|
||||
* 仍继续回填,会把「升级后新设置但尚未验证」的域名误标为已验证。
|
||||
* domain_verified_at 保持 NULL:历史生效时间不可考,不写入虚假时间。
|
||||
*
|
||||
* Idempotent: 列/索引已存在时跳过;down 逐索引、逐列判存在后删除。
|
||||
*/
|
||||
|
||||
/**
|
||||
* 判断表是否存在。
|
||||
* @param {import('sequelize').QueryInterface} queryInterface 查询接口。
|
||||
* @param {string} tableName 表名。
|
||||
* @return {Promise<boolean>} 存在返回 true。
|
||||
*/
|
||||
async function tableExists(queryInterface, tableName) {
|
||||
const tables = await queryInterface.showAllTables();
|
||||
return tables.some(t => (typeof t === 'string' ? t : (t.tableName || t.name)) === tableName);
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断索引是否存在。
|
||||
* @param {import('sequelize').QueryInterface} queryInterface 查询接口。
|
||||
* @param {string} tableName 表名。
|
||||
* @param {string} indexName 索引名。
|
||||
* @return {Promise<boolean>} 存在返回 true。
|
||||
*/
|
||||
async function indexExists(queryInterface, tableName, indexName) {
|
||||
const indexes = await queryInterface.showIndex(tableName);
|
||||
return (indexes || []).some(item => (typeof item === 'string' ? item : item.name) === indexName);
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
/**
|
||||
* 执行正向迁移:新增域名验证相关列与索引,并回填存量已生效域名(幂等)。
|
||||
* @param {import('sequelize').QueryInterface} queryInterface 查询接口。
|
||||
* @param {import('sequelize')} Sequelize Sequelize 实例。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
async up(queryInterface, Sequelize) {
|
||||
if (!(await tableExists(queryInterface, TABLE_NAME))) {
|
||||
return;
|
||||
}
|
||||
|
||||
const columns = await queryInterface.describeTable(TABLE_NAME);
|
||||
const domainStatusAdded = !columns[DOMAIN_STATUS_COLUMN];
|
||||
|
||||
if (domainStatusAdded) {
|
||||
await queryInterface.addColumn(TABLE_NAME, DOMAIN_STATUS_COLUMN, {
|
||||
type: Sequelize.TINYINT,
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '域名验证状态:0-未验证,1-已验证,2-验证失败',
|
||||
after: 'domain',
|
||||
});
|
||||
}
|
||||
|
||||
if (!columns.domain_verify_host) {
|
||||
await queryInterface.addColumn(TABLE_NAME, 'domain_verify_host', {
|
||||
type: Sequelize.STRING(255),
|
||||
allowNull: true,
|
||||
comment: '待校验 TXT 记录主机名(wmsv-<随机码>.<域名>)',
|
||||
after: 'domain_status',
|
||||
});
|
||||
}
|
||||
|
||||
if (!columns.domain_verify_token) {
|
||||
await queryInterface.addColumn(TABLE_NAME, 'domain_verify_token', {
|
||||
type: Sequelize.STRING(64),
|
||||
allowNull: true,
|
||||
comment: '待校验 TXT 记录值(32 位 hex)',
|
||||
after: 'domain_verify_host',
|
||||
});
|
||||
}
|
||||
|
||||
if (!columns.domain_verified_at) {
|
||||
await queryInterface.addColumn(TABLE_NAME, 'domain_verified_at', {
|
||||
type: Sequelize.DATE,
|
||||
allowNull: true,
|
||||
comment: '域名验证通过时间',
|
||||
after: 'domain_verify_token',
|
||||
});
|
||||
}
|
||||
|
||||
if (!columns.domain_verify_attempts) {
|
||||
await queryInterface.addColumn(TABLE_NAME, 'domain_verify_attempts', {
|
||||
type: Sequelize.INTEGER(11),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '域名验证尝试次数',
|
||||
after: 'domain_verified_at',
|
||||
});
|
||||
}
|
||||
|
||||
if (!columns.domain_last_error) {
|
||||
await queryInterface.addColumn(TABLE_NAME, 'domain_last_error', {
|
||||
type: Sequelize.STRING(500),
|
||||
allowNull: true,
|
||||
comment: '最近一次域名验证失败原因',
|
||||
after: 'domain_verify_attempts',
|
||||
});
|
||||
}
|
||||
|
||||
if (!(await indexExists(queryInterface, TABLE_NAME, DOMAIN_STATUS_INDEX_NAME))) {
|
||||
await queryInterface.addIndex(TABLE_NAME, [ DOMAIN_STATUS_COLUMN ], {
|
||||
name: DOMAIN_STATUS_INDEX_NAME,
|
||||
});
|
||||
}
|
||||
|
||||
// 存量回填:升级前已写入 domain 的行在线上已生效,必须视为「已验证」,
|
||||
// 否则 domain_status=1 闸门会在升级瞬间断掉生产现有域名。
|
||||
// 仅在本次真正新增该列时执行(重复执行迁移不得把新设置但未验证的域名误标为已验证),
|
||||
// WHERE 仍带 domain_status = 0 守卫,重复执行同样安全。
|
||||
if (domainStatusAdded) {
|
||||
const [ result ] = await queryInterface.sequelize.query(
|
||||
`UPDATE \`${TABLE_NAME}\`
|
||||
SET \`domain_status\` = 1
|
||||
WHERE \`domain\` IS NOT NULL
|
||||
AND \`domain\` <> ''
|
||||
AND \`domain_status\` = 0`
|
||||
);
|
||||
const affectedRows = Number(result && result.affectedRows !== undefined ? result.affectedRows : result) || 0;
|
||||
console.log(`[migration] ${TABLE_NAME} 存量域名回填 domain_status=1,影响行数=${affectedRows}`);
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* 回滚迁移:删除域名验证相关索引与列(幂等)。
|
||||
* 注意:回滚会一并丢弃域名验证状态与校验记录,域名将退回「无验证闸门」状态。
|
||||
* @param {import('sequelize').QueryInterface} queryInterface 查询接口。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
async down(queryInterface) {
|
||||
if (!(await tableExists(queryInterface, TABLE_NAME))) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (await indexExists(queryInterface, TABLE_NAME, DOMAIN_STATUS_INDEX_NAME)) {
|
||||
await queryInterface.removeIndex(TABLE_NAME, DOMAIN_STATUS_INDEX_NAME);
|
||||
}
|
||||
|
||||
const columns = await queryInterface.describeTable(TABLE_NAME);
|
||||
for (const columnName of [
|
||||
'domain_last_error',
|
||||
'domain_verify_attempts',
|
||||
'domain_verified_at',
|
||||
'domain_verify_token',
|
||||
'domain_verify_host',
|
||||
DOMAIN_STATUS_COLUMN,
|
||||
]) {
|
||||
if (columns[columnName]) {
|
||||
await queryInterface.removeColumn(TABLE_NAME, columnName);
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
@ -1,72 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 打包任务表 wms_pack_task 增加 wave_scope(波次范围)字段。
|
||||
*
|
||||
* 取值约定(与 wms_order_delivery.wave_scope 一致):
|
||||
* - 0 = 未分配波次
|
||||
* - 1 = 大团购
|
||||
* - 2 = 散单
|
||||
* - 3 = 小团购
|
||||
* - 4 = 单品单件
|
||||
* 默认 0。
|
||||
*
|
||||
* 来源:workbench.packOrder 创建打包任务时落库,值由服务端复查
|
||||
* (优先取打包上下文上报值,非法/缺省时兜底取订单行 wave_scope)。
|
||||
*
|
||||
* 幂等:列已存在则跳过。
|
||||
*/
|
||||
|
||||
const TABLE_NAME = 'wms_pack_task';
|
||||
|
||||
const COLUMN_NAME = 'wave_scope';
|
||||
|
||||
/**
|
||||
* 判断列是否已存在。
|
||||
* @param {import('sequelize').QueryInterface} queryInterface 查询接口。
|
||||
* @param {string} tableName 表名。
|
||||
* @param {string} columnName 列名。
|
||||
* @return {Promise<boolean>} 是否存在。
|
||||
*/
|
||||
async function columnExists(queryInterface, tableName, columnName) {
|
||||
const described = await queryInterface.describeTable(tableName);
|
||||
return Boolean(described && described[columnName]);
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
/**
|
||||
* 执行迁移:为 wms_pack_task 增加 wave_scope 列。
|
||||
* @param {import('sequelize').QueryInterface} queryInterface 查询接口。
|
||||
* @param {import('sequelize')} Sequelize Sequelize 构造器。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
async up(queryInterface, Sequelize) {
|
||||
if (await columnExists(queryInterface, TABLE_NAME, COLUMN_NAME)) {
|
||||
console.log('[20260924150000-add-wave-scope-to-pack-task] up: 列已存在,跳过');
|
||||
return;
|
||||
}
|
||||
|
||||
await queryInterface.addColumn(TABLE_NAME, COLUMN_NAME, {
|
||||
type: Sequelize.TINYINT(4),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '波次范围:0未分配波次 1大团购 2散单 3小团购 4单品单件',
|
||||
});
|
||||
console.log('[20260924150000-add-wave-scope-to-pack-task] up: 已为 wms_pack_task 添加 wave_scope 列');
|
||||
},
|
||||
|
||||
/**
|
||||
* 回滚迁移:移除 wms_pack_task 的 wave_scope 列。
|
||||
* @param {import('sequelize').QueryInterface} queryInterface 查询接口。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
async down(queryInterface) {
|
||||
if (!await columnExists(queryInterface, TABLE_NAME, COLUMN_NAME)) {
|
||||
console.log('[20260924150000-add-wave-scope-to-pack-task] down: 列不存在,跳过');
|
||||
return;
|
||||
}
|
||||
|
||||
await queryInterface.removeColumn(TABLE_NAME, COLUMN_NAME);
|
||||
console.log('[20260924150000-add-wave-scope-to-pack-task] down: 已移除 wms_pack_task 的 wave_scope 列');
|
||||
},
|
||||
};
|
||||
@ -1,340 +1,4 @@
|
||||
[
|
||||
{
|
||||
"version": "2026.09.24-setting-big-group-pack-coefficient",
|
||||
"date": "2026-09-24",
|
||||
"type": "updated",
|
||||
"summary": "仓库设置新增大团购打包系数:subject_config 新增 big_group_pack_coefficient(数字,默认 3,单位秒/单,必须大于 0),用于 workbench 大团购波次打包时长闸门与倒计时;setting.warehouse.getSettings 响应新增该字段说明,getFieldMeta 字段元信息列表同步新增该项",
|
||||
"methods": [
|
||||
"setting.warehouse.getSettings",
|
||||
"setting.warehouse.getFieldMeta"
|
||||
],
|
||||
"notes": [
|
||||
"代码位置:app/service/systems/setting/warehouse.js(WAREHOUSE_SETTING_FIELDS 新增字段元信息:type=number、default=3、min=0.1);app/model/store.js(DEFAULT_SUBJECT_CONFIG 与 normalizeSubjectConfig 校验:空值回填 3,非法值抛错)",
|
||||
"读取链路:app/service/systems/delivery_order.js getStoreSubjectConfig(带缓存),workbench 侧经 _getBigGroupPackCoefficient 读取,异常/非法降级默认 3",
|
||||
"无需数据库迁移:配置存于 wms_store.subject_config(JSON 字段),仅需代码发布"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "2026.09.24-workbench-big-group-pack-gate",
|
||||
"date": "2026-09-24",
|
||||
"type": "updated",
|
||||
"summary": "工作台大团购打包系数与打包时长闸门:workbench.packOrder 打包任务落库 wave_scope,大团购波次(wave_scope=1)响应新增倒计时字段 pack_wait_seconds(当前波次打包数 × 大团购打包系数,单位秒)与 pack_start_time(开始打包时间,毫秒时间戳),其他波次均为 0;workbench.queryOrder 响应 order 新增 wave_scope,并新增大团购打包时长闸门(当前工作台 wave_scope=1 任务未到时仅允许查询本波次订单,其他波次返回「打包时长不足」错误)",
|
||||
"methods": [
|
||||
"workbench.packOrder",
|
||||
"workbench.queryOrder"
|
||||
],
|
||||
"notes": [
|
||||
"数据库迁移:wms_pack_task 新增 wave_scope 列(database/migrations/20260924150000-add-wave-scope-to-pack-task.js,幂等),开发库与生产库均已执行(生产库因存在更早 pending 迁移改为等价 DDL + SequelizeMeta 记录)",
|
||||
"代码位置:app/service/systems/workbench.js(_queryOrder 步骤3.5 闸门、_packOrder 落库与倒计时下发、_getBigGroupPackCoefficient 配置读取);app/model/pack_task.js 新增 wave_scope 字段定义",
|
||||
"回归测试:test/app/service/systems/workbench.bigGroupTimeGate.regression.test.js(11 用例全绿:响应 wave_scope / packOrder 落库与倒计时 / 闸门未到时同波次放行、不同波次拦截、已到时放行、其他 wave_scope 不限制)"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "2026.09.24-front-config-domain-verify",
|
||||
"date": "2026-09-24",
|
||||
"type": "updated",
|
||||
"summary": "前端独立部署新增「域名归属验证」能力:新增设置/查询/校验域名的 3 个接口(frontConfig.setDomain/getDomain/checkDomain,均需登录、免权限、免鉴权、仅仓库主体可用);两个保存接口不再负责设置域名(saveCert 移除 domain 入参);新增域名验证闸门(getByDomain 仅放行 domain_status=1 的已验证域名、nginx 侧仅对已验证域名生成 server 块);getCert/saveCert 响应新增证书可设置性字段(10 → 13 字段:can_set_cert/can_set_cert_reason/domain_status)。",
|
||||
"methods": [
|
||||
"frontConfig.setDomain",
|
||||
"frontConfig.getDomain",
|
||||
"frontConfig.checkDomain",
|
||||
"frontConfig.getByDomain",
|
||||
"frontConfig.getCert",
|
||||
"frontConfig.saveCert"
|
||||
],
|
||||
"notes": [
|
||||
"数据表与迁移:wms_warehouse_front_config 新增列 domain_status(tinyint 默认 0)/domain_verify_host/domain_verify_token/domain_verified_at/domain_verify_attempts/domain_last_error 与索引 idx_domain_status;迁移文件 database/migrations/20260924120000-add-domain-verify-to-wms-warehouse-front-config.js(幂等:列/索引已存在则跳过)。迁移会把历史非空 domain 的行回填 domain_status=1:存量域名在线上已生效(nginx 已在按域名提供服务),不回填会被新闸门在升级瞬间全部断流(证书上传被拒、公共拉取 404);回填只在真正新增该列的那一次执行,避免把升级后新设但未验证的域名误标为已验证;domain_verified_at 保持 NULL(历史生效时间不可考,不写虚假时间)",
|
||||
"定时任务:新增 app/schedule/domain_verify_scan.js,按 config.frontConfig.domainVerify.interval(默认 10m)扫描待验证行;配置项 enable(true)/interval(10m)/lockTtlSeconds(600)/batchSize(50)/dohUrl(https://doh.pub/dns-query)/timeoutMs(5000)/maxAttempts(20);并发控制为进程内重入标志(ctx.app._domainVerifyScanRunning)+ Redis SET NX EX 跨进程互斥锁(Redis 不可用/抛错时降级为仅进程内防重入并 WARN);业务逻辑全部委托 service.systems.frontConfig.verifyPendingDomains(schedule 内不写 SQL);单行解析/落库失败只计入 errors 不中断整轮;已达 maxAttempts 的行不再自动重试(计入 skipped,仍可由 checkDomain 手动触发)",
|
||||
"DNS 解析:DoH 为主(config.frontConfig.domainVerify.dohUrl,默认 https://doh.pub/dns-query;Status=3 或无 Answer 视为未解析到记录,不重复走系统 DNS),失败降级系统 DNS(node:dns,本仓首次引入,仅服务域名验证链路);校验目标一律为一次性子域 wmsv-<10 位 hex>.<域名>,避免与用户主域已有 TXT 记录(SPF/DKIM/站点校验等)冲突",
|
||||
"配置新增 config.frontConfig.cname(默认空字符串):域名未通过验证时随 getDomain/setDomain/checkDomain 响应返回给前端,提示用户把域名 CNAME 指向该目标",
|
||||
"nginx 侧联动(未改动本次文档范围,仅记录):script/warehouse-cert-sync.cjs 扫描待同步记录时新增 domain_status = 1 过滤(无该列时降级为不过滤并 WARN);script/deploy-cert-sync.cjs 探针新增 domain_status 列探测与取值分布/计数输出(0_unverified/1_verified/2_failed 与 gated-out 行数)",
|
||||
"前端必须改造(不兼容变更):域名设置从 saveCert 迁移到 setDomain —— saveCert 已删除 domain 入参,前端若继续传 domain 会被静默忽略且不再变更域名;正确顺序为 setDomain → 按 verify_host/verify_value 配置 TXT 记录(并按 cname 配置 CNAME)→ checkDomain 手动校验或等待定时任务 → domain_status=1 后才可 saveCert 上传证书;getCert/saveCert 响应新增 can_set_cert/can_set_cert_reason/domain_status,供上传入口置灰与提示文案",
|
||||
"风险提示:config.frontConfig.domainVerify.enable = false 时 app/schedule/domain_verify_scan.js 标记 disable、Egg 不注册该任务,新域名只能靠前端调用 checkDomain 手动触发才会放行;迁移尚未执行时 getByDomain 闸门降级为仅按 domain 查询(一次性 WARN),需迁移完成并重启实例后闸门才真正生效;getByDomain 命中配置缓存最长 600s 内仍可能放行刚被置为未验证的域名(setDomain/saveCert/校验成功均已主动清缓存,实际窗口极短,接受该取舍)",
|
||||
"文档变更:methods/system.json 的 frontConfig 分组新增 3 条(setDomain/getDomain/checkDomain,均 isNeedLogin=true、isNeedAuth=false、带 Authorization 头)+ 更新 3 条(getByDomain 描述补充闸门语义与迁移降级说明,params/response/errors 未变;getCert 响应 10 → 13 字段;saveCert 删除 domain 入参、新增前置闸门、response 10 → 13 字段、errors 同步收敛);spec.methods 只放上述 6 条,未放入 getInfo/saveInfo(避免整条覆盖造成语义漂移);未使用 deleteMethods;根版本 0.3.178 → 0.3.179,updatedAt 保持 2026-09-24",
|
||||
"已知遗留(本次未处理,建议下一批单独修正):frontConfig.getInfo 与 frontConfig.saveInfo 的描述仍写「domain 只能通过 frontConfig.saveCert 变更」,实际域名变更已收敛到 frontConfig.setDomain;这两条不在本批 spec.methods 内(避免整条覆盖),故未同步",
|
||||
"变更记录条目数 640 → 641(新记录插入数组首位,既有 640 条 version 未改动、未删除)",
|
||||
"维护源口径冲突(仅记录,未处理):与上一轮维持一致,methods/*.json 的维护源是否为数据库表 wms_method_doc_meta 仍待用户决策;本次仍按 docs/api-doc-update-workflow.md 走 npm run doc:api:update 直接写 JSON,未连接数据库、未写库",
|
||||
"自动清单刷新:node temp/tmp-gen-service-method-inventory.cjs 与 node temp/tmp-update-ai-method-routing.cjs(AI_METHOD_ROUTING.md 第 6 节 SERVICE_METHOD_INVENTORY 标记区与 temp/tmp-service-method-inventory.md 同步刷新)",
|
||||
"docs/*.md 无需同步:检索 frontConfig/setDomain/checkDomain/域名验证 未命中解释性文档(仅 AI_METHOD_ROUTING.md 与 temp/tmp-service-method-inventory.md 含自动清单命中,已由刷新脚本处理)"
|
||||
],
|
||||
"module": "frontConfig"
|
||||
},
|
||||
{
|
||||
"version": "2026.09.24-front-config-saveCert-response-fix",
|
||||
"date": "2026-09-24",
|
||||
"type": "updated",
|
||||
"summary": "修正 frontConfig.saveCert 的响应契约:由错误的 8 字段品牌口径(buildInfoOutput:warehouse_id/domain/title/logo_url/favicon_url/login_bg_url/theme/updated_at)更正为 10 字段证书口径(buildCertOutput,与 frontConfig.getCert 一致:warehouse_id/domain/cert_pem/key_pem/cert_expire_at/sync_status/sync_attempts/last_sync_error/last_synced_at/updated_at);入参 domain/pem/key 与错误码 400/403/409/500 口径不变,其余 frontConfig 条目(getInfo/getCert/saveInfo/getByDomain)未改动。本记录闭环 2026.09.24-front-config-migrate-to-frontConfig 中标注的「saveCert 响应口径待确认」一项。",
|
||||
"methods": [
|
||||
"frontConfig.saveCert"
|
||||
],
|
||||
"notes": [
|
||||
"闭环说明:本记录闭环 2026.09.24-front-config-migrate-to-frontConfig 中标注的「saveCert 响应口径待确认」一项(该记录 notes 第 6 条:JSDoc 声明返回 10 字段证书输出,但实现实际 return this.buildInfoOutput(...) 返回 8 字段品牌信息);按工作流「新记录插入数组头部、历史记录不回改」,原记录保持原样,修正以本记录承接",
|
||||
"代码证据:app/service/systems/frontConfig.js:782 saveCert 出口 return this.buildCertOutput(savedRecord, warehouseId);buildCertOutput 定义于同文件 :202,输出 10 字段 warehouse_id/domain/cert_pem/key_pem/cert_expire_at/sync_status/sync_attempts/last_sync_error/last_synced_at/updated_at(其中 key_pem 读 cert_key 列)",
|
||||
"由 wms-dev-agent 修正实现(saveCert 返回由 buildInfoOutput 改为 buildCertOutput),本次仅同步文档口径,未改动任何代码",
|
||||
"文档变更:methods/system.json 的 frontConfig 分组仅更新 saveCert 一条(spec.methods 只放这一条,未放入 getInfo/getCert/saveInfo/getByDomain,避免整条覆盖造成语义漂移;未使用 deleteMethods);响应字段 8 -> 10,method 级 notes 中「响应口径待确认」一条被替换为「响应契约修正」;headers/params/errors 沿用既有条目不变;根版本 0.3.177 -> 0.3.178,updatedAt 保持 2026-09-24",
|
||||
"通配语义同步写准:certCoversDomain 的 *.example.com 分支(app/service/systems/frontConfig.js:512)要求通配前缀非空且不含「.」,即仅覆盖恰好一级标签;*.a.com 覆盖 b.a.com,不覆盖 x.y.a.com(报 400「证书不合法」)",
|
||||
"变更记录条目数 639 -> 640(新记录插入数组首位,既有 639 条 version 未改动、未删除);script/update-api-doc.cjs 的 appendChange 仅支持 unshift + 重复 version 拦截,无整条替换既有 change 的能力,故未回改上一条记录的 note",
|
||||
"无代码结构变化,未重新生成 AI_METHOD_ROUTING.md 与 temp/tmp-service-method-inventory.md(上一轮已刷新,本次仅文档响应口径修正)",
|
||||
"维护源口径冲突(仅记录,未处理):与上一轮维持一致,methods/*.json 的维护源是否为数据库表 wms_method_doc_meta 仍待用户决策;本次仍按 docs/api-doc-update-workflow.md 走 npm run doc:api:update 直接写 JSON,未连接数据库、未写库"
|
||||
],
|
||||
"module": "frontConfig"
|
||||
},
|
||||
{
|
||||
"version": "2026.09.24-front-config-migrate-to-frontConfig",
|
||||
"date": "2026-09-24",
|
||||
"type": "updated",
|
||||
"summary": "前端独立部署接口从 setting.warehouse 迁移到 frontConfig 模块:删除 setting.warehouse.getFrontConfig / saveFrontConfig / saveFrontCert 三个旧方法(出口、服务实现与鉴权白名单同步移除,实测调用返回「方法 xxx 不存在」),新增 frontConfig.getInfo / getCert / saveInfo / saveCert 四个需登录、免权限、免鉴权的配置接口(权限由业务层 isWarehouse 判定,仅仓库主体可用);公共按域名拉取接口 frontConfig.getByDomain 保持不变(仍 6 字段公开白名单,免登录免权限免鉴权)。",
|
||||
"methods": [
|
||||
"frontConfig.getInfo",
|
||||
"frontConfig.getCert",
|
||||
"frontConfig.saveInfo",
|
||||
"frontConfig.saveCert",
|
||||
"setting.warehouse.getFrontConfig",
|
||||
"setting.warehouse.saveFrontConfig",
|
||||
"setting.warehouse.saveFrontCert"
|
||||
],
|
||||
"notes": [
|
||||
"代码变更:新增出口 app/service/systemMethods/frontConfig.js 的 getInfo/getCert/saveInfo/saveCert(_noNeedRight/_noNeedAuth/_noNeedLog 均含这 4 个方法;_noNeedLogin 仍仅 getByDomain),实现见新增服务 app/service/systems/frontConfig.js(TEXT_FIELDS/PUBLIC_FIELDS 白名单、buildInfoOutput/buildCertOutput/buildPublicOutput)",
|
||||
"代码变更:app/service/systemMethods/setting/warehouse.js 与 app/service/systems/setting/warehouse.js 中 getFrontConfig/saveFrontConfig/saveFrontCert 的出口与实现已删除,_noNeedRight 收敛为 getSettings,getFieldMeta,saveSettings,getweChatApp;methods/system.json 中 setting.warehouse 分组仅删除这 3 条条目,分组与 getSettings/getFieldMeta/saveSettings 保留",
|
||||
"文档变更:methods/system.json 删除 setting.warehouse 分组下 3 条旧条目(原 L15632 saveFrontConfig / L15797 getFrontConfig / L15914 saveFrontCert),frontConfig 分组(groupName 前端独立部署模块)新增 4 条条目(isNeedLogin=true、isNeedAuth=false、Authorization 头);frontConfig.getByDomain 条目未改动(未放入本次 spec.methods,避免整条覆盖造成语义漂移);根版本 0.3.176 -> 0.3.177,updatedAt 2026-09-23 -> 2026-09-24",
|
||||
"saveInfo 口径:upsert 一仓一行;仅受理 title(≤100)/logo_url、favicon_url、login_bg_url(≤255)/theme(合法 JSON 对象或 JSON 字符串),domain 与证书字段由方法层白名单静默忽略;保存即重置同步状态(sync_status=0、sync_attempts=0、清空 last_sync_error/last_synced_at);写库成功后清当前 domain 公共拉取缓存(清缓存失败仅记日志)",
|
||||
"saveCert 口径:校验链 证书可解析 → 未生效拒绝 → 已过期拒绝 → 私钥与证书 SPKI 配对 → 证书 SAN/CN 覆盖 domain(支持 *.example.com 通配,仅匹配一级标签) → domain 全局唯一;校验链任一失败统一 400「证书不合法」不吐细节;cert_expire_at 以证书 validTo 权威写入;cert_pem/cert_key 直接入库、cert_path/key_path 置 null(等待 script/warehouse-cert-sync.cjs 部署后回填);写库后同时清旧 domain 与新 domain 两个公共缓存 key",
|
||||
"响应口径待确认:app/service/systems/frontConfig.js saveCert 的 JSDoc(及方法层注释)声明返回证书输出(10 字段含 cert_pem/key_pem),但实现实际 return this.buildInfoOutput(...) 返回 8 字段品牌信息、不含证书字段;本文档按当前实现(8 字段)编写,若确认应返回证书输出需先修正实现再同步文档",
|
||||
"维护源口径冲突(仅记录,未处理):methods/changes/system.json 既有记录备注「维护源是数据库表 wms_method_doc_meta,methods/*.json 只是导出产物」,仓库内已存在 script/method-doc-*.cjs 工具链与迁移 database/migrations/20260923150000-create-method-doc-tables.js;本次仍按 docs/api-doc-update-workflow.md 走 npm run doc:api:update 直接写 JSON,未连接数据库、未写库,待用户决策是否需要回灌数据库维护源",
|
||||
"自动清单刷新:node temp/tmp-gen-service-method-inventory.cjs 与 node temp/tmp-update-ai-method-routing.cjs(AI_METHOD_ROUTING.md 第 6 节 SERVICE_METHOD_INVENTORY 标记区与 temp/tmp-service-method-inventory.md 同步刷新,会顺带更新扫描时间与文件/方法计数,属脚本预期行为)",
|
||||
"docs/*.md 与 README.md 无需同步:检索 getFrontConfig/saveFrontConfig/saveFrontCert/前端独立部署/frontConfig/getByDomain 未命中任何解释性文档(仅 AI_METHOD_ROUTING.md 与 temp/tmp-service-method-inventory.md 含自动清单命中,已由刷新脚本处理)"
|
||||
],
|
||||
"module": "frontConfig"
|
||||
},
|
||||
{
|
||||
"version": "2026.09.23-returnReceived-create-is-urgent",
|
||||
"date": "2026-09-23",
|
||||
"type": "updated",
|
||||
"summary": "returnReceived.create 响应新增 is_urgent 加急标记(boolean):wms_return_query_log(退回查询记录表)按 仓库+运单号 精确匹配,命中即 true,未命中或查询失败降级为 false;幂等命中(duplicated=true)与新创建(duplicated=false)两个分支均返回该字段",
|
||||
"methods": [
|
||||
"returnReceived.create"
|
||||
],
|
||||
"notes": [
|
||||
"代码变更:app/service/systems/return_received.js 的 create 在幂等命中与新登记两个返回分支均新增顶层 is_urgent 字段,并新增私有辅助方法 _isUrgentReturnQuery(waybillCode, warehouseId)(含 JSDoc)",
|
||||
"判定口径:wms_return_query_log(退回查询记录表)中存在 warehouse_id=当前仓库且 waybill_code=登记运单号(精确匹配)的记录时为 true,否则 false;查询失败降级为 false,不影响登记主流程",
|
||||
"方法层 app/service/systemMethods/returnReceived.js 无需改动;文档变更:response 新增 is_urgent(boolean,required=true);维护源 wms_method_doc_meta 与导出产物 methods/system.json 版本同步至 0.3.176(dashboard.hot_order_rank mask 变更同步入库 0.3.175,本次变更升至 0.3.176)"
|
||||
],
|
||||
"module": "returnReceived"
|
||||
},
|
||||
{
|
||||
"version": "2026.09.23-dashboard.hot_order_rank.mask",
|
||||
"date": "2026-09-23",
|
||||
"type": "updated",
|
||||
"summary": "dashboard.hot_order_rank 响应口径调整:data[].sku 由商品编码改为库存商品ID(stock_warehouse.id);data[].name 做脱敏处理(前2字符+***+后2字符,长度不足 4 字符时返回 ***)",
|
||||
"methods": [
|
||||
"dashboard.hot_order_rank"
|
||||
],
|
||||
"notes": [
|
||||
"代码变更:app/service/systemMethods/dashboard.js 中 buildHotOrderRankMap/mergeHotOrderRank 的聚合条目新增 stockId(订单明细 stock_id),并在货主端跨仓合并时保留首个非 0 值",
|
||||
"代码变更:resolveHotOrderRankProduct 的 sku 改为返回库存商品ID(number,stock_warehouse.id),仅当 stock_id 缺失时回退商品编码字符串;新增 maskHotOrderRankName 对最终展示名称统一脱敏(长度>=4 时前2字符+***+后2字符,否则返回 ***)",
|
||||
"文档变更:data[].sku 类型改为 number 并更新描述;data[].name 描述补充脱敏规则;根版本 0.3.174 -> 0.3.175"
|
||||
],
|
||||
"module": "dashboard"
|
||||
},
|
||||
{
|
||||
"version": "2026.09.23-returnReceived-list-created-at-filter",
|
||||
"date": "2026-09-23",
|
||||
"type": "updated",
|
||||
"summary": "修复 returnReceived.list 登记时间(created_at)筛选不生效问题:_buildListWhere 白名单补充 created_at/updated_at,并补齐文档此前缺失但代码已支持的 where 字段(scanner_name/order_express_id/order_id);returnReceived.export 的 where 语义描述同步更新(与 list 一致)。配套新增 wms_return_received 索引 idx_warehouse_created_at(warehouse_id, created_at)(迁移 20260923180000),优化登记时间范围过滤与默认 created_at desc 排序。",
|
||||
"methods": [
|
||||
"returnReceived.list",
|
||||
"returnReceived.export"
|
||||
],
|
||||
"notes": [
|
||||
"代码变更:app/service/systems/return_received.js _buildListWhere 的 directFields 白名单补充 created_at、updated_at(list 与 exportList 同时生效)",
|
||||
"数据库变更:database/migrations/20260923180000-add-created-at-index-to-wms-return-received.js 新增 idx_warehouse_created_at(warehouse_id, created_at),已在开发库执行",
|
||||
"文档变更:returnReceived.list 新增 where.created_at / where.updated_at / where.scanner_name / where.order_express_id / where.order_id 参数说明,description 更新;returnReceived.export 的 where 参数描述补充 created_at/updated_at 范围",
|
||||
"文档库版本 0.3.173 -> 0.3.174(wms_method_doc_meta.version),methods/system.json 为导出产物"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "2026.09.23-dashboard.hot_order_rank.realtime",
|
||||
"date": "2026-09-23",
|
||||
"type": "updated",
|
||||
"summary": "dashboard.hot_order_rank 由演示数据改为真实数据库查询:统计今日(00:00 至当前时刻)销量 Top10 商品及环比昨日趋势;仓库端单仓统计,货主端跨已签约仓库聚合",
|
||||
"methods": [
|
||||
"dashboard.hot_order_rank"
|
||||
],
|
||||
"notes": [
|
||||
"核实 app/service/systemMethods/dashboard.js 实现后更新:废弃旧版 mock 数据,改为查询订单常用表/配送分表(OrderDeliveryFactory/OrderItemsFactory 的 current 与 dispatch)聚合",
|
||||
"口径:今日窗口 [今日 00:00, 当前时刻),昨日窗口 [昨日 00:00, 今日 00:00);value 为窗口内非取消、非异常、未删除订单的商品计划数量(plan_qty)合计;trend 为环比昨日百分比(保留 1 位小数,昨日为 0 且今日 >0 时按 100)",
|
||||
"仓库端使用 ctx.user.store_id 单仓统计;货主端(store_type=store)跨已签约仓库(auth_status=2)并行统计并按商品聚合;按今日销量降序取前 10 条,无数据时返回空数组",
|
||||
"响应更新:data[].name 无名称回退商品编码/商品+库存ID、data[].sku 无编码回退 SKU+库存ID;错误码补充 code=0(缺少仓库/货主上下文),500 改为订单数据查询失败",
|
||||
"文档库表同步:method-doc-update.cjs 更新 description/response/errors 并 --bump,method-doc-export.cjs 回写 methods/system.json"
|
||||
],
|
||||
"module": "dashboard"
|
||||
},
|
||||
{
|
||||
"version": "2026.09.23-dashboard.charts.doc",
|
||||
"date": "2026-09-23",
|
||||
"type": "updated",
|
||||
"summary": "补齐看板模块其余 5 个接口文档:express_ratio/platform_distribution/order_trend 为实时统计接口,warehouseStats/hot_order_rank 为演示数据接口(描述已标注);均无业务入参",
|
||||
"methods": [
|
||||
"dashboard.express_ratio",
|
||||
"dashboard.platform_distribution",
|
||||
"dashboard.order_trend",
|
||||
"dashboard.warehouseStats",
|
||||
"dashboard.hot_order_rank"
|
||||
],
|
||||
"notes": [
|
||||
"核实 app/service/systemMethods/dashboard.js 实现后补齐",
|
||||
"express_ratio/platform_distribution 货主端跨已签约仓库(auth_status=2)汇总,返回 name/value/itemStyle.color 结构",
|
||||
"order_trend 按小时统计 08:00 至当前小时,返回 summary/categories/orders/shipments",
|
||||
"warehouseStats/hot_order_rank 当前为固定演示数据,待业务接入真实统计后需同步更新文档"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "2026.09.23-dashboard.storeStats.doc",
|
||||
"date": "2026-09-23",
|
||||
"type": "updated",
|
||||
"summary": "补齐 dashboard.storeStats 接口文档:补充描述、13 个响应统计字段与错误码(无业务入参,依据登录用户上下文区分仓库端/货主端)",
|
||||
"methods": [
|
||||
"dashboard.storeStats"
|
||||
],
|
||||
"notes": [
|
||||
"核实 app/service/systemMethods/dashboard.js 实现后补齐",
|
||||
"仓库端按当前用户 store_id 单仓统计;货主端跨已签约仓库(auth_status=2)汇总"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "2026.09.23-index.tryAutoTranslateNewKeys.doc",
|
||||
"date": "2026-09-23",
|
||||
"type": "updated",
|
||||
"summary": "补全 index.tryAutoTranslateNewKeys 文档:明确其为 putI18nCollect 的内部辅助方法,补充 project/targetLanguage 参数说明,注明无对外返回值、异常仅记日志、不建议作为 HTTP API 直接调用",
|
||||
"methods": [
|
||||
"index.tryAutoTranslateNewKeys"
|
||||
],
|
||||
"notes": [
|
||||
"代码事实:app/service/systemMethods/index.js:1512 async tryAutoTranslateNewKeys(project, targetLanguage),仅被 putI18nCollect(1451 行)内部调用;目标语言为 zh-CN 直接返回;为 zh-CN 已有翻译的键批量创建目标语言占位(translation=null、translation_status=0、auto_generated=1、translator=auto-translate);无返回值,异常被内部 try/catch 吞掉仅记日志。",
|
||||
"文档库表同步:method-doc-update.cjs 更新 description/params 并 --bump(版本 0.3.169 -> 0.3.170),method-doc-export.cjs 回写 methods/system.json(562 个方法)。",
|
||||
"说明:/system 通用分发不区分 public 与内部函数,该方法理论上可被直接调用,文档已注明不建议直接调用。"
|
||||
],
|
||||
"module": "index"
|
||||
},
|
||||
{
|
||||
"version": "2026.09.23-wechat.dropAgreementVersionNumber",
|
||||
"date": "2026-09-23",
|
||||
"type": "updated",
|
||||
"summary": "用户须知版本表去掉 version 数字版本号,直接使用 id 自增:最新版判定改 ORDER BY id DESC,提交即插入新行(去掉 max+1 与并发重试),接口响应只保留 version_id",
|
||||
"methods": [
|
||||
"wechat.getUserAgreementText",
|
||||
"wechat.getUserAgreement",
|
||||
"wechat.setUserAgreement",
|
||||
"wechat.getAgreementVersion",
|
||||
"wechat.loginByCode"
|
||||
],
|
||||
"notes": [
|
||||
"迁移 20260923140000-drop-version-from-wechat-agreement-version(开发+生产均执行):removeIndex uk_appid_version + removeColumn version;down 为加回列与唯一索引。同步 app/model/wechat_agreement_version.js 删 version 字段与唯一索引(仅保留 idx_appid)。",
|
||||
"最新版判定统一为 ORDER BY id DESC(loginByCode/getUserAgreementText/getUserAgreement/findLatestAgreementVersion/cleanupUnusedAgreementVersions 的最终版=max(id));setUserAgreement 改为直接 create(appid+content),无并发重试;getUserAgreementText 缓存 JSON 仅 {version_id,text}。",
|
||||
"接口响应精简:getUserAgreementText/getUserAgreement/setUserAgreement 去掉 version 字段、getAgreementVersion 去掉 version 字段,均保留 version_id(=记录 id)。"
|
||||
],
|
||||
"module": "wechat"
|
||||
},
|
||||
{
|
||||
"version": "2026.09.23-wechat.getAgreementVersion",
|
||||
"date": "2026-09-23",
|
||||
"type": "added",
|
||||
"summary": "新增 wechat.getAgreementVersion(按协议版本 id 获取协议内容,需登录免权限+校验仓库);wechat.userList 响应新增 agreement_version_id(协议id)",
|
||||
"methods": [
|
||||
"wechat.getAgreementVersion",
|
||||
"wechat.userList"
|
||||
],
|
||||
"notes": [
|
||||
"wechat.getAgreementVersion:入参 id(wms_wechat_agreement_version.id,来源 userList 的 agreement_version_id),按 id 查版本 → 校验该版本 appid 属于当前仓库启用小程序(warehouse_id=ctx.user.store_id, is_enabled=1),不属于则提示「该协议版本不属于当前仓库的小程序」;返回 id/appid/nickname/version/text/created_at。需登录免权限(systemInit 第2/4参)。",
|
||||
"wechat.userList:响应行新增 agreement_version_id(数值化,null 保持 null),sortField 白名单新增 agreement_version_id;该字段由 loginByCode 自动回写,供前端按版本 id 拉取协议内容。",
|
||||
"代码变更:app/service/systems/wechat.js 新增 getAgreementVersion + userList 响应数值化/排序白名单;app/service/systemMethods/wechat.js 白名单与出口同步。"
|
||||
],
|
||||
"module": "wechat"
|
||||
},
|
||||
{
|
||||
"version": "2026.09.23-wechat.agreementVersionCleanup",
|
||||
"date": "2026-09-23",
|
||||
"type": "updated",
|
||||
"summary": "新增定时任务:每 1 小时扫描 wms_wechat_agreement_version,真实删除未使用且非对应 appid 最终版的历史版本,释放 MySQL 磁盘",
|
||||
"methods": [],
|
||||
"notes": [
|
||||
"保留规则:① 各 appid 的最终版(version 最大)永久保留;② 被 wms_user_oauth.agreement_version_id 引用的版本保留(老用户仍停留在旧协议);其余版本真实删除(模型 paranoid=false)。",
|
||||
"触发:app/schedule/wechat_agreement_cleanup.js,cron 从 config.wechatAgreementCleanup.cron 读取(默认 0 0 * * * * = 每 1 小时整点,type=worker 单 worker 防重入,enable=false 不注册);清理逻辑收敛在 service.systems.wechat.cleanupUnusedAgreementVersions(batchSize 默认 500,按 id 分批删走主键索引)。",
|
||||
"每次任务完成后输出日志:deleted/kept_latest/kept_in_use/total;失败仅记 error 日志不抛出。"
|
||||
],
|
||||
"module": "wechat"
|
||||
},
|
||||
{
|
||||
"version": "2026.09.23-wechat.userAgreement.versioning",
|
||||
"date": "2026-09-23",
|
||||
"type": "updated",
|
||||
"summary": "用户须知改为副表版本管理:移除 wms_wechat_app.user_agreement;新增 wms_wechat_agreement_version(appid+数字版本号+富文本,提交一次自动新增版本,拉取只取最新);wms_user_oauth 加 agreement_version_id,loginByCode 自动更新到最新协议版本",
|
||||
"methods": [
|
||||
"wechat.getUserAgreementText",
|
||||
"wechat.getUserAgreement",
|
||||
"wechat.setUserAgreement",
|
||||
"wechat.loginByCode"
|
||||
],
|
||||
"notes": [
|
||||
"迁移 20260923130000-user-agreement-versioning(开发+生产均执行):① removeColumn wms_wechat_app.user_agreement;② createTable wms_wechat_agreement_version(id/appid/version INT/content LONGTEXT/时间戳,uk_appid_version(appid,version) 唯一 + idx_appid);③ addColumn wms_user_oauth.agreement_version_id(BIGINT UNSIGNED 可空,关联版本表 id)。同步 app/model/wechat_agreement_version.js 新增、wechat_app.js/user_oauth.js 字段同步。",
|
||||
"wechat.setUserAgreement:提交一次自动新增版本——查该 appid 最大 version 后 +1 插入(并发撞唯一键时重算重试最多 3 次),成功后 cacheDel 清 24h 缓存;返回 version_id/version/text。",
|
||||
"wechat.getUserAgreementText/getUserAgreement:拉取只拉最新版本(ORDER BY version DESC);getUserAgreementText 缓存 24h 存 JSON {version_id,version,text},命中 from_cache=true;无版本分别提示「未找到对应小程序或该小程序暂无用户须知」/「该小程序暂无用户须知」。",
|
||||
"wechat.loginByCode:查该小程序 appid 最新协议版本 id,oauth 新增/更新时自动写入 agreement_version_id(无需前端传入,为空版本表时为 null)。",
|
||||
"代码变更:app/service/systems/wechat.js loginByCode/getUserAgreementText/getUserAgreement/setUserAgreement 改版并新增 findLatestAgreementVersion;systemMethods 无签名变化。"
|
||||
],
|
||||
"module": "wechat"
|
||||
},
|
||||
{
|
||||
"version": "2026.09.23-wechat.userAgreement",
|
||||
"date": "2026-09-23",
|
||||
"type": "added",
|
||||
"summary": "新增用户须知三接口:wms_wechat_app 加 user_agreement(LONGTEXT)字段;wechat.getUserAgreementText(免登录,appId 查询 + 24h Redis 缓存)、wechat.getUserAgreement(需登录,当前仓库)、wechat.setUserAgreement(需登录,更新并清缓存)",
|
||||
"methods": [
|
||||
"wechat.getUserAgreementText",
|
||||
"wechat.getUserAgreement",
|
||||
"wechat.setUserAgreement"
|
||||
],
|
||||
"notes": [
|
||||
"迁移 20260923120000-add-user-agreement-to-wms-wechat-app:wms_wechat_app 仅加 user_agreement 字段(Sequelize TEXT('long') = LONGTEXT,allowNull,comment 用户须知富文本),同步 app/model/wechat_app.js。开发+生产均需执行(生产:$env:NODE_ENV='production'; npx sequelize-cli db:migrate --migrations-path database/migrations --env production)。",
|
||||
"wechat.getUserAgreementText:免登录(systemInit 第1参),入参 appId;Redis key wechat:userAgreement:{appid},TTL 24h,命中直接返回 from_cache=true;未命中查 wms_wechat_app.user_agreement 并回写缓存;无该 appid 返回「未找到对应小程序」。",
|
||||
"wechat.getUserAgreement/setUserAgreement:需登录免权限(systemInit 第2/4参),按 ctx.user.store_id 取启用小程序(is_enabled=1),无则提示「无小程序,需要先绑定」;set 校验 text 为字符串(可空串清空)→ update 后 cacheDel 清除 24h 缓存。",
|
||||
"代码变更:app/service/systems/wechat.js 新增 getUserAgreementText/getUserAgreement/setUserAgreement/findWarehouseWechatApp;app/service/systemMethods/wechat.js 白名单与出口同步。"
|
||||
],
|
||||
"module": "wechat"
|
||||
},
|
||||
{
|
||||
"version": "2026.09.23-wechat.bindByEmployee",
|
||||
"date": "2026-09-23",
|
||||
"type": "added",
|
||||
"summary": "新增 wechat.bindByEmployee:管理员按工号绑定微信(需登录需权限),传工号 id + 微信绑定记录 id,查工号账号 id 写入 wms_user_oauth.user_id",
|
||||
"methods": [
|
||||
"wechat.bindByEmployee"
|
||||
],
|
||||
"notes": [
|
||||
"新增接口 wechat.bindByEmployee(需登录需权限,区别于中间层 wechat.bindUser 的用户名密码自绑定):入参 id(工号 id=wms_account_store_employee.id,必填正整数)与 oauth_id(微信绑定记录 id=wms_user_oauth.id,必填正整数,来自 wechat.userList 结果)。",
|
||||
"业务:工号存在且 status=1 → account_id;工号须属于当前仓库(store_id=ctx.user.store_id);oauth 须存在、provider=wechat、未绑定或已绑定同一账号(已绑其他账号拒绝换绑);oauth.app_id 存在时校验对应 wms_wechat_app 属于当前仓库;账号存在且 status=1。校验通过后 wms_user_oauth.user_id=account_id,幂等返回 already_bound。不签发 token。",
|
||||
"鉴权:不加入 systemInit 任何白名单 → 需正常登录 token 且需 wms_permission 接口权限(path=wechat.bindByEmployee,type=api,需在开发库插入该权限记录并由管理员在角色中勾选后生效)。",
|
||||
"代码变更:app/service/systems/wechat.js 新增 bindByEmployee;app/service/systemMethods/wechat.js 新增 bindByEmployee 出口。"
|
||||
],
|
||||
"module": "wechat"
|
||||
},
|
||||
{
|
||||
"version": "2026.09.23-wechat.wxaauth-new-api",
|
||||
"date": "2026-09-23",
|
||||
"type": "updated",
|
||||
"summary": "wechat.wxaauth 迁移到微信新版认证接口:旧接口 /wxa/sec/wxaapi/wxaauth、/wxa/sec/wxaapi/uploadmedia 已下线(40066 invalid url),改为 POST /wxa/sec/wxaauth(auth_data 包裹)+ POST /wxa/sec/uploadauthmaterial(mediaid)",
|
||||
"methods": [
|
||||
"wechat.wxaauth"
|
||||
],
|
||||
"notes": [
|
||||
"根因:微信下线旧版小程序认证接口,调用 /wxa/sec/wxaapi/wxaauth 与 /wxa/sec/wxaapi/uploadmedia 返回 40066 invalid url(与 queryauth 当年同因:路径不存在,详见 2026.09.22-wechat.queryauth-fix 记录)。",
|
||||
"发起认证改为 POST /wxa/sec/wxaauth,请求体 { auth_data }:customer_type(1 企业/12 个体户/15 个人)、account_name、account_name_type(1 自选词汇/2 商标)、pay_type(1 服务商预购包/2 自行支付)、third_party_phone、contact_info{name,email,mobile?} 必填;invoice_info/qualification/qualification_other(≤10)/account_supplemental/auth_identification/auth_ident_material/service_appid(代缴必填)/taskid 可选。",
|
||||
"上传材料改为 POST /wxa/sec/uploadauthmaterial(multipart media=文件,图片 ≤2M,PNG/JPEG/JPG/GIF),返回 mediaid(lib 层归一化为 media_id)。自动换 mediaid 的图片字段:qualification(单张)、qualification_other[]/account_supplemental[]/auth_ident_material[](数组),支持传 COS URL。",
|
||||
"破坏性变更:入参由旧扁平字段(contact_type/contact_name/contact_cert_photo/business_license_*/legal_persona_*/pic_list/qualification_list/statement_list 等 33 字段白名单)改为新版 auth_data 字段,前端需同步切换。打回重填走新接口 POST /wxa/sec/reauth(同 auth_data + taskid,暂未接入,可后续补 wechat.reauth)。",
|
||||
"代码变更:app/lib/wechat_open_client.js wxaauth/uploadAuthMedia 路径与 mediaid 归一化;app/service/systems/wechat.js wxaauth/resolveBodyMedia/resolveMediaValue 换新字段;app/service/systemMethods/wechat.js 注释同步。"
|
||||
],
|
||||
"module": "wechat"
|
||||
},
|
||||
{
|
||||
"version": "2026.09.22-wechat.wxaauth-cos-url",
|
||||
"date": "2026-09-22",
|
||||
|
||||
@ -1,22 +1,4 @@
|
||||
[
|
||||
{
|
||||
"version": "2026.09.23-warehouse-receiving-pending-notice-reliability",
|
||||
"date": "2026-09-23",
|
||||
"type": "updated",
|
||||
"summary": "收货未入库提醒(receiving_pending_inbound)可靠性增强:修复 10 分钟宽限窗口内每 5 分钟一轮导致的重复执行/重复通知(Redis SET NX 抢锁判定修正 + 进程内兜底锁改为 app 级共享集合);逐货主群异常隔离(单群发送异常不中断其他货主群);货主收货群推送失败自动回退仓库客服群人工跟进(独立幂等键与文案前缀);pushSystemMessage 推送幂等去重(同 ext_id 已送达跳过重推)",
|
||||
"methods": [
|
||||
"notify.reply"
|
||||
],
|
||||
"notes": [
|
||||
"定时任务锁修复:app/service/systems/receiving_pending_notice.js#acquireDailyLock 中 Redis SET NX 返回 null(键已存在)直接判定未抢到锁,不再落入进程内兜底(兜底仅用于 Redis 不可用/命令异常);进程内兜底锁由 service 实例级改为 app._receivingPendingDailyLocks 共享集合(getMemoryDailyLocks),跨轮次/跨实例生效;app/schedule/notice_receiving_pending_inbound.js 汇总日志补充 fallbackCount。修复 10 分钟宽限窗口内每 5 分钟一轮导致的重复执行/重复通知",
|
||||
"逐群异常隔离:notifyWarehouse 对每个货主批次 try/catch(sendPendingNotice 内部同样隔离主推异常),单群发送异常只计失败并继续后续货主群,确保所有货主群的收货群均被通知,部分群失败不遗漏其他群",
|
||||
"失败自动回退客服群:新增 sendCustomerServiceFallback——货主收货群主推失败(含异常)时自动回退仓库客服群人工跟进,文案前缀「通知货主【X】收货群推送失败,请人工跟进:」;幂等键独立为 receiving-pending-fallback:{仓库}:{货主}:{YYYYMMDD},与主推送互不影响;执行汇总(summary)新增 fallbackCount",
|
||||
"推送幂等去重:app/service/systems/warehouseNotify.js#pushSystemMessage 中同 ext_id 且 push_status=2(已送达)直接返回成功并跳过推送;push_status=0/1/3 仍复用同一 wms_inbox_message 记录重推,防止重复轮次/多实例并发导致同一群重复收到相同通知",
|
||||
"事件路由与协议不变:仍为 receiving_pending_inbound + notify.reply(type=system),固定订阅 store:receiving(未命中回退 warehouse:customer_service);主推送幂等键仍为 receiving-pending:{仓库}:{货主}:{YYYYMMDD};接口文档(methods/system.json 的 setting.warehouse 字段、methods/warehouse_notify.json 的 notify.reply 协议)无需变更",
|
||||
"单测:test/app/service/systems/receiving_pending_notice.test.js 新增 5 个用例(推送失败同日不重发+回退计数、回退独立幂等键与失败前缀、逐群异常隔离、Redis SET NX null 判定、app 级进程内锁跨实例共享),全部通过;npx eslint 无告警"
|
||||
],
|
||||
"module": "receiving"
|
||||
},
|
||||
{
|
||||
"version": "2026-09-15-warehouse-02",
|
||||
"date": "2026-09-15",
|
||||
|
||||
1852
methods/system.json
1852
methods/system.json
File diff suppressed because it is too large
Load Diff
@ -178,21 +178,10 @@ const seq = new Sequelize(client.database, client.username || client.user, clien
|
||||
if (exists) {
|
||||
const [cols] = await seq.query("SELECT column_name AS cn FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'wms_warehouse_front_config'");
|
||||
console.log("[DB_PROBE] columns: " + cols.map(r => r.cn).join(","));
|
||||
const hasDomainStatus = cols.some(r => r.cn === "domain_status");
|
||||
console.log("[DB_PROBE] domain_status column: " + (hasDomainStatus ? "YES" : "NO"));
|
||||
const [total] = await seq.query("SELECT COUNT(*) AS c FROM wms_warehouse_front_config");
|
||||
console.log("[DB_PROBE] total rows: " + total[0].c);
|
||||
const [dist] = await seq.query("SELECT sync_status AS s, COUNT(*) AS c FROM wms_warehouse_front_config GROUP BY sync_status ORDER BY sync_status");
|
||||
console.log("[DB_PROBE] sync_status distribution: " + (dist.length ? dist.map(r => r.s + "=" + r.c).join(" ") : "(empty)"));
|
||||
if (hasDomainStatus) {
|
||||
const [ddist] = await seq.query("SELECT domain_status AS s, COUNT(*) AS c FROM wms_warehouse_front_config GROUP BY domain_status ORDER BY domain_status");
|
||||
console.log("[DB_PROBE] domain_status distribution: " + (ddist.length ? ddist.map(r => (r.s === null ? "null" : r.s) + "=" + r.c).join(" ") : "(empty)"));
|
||||
const sumStatus = want => ddist.filter(r => Number(r.s) === want).reduce((n, r) => n + Number(r.c), 0);
|
||||
console.log("[DB_PROBE] domain_status counts: 0_unverified=" + sumStatus(0) + " 1_verified=" + sumStatus(1) + " 2_failed=" + sumStatus(2));
|
||||
console.log("[DB_PROBE] gated-out rows (domain_status 0/2, no nginx server block after gate): " + (sumStatus(0) + sumStatus(2)));
|
||||
} else {
|
||||
console.log("[DB_PROBE] domain_status distribution: (column missing, migration not applied; cert-sync falls back to no filter)");
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
console.log("[DB_PROBE] failed: " + e.message);
|
||||
|
||||
@ -1,129 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* methods/system.json 库表化维护脚本共用工具。
|
||||
*
|
||||
* 环境:`--env production` 或 `NODE_ENV=production` 走生产库;默认开发库。
|
||||
* JSON 字段参数(headers/params/response/errors)支持内联 JSON 或 `@文件路径`。
|
||||
*/
|
||||
|
||||
const fs = require('node:fs');
|
||||
const path = require('node:path');
|
||||
const mysql = require('mysql2/promise');
|
||||
|
||||
function resolveEnv(argv = process.argv) {
|
||||
const idx = argv.indexOf('--env');
|
||||
if (idx > -1 && argv[idx + 1] && !argv[idx + 1].startsWith('--')) {
|
||||
return argv[idx + 1] === 'production' ? 'production' : 'development';
|
||||
}
|
||||
return process.env.NODE_ENV === 'production' ? 'production' : 'development';
|
||||
}
|
||||
|
||||
function loadDbConfig(env) {
|
||||
const dbConfig = require(path.join(__dirname, '..', 'database', 'config'));
|
||||
return dbConfig[env];
|
||||
}
|
||||
|
||||
function warnIfProduction(env) {
|
||||
if (env !== 'production') return;
|
||||
console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
|
||||
console.log('[DB-CONFIG] ⚠ 警告:目标为【生产数据库】');
|
||||
console.log('[DB-CONFIG] ⚠ 请确认这是预期环境;如属误判,请去掉 --env production 或清空 NODE_ENV。');
|
||||
console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
|
||||
}
|
||||
|
||||
async function createConnection(env) {
|
||||
warnIfProduction(env);
|
||||
const cfg = loadDbConfig(env);
|
||||
return mysql.createConnection({
|
||||
host: cfg.host,
|
||||
port: cfg.port,
|
||||
user: cfg.username,
|
||||
password: cfg.password,
|
||||
database: cfg.database,
|
||||
charset: 'utf8mb4',
|
||||
});
|
||||
}
|
||||
|
||||
/** 简单参数解析:--key value / --flag;返回 Map。
|
||||
* @param {string[]} [argv] 参数数组(默认 process.argv)。
|
||||
*/
|
||||
function parseArgs(argv = process.argv) {
|
||||
const map = new Map();
|
||||
for (let i = 2; i < argv.length; i++) {
|
||||
const token = argv[i];
|
||||
if (!token.startsWith('--')) continue;
|
||||
const key = token.slice(2);
|
||||
const next = argv[i + 1];
|
||||
if (next !== undefined && !next.startsWith('--')) {
|
||||
map.set(key, next);
|
||||
i++;
|
||||
} else {
|
||||
map.set(key, '');
|
||||
}
|
||||
}
|
||||
return map;
|
||||
}
|
||||
|
||||
/** JSON 参数:内联 JSON 或 @文件路径。
|
||||
* @param {string|undefined} value 参数值。
|
||||
*/
|
||||
function readJsonArg(value) {
|
||||
if (value === undefined || value === null || value === '') return null;
|
||||
const text = String(value);
|
||||
if (text.startsWith('@')) {
|
||||
return JSON.parse(fs.readFileSync(text.slice(1), 'utf8'));
|
||||
}
|
||||
return JSON.parse(text);
|
||||
}
|
||||
|
||||
/** 解析 JSON 列(DB 返回 string/object 两种可能)。
|
||||
* @param {string|object|null|undefined} raw 原始值。
|
||||
*/
|
||||
function parseJsonColumn(raw) {
|
||||
if (raw === null || raw === undefined) return null;
|
||||
if (typeof raw === 'object') return raw;
|
||||
return JSON.parse(String(raw));
|
||||
}
|
||||
|
||||
/** 版本号补丁位 +1:0.3.169 -> 0.3.170。
|
||||
* @param {string} version 当前版本。
|
||||
*/
|
||||
function bumpVersion(version) {
|
||||
const parts = String(version || '0.3.0').split('.');
|
||||
const last = parts.length - 1;
|
||||
parts[last] = String((Number(parts[last]) || 0) + 1);
|
||||
return parts.join('.');
|
||||
}
|
||||
|
||||
function today() {
|
||||
const d = new Date();
|
||||
return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
|
||||
}
|
||||
|
||||
/** Date/字符串统一格式化为 YYYY-MM-DD。
|
||||
* @param {Date|string} value 日期值。
|
||||
*/
|
||||
function formatDate(value) {
|
||||
if (value instanceof Date) {
|
||||
return `${value.getFullYear()}-${String(value.getMonth() + 1).padStart(2, '0')}-${String(value.getDate()).padStart(2, '0')}`;
|
||||
}
|
||||
return String(value || '').slice(0, 10);
|
||||
}
|
||||
|
||||
function fail(message) {
|
||||
console.error(`[method-doc] ${message}`);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
resolveEnv,
|
||||
createConnection,
|
||||
parseArgs,
|
||||
readJsonArg,
|
||||
parseJsonColumn,
|
||||
bumpVersion,
|
||||
today,
|
||||
formatDate,
|
||||
fail,
|
||||
};
|
||||
@ -1,109 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 新建 API 方法文档(写入 wms_api_method_doc;建议完成后执行 method-doc-export.cjs 回写 methods/system.json)。
|
||||
*
|
||||
* 用法:
|
||||
* node script/method-doc-create.cjs --method wechat.xxx --module wechat --group 微信模块 \
|
||||
* --description "接口说明" [--login 1] [--auth 0] \
|
||||
* [--headers @h.json] [--params @p.json] [--response @r.json] [--errors @e.json] \
|
||||
* [--bump] [--doc system] [--env production]
|
||||
*
|
||||
* JSON 字段支持内联 JSON 或 @文件路径;--bump 时文档版本补丁位 +1 并更新 updatedAt。
|
||||
*/
|
||||
|
||||
const {
|
||||
resolveEnv, createConnection, parseArgs, readJsonArg, bumpVersion, today, fail,
|
||||
} = require('./method-doc-common.cjs');
|
||||
|
||||
(async () => {
|
||||
const args = parseArgs();
|
||||
const env = resolveEnv();
|
||||
const docName = args.get('doc') || 'system';
|
||||
|
||||
const method = args.get('method');
|
||||
const module = args.get('module');
|
||||
if (!method) fail('缺少 --method(方法名,如 wechat.xxx)');
|
||||
if (!module) fail('缺少 --module(模块标识,如 wechat)');
|
||||
|
||||
const groupName = args.get('group') || '';
|
||||
const description = args.get('description') || '';
|
||||
const isNeedLogin = String(args.get('login') || '1') === '1' ? 1 : 0;
|
||||
const isNeedAuth = String(args.get('auth') || '0') === '1' ? 1 : 0;
|
||||
const headers = readJsonArg(args.get('headers'));
|
||||
const params = readJsonArg(args.get('params'));
|
||||
const response = readJsonArg(args.get('response'));
|
||||
const errors = readJsonArg(args.get('errors'));
|
||||
const bump = args.has('bump');
|
||||
|
||||
const conn = await createConnection(env);
|
||||
|
||||
// 排序:同 module+group 沿用其 group_sort;否则取全局最大 group_sort+1
|
||||
const [ groupRows ] = await conn.query(
|
||||
'SELECT group_sort FROM wms_api_method_doc WHERE module=? AND group_name=? ORDER BY group_sort DESC LIMIT 1',
|
||||
[ module, groupName ]
|
||||
);
|
||||
let groupSort;
|
||||
if (groupRows[0]) {
|
||||
groupSort = Number(groupRows[0].group_sort);
|
||||
} else {
|
||||
const [ maxRows ] = await conn.query('SELECT COALESCE(MAX(group_sort),0) AS m FROM wms_api_method_doc');
|
||||
groupSort = Number(maxRows[0].m) + 1;
|
||||
}
|
||||
const [ itemRows ] = await conn.query(
|
||||
'SELECT COALESCE(MAX(item_sort),0) AS m FROM wms_api_method_doc WHERE module=? AND group_name=?',
|
||||
[ module, groupName ]
|
||||
);
|
||||
const itemSort = Number(itemRows[0].m) + 1;
|
||||
|
||||
const item = {
|
||||
method,
|
||||
description,
|
||||
isNeedAuth: isNeedAuth === 1,
|
||||
isNeedLogin: isNeedLogin === 1,
|
||||
headers: headers || [],
|
||||
params: params || [],
|
||||
response: response || [],
|
||||
errors: errors || [],
|
||||
};
|
||||
|
||||
try {
|
||||
await conn.query(
|
||||
`INSERT INTO wms_api_method_doc
|
||||
(method, module, group_name, description, is_need_login, is_need_auth,
|
||||
headers, params, response, errors, group_sort, item_sort, status, payload)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?)`,
|
||||
[
|
||||
method,
|
||||
module,
|
||||
groupName,
|
||||
description,
|
||||
isNeedLogin,
|
||||
isNeedAuth,
|
||||
JSON.stringify(headers || []),
|
||||
JSON.stringify(params || []),
|
||||
JSON.stringify(response || []),
|
||||
JSON.stringify(errors || []),
|
||||
groupSort,
|
||||
itemSort,
|
||||
JSON.stringify(item),
|
||||
]
|
||||
);
|
||||
} catch (e) {
|
||||
if (e && e.code === 'ER_DUP_ENTRY') {
|
||||
await conn.end();
|
||||
fail(`method 已存在(${method}),请用 method-doc-update.cjs 更新`);
|
||||
}
|
||||
throw e;
|
||||
}
|
||||
|
||||
if (bump) {
|
||||
const [ metaRows ] = await conn.query('SELECT version FROM wms_method_doc_meta WHERE doc_name=?', [ docName ]);
|
||||
const next = bumpVersion(metaRows[0] ? metaRows[0].version : '0.3.0');
|
||||
await conn.query('UPDATE wms_method_doc_meta SET version=?, updated_at=? WHERE doc_name=?', [ next, today(), docName ]);
|
||||
console.log(`[method-doc] 文档版本已升至 ${next}`);
|
||||
}
|
||||
|
||||
await conn.end();
|
||||
console.log(`[method-doc] 已创建:${method}(module=${module} group=${groupName || '(空)'} sort=${groupSort}/${itemSort}${bump ? '' : ',未 --bump 版本未变'})(env=${env})`);
|
||||
})().catch(e => fail(e.message));
|
||||
@ -1,45 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 下线/删除 API 方法文档(默认软删 status=0,导出时排除;--hard 真实删除)。
|
||||
*
|
||||
* 用法:
|
||||
* node script/method-doc-delete.cjs --method wechat.xxx --yes [--hard] [--bump] [--doc system] [--env production]
|
||||
*/
|
||||
|
||||
const {
|
||||
resolveEnv, createConnection, parseArgs, bumpVersion, today, fail,
|
||||
} = require('./method-doc-common.cjs');
|
||||
|
||||
(async () => {
|
||||
const args = parseArgs();
|
||||
const env = resolveEnv();
|
||||
const docName = args.get('doc') || 'system';
|
||||
|
||||
const method = args.get('method');
|
||||
if (!method) fail('缺少 --method(方法名)');
|
||||
if (!args.has('yes')) fail('危险操作:请追加 --yes 确认');
|
||||
|
||||
const hard = args.has('hard');
|
||||
const bump = args.has('bump');
|
||||
|
||||
const conn = await createConnection(env);
|
||||
const [ result ] = hard
|
||||
? await conn.query('DELETE FROM wms_api_method_doc WHERE method=?', [ method ])
|
||||
: await conn.query('UPDATE wms_api_method_doc SET status=0, updated_at=NOW() WHERE method=?', [ method ]);
|
||||
|
||||
if (result.affectedRows === 0) {
|
||||
await conn.end();
|
||||
fail(`method 不存在(${method})`);
|
||||
}
|
||||
|
||||
if (bump) {
|
||||
const [ metaRows ] = await conn.query('SELECT version FROM wms_method_doc_meta WHERE doc_name=?', [ docName ]);
|
||||
const next = bumpVersion(metaRows[0] ? metaRows[0].version : '0.3.0');
|
||||
await conn.query('UPDATE wms_method_doc_meta SET version=?, updated_at=? WHERE doc_name=?', [ next, today(), docName ]);
|
||||
console.log(`[method-doc] 文档版本已升至 ${next}`);
|
||||
}
|
||||
|
||||
await conn.end();
|
||||
console.log(`[method-doc] 已${hard ? '真实删除' : '下线(status=0)'}:${method}(env=${env})`);
|
||||
})().catch(e => fail(e.message));
|
||||
@ -1,73 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 从库表重建 methods/system.json(原子写入,docs 页面仍读该文件)。
|
||||
*
|
||||
* 用法:
|
||||
* node script/method-doc-export.cjs [--env production] [--doc system] [--file methods/system.json]
|
||||
*/
|
||||
|
||||
const fs = require('node:fs');
|
||||
const {
|
||||
resolveEnv, createConnection, parseArgs, parseJsonColumn, formatDate, fail,
|
||||
} = require('./method-doc-common.cjs');
|
||||
|
||||
(async () => {
|
||||
const args = parseArgs();
|
||||
const env = resolveEnv();
|
||||
const docName = args.get('doc') || 'system';
|
||||
const file = args.get('file') || `methods/${docName}.json`;
|
||||
|
||||
const conn = await createConnection(env);
|
||||
const [ metaRows ] = await conn.query(
|
||||
'SELECT * FROM wms_method_doc_meta WHERE doc_name=? ORDER BY id ASC LIMIT 1',
|
||||
[ docName ]
|
||||
);
|
||||
const [ rows ] = await conn.query(
|
||||
'SELECT * FROM wms_api_method_doc WHERE status=1 ORDER BY group_sort ASC, item_sort ASC, id ASC'
|
||||
);
|
||||
await conn.end();
|
||||
|
||||
const meta = metaRows[0];
|
||||
|
||||
// 按 (group_sort, module, group_name) 重建分组
|
||||
const groups = [];
|
||||
const groupIndex = new Map();
|
||||
for (const row of rows) {
|
||||
const key = `${row.group_sort}\u0000${row.module}\u0000${row.group_name}`;
|
||||
let group = groupIndex.get(key);
|
||||
if (!group) {
|
||||
group = { groupName: row.group_name || '', module: row.module || '', list: [] };
|
||||
groupIndex.set(key, group);
|
||||
groups.push(group);
|
||||
}
|
||||
// 优先用 payload 原文(含 status/notes/requestBody 等扩展字段,无损往返);
|
||||
// 无 payload(老数据/脚本创建未带)时按结构化列组装
|
||||
const parsedPayload = row.payload ? parseJsonColumn(row.payload) : null;
|
||||
group.list.push(parsedPayload || {
|
||||
method: row.method,
|
||||
description: row.description || '',
|
||||
isNeedAuth: !!row.is_need_auth,
|
||||
isNeedLogin: !!row.is_need_login,
|
||||
headers: parseJsonColumn(row.headers) || [],
|
||||
params: parseJsonColumn(row.params) || [],
|
||||
response: parseJsonColumn(row.response) || [],
|
||||
errors: parseJsonColumn(row.errors) || [],
|
||||
});
|
||||
}
|
||||
|
||||
const doc = {
|
||||
module: (meta && meta.module) || docName,
|
||||
description: (meta && meta.description) || '',
|
||||
version: (meta && meta.version) || '0.3.0',
|
||||
updatedAt: meta ? formatDate(meta.updated_at) : new Date().toISOString().slice(0, 10),
|
||||
headers: parseJsonColumn(meta && meta.headers) || [],
|
||||
methods: { groups },
|
||||
};
|
||||
|
||||
const tmp = `${file}.tmp`;
|
||||
fs.writeFileSync(tmp, JSON.stringify(doc, null, 4) + '\n', 'utf8');
|
||||
fs.renameSync(tmp, file);
|
||||
|
||||
console.log(`[method-doc] 导出完成:file=${file} version=${doc.version} updatedAt=${doc.updatedAt} groups=${groups.length} methods=${rows.length}(env=${env})`);
|
||||
})().catch(e => fail(e.message));
|
||||
@ -1,46 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 查询单个 API 方法文档(pretty JSON)。
|
||||
*
|
||||
* 用法:
|
||||
* node script/method-doc-get.cjs --method wechat.userList [--env production]
|
||||
*/
|
||||
|
||||
const {
|
||||
resolveEnv, createConnection, parseArgs, parseJsonColumn, fail,
|
||||
} = require('./method-doc-common.cjs');
|
||||
|
||||
(async () => {
|
||||
const args = parseArgs();
|
||||
const env = resolveEnv();
|
||||
const method = args.get('method');
|
||||
if (!method) fail('缺少 --method(方法名)');
|
||||
|
||||
const conn = await createConnection(env);
|
||||
const [ rows ] = await conn.query('SELECT * FROM wms_api_method_doc WHERE method=? LIMIT 1', [ method ]);
|
||||
await conn.end();
|
||||
|
||||
if (!rows[0]) fail(`method 不存在(${method})`);
|
||||
const row = rows[0];
|
||||
const item = row.payload ? parseJsonColumn(row.payload) : {
|
||||
method: row.method,
|
||||
description: row.description || '',
|
||||
isNeedAuth: !!row.is_need_auth,
|
||||
isNeedLogin: !!row.is_need_login,
|
||||
headers: parseJsonColumn(row.headers) || [],
|
||||
params: parseJsonColumn(row.params) || [],
|
||||
response: parseJsonColumn(row.response) || [],
|
||||
errors: parseJsonColumn(row.errors) || [],
|
||||
};
|
||||
const out = {
|
||||
...item,
|
||||
module: row.module,
|
||||
group_name: row.group_name,
|
||||
group_sort: Number(row.group_sort),
|
||||
item_sort: Number(row.item_sort),
|
||||
status: Number(row.status),
|
||||
updated_at: row.updated_at,
|
||||
};
|
||||
console.log(JSON.stringify(out, null, 2));
|
||||
})().catch(e => fail(e.message));
|
||||
@ -1,86 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 将 methods/system.json 全量导入库表(wms_method_doc_meta + wms_api_method_doc,按 method upsert)。
|
||||
*
|
||||
* 用法:
|
||||
* node script/method-doc-import.cjs [--env production] [--doc system] [--file methods/system.json]
|
||||
*/
|
||||
|
||||
const fs = require('node:fs');
|
||||
const {
|
||||
resolveEnv, createConnection, parseArgs, today, fail,
|
||||
} = require('./method-doc-common.cjs');
|
||||
|
||||
(async () => {
|
||||
const args = parseArgs();
|
||||
const env = resolveEnv();
|
||||
const docName = args.get('doc') || 'system';
|
||||
const file = args.get('file') || `methods/${docName}.json`;
|
||||
|
||||
const doc = JSON.parse(fs.readFileSync(file, 'utf8'));
|
||||
if (!doc.methods || !Array.isArray(doc.methods.groups)) {
|
||||
fail(`不支持的文档结构:${file} 缺少 methods.groups`);
|
||||
}
|
||||
const groups = doc.methods.groups || [];
|
||||
|
||||
const conn = await createConnection(env);
|
||||
|
||||
// 1. 元信息 upsert
|
||||
await conn.query(
|
||||
`INSERT INTO wms_method_doc_meta (id, doc_name, module, description, headers, version, updated_at)
|
||||
VALUES (1, ?, ?, ?, ?, ?, ?)
|
||||
ON DUPLICATE KEY UPDATE module=VALUES(module), description=VALUES(description),
|
||||
headers=VALUES(headers), version=VALUES(version), updated_at=VALUES(updated_at)`,
|
||||
[
|
||||
docName,
|
||||
doc.module || docName,
|
||||
doc.description || '',
|
||||
JSON.stringify(doc.headers || []),
|
||||
doc.version || '0.3.0',
|
||||
doc.updatedAt || today(),
|
||||
]
|
||||
);
|
||||
|
||||
// 2. 方法文档 upsert(保留原始分组/组内顺序)
|
||||
const upsertSql = `
|
||||
INSERT INTO wms_api_method_doc
|
||||
(method, module, group_name, description, is_need_login, is_need_auth,
|
||||
headers, params, response, errors, group_sort, item_sort, status, payload)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?)
|
||||
ON DUPLICATE KEY UPDATE
|
||||
module=VALUES(module), group_name=VALUES(group_name), description=VALUES(description),
|
||||
is_need_login=VALUES(is_need_login), is_need_auth=VALUES(is_need_auth),
|
||||
headers=VALUES(headers), params=VALUES(params), response=VALUES(response),
|
||||
errors=VALUES(errors), group_sort=VALUES(group_sort), item_sort=VALUES(item_sort),
|
||||
status=1, payload=VALUES(payload)`;
|
||||
|
||||
let upserted = 0;
|
||||
for (let g = 0; g < groups.length; g++) {
|
||||
const group = groups[g];
|
||||
const list = Array.isArray(group.list) ? group.list : [];
|
||||
for (let i = 0; i < list.length; i++) {
|
||||
const item = list[i];
|
||||
if (!item || !item.method) continue;
|
||||
await conn.query(upsertSql, [
|
||||
item.method,
|
||||
group.module || '',
|
||||
group.groupName || '',
|
||||
item.description || '',
|
||||
item.isNeedLogin ? 1 : 0,
|
||||
item.isNeedAuth ? 1 : 0,
|
||||
JSON.stringify(item.headers || []),
|
||||
JSON.stringify(item.params || []),
|
||||
JSON.stringify(item.response || []),
|
||||
JSON.stringify(item.errors || []),
|
||||
g,
|
||||
i,
|
||||
JSON.stringify(item),
|
||||
]);
|
||||
upserted++;
|
||||
}
|
||||
}
|
||||
|
||||
await conn.end();
|
||||
console.log(`[method-doc] 导入完成:doc=${docName} file=${file} groups=${groups.length} methods=${upserted}(env=${env})`);
|
||||
})().catch(e => fail(e.message));
|
||||
@ -1,49 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 列出 API 方法文档(支持按模块/关键字过滤)。
|
||||
*
|
||||
* 用法:
|
||||
* node script/method-doc-list.cjs [--module wechat] [--search 用户须知] [--env production]
|
||||
*/
|
||||
|
||||
const {
|
||||
resolveEnv, createConnection, parseArgs, fail,
|
||||
} = require('./method-doc-common.cjs');
|
||||
|
||||
(async () => {
|
||||
const args = parseArgs();
|
||||
const env = resolveEnv();
|
||||
const module = args.get('module');
|
||||
const search = args.get('search');
|
||||
|
||||
const conditions = [];
|
||||
const values = [];
|
||||
if (module) {
|
||||
conditions.push('module=?');
|
||||
values.push(module);
|
||||
}
|
||||
if (search) {
|
||||
conditions.push('(method LIKE ? OR description LIKE ? OR group_name LIKE ?)');
|
||||
const kw = `%${search}%`;
|
||||
values.push(kw, kw, kw);
|
||||
}
|
||||
const where = conditions.length > 0 ? `WHERE ${conditions.join(' AND ')}` : '';
|
||||
|
||||
const conn = await createConnection(env);
|
||||
const [ rows ] = await conn.query(
|
||||
`SELECT method, module, group_name, is_need_login, is_need_auth, status, group_sort, item_sort
|
||||
FROM wms_api_method_doc ${where}
|
||||
ORDER BY group_sort ASC, item_sort ASC, id ASC`,
|
||||
values
|
||||
);
|
||||
await conn.end();
|
||||
|
||||
console.log(`method count: ${rows.length}`);
|
||||
for (const row of rows) {
|
||||
console.log(
|
||||
`${String(row.method).padEnd(48)} | ${String(row.module).padEnd(18)} | ${String(row.group_name).padEnd(16)}`
|
||||
+ ` | login=${row.is_need_login} auth=${row.is_need_auth} status=${row.status}`
|
||||
);
|
||||
}
|
||||
})().catch(e => fail(e.message));
|
||||
@ -1,100 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 更新 API 方法文档(部分更新;建议完成后执行 method-doc-export.cjs 回写 methods/system.json)。
|
||||
*
|
||||
* 用法:
|
||||
* node script/method-doc-update.cjs --method wechat.xxx \
|
||||
* [--module wechat] [--group 微信模块] [--description "新说明"] \
|
||||
* [--login 1|0] [--auth 1|0] [--status 1|0] \
|
||||
* [--headers @h.json] [--params @p.json] [--response @r.json] [--errors @e.json] \
|
||||
* [--bump] [--doc system] [--env production]
|
||||
*
|
||||
* 至少提供除 --method/--env/--doc 外的一个字段;JSON 字段支持内联 JSON 或 @文件路径。
|
||||
*/
|
||||
|
||||
const {
|
||||
resolveEnv, createConnection, parseArgs, readJsonArg, parseJsonColumn, bumpVersion, today, fail,
|
||||
} = require('./method-doc-common.cjs');
|
||||
|
||||
(async () => {
|
||||
const args = parseArgs();
|
||||
const env = resolveEnv();
|
||||
const docName = args.get('doc') || 'system';
|
||||
|
||||
const method = args.get('method');
|
||||
if (!method) fail('缺少 --method(方法名)');
|
||||
|
||||
const updates = [];
|
||||
const values = [];
|
||||
const push = (column, value) => {
|
||||
updates.push(`${column}=?`);
|
||||
values.push(value);
|
||||
};
|
||||
|
||||
if (args.has('description')) push('description', args.get('description') || '');
|
||||
if (args.has('module')) push('module', args.get('module'));
|
||||
if (args.has('group')) push('group_name', args.get('group') || '');
|
||||
if (args.has('login')) push('is_need_login', String(args.get('login')) === '1' ? 1 : 0);
|
||||
if (args.has('auth')) push('is_need_auth', String(args.get('auth')) === '1' ? 1 : 0);
|
||||
if (args.has('status')) push('status', String(args.get('status')) === '1' ? 1 : 0);
|
||||
if (args.has('headers')) push('headers', JSON.stringify(readJsonArg(args.get('headers')) || []));
|
||||
if (args.has('params')) push('params', JSON.stringify(readJsonArg(args.get('params')) || []));
|
||||
if (args.has('response')) push('response', JSON.stringify(readJsonArg(args.get('response')) || []));
|
||||
if (args.has('errors')) push('errors', JSON.stringify(readJsonArg(args.get('errors')) || []));
|
||||
|
||||
if (updates.length === 0) {
|
||||
fail('未提供任何要更新的字段(description/module/group/login/auth/status/headers/params/response/errors)');
|
||||
}
|
||||
|
||||
const bump = args.has('bump');
|
||||
const conn = await createConnection(env);
|
||||
|
||||
// 读取当前行,payload 原文基础上应用变更(保持未改字段原键序)
|
||||
const [ currentRows ] = await conn.query(
|
||||
'SELECT method, module, group_name, description, is_need_login, is_need_auth, headers, params, response, errors, payload FROM wms_api_method_doc WHERE method=? LIMIT 1',
|
||||
[ method ]
|
||||
);
|
||||
if (!currentRows[0]) {
|
||||
await conn.end();
|
||||
fail(`method 不存在(${method}),请先用 method-doc-create.cjs 创建`);
|
||||
}
|
||||
const current = currentRows[0];
|
||||
const item = current.payload ? parseJsonColumn(current.payload) : {
|
||||
method: current.method,
|
||||
description: current.description || '',
|
||||
isNeedAuth: !!current.is_need_auth,
|
||||
isNeedLogin: !!current.is_need_login,
|
||||
headers: parseJsonColumn(current.headers) || [],
|
||||
params: parseJsonColumn(current.params) || [],
|
||||
response: parseJsonColumn(current.response) || [],
|
||||
errors: parseJsonColumn(current.errors) || [],
|
||||
};
|
||||
|
||||
if (args.has('description')) item.description = args.get('description') || '';
|
||||
if (args.has('login')) item.isNeedLogin = String(args.get('login')) === '1';
|
||||
if (args.has('auth')) item.isNeedAuth = String(args.get('auth')) === '1';
|
||||
if (args.has('headers')) item.headers = readJsonArg(args.get('headers')) || [];
|
||||
if (args.has('params')) item.params = readJsonArg(args.get('params')) || [];
|
||||
if (args.has('response')) item.response = readJsonArg(args.get('response')) || [];
|
||||
if (args.has('errors')) item.errors = readJsonArg(args.get('errors')) || [];
|
||||
|
||||
const [ result ] = await conn.query(
|
||||
`UPDATE wms_api_method_doc SET ${updates.join(', ')}, updated_at=NOW(), payload=? WHERE method=?`,
|
||||
[ ...values, JSON.stringify(item), method ]
|
||||
);
|
||||
if (result.affectedRows === 0) {
|
||||
await conn.end();
|
||||
fail(`method 不存在(${method})`);
|
||||
}
|
||||
|
||||
if (bump) {
|
||||
const [ metaRows ] = await conn.query('SELECT version FROM wms_method_doc_meta WHERE doc_name=?', [ docName ]);
|
||||
const next = bumpVersion(metaRows[0] ? metaRows[0].version : '0.3.0');
|
||||
await conn.query('UPDATE wms_method_doc_meta SET version=?, updated_at=? WHERE doc_name=?', [ next, today(), docName ]);
|
||||
console.log(`[method-doc] 文档版本已升至 ${next}`);
|
||||
}
|
||||
|
||||
await conn.end();
|
||||
console.log(`[method-doc] 已更新:${method}(字段:${updates.map(u => u.split('=')[0]).join('/')}${bump ? '' : ',未 --bump 版本未变'})(env=${env})`);
|
||||
})().catch(e => fail(e.message));
|
||||
@ -473,43 +473,16 @@ function nginxBinExists(nginxBin, nginxPrefix) {
|
||||
}
|
||||
|
||||
/**
|
||||
* 探测 wms_warehouse_front_config 是否已有 domain_status 列。
|
||||
*
|
||||
* 域名验证闸门依赖该列;脚本部署早于迁移时该列不存在,需降级为不按验证状态过滤,
|
||||
* 保证脚本可在迁移前先行部署(与 app/service/systems/frontConfig.js 的降级策略一致)。
|
||||
* @param {import('sequelize').Sequelize} sequelize Sequelize 实例。
|
||||
* @return {Promise<boolean>} 存在返回 true;探测失败返回 false。
|
||||
*/
|
||||
async function hasDomainStatusColumn(sequelize) {
|
||||
try {
|
||||
const rows = await sequelize.query(
|
||||
`SELECT COUNT(*) AS c FROM information_schema.columns
|
||||
WHERE table_schema = DATABASE() AND table_name = ? AND column_name = 'domain_status'`,
|
||||
{ replacements: [ TABLE_NAME ], type: Sequelize.QueryTypes.SELECT }
|
||||
);
|
||||
return Number(rows && rows[0] && rows[0].c) > 0;
|
||||
} catch (error) {
|
||||
console.warn(`[CERT-SYNC] domain_status 列探测失败(按无该列降级): ${sanitizeErrorText(error.message)}`);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 扫描待同步记录(sync_status=0、且域名已验证 domain_status=1,按 id 升序,limit 条)。
|
||||
*
|
||||
* 域名验证闸门:未通过验证(domain_status 为 0/2)的域名不生成 nginx server 块;
|
||||
* filterVerifiedDomain 为 false 时(迁移尚未执行、无 domain_status 列)降级为不过滤。
|
||||
* 扫描待同步记录(sync_status=0,按 id 升序,limit 条)。
|
||||
* @param {import('sequelize').Sequelize} sequelize Sequelize 实例。
|
||||
* @param {number} limit 单次处理条数上限。
|
||||
* @param {boolean} [filterVerifiedDomain] 是否只取已验证域名,默认 true。
|
||||
* @return {Promise<Object[]>} 待同步记录数组。
|
||||
*/
|
||||
async function scanPendingRows(sequelize, limit, filterVerifiedDomain = true) {
|
||||
const verifiedFilter = filterVerifiedDomain ? ' AND domain_status = 1' : '';
|
||||
async function scanPendingRows(sequelize, limit) {
|
||||
return sequelize.query(
|
||||
`SELECT id, store_id, domain, cert_pem, cert_key, cert_expire_at, sync_attempts
|
||||
FROM ${TABLE_NAME}
|
||||
WHERE sync_status = 0${verifiedFilter}
|
||||
WHERE sync_status = 0
|
||||
ORDER BY id ASC
|
||||
LIMIT ?`,
|
||||
{ replacements: [ limit ], type: Sequelize.QueryTypes.SELECT }
|
||||
@ -944,14 +917,7 @@ async function main() {
|
||||
}
|
||||
}
|
||||
|
||||
// 域名验证闸门:迁移尚未执行(无 domain_status 列)时降级为不按验证状态过滤,
|
||||
// 保证脚本可先行部署;迁移执行后自动生效
|
||||
const domainStatusReady = await hasDomainStatusColumn(sequelize);
|
||||
if (!domainStatusReady) {
|
||||
console.warn('[CERT-SYNC] 未检测到 wms_warehouse_front_config.domain_status 列(迁移尚未执行),本轮降级为不按域名验证状态过滤');
|
||||
}
|
||||
|
||||
const rows = await scanPendingRows(sequelize, args.limit, domainStatusReady);
|
||||
const rows = await scanPendingRows(sequelize, args.limit);
|
||||
if (!rows || rows.length === 0) {
|
||||
console.log('[CERT-SYNC] 无待同步记录,静默退出');
|
||||
return;
|
||||
|
||||
@ -1,443 +0,0 @@
|
||||
'use strict';
|
||||
|
||||
const assert = require('node:assert/strict');
|
||||
const Sequelize = require('sequelize');
|
||||
const WorkbenchService = require('../../../../app/service/systems/workbench');
|
||||
|
||||
// 测试环境固定参数:仓库 100000 / 货主 1000000(与 wms-test-agent 约定一致)
|
||||
const TEST_WAREHOUSE_ID = 100000;
|
||||
const TEST_STORE_ID = 1000000;
|
||||
const TEST_ORDER_ID = 9001;
|
||||
const TEST_WAVE_ID = 5001;
|
||||
const TEST_OTHER_WAVE_ID = 5002;
|
||||
const TEST_BARCODE = 'SF1234567890';
|
||||
const TEST_WORKBENCH_ID = 200;
|
||||
|
||||
// 大团购打包系数:mock 仓库配置固定为 3(秒/单)
|
||||
const TEST_COEFFICIENT = 3;
|
||||
|
||||
/**
|
||||
* 构造待处理/配送分表订单行 fixture。
|
||||
* @param {Object} [overrides={}] 字段覆盖。
|
||||
* @return {Object} 订单行。
|
||||
*/
|
||||
function buildOrderRow(overrides = {}) {
|
||||
return {
|
||||
id: TEST_ORDER_ID,
|
||||
warehouse_id: TEST_WAREHOUSE_ID,
|
||||
wave_id: TEST_WAVE_ID,
|
||||
wave_no: 'W20260830001',
|
||||
wave_scope: 1,
|
||||
delivery_order_code: 'DO20260830001',
|
||||
order_type: 1,
|
||||
store_id: TEST_STORE_ID,
|
||||
status: 1,
|
||||
step: 1,
|
||||
post_status: null,
|
||||
pick_status: null,
|
||||
pack_status: 'none',
|
||||
intercept_status: 'none',
|
||||
recheck_status: null,
|
||||
outbound_status: null,
|
||||
items_count: 2,
|
||||
items_total: 2,
|
||||
items_weight: 500,
|
||||
source_platform_code: 'PDD',
|
||||
logistics_name: '顺丰速运',
|
||||
create_at: '2026-08-30 08:00:00',
|
||||
updated_at: '2026-08-30 08:00:00',
|
||||
...overrides,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 构造 _queryOrder 回归 harness(mock ctx,不访问数据库)。
|
||||
* @param {Object} [options={}] 测试配置。
|
||||
* @param {Object} [options.currentTask] 当前工作台进行中的打包任务行(PackTask.findOne 返回值)。
|
||||
* @param {boolean} [options.withWorkbench=true] 是否携带 workbench_id(false 模拟无工作台上下文)。
|
||||
* @param {Object} [options.orderRow] 订单行覆盖(wave_scope / wave_id 等)。
|
||||
* @return {Object} 测试上下文。
|
||||
*/
|
||||
function createQueryOrderHarness(options = {}) {
|
||||
const orderRow = buildOrderRow(options.orderRow || {});
|
||||
const waveBatch = { wave_id: orderRow.wave_id, warehouse_id: TEST_WAREHOUSE_ID, wave_type: 1, total_orders: 99 };
|
||||
|
||||
const currentModel = {
|
||||
async findOne() {
|
||||
return orderRow;
|
||||
},
|
||||
async count() {
|
||||
return 3;
|
||||
},
|
||||
};
|
||||
const dispatchModel = {
|
||||
async findOne() {
|
||||
return null;
|
||||
},
|
||||
async count() {
|
||||
return 4;
|
||||
},
|
||||
};
|
||||
const itemsModel = {
|
||||
async findAll() {
|
||||
return [];
|
||||
},
|
||||
};
|
||||
|
||||
const packTaskCalls = { findOne: 0 };
|
||||
|
||||
const ctx = {
|
||||
app: {
|
||||
Sequelize,
|
||||
config: {},
|
||||
async getCacheAsync() {
|
||||
return null;
|
||||
},
|
||||
async setCacheAsync() {
|
||||
// mock:写入缓存无操作
|
||||
},
|
||||
},
|
||||
user: { store_id: TEST_WAREHOUSE_ID },
|
||||
logger: { info() {}, warn() {}, error() {} },
|
||||
service: {
|
||||
systems: {
|
||||
deliveryOrder: {
|
||||
async getStoreSubjectConfig() {
|
||||
return { big_group_pack_coefficient: TEST_COEFFICIENT };
|
||||
},
|
||||
},
|
||||
stockWarehouse: {
|
||||
async getStockDetails() {
|
||||
return [];
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
model: {
|
||||
OrderExpress: {
|
||||
async findOne() {
|
||||
return {
|
||||
order_id: TEST_ORDER_ID,
|
||||
warehouse_id: TEST_WAREHOUSE_ID,
|
||||
waybill_code: TEST_BARCODE,
|
||||
logistics_name: '顺丰速运',
|
||||
weighing_weight: 1000,
|
||||
package_material_name_snapshot: '快递袋',
|
||||
};
|
||||
},
|
||||
},
|
||||
OrderDeliveryFactory: {
|
||||
async getCurrentModel() {
|
||||
return currentModel;
|
||||
},
|
||||
async getDispatchModel() {
|
||||
return dispatchModel;
|
||||
},
|
||||
},
|
||||
WaveBatch: {
|
||||
async findOne() {
|
||||
return waveBatch;
|
||||
},
|
||||
},
|
||||
OrderItemsFactory: {
|
||||
async getCurrentModel() {
|
||||
return itemsModel;
|
||||
},
|
||||
async getDispatchModel() {
|
||||
return itemsModel;
|
||||
},
|
||||
},
|
||||
StoreWarehouse: {
|
||||
async findOne() {
|
||||
return null;
|
||||
},
|
||||
},
|
||||
PackTask: {
|
||||
async findOne(findOptions) {
|
||||
packTaskCalls.findOne += 1;
|
||||
if (!options.currentTask) {
|
||||
return null;
|
||||
}
|
||||
// 模拟数据库 where 过滤:wave_scope 不匹配时视为无记录
|
||||
const where = findOptions && findOptions.where;
|
||||
if (where && where.wave_scope !== undefined
|
||||
&& Number(where.wave_scope) !== Number(options.currentTask.wave_scope || 0)) {
|
||||
return null;
|
||||
}
|
||||
return options.currentTask;
|
||||
},
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
const service = new WorkbenchService(ctx);
|
||||
|
||||
const queryParams = {
|
||||
barcode: TEST_BARCODE,
|
||||
warehouseId: String(TEST_WAREHOUSE_ID),
|
||||
...(options.withWorkbench === false ? {} : { workbench_id: TEST_WORKBENCH_ID }),
|
||||
};
|
||||
|
||||
return { service, ctx, orderRow, packTaskCalls, queryParams };
|
||||
}
|
||||
|
||||
/**
|
||||
* 构造 _packOrder 回归 harness(散单路径 mock,不访问数据库)。
|
||||
* @param {Object} [options={}] - { orderWaveScope, waveScopeParam, coefficient }
|
||||
* @return {Object} 测试上下文(created 数组捕获 PackTask.create 落库数据)。
|
||||
*/
|
||||
function createPackOrderHarness(options = {}) {
|
||||
const orderRow = buildOrderRow({
|
||||
wave_id: 0,
|
||||
wave_no: '',
|
||||
wave_scope: options.orderWaveScope === undefined ? 1 : options.orderWaveScope,
|
||||
});
|
||||
|
||||
const created = [];
|
||||
|
||||
const orderModel = {
|
||||
async findOne() {
|
||||
return orderRow;
|
||||
},
|
||||
async update() {
|
||||
return [ 1 ];
|
||||
},
|
||||
};
|
||||
|
||||
const ctx = {
|
||||
app: {
|
||||
Sequelize,
|
||||
config: {},
|
||||
async getCacheAsync() {
|
||||
return null;
|
||||
},
|
||||
async setCacheAsync() {
|
||||
// mock:写入缓存无操作
|
||||
},
|
||||
async delCacheAsync() {
|
||||
// mock:删除缓存无操作
|
||||
},
|
||||
},
|
||||
logger: { info() {}, warn() {}, error() {} },
|
||||
service: {
|
||||
systems: {
|
||||
deliveryOrder: {
|
||||
async getStoreSubjectConfig() {
|
||||
return { big_group_pack_coefficient: options.coefficient === undefined ? TEST_COEFFICIENT : options.coefficient };
|
||||
},
|
||||
},
|
||||
},
|
||||
systemMethods: {
|
||||
order: {
|
||||
wave: {
|
||||
async bumpConfirmPrintUnclaimedWaveVersion() {
|
||||
// mock:统计版本号递增无操作
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
model: {
|
||||
OrderDeliveryFactory: {
|
||||
async getCurrentModel() {
|
||||
return orderModel;
|
||||
},
|
||||
async getDispatchModel() {
|
||||
return orderModel;
|
||||
},
|
||||
},
|
||||
WaveBatch: {
|
||||
async findOne() {
|
||||
return null;
|
||||
},
|
||||
},
|
||||
OrderExpress: {
|
||||
async findOne() {
|
||||
return null;
|
||||
},
|
||||
},
|
||||
Workbench: {
|
||||
async findByPk() {
|
||||
return { name: '打包台1', device_ids: null, token: 'mock-token' };
|
||||
},
|
||||
},
|
||||
WorkbenchMember: {
|
||||
async findAll() {
|
||||
return [];
|
||||
},
|
||||
},
|
||||
PackTask: {
|
||||
async findOne() {
|
||||
return null;
|
||||
},
|
||||
async findAll() {
|
||||
return [];
|
||||
},
|
||||
async create(data) {
|
||||
created.push({ ...data });
|
||||
return { id: 777, ...data };
|
||||
},
|
||||
async destroy() {
|
||||
return 0;
|
||||
},
|
||||
},
|
||||
PackTaskPacker: {
|
||||
async destroy() {
|
||||
return 0;
|
||||
},
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
const service = new WorkbenchService(ctx);
|
||||
|
||||
const packParams = {
|
||||
delivery_order_code: orderRow.delivery_order_code,
|
||||
warehouse_id: TEST_WAREHOUSE_ID,
|
||||
workbench_id: TEST_WORKBENCH_ID,
|
||||
...(options.waveScopeParam === undefined ? {} : { wave_scope: options.waveScopeParam }),
|
||||
};
|
||||
|
||||
return { service, ctx, orderRow, created, packParams };
|
||||
}
|
||||
|
||||
describe('workbench 大团购打包系数回归(wave_scope 落库 / 倒计时下发 / 查询阀门)', () => {
|
||||
describe('1. queryOrder 响应带波次类型(order.wave_scope)', () => {
|
||||
it('大团购订单(wave_scope=1)响应返回 order.wave_scope=1', async () => {
|
||||
const harness = createQueryOrderHarness({ orderRow: { wave_scope: 1 } });
|
||||
const result = await harness.service._queryOrder(harness.queryParams);
|
||||
assert.strictEqual(result.order.wave_scope, 1);
|
||||
});
|
||||
|
||||
it('散单波次订单(wave_scope=2)响应返回 order.wave_scope=2', async () => {
|
||||
const harness = createQueryOrderHarness({ orderRow: { wave_scope: 2 } });
|
||||
const result = await harness.service._queryOrder(harness.queryParams);
|
||||
assert.strictEqual(result.order.wave_scope, 2);
|
||||
});
|
||||
});
|
||||
|
||||
describe('2. packOrder 信息写入 wms_pack_task(wave_scope 落库)与倒计时字段下发', () => {
|
||||
it('wave_scope=1:PackTask.create 落库 wave_scope=1,并下发 pack_wait_seconds=打包数×系数 与 pack_start_time>0', async () => {
|
||||
const harness = createPackOrderHarness({ orderWaveScope: 1, waveScopeParam: 1 });
|
||||
const result = await harness.service._packOrder(harness.packParams);
|
||||
|
||||
assert.strictEqual(harness.created.length, 1, '应创建一条打包任务');
|
||||
assert.strictEqual(harness.created[0].wave_scope, 1, 'wave_scope=1 应写入打包任务');
|
||||
// 散单打包数=1,系数=3 → 等待秒数=3
|
||||
assert.strictEqual(result.pack_wait_seconds, 3);
|
||||
assert.ok(result.pack_start_time > 0, 'wave_scope=1 时应下发开始打包时间');
|
||||
});
|
||||
|
||||
it('未上报 wave_scope:兜底订单行 wave_scope=1 落库,并下发倒计时字段', async () => {
|
||||
const harness = createPackOrderHarness({ orderWaveScope: 1 });
|
||||
const result = await harness.service._packOrder(harness.packParams);
|
||||
|
||||
assert.strictEqual(harness.created[0].wave_scope, 1, '缺省时应兜底订单行 wave_scope=1 落库');
|
||||
assert.strictEqual(result.pack_wait_seconds, 3);
|
||||
assert.ok(result.pack_start_time > 0);
|
||||
});
|
||||
|
||||
it('wave_scope=2(非大团购):落库 wave_scope=2,倒计时字段一律为 0', async () => {
|
||||
const harness = createPackOrderHarness({ orderWaveScope: 2, waveScopeParam: 2 });
|
||||
const result = await harness.service._packOrder(harness.packParams);
|
||||
|
||||
assert.strictEqual(harness.created[0].wave_scope, 2);
|
||||
assert.strictEqual(result.pack_wait_seconds, 0);
|
||||
assert.strictEqual(result.pack_start_time, 0);
|
||||
});
|
||||
});
|
||||
|
||||
describe('3. queryOrder 大团购打包时长阀门(wave_scope=1 任务限制,其他不限制)', () => {
|
||||
it('wave_scope=1 任务未到时 + 查询订单非本波次 → 抛「打包时长不足」', async () => {
|
||||
const harness = createQueryOrderHarness({
|
||||
orderRow: { wave_scope: 1, wave_id: TEST_WAVE_ID },
|
||||
currentTask: {
|
||||
id: 1,
|
||||
wave_scope: 1,
|
||||
wave_id: TEST_OTHER_WAVE_ID,
|
||||
pack_quantity: 10,
|
||||
start_time: new Date(Date.now() - 5 * 1000),
|
||||
create_time: new Date(Date.now() - 5 * 1000),
|
||||
},
|
||||
});
|
||||
|
||||
// 需要 10×3=30 秒,仅过去 5 秒 → 未到时 → 不同波次拦截
|
||||
await assert.rejects(
|
||||
() => harness.service._queryOrder(harness.queryParams),
|
||||
error => error && error.message === '打包时长不足'
|
||||
);
|
||||
});
|
||||
|
||||
it('wave_scope=1 任务未到时 + 查询订单为本波次 → 正常返回信息', async () => {
|
||||
const harness = createQueryOrderHarness({
|
||||
orderRow: { wave_scope: 1, wave_id: TEST_OTHER_WAVE_ID },
|
||||
currentTask: {
|
||||
id: 1,
|
||||
wave_scope: 1,
|
||||
wave_id: TEST_OTHER_WAVE_ID,
|
||||
pack_quantity: 10,
|
||||
start_time: new Date(Date.now() - 5 * 1000),
|
||||
create_time: new Date(Date.now() - 5 * 1000),
|
||||
},
|
||||
});
|
||||
|
||||
const result = await harness.service._queryOrder(harness.queryParams);
|
||||
assert.strictEqual(result.order.wave_id, TEST_OTHER_WAVE_ID);
|
||||
assert.strictEqual(result.order.wave_scope, 1);
|
||||
});
|
||||
|
||||
it('wave_scope=1 任务已到时 + 查询订单非本波次 → 正常返回(不限制)', async () => {
|
||||
const harness = createQueryOrderHarness({
|
||||
orderRow: { wave_scope: 1, wave_id: TEST_WAVE_ID },
|
||||
currentTask: {
|
||||
id: 1,
|
||||
wave_scope: 1,
|
||||
wave_id: TEST_OTHER_WAVE_ID,
|
||||
pack_quantity: 10,
|
||||
start_time: new Date(Date.now() - 60 * 1000),
|
||||
create_time: new Date(Date.now() - 60 * 1000),
|
||||
},
|
||||
});
|
||||
|
||||
// 需要 30 秒,已过 60 秒 → 已到时 → 不拦截
|
||||
const result = await harness.service._queryOrder(harness.queryParams);
|
||||
assert.strictEqual(result.order.wave_id, TEST_WAVE_ID);
|
||||
});
|
||||
|
||||
it('当前任务 wave_scope≠1(散单任务)→ 不限制(其他不限制)', async () => {
|
||||
const harness = createQueryOrderHarness({
|
||||
orderRow: { wave_scope: 1, wave_id: TEST_WAVE_ID },
|
||||
currentTask: {
|
||||
id: 1,
|
||||
wave_scope: 2,
|
||||
wave_id: TEST_OTHER_WAVE_ID,
|
||||
pack_quantity: 10,
|
||||
start_time: new Date(Date.now() - 5 * 1000),
|
||||
create_time: new Date(Date.now() - 5 * 1000),
|
||||
},
|
||||
});
|
||||
|
||||
// 任务 wave_scope=2 不匹配阀门 where.wave_scope=1 → 无匹配任务 → 不拦截
|
||||
const result = await harness.service._queryOrder(harness.queryParams);
|
||||
assert.strictEqual(result.order.wave_id, TEST_WAVE_ID);
|
||||
assert.strictEqual(harness.packTaskCalls.findOne, 1);
|
||||
});
|
||||
|
||||
it('无进行中的 wave_scope=1 任务 → 不限制', async () => {
|
||||
const harness = createQueryOrderHarness({ orderRow: { wave_scope: 1, wave_id: TEST_WAVE_ID } });
|
||||
const result = await harness.service._queryOrder(harness.queryParams);
|
||||
assert.strictEqual(result.order.wave_id, TEST_WAVE_ID);
|
||||
assert.strictEqual(harness.packTaskCalls.findOne, 1);
|
||||
});
|
||||
|
||||
it('无 workbench_id 上下文 → 不触发阀门查询', async () => {
|
||||
const harness = createQueryOrderHarness({
|
||||
withWorkbench: false,
|
||||
orderRow: { wave_scope: 1, wave_id: TEST_WAVE_ID },
|
||||
});
|
||||
const result = await harness.service._queryOrder(harness.queryParams);
|
||||
assert.strictEqual(result.order.wave_id, TEST_WAVE_ID);
|
||||
assert.strictEqual(harness.packTaskCalls.findOne, 0, '无工作台上下文不应查询打包任务');
|
||||
});
|
||||
});
|
||||
});
|
||||
Loading…
x
Reference in New Issue
Block a user