ming #1

Merged
liufumingren merged 558 commits from ming into main 2026-11-18 16:13:25 +08:00
2 changed files with 12 additions and 4 deletions
Showing only changes of commit 72d759964d - Show all commits

View File

@ -326,7 +326,9 @@ class SettingStoreWarehouseService extends Service {
where.auth_status = authStatus;
}
const useStatus = this.normalizeStatusFlag(data.use_status || data.warehouse_use_status || data.store_use_status, 'use_status', null);
const rawUseStatus = data.use_status !== undefined ? data.use_status
: (data.warehouse_use_status !== undefined ? data.warehouse_use_status : data.store_use_status);
const useStatus = this.normalizeStatusFlag(rawUseStatus, 'use_status', null);
if (useStatus !== null) {
if (currentSubject.isWarehouse) {
where.warehouse_use_status = useStatus;
@ -691,7 +693,9 @@ class SettingStoreWarehouseService extends Service {
try {
const currentSubject = await this.getCurrentSubject();
const relation = await this.findScopedRelation(data, currentSubject, transaction);
const nextUseStatus = this.normalizeStatusFlag(data.use_status || data.warehouse_use_status, 'warehouse_use_status', 0);
const nextUseStatus = this.normalizeStatusFlag(
data.use_status !== undefined ? data.use_status : data.warehouse_use_status,
'warehouse_use_status', 0);
const patch = currentSubject.isWarehouse
? { warehouse_use_status: nextUseStatus }
: { store_use_status: nextUseStatus };

View File

@ -923,7 +923,9 @@ class SettingStoreWarehouseService extends Service {
where.auth_status = authStatus;
}
const useStatus = this.normalizeStatusFlag(data.use_status || data.warehouse_use_status || data.store_use_status, 'use_status', null);
const rawUseStatus = data.use_status !== undefined ? data.use_status
: (data.warehouse_use_status !== undefined ? data.warehouse_use_status : data.store_use_status);
const useStatus = this.normalizeStatusFlag(rawUseStatus, 'use_status', null);
if (useStatus !== null) {
if (currentSubject.isWarehouse) {
where.warehouse_use_status = useStatus;
@ -2404,7 +2406,9 @@ class SettingStoreWarehouseService extends Service {
try {
const currentSubject = await this.getCurrentSubject();
const relation = await this.findScopedRelation(data, currentSubject, transaction);
const nextUseStatus = this.normalizeStatusFlag(data.use_status || data.warehouse_use_status, 'warehouse_use_status', 0);
const nextUseStatus = this.normalizeStatusFlag(
data.use_status !== undefined ? data.use_status : data.warehouse_use_status,
'warehouse_use_status', 0);
const patch = currentSubject.isWarehouse
? { warehouse_use_status: nextUseStatus }
: { store_use_status: nextUseStatus };