div #69

Merged
longbot merged 3 commits from zhuotianyuan/API:div into stable 2026-01-29 03:52:49 +00:00
Collaborator
No description provided.
zhuotianyuan added 2 commits 2026-01-28 09:45:06 +00:00
be32eead2c feat(logistics): 添加courierCompany字段并更新相关逻辑
在ShipmentBookDTO和ShipmentFeeBookDTO中添加courierCompany字段
更新物流服务中shipCompany的赋值逻辑,优先使用courierCompany
59f4c46f08 fix(logistics): 修复运单状态判断和结果合并问题
修正运单状态判断逻辑,移除冗余的条件检查
修复freightwaves服务返回结果合并方式
zhuotianyuan added 1 commit 2026-01-28 12:15:31 +00:00
97ae006468 fix(logistics): 修复货运平台courierCompany字段处理逻辑
当courierCompany为"最优物流"时不再传递空字符串,而是不设置shipCompany字段
longbot requested changes 2026-01-29 02:00:16 +00:00
@ -735,3 +733,4 @@
}
if (data.shipmentPlatform === 'freightwaves') {
Collaborator

这个应该在前端处理!

这个应该在前端处理!
@ -834,9 +841,14 @@ export class LogisticsService {
})
const address = shipments?.address;
let courierCompany: string = "";
Collaborator

前端处理!

前端处理!
zhuotianyuan added 1 commit 2026-01-29 03:02:51 +00:00
f2f72f8c44 fix(logistics): 修改courierCompany验证规则并移除冗余逻辑
将logistics.dto.ts中的courierCompany验证规则从string()改为any()
移除logistics.service.ts中关于courierCompany的条件判断逻辑,直接使用原始值
zhuotianyuan force-pushed div from f2f72f8c44 to 4eeda35c2d 2026-01-29 03:36:34 +00:00 Compare
longbot merged commit 4eeda35c2d into stable 2026-01-29 03:52:49 +00:00
Sign in to join this conversation.
No reviewers
No Label
No Milestone
No project
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: yoone/API#69
No description provided.