refactor(dealer): 重构经销商设置和模板更新功能
- 将 updateDealer 方法拆分为 updateDealerSettings 和 updateDealerTemplate 两个独立方法 - 添加了 PUT 和 PATCH 两种请求方式的 API 接口实现 - 调整了类型定义，将经销商设置和模板字段分离到不同接口中 - 修正了瓜农发票信息注释为供应商发票信息 - 调整了分页响应类型中 totalPages 和 notEmpty 字段顺序 - 为供应商发票类型添加了发票编号字段
This commit is contained in:
shenyifei
parent
b53d26ec65
commit
f65598d42c
@ -136,7 +136,7 @@ export default function DealerPurchaseSetting(
|
||||
};
|
||||
}}
|
||||
onFinish={async (formData) => {
|
||||
await business.dealer.updateDealer({
|
||||
await business.dealer.updateDealerSettings({
|
||||
dealerId: formData.dealerId!,
|
||||
enableLoss:
|
||||
formData?.enableLoss || defaultDealerSetting.enableLoss,
|
||||
|
||||
@ -806,7 +806,7 @@ export default function DeliveryTemplate(props: IDeliveryTemplateProps) {
|
||||
// 将模板数据序列化为JSON字符串
|
||||
const deliveryTemplate = JSON.stringify(modules);
|
||||
|
||||
const { success } = await business.dealer.updateDealer({
|
||||
const { success } = await business.dealer.updateDealerTemplate({
|
||||
dealerId: formData.dealerId!,
|
||||
deliveryTemplate,
|
||||
} as any);
|
||||
|
||||
@ -154,3 +154,75 @@ export async function updateDealer1(
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/** 更新经销商设置 PUT /operation/updateDealerSettings */
|
||||
export async function updateDealerSettings(
|
||||
body: BusinessAPI.DealerUpdateSettingsCmd,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<BusinessAPI.SingleResponseDealerVO>(
|
||||
'/operation/updateDealerSettings',
|
||||
{
|
||||
method: 'PUT',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
data: body,
|
||||
...(options || {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/** 更新经销商设置 PATCH /operation/updateDealerSettings */
|
||||
export async function updateDealerSettings1(
|
||||
body: BusinessAPI.DealerUpdateSettingsCmd,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<BusinessAPI.SingleResponseDealerVO>(
|
||||
'/operation/updateDealerSettings',
|
||||
{
|
||||
method: 'PATCH',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
data: body,
|
||||
...(options || {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/** 更新经销商发货单模板 PUT /operation/updateDealerTemplate */
|
||||
export async function updateDealerTemplate(
|
||||
body: BusinessAPI.DealerUpdateTemplateCmd,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<BusinessAPI.SingleResponseDealerVO>(
|
||||
'/operation/updateDealerTemplate',
|
||||
{
|
||||
method: 'PUT',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
data: body,
|
||||
...(options || {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/** 更新经销商发货单模板 PATCH /operation/updateDealerTemplate */
|
||||
export async function updateDealerTemplate1(
|
||||
body: BusinessAPI.DealerUpdateTemplateCmd,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<BusinessAPI.SingleResponseDealerVO>(
|
||||
'/operation/updateDealerTemplate',
|
||||
{
|
||||
method: 'PATCH',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
data: body,
|
||||
...(options || {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
@ -1318,42 +1318,12 @@ declare namespace BusinessAPI {
|
||||
fullName?: string;
|
||||
/** 经销商类型：1_市场；2_超市； */
|
||||
dealerType: 'MARKET' | 'SUPERMARKET';
|
||||
/** 是否开启分成 */
|
||||
enableShare?: boolean;
|
||||
/** 分成比例 */
|
||||
shareRatio?: number;
|
||||
/** 运费是否作为成本 */
|
||||
freightCostFlag?: boolean;
|
||||
/** 草帘是否作为成本 */
|
||||
strawMatCostFlag?: boolean;
|
||||
/** 发货单合计金额是否含包装费 */
|
||||
includePackingFlag?: boolean;
|
||||
/** 发货单合计金额是否含包运费 */
|
||||
includeFreightFlag?: boolean;
|
||||
/** 应收金额 */
|
||||
receivable?: number;
|
||||
/** 备注 */
|
||||
remark?: string;
|
||||
/** 状态：1_启用；0_禁用； */
|
||||
status: boolean;
|
||||
/** 是否开启计提税金 */
|
||||
enableAccrualTax?: boolean;
|
||||
/** 计提税金比例 */
|
||||
accrualTaxRatio?: number;
|
||||
/** 是否开启公司返点 */
|
||||
enableCompanyRebate?: boolean;
|
||||
/** 公司返点比例 */
|
||||
companyRebateRatio?: number;
|
||||
/** 是否可调整比例 */
|
||||
shareAdjusted?: boolean;
|
||||
/** 是否开启损耗 */
|
||||
enableLoss?: boolean;
|
||||
/** 损耗金额 */
|
||||
lossAmount?: number;
|
||||
/** 是否启用初始车次号 */
|
||||
enableInitialTrainNo?: boolean;
|
||||
/** 初始车次号 */
|
||||
initialTrainNo?: number;
|
||||
};
|
||||
|
||||
type DealerDestroyCmd = {
|
||||
@ -1646,6 +1616,19 @@ declare namespace BusinessAPI {
|
||||
fullName?: string;
|
||||
/** 经销商类型：1_市场；2_超市； */
|
||||
dealerType: 'MARKET' | 'SUPERMARKET';
|
||||
/** 应收金额 */
|
||||
receivable?: number;
|
||||
/** 备注 */
|
||||
remark?: string;
|
||||
/** 状态：1_启用；0_禁用； */
|
||||
status: boolean;
|
||||
/** 发货单模板 */
|
||||
deliveryTemplate?: string;
|
||||
};
|
||||
|
||||
type DealerUpdateSettingsCmd = {
|
||||
/** 经销商ID */
|
||||
dealerId: string;
|
||||
/** 是否开启分成 */
|
||||
enableShare?: boolean;
|
||||
/** 分成比例 */
|
||||
@ -1658,12 +1641,6 @@ declare namespace BusinessAPI {
|
||||
includePackingFlag?: boolean;
|
||||
/** 发货单合计金额是否含包运费 */
|
||||
includeFreightFlag?: boolean;
|
||||
/** 应收金额 */
|
||||
receivable?: number;
|
||||
/** 备注 */
|
||||
remark?: string;
|
||||
/** 状态：1_启用；0_禁用； */
|
||||
status: boolean;
|
||||
/** 是否开启计提税金 */
|
||||
enableAccrualTax?: boolean;
|
||||
/** 计提税金比例 */
|
||||
@ -1682,8 +1659,13 @@ declare namespace BusinessAPI {
|
||||
enableInitialTrainNo?: boolean;
|
||||
/** 初始车次号 */
|
||||
initialTrainNo?: number;
|
||||
};
|
||||
|
||||
type DealerUpdateTemplateCmd = {
|
||||
/** 经销商ID */
|
||||
dealerId: string;
|
||||
/** 发货单模板 */
|
||||
deliveryTemplate?: string;
|
||||
deliveryTemplate: string;
|
||||
};
|
||||
|
||||
type DealerVO = {
|
||||
@ -4019,7 +4001,7 @@ declare namespace BusinessAPI {
|
||||
orderCompany: OrderCompany;
|
||||
/** 采购订单信息 */
|
||||
orderVO: OrderVO;
|
||||
/** 瓜农发票信息 */
|
||||
/** 供应商发票信息 */
|
||||
supplierInvoiceVO?: SupplierInvoiceVO;
|
||||
};
|
||||
|
||||
@ -4269,8 +4251,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: AgreementVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseAuditVO = {
|
||||
@ -4282,8 +4264,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: AuditVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseBoxBrandVO = {
|
||||
@ -4295,8 +4277,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: BoxBrandVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseBoxProductVO = {
|
||||
@ -4308,8 +4290,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: BoxProductVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseBoxSpecVO = {
|
||||
@ -4321,8 +4303,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: BoxSpecVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseChannelVO = {
|
||||
@ -4334,8 +4316,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: ChannelVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseCompanyPaymentAccountVO = {
|
||||
@ -4347,8 +4329,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: CompanyPaymentAccountVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseCompanyVO = {
|
||||
@ -4360,8 +4342,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: CompanyVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseCostItemVO = {
|
||||
@ -4373,8 +4355,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: CostItemVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseCostVO = {
|
||||
@ -4386,8 +4368,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: CostVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseDealerPaymentAccountVO = {
|
||||
@ -4399,8 +4381,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: DealerPaymentAccountVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseDealerRebateCustomerVO = {
|
||||
@ -4412,8 +4394,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: DealerRebateCustomerVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseDealerVO = {
|
||||
@ -4425,8 +4407,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: DealerVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseDealerWarehouseVO = {
|
||||
@ -4438,8 +4420,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: DealerWarehouseVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseDictionaryVO = {
|
||||
@ -4451,8 +4433,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: DictionaryVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseEmployeeVO = {
|
||||
@ -4464,8 +4446,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: EmployeeVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseGiftBoxVO = {
|
||||
@ -4477,8 +4459,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: GiftBoxVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseMaterialVO = {
|
||||
@ -4490,8 +4472,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: MaterialVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseOrderCostVO = {
|
||||
@ -4503,8 +4485,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: OrderCostVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseOrderRebateVO = {
|
||||
@ -4516,8 +4498,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: OrderRebateVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseOrderShipVO = {
|
||||
@ -4529,8 +4511,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: OrderShipVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseOrderSupplierVO = {
|
||||
@ -4542,8 +4524,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: OrderSupplierVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseOrderVO = {
|
||||
@ -4555,8 +4537,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: OrderVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponsePaymentTaskVO = {
|
||||
@ -4568,8 +4550,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: PaymentTaskVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponsePermissionVO = {
|
||||
@ -4581,8 +4563,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: PermissionVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponsePlatformVO = {
|
||||
@ -4594,8 +4576,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: PlatformVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseProductVO = {
|
||||
@ -4607,8 +4589,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: ProductVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseRoleVO = {
|
||||
@ -4620,8 +4602,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: RoleVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseSupplierInvoiceVO = {
|
||||
@ -4633,8 +4615,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: SupplierInvoiceVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseSupplierVO = {
|
||||
@ -4646,8 +4628,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: SupplierVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type PageResponseUserVO = {
|
||||
@ -4659,8 +4641,8 @@ declare namespace BusinessAPI {
|
||||
pageIndex?: number;
|
||||
data?: UserVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type pageRoleParams = {
|
||||
@ -5792,6 +5774,8 @@ declare namespace BusinessAPI {
|
||||
type SupplierInvoiceVO = {
|
||||
/** 瓜农发票ID */
|
||||
supplierInvoiceId: string;
|
||||
/** 瓜农发票编号 */
|
||||
invoiceSn: string;
|
||||
/** 瓜农发票类型：1_瓜农 */
|
||||
type?: 'FARMER';
|
||||
/** 瓜农发票开具人 */
|
||||
@ -5800,7 +5784,6 @@ declare namespace BusinessAPI {
|
||||
supplierName: string;
|
||||
/** 代开发票人的信息 */
|
||||
orderSupplierInvoiceList?: OrderSupplierInvoice[];
|
||||
invoiceSn: string;
|
||||
/** 瓜农发票图片（支持多张） */
|
||||
invoiceImg?: UploadFileItem[];
|
||||
/** 登记时间 */
|
||||
|
||||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user