diff --git a/src/controller/orderdata/orderdata.gateway.ts b/src/controller/orderdata/orderdata.gateway.ts index c63cb03a3bd59bcccf146ce13707220c0510c183..679ee7f36a5a089b6b9227b0e745fd7d06b8d721 100644 --- a/src/controller/orderdata/orderdata.gateway.ts +++ b/src/controller/orderdata/orderdata.gateway.ts @@ -1,3 +1,4 @@ +import { OrderData } from './orderdata.model'; import { Orders } from './../orders/orders.model'; import { OrdersService } from './../orders/orders.service'; import { SubscribeMessage, WebSocketGateway } from '@nestjs/websockets'; @@ -147,10 +148,52 @@ export class OrderDataGateway { @SubscribeMessage('OrderDataDel') Delete(client: Socket, data: any): Promise { return new Promise((resolve, reject)=>{ + console.log("删除",data); let result=new ResultDTO(); - result.ok=1; + this._od.GetOne({'_id':data}).then(doc=>{ + console.log('查获',doc); + if(doc){ + this._od.Delete(doc._id).then(ret=>{ + console.log('del ret',ret); + if(ret.deletedCount>0){ + result.ok=1; + result.msg=`已删除数据: ${ret.deletedCount}`; + this.updateOrder(doc.order).then(order=>{ + client.emit('freshOrder',order) + }) + resolve(result); + }else{ + console.log("无可删除数据"); + result.ok=0; + result.msg="无可删除数据." + resolve(result); + } + + }) + }else{ + console.log("无可删除数据"); + result.ok=0; + result.msg="无可删除数据." + resolve(result); + } + + }).catch(error=>{ + result.ok=0; + result.msg=error.message; + reject(result) + }) + // let od:OrderData; + // od._id=data; + // console.log("删除o",od); + // let result=new ResultDTO(); + // result.ok=1; + // this._od.Delete(od).then(ret=>{ + // console.log("删除结果",ret); + // result.data=ret; + // resolve(result) + // }) //判断当前用户等级 - resolve(result) + }) } diff --git a/src/controller/orderdata/orderdata.service.ts b/src/controller/orderdata/orderdata.service.ts index 3c0869cebed942487082bbf73a76292648cec039..7322d24cfdaeea1dcdbab4c8711530e1e5d736ec 100644 --- a/src/controller/orderdata/orderdata.service.ts +++ b/src/controller/orderdata/orderdata.service.ts @@ -44,9 +44,9 @@ export class OrderDataService { } //创建 Orders -async Delete(theOrders:OrderData):Promise{ +async Delete(_id:string):Promise{ try { - return this._model.remove(theOrders) + return this._model.remove({'_id':_id}) // return await m.remove(data).then(result=> { // console.log('del ok',result.ok); // if(result.ok===1) { return result; }