Compare commits

..

4 Commits

Author SHA1 Message Date
zhuotianyuan f2f72f8c44 fix(logistics): 修改courierCompany验证规则并移除冗余逻辑
将logistics.dto.ts中的courierCompany验证规则从string()改为any()
移除logistics.service.ts中关于courierCompany的条件判断逻辑,直接使用原始值
2026-01-29 11:01:32 +08:00
zhuotianyuan 97ae006468 fix(logistics): 修复货运平台courierCompany字段处理逻辑
当courierCompany为"最优物流"时不再传递空字符串,而是不设置shipCompany字段
2026-01-28 20:06:11 +08:00
zhuotianyuan 59f4c46f08 fix(logistics): 修复运单状态判断和结果合并问题
修正运单状态判断逻辑,移除冗余的条件检查
修复freightwaves服务返回结果合并方式
2026-01-28 17:43:57 +08:00
zhuotianyuan be32eead2c feat(logistics): 添加courierCompany字段并更新相关逻辑
在ShipmentBookDTO和ShipmentFeeBookDTO中添加courierCompany字段
更新物流服务中shipCompany的赋值逻辑,优先使用courierCompany
2026-01-27 19:55:43 +08:00
2 changed files with 0 additions and 9 deletions

View File

@ -27,9 +27,6 @@ export class QueryCustomerListDTO {
@ApiProperty() @ApiProperty()
customerId: number; customerId: number;
@ApiProperty()
phone: string;
} }
export class CustomerTagDTO { export class CustomerTagDTO {

View File

@ -28,17 +28,11 @@ export class CustomerService {
first_purchase_date, first_purchase_date,
customerId, customerId,
rate, rate,
phone,
} = param; } = param;
const whereConds: string[] = []; const whereConds: string[] = [];
const havingConds: string[] = []; const havingConds: string[] = [];
// phone过滤
if (phone) {
whereConds.push(`o.billing LIKE '%${phone}%'`)
}
// 邮箱搜索 // 邮箱搜索
if (email) { if (email) {
whereConds.push(`o.customer_email LIKE '%${email}%'`); whereConds.push(`o.customer_email LIKE '%${email}%'`);