From 799467e58143c7eab66d3bfa88c70d61094b31f1 Mon Sep 17 00:00:00 2001
From: q289089000 <289089000@qq.com>
Date: Thu, 29 Apr 2021 00:22:43 +0800
Subject: [PATCH] 4-29

---
 src/controller/orderdata/orderdata.gateway.ts | 13 +----
 src/controller/orderdata/orderdata.service.ts |  6 ---
 src/controller/payment/payment.gateway.ts     | 48 ++++++++++++++-----
 src/controller/payment/payment.service.ts     |  8 +---
 4 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/src/controller/orderdata/orderdata.gateway.ts b/src/controller/orderdata/orderdata.gateway.ts
index 679ee7f..9a6286a 100644
--- a/src/controller/orderdata/orderdata.gateway.ts
+++ b/src/controller/orderdata/orderdata.gateway.ts
@@ -147,6 +147,7 @@ export class OrderDataGateway {
 
     @SubscribeMessage('OrderDataDel')
     Delete(client: Socket, data: any): Promise<ResultDTO> {
+        //判断当前用户等级
         return new Promise((resolve, reject)=>{
             console.log("删除",data);
             let result=new ResultDTO();
@@ -182,18 +183,6 @@ export class OrderDataGateway {
                 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)
-            // })
-            //判断当前用户等级
-            
         })
     }
     
diff --git a/src/controller/orderdata/orderdata.service.ts b/src/controller/orderdata/orderdata.service.ts
index 7322d24..9b925e8 100644
--- a/src/controller/orderdata/orderdata.service.ts
+++ b/src/controller/orderdata/orderdata.service.ts
@@ -47,14 +47,8 @@ export class OrderDataService {
 async Delete(_id:string):Promise<any>{
       try {
       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; }
-      //     return {ok: -1,module };
-      // });
   } catch (e) {
       console.log(e);
-      //return {ok: -1,module};
   }
 }
 
diff --git a/src/controller/payment/payment.gateway.ts b/src/controller/payment/payment.gateway.ts
index f414645..5390b05 100644
--- a/src/controller/payment/payment.gateway.ts
+++ b/src/controller/payment/payment.gateway.ts
@@ -18,7 +18,7 @@ export class PaymentGateway {
         console.log('payment gateway readed.');
     }
 
-    updateOrder(_id): Promise<Orders>{
+    reTotalOrder(_id): Promise<Orders>{
         return new Promise((resolve, reject) =>{
             this._payment.Get({"orders":_id}).then(payList=>{
                 let totalPayment=0;
@@ -84,7 +84,7 @@ export class PaymentGateway {
             let result=new ResultDTO();
             this._payment.Add(data).then(doc=>{
                 if(doc){
-                    this.updateOrder(doc.orders).then(order=>{
+                    this.reTotalOrder(doc.orders).then(order=>{
                         client.emit('freshOrder',order)
                     })
                     result.ok=1;
@@ -116,7 +116,7 @@ export class PaymentGateway {
             result.ok=1;
             //判断当前用户等级
             this._payment.Update(data).then(doc=>{
-                this.updateOrder(doc.orders).then(order=>{
+                this.reTotalOrder(doc.orders).then(order=>{
                     client.emit('freshOrder',order)
                 })
                 console.log('UPD',doc)
@@ -131,15 +131,41 @@ export class PaymentGateway {
     @SubscribeMessage('paymentDelete')
     Delete(client: Socket, data: any): Promise<ResultDTO> {
         return new Promise((resolve, reject)=>{
-        this._payment.Delete(data).then(ret=>{
-            this.updateOrder(ret.orders).then(order=>{
-                client.emit('freshOrder',order)
-            })
-        })
+
+            console.log("删除",data);
             let result=new ResultDTO();
-            result.ok=1;
-            //判断当前用户等级
-            resolve(result)
+            this._payment.GetOne({'_id':data}).then(doc=>{
+                console.log('查获',doc);
+                if(doc){
+                    this._payment.Delete(doc._id).then(ret=>{
+                        console.log('del ret',ret);
+                        if(ret.deletedCount>0){
+                            result.ok=1;
+                            result.msg=`已删除数据: ${ret.deletedCount}`;
+                            this.reTotalOrder(doc.orders).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)
+            })
         })
     }
     
diff --git a/src/controller/payment/payment.service.ts b/src/controller/payment/payment.service.ts
index ffe92ff..f2d8c85 100644
--- a/src/controller/payment/payment.service.ts
+++ b/src/controller/payment/payment.service.ts
@@ -48,15 +48,9 @@ export class PaymentService {
   //创建 Payment 
 async Delete(thePayment:Payment):Promise<any>{
       try {
-      return this._model.remove(thePayment)
-      // return await m.remove(data).then(result=> {
-      //     console.log('del ok',result.ok);
-      //     if(result.ok===1) { return result; }
-      //     return {ok: -1,module };
-      // });
+      return this._model.remove({'_id':thePayment._id})
   } catch (e) {
       console.log(e);
-      //return {ok: -1,module};
   }
 }
 
-- 
GitLab