diff --git a/src/config/config.default.ts b/src/config/config.default.ts index ac5f89a..2a37fd0 100644 --- a/src/config/config.default.ts +++ b/src/config/config.default.ts @@ -42,7 +42,7 @@ import DictSeeder from '../db/seeds/dict.seeder'; import CategorySeeder from '../db/seeds/category.seeder'; import CategoryAttributeSeeder from '../db/seeds/category_attribute.seeder'; import { SiteSku } from '../entity/site-sku.entity'; -import { logisticsAlias } from '../entity/logistics_alias.emtity'; +import { logisticsAlias } from '../entity/logistics_alias.entity'; export default { // use for cookie sign key, should change to your own and keep security diff --git a/src/entity/logistics_alias.emtity.ts b/src/entity/logistics_alias.emtity.ts deleted file mode 100644 index 3a217d6..0000000 --- a/src/entity/logistics_alias.emtity.ts +++ /dev/null @@ -1,34 +0,0 @@ - -import { ApiProperty } from '@midwayjs/swagger'; -import { Entity,CreateDateColumn,UpdateDateColumn, PrimaryGeneratedColumn, Column } from 'typeorm'; - -@Entity('logistics_alias') -export class logisticsAlias { - @PrimaryGeneratedColumn() - id: number; - - @ApiProperty({ type: 'string' }) - @Column() - logistics_company:string - - @ApiProperty({ type: 'string' }) - @Column() - logistics_alias:string - - @ApiProperty({ type: 'string' }) - @Column() - platform:string - - - // 是否可删除 - @Column({ default: true, comment: '是否可删除' }) - deletable: boolean; - // 创建时间 - @CreateDateColumn() - createdAt: Date; - - // 更新时间 - @UpdateDateColumn() - updatedAt: Date; - -} \ No newline at end of file diff --git a/src/entity/logistics_alias.entity.ts b/src/entity/logistics_alias.entity.ts new file mode 100644 index 0000000..bf2c475 --- /dev/null +++ b/src/entity/logistics_alias.entity.ts @@ -0,0 +1,34 @@ + +import { ApiProperty } from '@midwayjs/swagger'; +import { Entity, CreateDateColumn, UpdateDateColumn, PrimaryGeneratedColumn, Column } from 'typeorm'; + +@Entity('logistics_alias') +export class logisticsAlias { + @PrimaryGeneratedColumn() + id: number; + + @ApiProperty({ type: 'string' }) + @Column() + logistics_company: string + + @ApiProperty({ type: 'string' }) + @Column() + logistics_alias: string + + @ApiProperty({ type: 'string' }) + @Column() + platform: string + + + // 是否可删除 + @Column({ default: true, comment: '是否可删除' }) + deletable: boolean; + // 创建时间 + @CreateDateColumn() + createdAt: Date; + + // 更新时间 + @UpdateDateColumn() + updatedAt: Date; + +} \ No newline at end of file diff --git a/src/service/order.service.ts b/src/service/order.service.ts index 2e5efe3..4196090 100644 --- a/src/service/order.service.ts +++ b/src/service/order.service.ts @@ -42,7 +42,7 @@ import { UnifiedOrderDTO } from '../dto/site-api.dto'; import { CustomerService } from './customer.service'; import { ProductService } from './product.service'; import { Site } from '../entity/site.entity'; -import { logisticsAlias } from '../entity/logistics_alias.emtity'; +import { logisticsAlias } from '../entity/logistics_alias.entity'; @Provide() export class OrderService {