Merge branch 'test' of http://8.163.30.128:10082/java-project/baiyue-firstleg into test
This commit is contained in:
@@ -0,0 +1,83 @@
|
||||
USE baiyue_firstleg;
|
||||
SET NAMES utf8mb4;
|
||||
|
||||
-- 将计费快照发布为后台和客户共用的入库运费明细。
|
||||
DROP PROCEDURE IF EXISTS phase2_publish_add_column;
|
||||
DELIMITER $$
|
||||
CREATE PROCEDURE phase2_publish_add_column(
|
||||
IN target_table VARCHAR(64), IN target_column VARCHAR(64), IN column_definition TEXT
|
||||
)
|
||||
BEGIN
|
||||
IF NOT EXISTS (
|
||||
SELECT 1 FROM information_schema.columns
|
||||
WHERE table_schema = DATABASE() AND table_name = target_table AND column_name = target_column
|
||||
) THEN
|
||||
SET @ddl = CONCAT('ALTER TABLE `', target_table, '` ADD COLUMN `', target_column, '` ', column_definition);
|
||||
PREPARE statement FROM @ddl;
|
||||
EXECUTE statement;
|
||||
DEALLOCATE PREPARE statement;
|
||||
END IF;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
||||
CALL phase2_publish_add_column('fl_fee_item', 'fee_code',
|
||||
"VARCHAR(50) NULL COMMENT '稳定费用编码；系统费用使用固定编码' AFTER trade_scope");
|
||||
CALL phase2_publish_add_column('fl_inbound_fee_detail', 'source_type',
|
||||
"VARCHAR(32) NOT NULL DEFAULT 'MANUAL' COMMENT 'MANUAL或FBA_PRICING' AFTER fee_item_id");
|
||||
CALL phase2_publish_add_column('fl_inbound_fee_detail', 'source_fee_id',
|
||||
"BIGINT UNSIGNED NULL COMMENT '来源计费快照ID' AFTER source_type");
|
||||
CALL phase2_publish_add_column('fl_inbound_fee_detail', 'source_fee_version',
|
||||
"INT UNSIGNED NULL COMMENT '来源计费快照版本' AFTER source_fee_id");
|
||||
CALL phase2_publish_add_column('fl_inbound_fee_detail', 'source_fee_no',
|
||||
"VARCHAR(40) NULL COMMENT '来源费用单号' AFTER source_fee_version");
|
||||
CALL phase2_publish_add_column('fl_inbound_fee_detail', 'customer_id',
|
||||
"BIGINT UNSIGNED NULL COMMENT '客户ID快照' AFTER business_date");
|
||||
CALL phase2_publish_add_column('fl_inbound_fee_detail', 'customer_name',
|
||||
"VARCHAR(128) NULL COMMENT '客户公司名称快照' AFTER customer_id");
|
||||
CALL phase2_publish_add_column('fl_inbound_fee_detail', 'invoice_title',
|
||||
"VARCHAR(256) NULL COMMENT '发票抬头快照' AFTER customer_name");
|
||||
CALL phase2_publish_add_column('fl_inbound_fee_detail', 'chargeable_quantity',
|
||||
"DECIMAL(18,4) NULL COMMENT '本费用最终计费量' AFTER chargeable_volume_cbm");
|
||||
CALL phase2_publish_add_column('fl_inbound_fee_detail', 'charge_unit',
|
||||
"VARCHAR(16) NULL COMMENT 'KG或CBM' AFTER chargeable_quantity");
|
||||
CALL phase2_publish_add_column('fl_inbound_fee_detail', 'publication_status',
|
||||
"VARCHAR(16) NOT NULL DEFAULT 'DRAFT' COMMENT 'DRAFT、PUBLISHED、SUPERSEDED' AFTER review_reason");
|
||||
CALL phase2_publish_add_column('fl_inbound_fee_detail', 'published_by',
|
||||
"BIGINT NULL COMMENT '发布人ID' AFTER publication_status");
|
||||
CALL phase2_publish_add_column('fl_inbound_fee_detail', 'published_by_name',
|
||||
"VARCHAR(64) NULL COMMENT '发布人名称快照' AFTER published_by");
|
||||
CALL phase2_publish_add_column('fl_inbound_fee_detail', 'published_at',
|
||||
"DATETIME(3) NULL COMMENT '发布时间' AFTER published_by_name");
|
||||
CALL phase2_publish_add_column('fl_inbound_fee_detail', 'inbounded_at',
|
||||
"DATETIME(3) NULL COMMENT '入库完成时间快照' AFTER published_at");
|
||||
CALL phase2_publish_add_column('fl_inbound_fee_detail', 'settlement_included',
|
||||
"TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否参与结算' AFTER inbounded_at");
|
||||
|
||||
DROP PROCEDURE IF EXISTS phase2_publish_add_column;
|
||||
|
||||
DROP PROCEDURE IF EXISTS phase2_publish_add_index;
|
||||
DELIMITER $$
|
||||
CREATE PROCEDURE phase2_publish_add_index(
|
||||
IN target_table VARCHAR(64), IN target_index VARCHAR(64), IN index_definition TEXT
|
||||
)
|
||||
BEGIN
|
||||
IF NOT EXISTS (
|
||||
SELECT 1 FROM information_schema.statistics
|
||||
WHERE table_schema = DATABASE() AND table_name = target_table AND index_name = target_index
|
||||
) THEN
|
||||
SET @ddl = CONCAT('ALTER TABLE `', target_table, '` ADD ', index_definition);
|
||||
PREPARE statement FROM @ddl;
|
||||
EXECUTE statement;
|
||||
DEALLOCATE PREPARE statement;
|
||||
END IF;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
||||
CALL phase2_publish_add_index('fl_fee_item', 'uk_fee_item_code',
|
||||
'UNIQUE KEY `uk_fee_item_code` (`tenant_id`, `fee_code`)');
|
||||
CALL phase2_publish_add_index('fl_inbound_fee_detail', 'uk_inbound_fee_source',
|
||||
'UNIQUE KEY `uk_inbound_fee_source` (`tenant_id`, `source_type`, `source_fee_id`)');
|
||||
CALL phase2_publish_add_index('fl_inbound_fee_detail', 'idx_inbound_fee_published',
|
||||
'KEY `idx_inbound_fee_published` (`tenant_id`, `inbound_id`, `publication_status`, `source_fee_version`)');
|
||||
|
||||
DROP PROCEDURE IF EXISTS phase2_publish_add_index;
|
||||
@@ -183,7 +183,11 @@ paths:
|
||||
parameters:
|
||||
- {name: orderId, in: path, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
|
||||
responses:
|
||||
'200': {description: 成功或业务失败，按响应体 code 判断}
|
||||
'200':
|
||||
description: 成功；publishedFeeDetail 是后台和客户共同读取的同一条已发布入库运费明细，latestFee 仅为兼容保留的计费快照
|
||||
content:
|
||||
application/json:
|
||||
schema: {$ref: '#/components/schemas/MerchantInboundBillingEnvelope'}
|
||||
'403': {description: 非当前客户或无订单查看权限}
|
||||
/api/platform/v1/inbounds/{inboundId}/measurements/exception-release:
|
||||
post:
|
||||
@@ -255,6 +259,63 @@ components:
|
||||
in: query
|
||||
schema: {type: integer, format: int64, minimum: 1, maximum: 200, default: 20}
|
||||
schemas:
|
||||
MerchantInboundBillingEnvelope:
|
||||
type: object
|
||||
properties:
|
||||
code: {type: string, example: '200'}
|
||||
message: {type: string}
|
||||
data:
|
||||
type: object
|
||||
properties:
|
||||
inbound: {type: object, description: 入库单详情}
|
||||
measurementSummary: {type: object, description: 测量汇总}
|
||||
measurementItems: {type: array, items: {type: object}}
|
||||
weightResults: {type: array, items: {type: object}}
|
||||
measurementImages: {type: array, items: {type: object}}
|
||||
weightImages: {type: array, items: {type: object}}
|
||||
billingBasis: {type: object, description: 计费依据}
|
||||
latestFee: {type: object, nullable: true, description: 兼容保留的最新计费快照}
|
||||
publishedFeeDetail:
|
||||
allOf:
|
||||
- {$ref: '#/components/schemas/PublishedFreightFeeDetail'}
|
||||
nullable: true
|
||||
description: 后台与客户共用的已发布FBA头程运费应收明细
|
||||
PublishedFreightFeeDetail:
|
||||
type: object
|
||||
description: 审核发布后绑定入库单的FBA头程运费应收明细
|
||||
properties:
|
||||
id: {type: integer, format: int64, description: 入库费用明细ID}
|
||||
inboundId: {type: integer, format: int64}
|
||||
inboundCode: {type: string}
|
||||
sourceFeeId: {type: integer, format: int64, description: 来源计费快照ID}
|
||||
sourceFeeVersion: {type: integer}
|
||||
sourceFeeNo: {type: string}
|
||||
direction: {type: string, enum: [RECEIVABLE]}
|
||||
businessDate: {type: string, format: date}
|
||||
customerId: {type: integer, format: int64}
|
||||
customerName: {type: string}
|
||||
invoiceTitle: {type: string, nullable: true}
|
||||
channelCode: {type: string, nullable: true}
|
||||
channelName: {type: string, nullable: true}
|
||||
destinationCode: {type: string, nullable: true}
|
||||
destinationName: {type: string, nullable: true}
|
||||
packageCount: {type: integer, nullable: true}
|
||||
actualGrossWeightKg: {type: number, format: double, nullable: true}
|
||||
actualVolumeCbm: {type: number, format: double, nullable: true}
|
||||
volumeWeightKg: {type: number, format: double, nullable: true}
|
||||
chargeableWeightKg: {type: number, format: double, nullable: true}
|
||||
chargeableVolumeCbm: {type: number, format: double, nullable: true}
|
||||
chargeableQuantity: {type: number, format: double}
|
||||
chargeUnit: {type: string, enum: [KG, CBM]}
|
||||
feeTypeName: {type: string, example: FBA头程运费}
|
||||
unitPrice: {type: number, format: double}
|
||||
currency: {type: string, example: CNY}
|
||||
amount: {type: number, format: double, description: 客户应收金额}
|
||||
reviewStatus: {type: string, enum: [APPROVED]}
|
||||
publicationStatus: {type: string, enum: [PUBLISHED]}
|
||||
publishedAt: {type: string, format: date-time}
|
||||
inboundedAt: {type: string, format: date-time, nullable: true}
|
||||
settlementIncluded: {type: boolean, example: true}
|
||||
InboundOrderPageEnvelope:
|
||||
type: object
|
||||
properties:
|
||||
|
||||
Reference in New Issue
Block a user