master #1

Open
gxwebsoft wants to merge 108 commits from developer/template-10584:master into master
Showing only changes of commit a2e34466d5 - Show all commits

View File

@@ -191,7 +191,7 @@ export class PaymentHandler {
// 后端字段可能叫 dealerId 或 storeId这里都带上服务端忽略未知字段即可。
// 这里做一次路径兼容camel vs kebab避免接口路径不一致导致整单失败。
const list = await this.listByCompatEndpoint<ShopStoreRider>(
['/shop/shopStoreRider', '/shop/shop-store-rider'],
['/shop/shop-store-rider', '/shop/shop-store-rider'],
{
dealerId: storeId,
storeId: storeId,
@@ -224,7 +224,7 @@ export class PaymentHandler {
private static async getWarehouses(): Promise<ShopWarehouse[]> {
if (this.warehousesCache) return this.warehousesCache;
const list = await this.listByCompatEndpoint<ShopWarehouse>(
['/shop/shopWarehouse', '/shop/shop-warehouse'],
['/shop/shop-warehouse', '/shop/shop-warehouse'],
{}
);
const usable = (list || []).filter(w => w?.isDelete !== 1 && (w.status === undefined || w.status === 1));