feat(business): 新增经销商设置和付款功能模块
- 更新APP版本号从v0.0.69到v0.0.70 - 在审计页面中添加订单返点逻辑并限制仅生产采购类型订单生效 - 添加经销商设置相关API接口包括更新设置和模板的PUT/PATCH方法 - 新增付款任务和付款记录的服务模块及类型定义 - 在订单成本模块中添加付款和详情查看功能 - 调整经销商类型定义移除部分配置项并新增设置命令类型 - 新增付款记录、付款任务的创建、查询、更新等完整类型定义 - 在订单转换工具中集成订单计算器用于应收金额计算 - 优化订单返点类型定义确保关键字段必填 - 调整发货单类型定义增加应收金额和调整总额字段 - 移除发货单中的利润表相关字段并重新排列类型结构
This commit is contained in:
shenyifei
parent
9be4076df8
commit
547167af12
@ -1,2 +1,2 @@
|
||||
// App 相关常量
|
||||
export const APP_VERSION = "v0.0.69";
|
||||
export const APP_VERSION = "v0.0.70";
|
||||
|
||||
@ -492,7 +492,7 @@ export default hocAuth(function Page(props: CommonComponent) {
|
||||
orderVO.orderShipList = [convertOrderToOrderShip(orderVO)];
|
||||
}
|
||||
|
||||
if (!orderVO.orderRebate) {
|
||||
if (!orderVO.orderRebate && orderVO.type === "PRODUCTION_PURCHASE") {
|
||||
const {
|
||||
data: { data: dealerRebateCustomerVOList },
|
||||
} = await business.dealerRebateCustomer.listDealerRebateCustomer({
|
||||
@ -506,8 +506,7 @@ export default hocAuth(function Page(props: CommonComponent) {
|
||||
dealerRebateCustomerVOList &&
|
||||
dealerRebateCustomerVOList.length > 0
|
||||
) {
|
||||
orderVO.orderRebate =
|
||||
dealerRebateCustomerVOList[0] as BusinessAPI.OrderRebate;
|
||||
orderVO.orderRebate = dealerRebateCustomerVOList[0] as any;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -151,3 +151,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 || {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
@ -8,6 +8,8 @@ import * as supplierInvoice from "./supplierInvoice";
|
||||
import * as setting from "./setting";
|
||||
import * as product from "./product";
|
||||
import * as platform from "./platform";
|
||||
import * as paymentTask from "./paymentTask";
|
||||
import * as paymentRecord from "./paymentRecord";
|
||||
import * as order from "./order";
|
||||
import * as orderSupplier from "./orderSupplier";
|
||||
import * as orderShip from "./orderShip";
|
||||
@ -34,8 +36,8 @@ import * as audit from "./audit";
|
||||
import * as agreement from "./agreement";
|
||||
import * as role from "./role";
|
||||
import * as permission from "./permission";
|
||||
import * as extraction from "./extraction";
|
||||
import * as orderCost from "./orderCost";
|
||||
import * as extraction from "./extraction";
|
||||
import * as orderRebate from "./orderRebate";
|
||||
|
||||
export default {
|
||||
@ -45,6 +47,8 @@ export default {
|
||||
setting,
|
||||
product,
|
||||
platform,
|
||||
paymentTask,
|
||||
paymentRecord,
|
||||
order,
|
||||
orderSupplier,
|
||||
orderShip,
|
||||
@ -71,7 +75,7 @@ export default {
|
||||
agreement,
|
||||
role,
|
||||
permission,
|
||||
extraction,
|
||||
orderCost,
|
||||
extraction,
|
||||
orderRebate,
|
||||
};
|
||||
|
||||
@ -39,3 +39,41 @@ export async function pageOrderCost(
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/** 费用付款 POST /operation/payOrderCost */
|
||||
export async function payOrderCost(
|
||||
body: BusinessAPI.OrderCostPayCmd,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<BusinessAPI.SingleResponsePaymentRecordVO>(
|
||||
"/operation/payOrderCost",
|
||||
{
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
data: body,
|
||||
...(options || {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/** 订单成本项详情 GET /operation/showOrderCost */
|
||||
export async function showOrderCost(
|
||||
// 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
|
||||
params: BusinessAPI.showOrderCostParams,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<BusinessAPI.SingleResponseOrderCostVO>(
|
||||
"/operation/showOrderCost",
|
||||
{
|
||||
method: "GET",
|
||||
params: {
|
||||
...params,
|
||||
orderCostShowQry: undefined,
|
||||
...params["orderCostShowQry"],
|
||||
},
|
||||
...(options || {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
132
packages/app-client/src/services/business/paymentRecord.ts
Normal file
132
packages/app-client/src/services/business/paymentRecord.ts
Normal file
@ -0,0 +1,132 @@
|
||||
// @ts-ignore
|
||||
/* eslint-disable */
|
||||
import request from "../request";
|
||||
|
||||
/** 创建付款记录 POST /operation/createPaymentRecord */
|
||||
export async function createPaymentRecord(
|
||||
body: BusinessAPI.PaymentRecordCreateCmd,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<BusinessAPI.SingleResponsePaymentRecordVO>(
|
||||
"/operation/createPaymentRecord",
|
||||
{
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
data: body,
|
||||
...(options || {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/** 付款记录删除 DELETE /operation/destroyPaymentRecord */
|
||||
export async function destroyPaymentRecord(
|
||||
body: BusinessAPI.PaymentRecordDestroyCmd,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<BusinessAPI.Response>("/operation/destroyPaymentRecord", {
|
||||
method: "DELETE",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
data: body,
|
||||
...(options || {}),
|
||||
});
|
||||
}
|
||||
|
||||
/** 付款记录列表 GET /operation/listPaymentRecord */
|
||||
export async function listPaymentRecord(
|
||||
// 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
|
||||
params: BusinessAPI.listPaymentRecordParams,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<BusinessAPI.MultiResponsePaymentRecordVO>(
|
||||
"/operation/listPaymentRecord",
|
||||
{
|
||||
method: "GET",
|
||||
params: {
|
||||
...params,
|
||||
paymentRecordListQry: undefined,
|
||||
...params["paymentRecordListQry"],
|
||||
},
|
||||
...(options || {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/** 付款记录列表 GET /operation/pagePaymentRecord */
|
||||
export async function pagePaymentRecord(
|
||||
// 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
|
||||
params: BusinessAPI.pagePaymentRecordParams,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<BusinessAPI.PageResponsePaymentRecordVO>(
|
||||
"/operation/pagePaymentRecord",
|
||||
{
|
||||
method: "GET",
|
||||
params: {
|
||||
...params,
|
||||
paymentRecordPageQry: undefined,
|
||||
...params["paymentRecordPageQry"],
|
||||
},
|
||||
...(options || {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/** 付款记录详情 GET /operation/showPaymentRecord */
|
||||
export async function showPaymentRecord(
|
||||
// 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
|
||||
params: BusinessAPI.showPaymentRecordParams,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<BusinessAPI.SingleResponsePaymentRecordVO>(
|
||||
"/operation/showPaymentRecord",
|
||||
{
|
||||
method: "GET",
|
||||
params: {
|
||||
...params,
|
||||
paymentRecordShowQry: undefined,
|
||||
...params["paymentRecordShowQry"],
|
||||
},
|
||||
...(options || {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/** 付款记录更新 PUT /operation/updatePaymentRecord */
|
||||
export async function updatePaymentRecord(
|
||||
body: BusinessAPI.PaymentRecordUpdateCmd,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<BusinessAPI.SingleResponsePaymentRecordVO>(
|
||||
"/operation/updatePaymentRecord",
|
||||
{
|
||||
method: "PUT",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
data: body,
|
||||
...(options || {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/** 付款记录更新 PATCH /operation/updatePaymentRecord */
|
||||
export async function updatePaymentRecord1(
|
||||
body: BusinessAPI.PaymentRecordUpdateCmd,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<BusinessAPI.SingleResponsePaymentRecordVO>(
|
||||
"/operation/updatePaymentRecord",
|
||||
{
|
||||
method: "PATCH",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
data: body,
|
||||
...(options || {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
170
packages/app-client/src/services/business/paymentTask.ts
Normal file
170
packages/app-client/src/services/business/paymentTask.ts
Normal file
@ -0,0 +1,170 @@
|
||||
// @ts-ignore
|
||||
/* eslint-disable */
|
||||
import request from "../request";
|
||||
|
||||
/** 创建付款任务 POST /operation/createPaymentTask */
|
||||
export async function createPaymentTask(
|
||||
body: BusinessAPI.PaymentTaskCreateCmd,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<BusinessAPI.SingleResponsePaymentTaskVO>(
|
||||
"/operation/createPaymentTask",
|
||||
{
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
data: body,
|
||||
...(options || {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/** 付款任务删除 DELETE /operation/destroyPaymentTask */
|
||||
export async function destroyPaymentTask(
|
||||
body: BusinessAPI.PaymentTaskDestroyCmd,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<BusinessAPI.Response>("/operation/destroyPaymentTask", {
|
||||
method: "DELETE",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
data: body,
|
||||
...(options || {}),
|
||||
});
|
||||
}
|
||||
|
||||
/** 付款任务列表 GET /operation/listPaymentTask */
|
||||
export async function listPaymentTask(
|
||||
// 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
|
||||
params: BusinessAPI.listPaymentTaskParams,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<BusinessAPI.MultiResponsePaymentTaskVO>(
|
||||
"/operation/listPaymentTask",
|
||||
{
|
||||
method: "GET",
|
||||
params: {
|
||||
...params,
|
||||
paymentTaskListQry: undefined,
|
||||
...params["paymentTaskListQry"],
|
||||
},
|
||||
...(options || {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/** 付款任务列表 GET /operation/pagePaymentTask */
|
||||
export async function pagePaymentTask(
|
||||
// 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
|
||||
params: BusinessAPI.pagePaymentTaskParams,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<BusinessAPI.PageResponsePaymentTaskVO>(
|
||||
"/operation/pagePaymentTask",
|
||||
{
|
||||
method: "GET",
|
||||
params: {
|
||||
...params,
|
||||
paymentTaskPageQry: undefined,
|
||||
...params["paymentTaskPageQry"],
|
||||
},
|
||||
...(options || {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/** 付款任务付款 POST /operation/payPaymentTask */
|
||||
export async function payPaymentTask(
|
||||
body: BusinessAPI.PaymentTaskPayCmd,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<BusinessAPI.SingleResponsePaymentTaskVO>(
|
||||
"/operation/payPaymentTask",
|
||||
{
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
data: body,
|
||||
...(options || {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/** 付款任务详情 GET /operation/showPaymentTask */
|
||||
export async function showPaymentTask(
|
||||
// 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
|
||||
params: BusinessAPI.showPaymentTaskParams,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<BusinessAPI.SingleResponsePaymentTaskVO>(
|
||||
"/operation/showPaymentTask",
|
||||
{
|
||||
method: "GET",
|
||||
params: {
|
||||
...params,
|
||||
paymentTaskShowQry: undefined,
|
||||
...params["paymentTaskShowQry"],
|
||||
},
|
||||
...(options || {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/** 付款任务统计 GET /operation/statisticsPaymentTask */
|
||||
export async function statisticsPaymentTask(
|
||||
// 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
|
||||
params: BusinessAPI.statisticsPaymentTaskParams,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<BusinessAPI.SingleResponsePaymentTaskStatisticsVO>(
|
||||
"/operation/statisticsPaymentTask",
|
||||
{
|
||||
method: "GET",
|
||||
params: {
|
||||
...params,
|
||||
statisticsQry: undefined,
|
||||
...params["statisticsQry"],
|
||||
},
|
||||
...(options || {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/** 付款任务更新 PUT /operation/updatePaymentTask */
|
||||
export async function updatePaymentTask(
|
||||
body: BusinessAPI.PaymentTaskUpdateCmd,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<BusinessAPI.SingleResponsePaymentTaskVO>(
|
||||
"/operation/updatePaymentTask",
|
||||
{
|
||||
method: "PUT",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
data: body,
|
||||
...(options || {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/** 付款任务更新 PATCH /operation/updatePaymentTask */
|
||||
export async function updatePaymentTask1(
|
||||
body: BusinessAPI.PaymentTaskUpdateCmd,
|
||||
options?: { [key: string]: any },
|
||||
) {
|
||||
return request<BusinessAPI.SingleResponsePaymentTaskVO>(
|
||||
"/operation/updatePaymentTask",
|
||||
{
|
||||
method: "PATCH",
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
data: body,
|
||||
...(options || {}),
|
||||
},
|
||||
);
|
||||
}
|
||||
@ -1310,42 +1310,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 = {
|
||||
@ -1638,6 +1608,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;
|
||||
/** 分成比例 */
|
||||
@ -1650,12 +1633,6 @@ declare namespace BusinessAPI {
|
||||
includePackingFlag?: boolean;
|
||||
/** 发货单合计金额是否含包运费 */
|
||||
includeFreightFlag?: boolean;
|
||||
/** 应收金额 */
|
||||
receivable?: number;
|
||||
/** 备注 */
|
||||
remark?: string;
|
||||
/** 状态：1_启用；0_禁用； */
|
||||
status: boolean;
|
||||
/** 是否开启计提税金 */
|
||||
enableAccrualTax?: boolean;
|
||||
/** 计提税金比例 */
|
||||
@ -1674,8 +1651,13 @@ declare namespace BusinessAPI {
|
||||
enableInitialTrainNo?: boolean;
|
||||
/** 初始车次号 */
|
||||
initialTrainNo?: number;
|
||||
};
|
||||
|
||||
type DealerUpdateTemplateCmd = {
|
||||
/** 经销商ID */
|
||||
dealerId: string;
|
||||
/** 发货单模板 */
|
||||
deliveryTemplate?: string;
|
||||
deliveryTemplate: string;
|
||||
};
|
||||
|
||||
type DealerVO = {
|
||||
@ -2345,6 +2327,14 @@ declare namespace BusinessAPI {
|
||||
orderShipListQry: OrderShipListQry;
|
||||
};
|
||||
|
||||
type listPaymentRecordParams = {
|
||||
paymentRecordListQry: PaymentRecordListQry;
|
||||
};
|
||||
|
||||
type listPaymentTaskParams = {
|
||||
paymentTaskListQry: PaymentTaskListQry;
|
||||
};
|
||||
|
||||
type listPermissionParams = {
|
||||
permissionListQry: PermissionListQry;
|
||||
};
|
||||
@ -2790,6 +2780,24 @@ declare namespace BusinessAPI {
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type MultiResponsePaymentRecordVO = {
|
||||
success?: boolean;
|
||||
errCode?: string;
|
||||
errMessage?: string;
|
||||
data?: PaymentRecordVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type MultiResponsePaymentTaskVO = {
|
||||
success?: boolean;
|
||||
errCode?: string;
|
||||
errMessage?: string;
|
||||
data?: PaymentTaskVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
};
|
||||
|
||||
type MultiResponsePermissionVO = {
|
||||
success?: boolean;
|
||||
errCode?: string;
|
||||
@ -3058,6 +3066,40 @@ declare namespace BusinessAPI {
|
||||
offset?: number;
|
||||
};
|
||||
|
||||
type OrderCostPayCmd = {
|
||||
/** 费用ID */
|
||||
orderCostId: string;
|
||||
/** 付款金额 */
|
||||
paidAmount: number;
|
||||
/** 付款公司ID */
|
||||
companyId: string;
|
||||
/** 账户类别：1_对公账户；2_私人账户 */
|
||||
accountCategory: "COMPANY_ACCOUNT" | "PRIVATE_ACCOUNT";
|
||||
/** 账户类型：1_银行卡；2_支付宝；3_微信 */
|
||||
accountType: "BANK_CARD" | "ALIPAY" | "WECHAT";
|
||||
/** 银行名称 */
|
||||
bankName?: string;
|
||||
/** 支行名称 */
|
||||
branchName?: string;
|
||||
/** 开户公司名称/支付宝昵称/微信号 */
|
||||
accountName: string;
|
||||
/** 银行账号/支付宝账号/微信账号 */
|
||||
accountNumber: string;
|
||||
/** 支付时间 */
|
||||
paidAt: string;
|
||||
/** 支付凭证 */
|
||||
paidCredentials?: string[];
|
||||
/** 备注 */
|
||||
remark?: string;
|
||||
};
|
||||
|
||||
type OrderCostShowQry = {
|
||||
/** 状态：1_启用；0_禁用； */
|
||||
status?: boolean;
|
||||
/** 费用ID */
|
||||
orderCostId: string;
|
||||
};
|
||||
|
||||
type OrderCostVO = {
|
||||
/** 记录ID */
|
||||
orderCostId: string;
|
||||
@ -3205,6 +3247,8 @@ declare namespace BusinessAPI {
|
||||
status?: boolean;
|
||||
/** 采购订单ID */
|
||||
orderId?: string;
|
||||
/** 经销商ID */
|
||||
dealerId?: string;
|
||||
/** 采购订单编号 */
|
||||
orderSn?: string;
|
||||
/** 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已关闭； */
|
||||
@ -3302,17 +3346,17 @@ declare namespace BusinessAPI {
|
||||
|
||||
type OrderRebate = {
|
||||
/** 记录ID */
|
||||
orderRebateId?: string;
|
||||
orderRebateId: string;
|
||||
/** 订单ID */
|
||||
orderId?: string;
|
||||
orderId: string;
|
||||
/** 客户ID */
|
||||
customerId?: string;
|
||||
customerId: string;
|
||||
/** 经销商ID */
|
||||
dealerId?: string;
|
||||
dealerId: string;
|
||||
/** 客户名称 */
|
||||
name?: string;
|
||||
name: string;
|
||||
/** 返点计算方式：1_按净重计算；2_固定金额； */
|
||||
calcMethod?: "NET_WEIGHT" | "FIXED_AMOUNT";
|
||||
calcMethod: "NET_WEIGHT" | "FIXED_AMOUNT";
|
||||
/** 返点净重 */
|
||||
netWeight?: number;
|
||||
/** 返点单价 */
|
||||
@ -3443,16 +3487,16 @@ declare namespace BusinessAPI {
|
||||
type?: "PURCHASE_SHIP" | "TRANSFER_SHIP" | "CHANGE_SHIP" | "RETURN_SHIP";
|
||||
/** 备注 */
|
||||
remark?: string;
|
||||
/** 应收金额（元） */
|
||||
receivableAmount?: number;
|
||||
/** 调整总额（元） */
|
||||
adjustedAmount?: number;
|
||||
/** 发货单明细 */
|
||||
orderShipItemList?: OrderShipItem[];
|
||||
/** PDF 文件地址 */
|
||||
pdfUrl?: string;
|
||||
/** 图片文件地址 */
|
||||
picUrl?: string;
|
||||
/** 利润表图片文件地址 */
|
||||
profitPicUrl?: string;
|
||||
/** 利润表文件地址 */
|
||||
profitExcelUrl?: string;
|
||||
};
|
||||
|
||||
type OrderShipCreateCmd = {
|
||||
@ -3484,6 +3528,10 @@ declare namespace BusinessAPI {
|
||||
companyName?: string;
|
||||
/** 备注 */
|
||||
remark?: string;
|
||||
/** 应收金额（元） */
|
||||
receivableAmount?: number;
|
||||
/** 调整总额（元） */
|
||||
adjustedAmount?: number;
|
||||
/** 发货单明细 */
|
||||
orderShipItemList?: OrderShipItem[];
|
||||
};
|
||||
@ -3608,6 +3656,10 @@ declare namespace BusinessAPI {
|
||||
companyName?: string;
|
||||
/** 备注 */
|
||||
remark?: string;
|
||||
/** 应收金额（元） */
|
||||
receivableAmount?: number;
|
||||
/** 调整总额（元） */
|
||||
adjustedAmount?: number;
|
||||
/** 发货单明细 */
|
||||
orderShipItemList?: OrderShipItem[];
|
||||
/** PDF 文件地址 */
|
||||
@ -3651,10 +3703,6 @@ declare namespace BusinessAPI {
|
||||
pdfUrl?: string;
|
||||
/** 图片文件地址 */
|
||||
picUrl?: string;
|
||||
/** 利润表图片文件地址 */
|
||||
profitPicUrl?: string;
|
||||
/** 利润表文件地址 */
|
||||
profitExcelUrl?: string;
|
||||
/** 发货单状态：0_草稿；1_待发货；2_待回款；3_待改签；4_部分回款；5_已回款；6_拒收完结；7_已完结； */
|
||||
state:
|
||||
| "DRAFT"
|
||||
@ -3669,6 +3717,10 @@ declare namespace BusinessAPI {
|
||||
type: "PURCHASE_SHIP" | "TRANSFER_SHIP" | "CHANGE_SHIP" | "RETURN_SHIP";
|
||||
/** 备注 */
|
||||
remark?: string;
|
||||
/** 应收金额（元） */
|
||||
receivableAmount?: number;
|
||||
/** 调整总额（元） */
|
||||
adjustedAmount?: number;
|
||||
/** 创建人ID */
|
||||
createdBy: string;
|
||||
/** 创建人姓名 */
|
||||
@ -3881,6 +3933,8 @@ declare namespace BusinessAPI {
|
||||
isPaid?: boolean;
|
||||
/** 供应商类型：1_瓜农；2_自家档口；3_其他家档口 */
|
||||
type?: "FARMER" | "STALL" | "OTHER_STALL";
|
||||
/** 发票ID */
|
||||
invoiceId?: string;
|
||||
offset?: number;
|
||||
};
|
||||
|
||||
@ -3984,6 +4038,8 @@ declare namespace BusinessAPI {
|
||||
orderCompany: OrderCompany;
|
||||
/** 采购订单信息 */
|
||||
orderVO: OrderVO;
|
||||
/** 供应商发票信息 */
|
||||
supplierInvoiceVO?: SupplierInvoiceVO;
|
||||
};
|
||||
|
||||
type OrderUpdateCmd = {
|
||||
@ -4207,6 +4263,14 @@ declare namespace BusinessAPI {
|
||||
orderSupplierPageQry: OrderSupplierPageQry;
|
||||
};
|
||||
|
||||
type pagePaymentRecordParams = {
|
||||
paymentRecordPageQry: PaymentRecordPageQry;
|
||||
};
|
||||
|
||||
type pagePaymentTaskParams = {
|
||||
paymentTaskPageQry: PaymentTaskPageQry;
|
||||
};
|
||||
|
||||
type pagePermissionParams = {
|
||||
permissionPageQry: PermissionPageQry;
|
||||
};
|
||||
@ -4518,6 +4582,32 @@ declare namespace BusinessAPI {
|
||||
totalPages?: number;
|
||||
};
|
||||
|
||||
type PageResponsePaymentRecordVO = {
|
||||
success?: boolean;
|
||||
errCode?: string;
|
||||
errMessage?: string;
|
||||
totalCount?: number;
|
||||
pageSize?: number;
|
||||
pageIndex?: number;
|
||||
data?: PaymentRecordVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
};
|
||||
|
||||
type PageResponsePaymentTaskVO = {
|
||||
success?: boolean;
|
||||
errCode?: string;
|
||||
errMessage?: string;
|
||||
totalCount?: number;
|
||||
pageSize?: number;
|
||||
pageIndex?: number;
|
||||
data?: PaymentTaskVO[];
|
||||
empty?: boolean;
|
||||
notEmpty?: boolean;
|
||||
totalPages?: number;
|
||||
};
|
||||
|
||||
type PageResponsePermissionVO = {
|
||||
success?: boolean;
|
||||
errCode?: string;
|
||||
@ -4625,6 +4715,357 @@ declare namespace BusinessAPI {
|
||||
userPageQry: UserPageQry;
|
||||
};
|
||||
|
||||
type PaymentRecordCreateCmd = {
|
||||
/** 付款记录ID */
|
||||
paymentRecordId: string;
|
||||
/** 付款编码 */
|
||||
paymentRecordSn: string;
|
||||
/** 付款任务ID */
|
||||
paymentTaskId?: string;
|
||||
/** 付款对象ID */
|
||||
targetId: string;
|
||||
/** 付款对象类型：1_瓜农；2_成本项 */
|
||||
targetType: "SUPPLIER" | "ORDER_COST";
|
||||
/** 付款公司ID */
|
||||
companyId: string;
|
||||
/** 账户类别：1_对公账户；2_私人账户 */
|
||||
accountCategory: "COMPANY_ACCOUNT" | "PRIVATE_ACCOUNT";
|
||||
/** 账户类型：1_银行卡；2_支付宝；3_微信 */
|
||||
accountType: "BANK_CARD" | "ALIPAY" | "WECHAT";
|
||||
/** 银行名称 */
|
||||
bankName?: string;
|
||||
/** 支行名称 */
|
||||
branchName?: string;
|
||||
/** 开户公司名称/支付宝昵称/微信号 */
|
||||
accountName: string;
|
||||
/** 银行账号/支付宝账号/微信账号 */
|
||||
accountNumber: string;
|
||||
/** 支付时间 */
|
||||
paidAt: string;
|
||||
/** 付款金额 */
|
||||
paidAmount: number;
|
||||
/** 支付状态：1_草稿；2_已支付； */
|
||||
paidState: "DRAFT" | "PAID";
|
||||
/** 支付凭证 */
|
||||
paidCredentials?: string[];
|
||||
/** 备注 */
|
||||
remark?: string;
|
||||
};
|
||||
|
||||
type PaymentRecordDestroyCmd = {
|
||||
/** 付款记录ID */
|
||||
paymentRecordId: string;
|
||||
};
|
||||
|
||||
type PaymentRecordListQry = {
|
||||
/** 状态：1_启用；0_禁用； */
|
||||
status?: boolean;
|
||||
/** 付款记录ID */
|
||||
paymentRecordId?: string;
|
||||
};
|
||||
|
||||
type PaymentRecordPageQry = {
|
||||
pageSize?: number;
|
||||
pageIndex?: number;
|
||||
orderBy?: string;
|
||||
orderDirection?: string;
|
||||
groupBy?: string;
|
||||
needTotalCount?: boolean;
|
||||
/** 自定义字段key */
|
||||
customFieldKey?: string;
|
||||
/** 自定义字段value */
|
||||
customFieldValue?: string;
|
||||
/** 备注 */
|
||||
remark?: string;
|
||||
/** 状态：1_启用；0_禁用； */
|
||||
status?: boolean;
|
||||
/** 付款记录ID */
|
||||
paymentRecordId?: string;
|
||||
/** 付款对象类型：1_瓜农；2_成本项 */
|
||||
targetType?: "SUPPLIER" | "ORDER_COST";
|
||||
/** 支付状态：1_草稿；2_已支付； */
|
||||
paidState?: "DRAFT" | "PAID";
|
||||
/** 支付时间 */
|
||||
paidAt?: string;
|
||||
/** 付款公司ID */
|
||||
companyId?: string;
|
||||
/** 付款编码 */
|
||||
paymentRecordSn?: string;
|
||||
/** 付款任务ID */
|
||||
paymentTaskId?: string;
|
||||
/** 供应商ID */
|
||||
supplierId?: string;
|
||||
/** 成本项ID */
|
||||
costId?: string;
|
||||
/** 账户类别：1_对公账户；2_私人账户 */
|
||||
accountCategory?: "COMPANY_ACCOUNT" | "PRIVATE_ACCOUNT";
|
||||
/** 账户类型：1_银行卡；2_支付宝；3_微信 */
|
||||
accountType?: "BANK_CARD" | "ALIPAY" | "WECHAT";
|
||||
offset?: number;
|
||||
};
|
||||
|
||||
type PaymentRecordShowQry = {
|
||||
/** 状态：1_启用；0_禁用； */
|
||||
status?: boolean;
|
||||
/** 付款记录ID */
|
||||
paymentRecordId?: string;
|
||||
};
|
||||
|
||||
type PaymentRecordUpdateCmd = {
|
||||
/** 付款记录ID */
|
||||
paymentRecordId: string;
|
||||
/** 付款编码 */
|
||||
paymentRecordSn: string;
|
||||
/** 付款任务ID */
|
||||
paymentTaskId?: string;
|
||||
/** 付款对象ID */
|
||||
targetId: string;
|
||||
/** 付款对象类型：1_瓜农；2_成本项 */
|
||||
targetType: "SUPPLIER" | "ORDER_COST";
|
||||
/** 付款公司ID */
|
||||
companyId: string;
|
||||
/** 账户类别：1_对公账户；2_私人账户 */
|
||||
accountCategory: "COMPANY_ACCOUNT" | "PRIVATE_ACCOUNT";
|
||||
/** 账户类型：1_银行卡；2_支付宝；3_微信 */
|
||||
accountType: "BANK_CARD" | "ALIPAY" | "WECHAT";
|
||||
/** 银行名称 */
|
||||
bankName?: string;
|
||||
/** 支行名称 */
|
||||
branchName?: string;
|
||||
/** 开户公司名称/支付宝昵称/微信号 */
|
||||
accountName: string;
|
||||
/** 银行账号/支付宝账号/微信账号 */
|
||||
accountNumber: string;
|
||||
/** 支付时间 */
|
||||
paidAt: string;
|
||||
/** 付款金额 */
|
||||
paidAmount: number;
|
||||
/** 支付状态：1_草稿；2_已支付； */
|
||||
paidState: "DRAFT" | "PAID";
|
||||
/** 支付凭证 */
|
||||
paidCredentials?: string[];
|
||||
/** 备注 */
|
||||
remark?: string;
|
||||
};
|
||||
|
||||
type PaymentRecordVO = {
|
||||
/** 付款记录ID */
|
||||
paymentRecordId: string;
|
||||
/** 付款编码 */
|
||||
paymentRecordSn: string;
|
||||
/** 付款任务ID */
|
||||
paymentTaskId?: string;
|
||||
/** 付款对象ID */
|
||||
targetId: string;
|
||||
/** 付款对象类型：1_瓜农；2_成本项 */
|
||||
targetType: "SUPPLIER" | "ORDER_COST";
|
||||
/** 付款公司ID */
|
||||
companyId: string;
|
||||
/** 账户类别：1_对公账户；2_私人账户 */
|
||||
accountCategory: "COMPANY_ACCOUNT" | "PRIVATE_ACCOUNT";
|
||||
/** 账户类型：1_银行卡；2_支付宝；3_微信 */
|
||||
accountType: "BANK_CARD" | "ALIPAY" | "WECHAT";
|
||||
/** 银行名称 */
|
||||
bankName?: string;
|
||||
/** 支行名称 */
|
||||
branchName?: string;
|
||||
/** 开户公司名称/支付宝昵称/微信号 */
|
||||
accountName: string;
|
||||
/** 银行账号/支付宝账号/微信账号 */
|
||||
accountNumber: string;
|
||||
/** 支付时间 */
|
||||
paidAt: string;
|
||||
/** 付款金额 */
|
||||
paidAmount: number;
|
||||
/** 支付状态：1_草稿；2_已支付； */
|
||||
paidState: "DRAFT" | "PAID";
|
||||
/** 支付凭证 */
|
||||
paidCredentials?: string[];
|
||||
/** 备注 */
|
||||
remark?: string;
|
||||
/** 创建时间 */
|
||||
createdAt: string;
|
||||
/** 付款任务信息 */
|
||||
paymentTaskVO?: PaymentTaskVO;
|
||||
/** 供应商信息 */
|
||||
supplierVO?: SupplierVO;
|
||||
/** 公司信息 */
|
||||
companyVO?: CompanyVO;
|
||||
/** 采购订单成本项目信息 */
|
||||
orderCostVO?: OrderCostVO;
|
||||
};
|
||||
|
||||
type PaymentTaskCreateCmd = {
|
||||
/** 付款任务ID */
|
||||
paymentTaskId?: string;
|
||||
/** 任务名称 */
|
||||
taskName: string;
|
||||
/** 任务类型：1-瓜农付款任务 */
|
||||
taskType: "MELON_FARMER";
|
||||
/** 付款任务对象ID */
|
||||
targetId: string;
|
||||
/** 付款总金额 */
|
||||
totalAmount: number;
|
||||
/** 已付金额 */
|
||||
paidAmount: number;
|
||||
/** 付款状态：0-待付款任务，1-部分付款任务，2-已完成任务，3-已取消任务 */
|
||||
state: "PENDING" | "PARTIAL" | "COMPLETED" | "CANCELLED";
|
||||
/** 订单数量 */
|
||||
orderCount: number;
|
||||
/** 备注 */
|
||||
remark?: string;
|
||||
/** 订单供应商信息 */
|
||||
orderSupplierVOList?: OrderSupplierVO[];
|
||||
};
|
||||
|
||||
type PaymentTaskDestroyCmd = {
|
||||
/** 付款任务ID */
|
||||
paymentTaskId: string;
|
||||
};
|
||||
|
||||
type PaymentTaskListQry = {
|
||||
/** 状态：1_启用；0_禁用； */
|
||||
status?: boolean;
|
||||
/** 付款任务ID */
|
||||
paymentTaskId?: string;
|
||||
};
|
||||
|
||||
type PaymentTaskPageQry = {
|
||||
pageSize?: number;
|
||||
pageIndex?: number;
|
||||
orderBy?: string;
|
||||
orderDirection?: string;
|
||||
groupBy?: string;
|
||||
needTotalCount?: boolean;
|
||||
/** 自定义字段key */
|
||||
customFieldKey?: string;
|
||||
/** 自定义字段value */
|
||||
customFieldValue?: string;
|
||||
/** 备注 */
|
||||
remark?: string;
|
||||
/** 状态：1_启用；0_禁用； */
|
||||
status?: boolean;
|
||||
/** 付款任务ID */
|
||||
paymentTaskId?: string;
|
||||
/** 付款任务名称 */
|
||||
taskName?: string;
|
||||
/** 任务类型：1-瓜农付款任务 */
|
||||
taskType?: "MELON_FARMER";
|
||||
/** 付款编码 */
|
||||
paymentTaskSn?: string;
|
||||
/** 付款状态：0-待付款任务，1-部分付款任务，2-已完成任务，3-已取消任务 */
|
||||
state?: "PENDING" | "PARTIAL" | "COMPLETED" | "CANCELLED";
|
||||
/** 供应商ID */
|
||||
supplierId?: number;
|
||||
offset?: number;
|
||||
};
|
||||
|
||||
type PaymentTaskPayCmd = {
|
||||
/** 付款任务ID */
|
||||
paymentTaskId: string;
|
||||
/** 付款金额 */
|
||||
paidAmount: number;
|
||||
/** 付款公司ID */
|
||||
companyId: string;
|
||||
/** 账户类别：1_对公账户；2_私人账户 */
|
||||
accountCategory: "COMPANY_ACCOUNT" | "PRIVATE_ACCOUNT";
|
||||
/** 账户类型：1_银行卡；2_支付宝；3_微信 */
|
||||
accountType: "BANK_CARD" | "ALIPAY" | "WECHAT";
|
||||
/** 银行名称 */
|
||||
bankName?: string;
|
||||
/** 支行名称 */
|
||||
branchName?: string;
|
||||
/** 开户公司名称/支付宝昵称/微信号 */
|
||||
accountName: string;
|
||||
/** 银行账号/支付宝账号/微信账号 */
|
||||
accountNumber: string;
|
||||
/** 支付时间 */
|
||||
paidAt: string;
|
||||
/** 支付凭证 */
|
||||
paidCredentials?: string[];
|
||||
/** 备注 */
|
||||
remark?: string;
|
||||
};
|
||||
|
||||
type PaymentTaskShowQry = {
|
||||
/** 状态：1_启用；0_禁用； */
|
||||
status?: boolean;
|
||||
/** 付款任务ID */
|
||||
paymentTaskId?: string;
|
||||
};
|
||||
|
||||
type PaymentTaskStatisticsQry = {
|
||||
/** 状态：1_启用；0_禁用； */
|
||||
status?: boolean;
|
||||
/** 任务类型 按任务类型筛选统计 */
|
||||
taskType?: number;
|
||||
};
|
||||
|
||||
type PaymentTaskStatisticsVO = {
|
||||
/** 待付款数量 状态为待付款的数量 */
|
||||
pendingCount?: number;
|
||||
/** 部分付款数量 状态为部分付款的数量 */
|
||||
partialCount?: number;
|
||||
/** 已完成数量 状态为已完成的数量 */
|
||||
completedCount?: number;
|
||||
/** 已取消数量 状态为已取消的数量 */
|
||||
cancelledCount?: number;
|
||||
/** 总数量 所有状态的总数量 */
|
||||
totalCount?: number;
|
||||
};
|
||||
|
||||
type PaymentTaskUpdateCmd = {
|
||||
/** 付款任务ID */
|
||||
paymentTaskId: string;
|
||||
/** 任务名称 */
|
||||
taskName: string;
|
||||
/** 任务类型：1-瓜农付款任务 */
|
||||
taskType: "MELON_FARMER";
|
||||
/** 付款任务对象ID */
|
||||
targetId: string;
|
||||
/** 付款总金额 */
|
||||
totalAmount: number;
|
||||
/** 已付金额 */
|
||||
paidAmount: number;
|
||||
/** 付款状态：0-待付款任务，1-部分付款任务，2-已完成任务，3-已取消任务 */
|
||||
state: "PENDING" | "PARTIAL" | "COMPLETED" | "CANCELLED";
|
||||
/** 订单数量 */
|
||||
orderCount: number;
|
||||
/** 备注 */
|
||||
remark?: string;
|
||||
/** 订单供应商信息 */
|
||||
orderSupplierVOList?: OrderSupplierVO[];
|
||||
};
|
||||
|
||||
type PaymentTaskVO = {
|
||||
/** 付款任务ID */
|
||||
paymentTaskId: string;
|
||||
/** 任务名称 */
|
||||
taskName: string;
|
||||
/** 任务类型：1-瓜农付款任务 */
|
||||
taskType: "MELON_FARMER";
|
||||
/** 付款编码 */
|
||||
paymentTaskSn: string;
|
||||
/** 付款任务对象ID */
|
||||
targetId: string;
|
||||
/** 付款总金额 */
|
||||
totalAmount: number;
|
||||
/** 已付金额 */
|
||||
paidAmount: number;
|
||||
/** 付款状态：0-待付款任务，1-部分付款任务，2-已完成任务，3-已取消任务 */
|
||||
state: "PENDING" | "PARTIAL" | "COMPLETED" | "CANCELLED";
|
||||
/** 订单数量 */
|
||||
orderCount: number;
|
||||
/** 备注 */
|
||||
remark?: string;
|
||||
/** 创建时间 */
|
||||
createdAt: string;
|
||||
/** 供应商信息 */
|
||||
supplierVO?: SupplierVO;
|
||||
/** 订单供应商信息 */
|
||||
orderSupplierVOList?: OrderSupplierVO[];
|
||||
};
|
||||
|
||||
type PermissionCreateCmd = {
|
||||
/** 权限标识 */
|
||||
slug: string;
|
||||
@ -5134,6 +5575,10 @@ declare namespace BusinessAPI {
|
||||
menuShowQry: MenuShowQry;
|
||||
};
|
||||
|
||||
type showOrderCostParams = {
|
||||
orderCostShowQry: OrderCostShowQry;
|
||||
};
|
||||
|
||||
type showOrderParams = {
|
||||
orderShowQry: OrderShowQry;
|
||||
};
|
||||
@ -5142,6 +5587,14 @@ declare namespace BusinessAPI {
|
||||
orderShipShowQry: OrderShipShowQry;
|
||||
};
|
||||
|
||||
type showPaymentRecordParams = {
|
||||
paymentRecordShowQry: PaymentRecordShowQry;
|
||||
};
|
||||
|
||||
type showPaymentTaskParams = {
|
||||
paymentTaskShowQry: PaymentTaskShowQry;
|
||||
};
|
||||
|
||||
type showPermissionParams = {
|
||||
permissionShowQry: PermissionShowQry;
|
||||
};
|
||||
@ -5363,6 +5816,27 @@ declare namespace BusinessAPI {
|
||||
data?: OssTokenVO;
|
||||
};
|
||||
|
||||
type SingleResponsePaymentRecordVO = {
|
||||
success?: boolean;
|
||||
errCode?: string;
|
||||
errMessage?: string;
|
||||
data?: PaymentRecordVO;
|
||||
};
|
||||
|
||||
type SingleResponsePaymentTaskStatisticsVO = {
|
||||
success?: boolean;
|
||||
errCode?: string;
|
||||
errMessage?: string;
|
||||
data?: PaymentTaskStatisticsVO;
|
||||
};
|
||||
|
||||
type SingleResponsePaymentTaskVO = {
|
||||
success?: boolean;
|
||||
errCode?: string;
|
||||
errMessage?: string;
|
||||
data?: PaymentTaskVO;
|
||||
};
|
||||
|
||||
type SingleResponsePermissionVO = {
|
||||
success?: boolean;
|
||||
errCode?: string;
|
||||
@ -5440,6 +5914,10 @@ declare namespace BusinessAPI {
|
||||
prompt?: string;
|
||||
};
|
||||
|
||||
type statisticsPaymentTaskParams = {
|
||||
statisticsQry: PaymentTaskStatisticsQry;
|
||||
};
|
||||
|
||||
type SupplierCheckQry = {
|
||||
pageSize?: number;
|
||||
pageIndex?: number;
|
||||
@ -5540,6 +6018,12 @@ declare namespace BusinessAPI {
|
||||
status?: boolean;
|
||||
/** 瓜农发票ID */
|
||||
supplierInvoiceId?: string;
|
||||
/** 瓜农发票编号 */
|
||||
invoiceSn?: string;
|
||||
/** 瓜农发票开具人 */
|
||||
supplierId?: string;
|
||||
/** 订单状态 */
|
||||
poStates?: ("DRAFT" | "AUDITING" | "COMPLETED" | "CLOSED")[];
|
||||
offset?: number;
|
||||
};
|
||||
|
||||
@ -5568,6 +6052,8 @@ declare namespace BusinessAPI {
|
||||
type SupplierInvoiceVO = {
|
||||
/** 瓜农发票ID */
|
||||
supplierInvoiceId: string;
|
||||
/** 瓜农发票编号 */
|
||||
invoiceSn: string;
|
||||
/** 瓜农发票类型：1_瓜农 */
|
||||
type?: "FARMER";
|
||||
/** 瓜农发票开具人 */
|
||||
@ -5961,6 +6447,10 @@ declare namespace BusinessAPI {
|
||||
dealerId: string;
|
||||
/** 经销商信息 */
|
||||
dealerVO?: DealerVO;
|
||||
/** 是否开启草帘 */
|
||||
openStrawCurtain?: boolean;
|
||||
/** 草帘价格 */
|
||||
strawCurtainPrice?: number;
|
||||
};
|
||||
|
||||
type WxCpNotifyConfigValue =
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
// 将OrderVO转换为OrderShipVO
|
||||
import { generateShortId } from "@/utils";
|
||||
import { generateShortId, OrderCalculator } from "@/utils";
|
||||
import { DecimalUtils } from "@/utils/classes/calculators/core/DecimalUtils";
|
||||
|
||||
/**
|
||||
@ -100,6 +100,7 @@ export const convertOrderToOrderShip = (
|
||||
};
|
||||
});
|
||||
|
||||
const calculator = new OrderCalculator(orderVO);
|
||||
// 构建orderShip对象，不转换费用信息
|
||||
return {
|
||||
orderShipId: orderShipId,
|
||||
@ -118,6 +119,7 @@ export const convertOrderToOrderShip = (
|
||||
pdfUrl: oldOrderShip?.pdfUrl || "",
|
||||
picUrl: oldOrderShip?.picUrl || "",
|
||||
state: "WAIT_PAYMENT",
|
||||
receivableAmount: calculator.getMarketPrice(),
|
||||
orderShipItemList,
|
||||
};
|
||||
};
|
||||
|
||||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user