From 3b2634cb37818406bca749b9d1084ffb77904d7b Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Thu, 18 Aug 2022 02:09:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AfterSaleOrder/AfterSaleOrderBusiness.cs | 22 +++++++++++++++++- BBWY.Server.Model/Db/Order/AfterSaleOrder.cs | 23 +++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs b/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs index 63dc51fc..689e4ecc 100644 --- a/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs +++ b/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs @@ -51,7 +51,11 @@ namespace BBWY.Server.Business Price = osku.Price.Value, AfterTotalCost = aso.AfterTotalCost, RefundAlipayOrderNo = aso.RefundAlipayOrderNo, - RefundMerchantOrderNo = aso.RefundMerchantOrderNo + RefundMerchantOrderNo = aso.RefundMerchantOrderNo, + PurchaseMethod = aso.PurchaseMethod, + PurchaseOrderId = aso.PurchaseOrderId, + PurchaseOrderPKId = aso.PurchaseOrderPKId, + PurchasePlatform = aso.PurchasePlatform }; } @@ -120,6 +124,11 @@ namespace BBWY.Server.Business dbAfterSaleOrder.StorageAmount = 0M; dbAfterSaleOrder.AfterTotalCost = 0M; + dbAfterSaleOrder.PurchaseMethod = null; + dbAfterSaleOrder.PurchasePlatform = null; + dbAfterSaleOrder.PurchaseOrderId = string.Empty; + dbAfterSaleOrder.PurchaseOrderPKId = null; + if (dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult.维修 || dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult.商品补发 || dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult.线下换新) @@ -168,6 +177,17 @@ namespace BBWY.Server.Business { dbAfterSaleOrder.RefundPurchaseAmount = 0M; } + else if (dbAfterSaleOrder.ProductHealth == Model.Enums.ProductHealth.厂家退货退款 && dbOrderCostDetail != null) + { + var po = fsql.Select(dbOrderCostDetail.PurchaseOrderPKId).ToOne(); + if (po != null) + { + dbAfterSaleOrder.PurchaseMethod = po.PurchaseMethod; + dbAfterSaleOrder.PurchasePlatform = po.PurchasePlatform; + dbAfterSaleOrder.PurchaseOrderId = po.PurchaseOrderId; + dbAfterSaleOrder.PurchaseOrderPKId = po.Id; + } + } dbAfterSaleOrder.AfterTotalCost = dbAfterSaleOrder.ReissueAfterSaleAmount.Value + dbAfterSaleOrder.ConsumableAmount.Value + diff --git a/BBWY.Server.Model/Db/Order/AfterSaleOrder.cs b/BBWY.Server.Model/Db/Order/AfterSaleOrder.cs index 7ebac0c9..df849951 100644 --- a/BBWY.Server.Model/Db/Order/AfterSaleOrder.cs +++ b/BBWY.Server.Model/Db/Order/AfterSaleOrder.cs @@ -150,6 +150,29 @@ namespace BBWY.Server.Model.Db /// [Column(StringLength = 100)] public string RefundAlipayOrderNo { get; set; } + + /// + /// 采购方式 + /// + [Column(DbType = "int(1)", MapType = typeof(int?))] + public Enums.PurchaseMethod? PurchaseMethod { get; set; } + + /// + /// 采购平台 + /// + [Column(DbType = "int(1)", MapType = (typeof(int?)))] + public Enums.Platform? PurchasePlatform { get; set; } + + /// + /// 采购单号 + /// + [Column(StringLength = 100)] + public string PurchaseOrderId { get; set; } + + /// + /// 采购单主键 + /// + public long? PurchaseOrderPKId { get; set; } } }