删除订单详情

src/controller/orderDetail.controller.ts

@@ -1,89 +0,0 @@
-import {
-  Body,
-  Controller,
-  Del,
-  Get,
-  Inject,
-  Param,
-  Post,
-  Query,
-} from '@midwayjs/decorator';
-import { BaseController } from 'free-midway-component';
-import { OrderDetailService } from '../service/orderDetail.service';
-import {
-  CDTO_orderDetail,
-  CVO_orderDetail,
-  FVO_orderDetail,
-  QDTO_orderDetail,
-  QVO_orderDetail,
-  UDTO_orderDetail,
-  UVAO_orderDetail,
-} from '../interface/orderDetail.interface';
-import { ApiResponse, ApiTags, ApiQuery } from '@midwayjs/swagger';
-import { Validate } from '@midwayjs/validate';
-@ApiTags(['订单详情'])
-@Controller('/orderDetail')
-export class OrderDetailController extends BaseController {
-  @Inject()
-  service: OrderDetailService;
-
-  @Post('/')
-  @Validate()
-  @ApiResponse({ type: CVO_orderDetail })
-  async create(@Body() data: CDTO_orderDetail) {
-    const dbData = await this.service.create(data);
-    const result = new CVO_orderDetail(dbData);
-    return result;
-  }
-  @Get('/')
-  @ApiQuery({ name: 'query' })
-  @ApiResponse({ type: QVO_orderDetail })
-  async query(
-    @Query() filter: QDTO_orderDetail,
-    @Query('skip') skip: number,
-    @Query('limit') limit: number
-  ) {
-    const list = await this.service.query(filter, { skip, limit });
-    const data = [];
-    for (const i of list) {
-      const newData = new QVO_orderDetail(i);
-      data.push(newData);
-    }
-    const total = await this.service.count(filter);
-    return { data, total };
-  }
-
-  @Get('/:id')
-  @ApiResponse({ type: FVO_orderDetail })
-  async fetch(@Param('id') id: string) {
-    const data = await this.service.fetch(id);
-    const result = new FVO_orderDetail(data);
-    return result;
-  }
-
-  @Post('/:id')
-  @Validate()
-  @ApiResponse({ type: UVAO_orderDetail })
-  async update(@Param('id') id: string, @Body() body: UDTO_orderDetail) {
-    const result = await this.service.updateOne(id, body);
-    return result;
-  }
-
-  @Del('/:id')
-  @Validate()
-  async delete(@Param('id') id: string) {
-    await this.service.delete(id);
-    return 'ok';
-  }
-  async createMany(...args: any[]) {
-    throw new Error('Method not implemented.');
-  }
-
-  async updateMany(...args: any[]) {
-    throw new Error('Method not implemented.');
-  }
-
-  async deleteMany(...args: any[]) {
-    throw new Error('Method not implemented.');
-  }
-}

src/entity/orderDetail.entity.ts

@@ -1,26 +0,0 @@
-import { modelOptions, prop } from '@typegoose/typegoose';
-import { BaseModel } from 'free-midway-component';
-@modelOptions({
-  schemaOptions: { collection: 'orderDetail' },
-})
-export class OrderDetail extends BaseModel {
-  @prop({ required: false, index: true, zh: '总订单id', ref: 'order' })
-  no: string;
-  @prop({ required: false, index: false, zh: '来源名称' })
-  source_name: string;
-  @prop({ required: true, index: true, zh: '用户', ref: 'user' })
-  user: string;
-  @prop({ required: false, index: true, zh: '游客姓名' })
-  name: string;
-  @prop({ required: false, index: true, zh: '游客身份证' })
-  card: string;
-  @prop({ required: false, index: true, zh: '电话号' })
-  phone: string;
-  @prop({
-    required: false,
-    index: true,
-    zh: '状态',
-    remark: '字典表:order_status',
-  })
-  status: string;
-}

src/interface/orderDetail.interface.ts

@@ -1,113 +0,0 @@
-import { Rule, RuleType } from '@midwayjs/validate';
-import { ApiProperty } from '@midwayjs/swagger';
-import { SearchBase } from 'free-midway-component';
-import get = require('lodash/get');
-const dealVO = (cla, data) => {
-  for (const key in cla) {
-    const val = get(data, key);
-    if (val || val === 0) cla[key] = val;
-  }
-};
-export class FVO_orderDetail {
-  constructor(data: object) {
-    dealVO(this, data);
-  }
-  @ApiProperty({ description: '数据id' })
-  _id: string = undefined;
-  @ApiProperty({ description: '总订单id' })
-  'no': string = undefined;
-  @ApiProperty({ description: '来源名称' })
-  'source_name': string = undefined;
-  @ApiProperty({ description: '用户' })
-  'user': string = undefined;
-  @ApiProperty({ description: '游客姓名' })
-  'name': string = undefined;
-  @ApiProperty({ description: '游客身份证' })
-  'card': string = undefined;
-  @ApiProperty({ description: '电话号' })
-  'phone': string = undefined;
-  @ApiProperty({ description: '状态' })
-  'status': string = undefined;
-}
-
-export class QDTO_orderDetail extends SearchBase {
-  constructor() {
-    const like_prop = [];
-    const props = [
-      'no',
-      'source_name',
-      'user',
-      'name',
-      'card',
-      'phone',
-      'status',
-    ];
-    const mapping = [];
-    super({ like_prop, props, mapping });
-  }
-  @ApiProperty({ description: '总订单id' })
-  'no': string = undefined;
-  @ApiProperty({ description: '来源名称' })
-  'source_name': string = undefined;
-  @ApiProperty({ description: '用户' })
-  'user': string = undefined;
-  @ApiProperty({ description: '游客姓名' })
-  'name': string = undefined;
-  @ApiProperty({ description: '游客身份证' })
-  'card': string = undefined;
-  @ApiProperty({ description: '电话号' })
-  'phone': string = undefined;
-  @ApiProperty({ description: '状态' })
-  'status': string = undefined;
-}
-
-export class QVO_orderDetail extends FVO_orderDetail {
-  constructor(data: object) {
-    super(data);
-    dealVO(this, data);
-  }
-}
-
-export class CDTO_orderDetail {
-  @ApiProperty({ description: '总订单id' })
-  @Rule(RuleType['string']().empty(''))
-  'no': string = undefined;
-  @ApiProperty({ description: '来源名称' })
-  @Rule(RuleType['string']().empty(''))
-  'source_name': string = undefined;
-  @ApiProperty({ description: '用户' })
-  @Rule(RuleType['string']().empty(''))
-  'user': string = undefined;
-  @ApiProperty({ description: '游客姓名' })
-  @Rule(RuleType['string']().empty(''))
-  'name': string = undefined;
-  @ApiProperty({ description: '游客身份证' })
-  @Rule(RuleType['string']().empty(''))
-  'card': string = undefined;
-  @ApiProperty({ description: '电话号' })
-  @Rule(RuleType['string']().empty(''))
-  'phone': string = undefined;
-  @ApiProperty({ description: '状态' })
-  @Rule(RuleType['string']().empty(''))
-  'status': string = undefined;
-}
-
-export class CVO_orderDetail extends FVO_orderDetail {
-  constructor(data: object) {
-    super(data);
-    dealVO(this, data);
-  }
-}
-
-export class UDTO_orderDetail extends CDTO_orderDetail {
-  @ApiProperty({ description: '数据id' })
-  @Rule(RuleType['string']().empty(''))
-  _id: string = undefined;
-}
-
-export class UVAO_orderDetail extends FVO_orderDetail {
-  constructor(data: object) {
-    super(data);
-    dealVO(this, data);
-  }
-}

src/service/order.service.ts

@@ -3,7 +3,6 @@ import { InjectEntityModel } from '@midwayjs/typegoose';
 import { ReturnModelType } from '@typegoose/typegoose';
 import { BaseService } from 'free-midway-component';
 import { Order } from '../entity/order.entity';
-import { OrderDetail } from '../entity/orderDetail.entity';
 import { UserCoupon } from '../entity/userCoupon.entity';
 import _ = require('lodash');
 import { Hotel } from '../entity/hotel.entity';
@@ -14,9 +13,6 @@ export class OrderService extends BaseService<modelType> {
   @InjectEntityModel(Order)
   model: modelType;
 
-  @InjectEntityModel(OrderDetail)
-  oModel: ReturnModelType<typeof OrderDetail>;
-
   @InjectEntityModel(UserCoupon)
   uModel: ReturnModelType<typeof UserCoupon>;
 
@@ -28,8 +24,7 @@ export class OrderService extends BaseService<modelType> {
 
   // 创建总订单后
   async createAfter(data) {
-    const { _id, user, source, type, source_name, identity, discount, status } =
-      data;
+    const { source, type, identity, discount } = data;
     // 如果使用优惠券 需要修改优惠券状态
     if (discount) {
       const UserCoupon = await this.uModel.findById(discount);
@@ -54,18 +49,5 @@ export class OrderService extends BaseService<modelType> {
           );
       }
     }
-    // 每个人分配一个详情订单
-    for (const val of identity) {
-      const data = {
-        no: _id,
-        user,
-        source_name,
-        name: val.name,
-        card: val.card,
-        phone: val.phone,
-        status,
-      };
-      await this.oModel.create(data);
-    }
   }
 }

src/service/orderDetail.service.ts

@@ -1,11 +0,0 @@
-import { Provide } from '@midwayjs/decorator';
-import { InjectEntityModel } from '@midwayjs/typegoose';
-import { ReturnModelType } from '@typegoose/typegoose';
-import { BaseService } from 'free-midway-component';
-import { OrderDetail } from '../entity/orderDetail.entity';
-type modelType = ReturnModelType<typeof OrderDetail>;
-@Provide()
-export class OrderDetailService extends BaseService<modelType> {
-  @InjectEntityModel(OrderDetail)
-  model: modelType;
-}