From d42e6815219dee7fa127ff68992115cb206d07ce Mon Sep 17 00:00:00 2001
From: q289089000 <289089000@qq.com>
Date: Wed, 14 Apr 2021 11:35:29 +0800
Subject: [PATCH] 4-14

---
 src/controller/orderdata/orderdata.gateway.ts | 2 +-
 src/controller/orders/orders.gateway.ts       | 7 ++++---
 src/controller/payment/payment.model.ts       | 8 +++++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/controller/orderdata/orderdata.gateway.ts b/src/controller/orderdata/orderdata.gateway.ts
index 9da1789..12e5a53 100644
--- a/src/controller/orderdata/orderdata.gateway.ts
+++ b/src/controller/orderdata/orderdata.gateway.ts
@@ -37,7 +37,7 @@ export class OrderDataGateway {
                 //遍历统计
                 orderList.map((i)=>{
                     totalOrder.box+=i.box;
-                    totalOrder.total+=(i.box*i.qty*i.price*i.discount);
+                    totalOrder.total+=Math.round(i.box*i.qty*i.price*i.discount);
                     totalOrder.size+=i.size;
                     totalOrder.weight+=i.weight;
                 })
diff --git a/src/controller/orders/orders.gateway.ts b/src/controller/orders/orders.gateway.ts
index 5ce9abf..8dcfb09 100644
--- a/src/controller/orders/orders.gateway.ts
+++ b/src/controller/orders/orders.gateway.ts
@@ -67,9 +67,7 @@ export class OrdersGateway {
                         result.data=_data
                         resolve(result)
                     })
-                    
-                }
-                
+                }   
         })
         })
 
@@ -84,6 +82,9 @@ export class OrdersGateway {
             result.ok=1;
             //判断当前用户等级
             this._Orders.Update(data).then(doc=>{
+                //发布更新
+                client.emit("freshOrder",doc)
+
                 console.log('UPD',doc)
                 result.msg='Upded Order'
                 result.data=doc;
diff --git a/src/controller/payment/payment.model.ts b/src/controller/payment/payment.model.ts
index d23255a..12ade9a 100644
--- a/src/controller/payment/payment.model.ts
+++ b/src/controller/payment/payment.model.ts
@@ -15,7 +15,13 @@ export class Payment extends Document  {
           default:Date.now
      })
      pay_date: Date;
-     
+
+     //金额变动类型 1 支付,2 调整. 调整金额 不统计 不显示在财务管理
+     @Prop({
+          default:1
+     })
+     pay_type:number;
+
      //关联订单
      @Prop({
           type:mSchame.Types.ObjectId,
-- 
GitLab