pengcong001
/
bbwy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1

qianyi
shanji 3 years ago
parent
d617553ff0
commit
441ffc8f2d
7 changed files with 102 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 45
      BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs
  2. 12
      BBWY.Server.Business/Order/OrderBusiness.cs
  3. 30
      BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
  4. 12
      BBWY.Server.Business/Sync/OrderSyncBusiness.cs
  5. 8
      BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrder.cs
  6. 23
      BBWY.Server.Model/Dto/Request/PurchaseOrder/AddPurchaseOrderRequest.cs
  7. 16
      BBWY.Server.Model/Dto/Request/PurchaseOrder/EditPurchaseOrderRequest.cs

45
BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs
View File

@ -105,6 +105,7 @@ namespace BBWY.Server.Business
var dbOrderCostDetail = fsql.Select<OrderCostDetail>().Where(ocd => ocd.OrderId == editAfterSaleOrderRequest.OrderId && var dbOrderCostDetail = fsql.Select<OrderCostDetail>().Where(ocd => ocd.OrderId == editAfterSaleOrderRequest.OrderId &&
ocd.SkuId == dbAfterSaleOrder.SkuId && ocd.SkuId == dbAfterSaleOrder.SkuId &&
ocd.IsEnabled == true).ToOne(); ocd.IsEnabled == true).ToOne();
var dbPurchaseOrder = fsql.Select<PurchaseOrder>(dbOrderCostDetail.PurchaseOrderPKId).ToOne();
var dbOrderCost = fsql.Select<OrderCost>(editAfterSaleOrderRequest.OrderId).ToOne(); var dbOrderCost = fsql.Select<OrderCost>(editAfterSaleOrderRequest.OrderId).ToOne();
#region 更新当前服务单属性 #region 更新当前服务单属性
@ -151,20 +152,24 @@ namespace BBWY.Server.Business
dbAfterSaleOrder.ReissueProductAmount = dbOrderCostDetail.SkuAmount; dbAfterSaleOrder.ReissueProductAmount = dbOrderCostDetail.SkuAmount;
dbAfterSaleOrder.ReissueFreight = dbOrderCostDetail.PurchaseFreight; dbAfterSaleOrder.ReissueFreight = dbOrderCostDetail.PurchaseFreight;
dbAfterSaleOrder.StorageAmount = dbOrderCostDetail.StorageAmount; dbAfterSaleOrder.StorageAmount = dbOrderCostDetail.StorageAmount;
if (dbOrder.StorageType == Model.Enums.StorageType.云仓) dbAfterSaleOrder.InStorageAmount = dbOrderCostDetail.InStorageAmount;
{ dbAfterSaleOrder.OutStorageAmount = dbOrderCostDetail.OutStorageAmount;
dbAfterSaleOrder.InStorageAmount = 0.2M * dbOrderCostDetail.DeductionQuantity;
dbAfterSaleOrder.OutStorageAmount = 0.9M * dbOrderCostDetail.DeductionQuantity; //if (dbOrder.StorageType == Model.Enums.StorageType.云仓)
} //{
else if (dbOrder.StorageType == Model.Enums.StorageType.京仓) // dbAfterSaleOrder.InStorageAmount = 0.2M * dbOrderCostDetail.DeductionQuantity;
{ // dbAfterSaleOrder.OutStorageAmount = 0.9M * dbOrderCostDetail.DeductionQuantity;
dbAfterSaleOrder.InStorageAmount = 1.4M * dbOrderCostDetail.DeductionQuantity; //0.2 //}
dbAfterSaleOrder.OutStorageAmount = 1.4M * dbOrderCostDetail.DeductionQuantity; //2.8 //else if (dbOrder.StorageType == Model.Enums.StorageType.京仓)
} //{
// dbAfterSaleOrder.InStorageAmount = 1.4M * dbOrderCostDetail.DeductionQuantity; //0.2
// dbAfterSaleOrder.OutStorageAmount = 1.4M * dbOrderCostDetail.DeductionQuantity; //2.8
//}
} }
if (dbAfterSaleOrder.ProductResult == Model.Enums.ProductResult.退回云仓 || dbAfterSaleOrder.ProductResult == Model.Enums.ProductResult.退回京仓) if ((dbAfterSaleOrder.ProductResult == Model.Enums.ProductResult.退回云仓 || dbAfterSaleOrder.ProductResult == Model.Enums.ProductResult.退回京仓) &&
dbAfterSaleOrder.RefundInStorageAmount = 1M; dbOrderCostDetail != null && dbPurchaseOrder != null)
dbAfterSaleOrder.RefundInStorageAmount = dbPurchaseOrder.SingleRefundInStorageAmount * dbOrderCostDetail.DeductionQuantity;
if (dbAfterSaleOrder.ProductHealth == Model.Enums.ProductHealth.可二次销售) if (dbAfterSaleOrder.ProductHealth == Model.Enums.ProductHealth.可二次销售)
{ {
@ -177,16 +182,14 @@ namespace BBWY.Server.Business
{ {
dbAfterSaleOrder.RefundPurchaseAmount = 0M; dbAfterSaleOrder.RefundPurchaseAmount = 0M;
} }
else if (dbAfterSaleOrder.ProductHealth == Model.Enums.ProductHealth.厂家退货退款 && dbOrderCostDetail != null) else if (dbAfterSaleOrder.ProductHealth == Model.Enums.ProductHealth.厂家退货退款 &&
dbOrderCostDetail != null &&
dbPurchaseOrder != null)
{ {
var po = fsql.Select<PurchaseOrder>(dbOrderCostDetail.PurchaseOrderPKId).ToOne(); dbAfterSaleOrder.PurchaseMethod = dbPurchaseOrder.PurchaseMethod;
if (po != null) dbAfterSaleOrder.PurchasePlatform = dbPurchaseOrder.PurchasePlatform;
{ dbAfterSaleOrder.PurchaseOrderId = dbPurchaseOrder.PurchaseOrderId;
dbAfterSaleOrder.PurchaseMethod = po.PurchaseMethod; dbAfterSaleOrder.PurchaseOrderPKId = dbPurchaseOrder.Id;
dbAfterSaleOrder.PurchasePlatform = po.PurchasePlatform;
dbAfterSaleOrder.PurchaseOrderId = po.PurchaseOrderId;
dbAfterSaleOrder.PurchaseOrderPKId = po.Id;
}
} }
dbAfterSaleOrder.AfterTotalCost = dbAfterSaleOrder.ReissueAfterSaleAmount.Value + dbAfterSaleOrder.AfterTotalCost = dbAfterSaleOrder.ReissueAfterSaleAmount.Value +

12
BBWY.Server.Business/Order/OrderBusiness.cs
View File

@ -532,7 +532,9 @@ namespace BBWY.Server.Business
TotalCost = currentPurchaseAmount, TotalCost = currentPurchaseAmount,
ConsumableAmount = purchaseOrder.SingleConsumableAmount * deductionQuantity, ConsumableAmount = purchaseOrder.SingleConsumableAmount * deductionQuantity,
FirstFreight = purchaseOrder.SingleFirstFreight * deductionQuantity, FirstFreight = purchaseOrder.SingleFirstFreight * deductionQuantity,
OperationAmount = purchaseOrder.SingleOperationAmount * deductionQuantity, InStorageAmount = purchaseOrder.SingleInStorageAmount * deductionQuantity,
OutStorageAmount = purchaseOrder.SingleOutStorageAmount * deductionQuantity,
//OperationAmount = purchaseOrder.SingleOperationAmount * deductionQuantity,
PurchaseFreight = purchaseOrder.SingleFreight * deductionQuantity, PurchaseFreight = purchaseOrder.SingleFreight * deductionQuantity,
SkuAmount = purchaseOrder.SingleSkuAmount * deductionQuantity, SkuAmount = purchaseOrder.SingleSkuAmount * deductionQuantity,
StorageAmount = purchaseOrder.SingleStorageAmount * deductionQuantity StorageAmount = purchaseOrder.SingleStorageAmount * deductionQuantity
@ -823,7 +825,9 @@ namespace BBWY.Server.Business
SingleConsumableAmount = 0, SingleConsumableAmount = 0,
SingleFirstFreight = 0, SingleFirstFreight = 0,
SingleFreight = odsRequest.PurchaseFreight / odsRequest.RelationPurchaseOrderSkuList.Count() / relationOrderSku.Quantity, SingleFreight = odsRequest.PurchaseFreight / odsRequest.RelationPurchaseOrderSkuList.Count() / relationOrderSku.Quantity,
SingleOperationAmount = 0, //SingleOperationAmount = 0,
SingleInStorageAmount = 0,
SingleOutStorageAmount = 0,
SingleStorageAmount = 0, SingleStorageAmount = 0,
SingleSkuAmount = relationOrderSku.SingleSkuAmount, SingleSkuAmount = relationOrderSku.SingleSkuAmount,
SingleDeliveryFreight = 0 SingleDeliveryFreight = 0
@ -840,7 +844,9 @@ namespace BBWY.Server.Business
DeductionQuantity = relationOrderSku.Quantity, DeductionQuantity = relationOrderSku.Quantity,
DeliveryExpressFreight = 0, DeliveryExpressFreight = 0,
FirstFreight = 0, FirstFreight = 0,
OperationAmount = 0, //OperationAmount = 0,
InStorageAmount = 0,
OutStorageAmount = 0,
OrderId = dbOrder.Id, OrderId = dbOrder.Id,
ProductId = relationOrderSku.ProductId, ProductId = relationOrderSku.ProductId,
PurchaseFreight = odsRequest.PurchaseFreight / odsRequest.RelationPurchaseOrderSkuList.Count(), PurchaseFreight = odsRequest.PurchaseFreight / odsRequest.RelationPurchaseOrderSkuList.Count(),

30
BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
View File

@ -65,6 +65,25 @@ namespace BBWY.Server.Business
var purchaseOrder = addPurchaseOrderRequest.Map<PurchaseOrder>(); var purchaseOrder = addPurchaseOrderRequest.Map<PurchaseOrder>();
purchaseOrder.Id = idGenerator.NewLong(); purchaseOrder.Id = idGenerator.NewLong();
purchaseOrder.CreateTime = DateTime.Now; purchaseOrder.CreateTime = DateTime.Now;
if (purchaseOrder.StorageType == Enums.StorageType.京仓)
{
if (purchaseOrder.SingleInStorageAmount == 0M)
purchaseOrder.SingleInStorageAmount = 0.2M;
if (purchaseOrder.SingleOutStorageAmount == 0M)
purchaseOrder.SingleOutStorageAmount = 2.8M;
if (purchaseOrder.SingleRefundInStorageAmount == 0M)
purchaseOrder.SingleRefundInStorageAmount = 2.8M;
}
if (purchaseOrder.StorageType == Enums.StorageType.云仓)
{
if (purchaseOrder.SingleInStorageAmount == 0M)
purchaseOrder.SingleInStorageAmount = 0.2M;
if (purchaseOrder.SingleOutStorageAmount == 0M)
purchaseOrder.SingleOutStorageAmount = 0.9M;
if (purchaseOrder.SingleRefundInStorageAmount == 0M)
purchaseOrder.SingleRefundInStorageAmount = 1M;
}
fsql.Insert(purchaseOrder).ExecuteAffrows(); fsql.Insert(purchaseOrder).ExecuteAffrows();
} }
@ -75,7 +94,8 @@ namespace BBWY.Server.Business
.Set(po => po.SingleSkuAmount, editPurchaseOrderRequest.SingleSkuAmount) .Set(po => po.SingleSkuAmount, editPurchaseOrderRequest.SingleSkuAmount)
.Set(po => po.SingleFreight, editPurchaseOrderRequest.SingleFreight) .Set(po => po.SingleFreight, editPurchaseOrderRequest.SingleFreight)
.Set(po => po.SingleFirstFreight, editPurchaseOrderRequest.SingleFirstFreight) .Set(po => po.SingleFirstFreight, editPurchaseOrderRequest.SingleFirstFreight)
.Set(po => po.SingleOperationAmount, editPurchaseOrderRequest.SingleOperationAmount) .Set(po => po.SingleInStorageAmount, editPurchaseOrderRequest.SingleInStorageAmount)
.Set(po => po.SingleOutStorageAmount, editPurchaseOrderRequest.SingleOutStorageAmount)
.Set(po => po.SingleConsumableAmount, editPurchaseOrderRequest.SingleConsumableAmount) .Set(po => po.SingleConsumableAmount, editPurchaseOrderRequest.SingleConsumableAmount)
.Set(po => po.SingleStorageAmount, editPurchaseOrderRequest.SingleStorageAmount) .Set(po => po.SingleStorageAmount, editPurchaseOrderRequest.SingleStorageAmount)
.Set(po => po.SingleDeliveryFreight, editPurchaseOrderRequest.SingleDeliveryFreight) .Set(po => po.SingleDeliveryFreight, editPurchaseOrderRequest.SingleDeliveryFreight)
@ -188,7 +208,9 @@ namespace BBWY.Server.Business
SingleDeliveryFreight = 0, SingleDeliveryFreight = 0,
SingleFirstFreight = 0, SingleFirstFreight = 0,
SingleStorageAmount = 0, SingleStorageAmount = 0,
SingleOperationAmount = 0, //SingleOperationAmount = 0,
SingleOutStorageAmount = 0,
SingleInStorageAmount = 0,
SingleSkuAmount = currentOrderSkuProductAmount / orderSku.ItemTotal.Value, SingleSkuAmount = currentOrderSkuProductAmount / orderSku.ItemTotal.Value,
SingleFreight = currentOrderSkuFreightAmount / orderSku.ItemTotal.Value, SingleFreight = currentOrderSkuFreightAmount / orderSku.ItemTotal.Value,
StorageType = Enums.StorageType.代发, StorageType = Enums.StorageType.代发,
@ -217,7 +239,9 @@ namespace BBWY.Server.Business
DeductionQuantity = orderSku.ItemTotal.Value, DeductionQuantity = orderSku.ItemTotal.Value,
DeliveryExpressFreight = 0, DeliveryExpressFreight = 0,
FirstFreight = 0, FirstFreight = 0,
OperationAmount = 0, //OperationAmount = 0,
InStorageAmount = 0,
OutStorageAmount = 0,
OrderId = createOnlinePurchaseOrderRequest.OrderId, OrderId = createOnlinePurchaseOrderRequest.OrderId,
ProductId = orderSku.ProductId, ProductId = orderSku.ProductId,
PurchaseFreight = currentOrderSkuFreightAmount, PurchaseFreight = currentOrderSkuFreightAmount,

12
BBWY.Server.Business/Sync/OrderSyncBusiness.cs
View File

@ -29,11 +29,11 @@ namespace BBWY.Server.Business
IIdGenerator idGenerator, IIdGenerator idGenerator,
TaskSchedulerManager taskSchedulerManager, TaskSchedulerManager taskSchedulerManager,
VenderBusiness venderBusiness) : base(restApiService, VenderBusiness venderBusiness) : base(restApiService,
options, options,
logger, logger,
fsql, fsql,
idGenerator, idGenerator,
taskSchedulerManager, taskSchedulerManager,
venderBusiness) venderBusiness)
{ {
syncOrderMethodDic = new Dictionary<Enums.Platform, Action<JArray, long, string, string, string, string, decimal>>() syncOrderMethodDic = new Dictionary<Enums.Platform, Action<JArray, long, string, string, string, string, decimal>>()
@ -468,7 +468,9 @@ namespace BBWY.Server.Business
TotalCost = currentPurchaseAmount, TotalCost = currentPurchaseAmount,
ConsumableAmount = purchaseOrder.SingleConsumableAmount * deductionQuantity, ConsumableAmount = purchaseOrder.SingleConsumableAmount * deductionQuantity,
FirstFreight = purchaseOrder.SingleFirstFreight * deductionQuantity, FirstFreight = purchaseOrder.SingleFirstFreight * deductionQuantity,
OperationAmount = purchaseOrder.SingleOperationAmount * deductionQuantity, //OperationAmount = purchaseOrder.SingleOperationAmount * deductionQuantity,
InStorageAmount = purchaseOrder.SingleInStorageAmount * deductionQuantity,
OutStorageAmount = purchaseOrder.SingleOutStorageAmount * deductionQuantity,
PurchaseFreight = purchaseOrder.SingleFreight * deductionQuantity, PurchaseFreight = purchaseOrder.SingleFreight * deductionQuantity,
SkuAmount = purchaseOrder.SingleSkuAmount * deductionQuantity, SkuAmount = purchaseOrder.SingleSkuAmount * deductionQuantity,
StorageAmount = purchaseOrder.SingleStorageAmount * deductionQuantity StorageAmount = purchaseOrder.SingleStorageAmount * deductionQuantity

8
BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrder.cs
View File

@ -124,6 +124,12 @@ namespace BBWY.Server.Model.Db
[Column(DbType = "decimal(20,2)")] [Column(DbType = "decimal(20,2)")]
public decimal SingleOutStorageAmount { get; set; } = 0.00M; public decimal SingleOutStorageAmount { get; set; } = 0.00M;
/// <summary>
/// 退货入仓操作费
/// </summary>
[Column(DbType = "decimal(20,2)")]
public decimal SingleRefundInStorageAmount { get; set; } = 0.00M;
/// <summary> /// <summary>
/// 单件耗材费 /// 单件耗材费
/// </summary> /// </summary>
@ -151,7 +157,7 @@ namespace BBWY.Server.Model.Db
{ {
get get
{ {
return SingleSkuAmount + SingleFreight + SingleFirstFreight + SingleOperationAmount + SingleConsumableAmount + SingleStorageAmount; return SingleSkuAmount + SingleFreight + SingleFirstFreight + SingleInStorageAmount + SingleOutStorageAmount + SingleConsumableAmount + SingleStorageAmount;
} }
} }
} }

23
BBWY.Server.Model/Dto/Request/PurchaseOrder/AddPurchaseOrderRequest.cs
View File

@ -4,7 +4,7 @@
{ {
public long ShopId { get; set; } public long ShopId { get; set; }
public string ProductId { get; set; } public string ProductId { get; set; }
/// <summary> /// <summary>
@ -55,11 +55,6 @@
/// </summary> /// </summary>
public decimal SingleFirstFreight { get; set; } public decimal SingleFirstFreight { get; set; }
/// <summary>
/// 单件操作费
/// </summary>
public decimal SingleOperationAmount { get; set; } = 0.00M;
/// <summary> /// <summary>
/// 单件耗材费 /// 单件耗材费
/// </summary> /// </summary>
@ -74,5 +69,21 @@
/// 单件销售运费(不参与均价计算) /// 单件销售运费(不参与均价计算)
/// </summary> /// </summary>
public decimal SingleDeliveryFreight { get; set; } public decimal SingleDeliveryFreight { get; set; }
/// <summary>
/// 单件入仓操作费
/// </summary>
public decimal SingleInStorageAmount { get; set; } = 0.00M;
/// <summary>
/// 单件出仓操作费
/// </summary>
public decimal SingleOutStorageAmount { get; set; } = 0.00M;
/// <summary>
/// 退货入仓操作费
/// </summary>
public decimal SingleRefundInStorageAmount { get; set; } = 0.00M;
} }
} }

16
BBWY.Server.Model/Dto/Request/PurchaseOrder/EditPurchaseOrderRequest.cs
View File

@ -29,11 +29,6 @@
/// </summary> /// </summary>
public decimal SingleFirstFreight { get; set; } = 0.00M; public decimal SingleFirstFreight { get; set; } = 0.00M;
/// <summary>
/// 单件操作费
/// </summary>
public decimal SingleOperationAmount { get; set; } = 0.00M;
/// <summary> /// <summary>
/// 单件耗材费 /// 单件耗材费
/// </summary> /// </summary>
@ -48,5 +43,16 @@
/// 单件销售运费(不参与均价计算) /// 单件销售运费(不参与均价计算)
/// </summary> /// </summary>
public decimal SingleDeliveryFreight { get; set; } = 0.00M; public decimal SingleDeliveryFreight { get; set; } = 0.00M;
/// <summary>
/// 单件入仓操作费
/// </summary>
public decimal SingleInStorageAmount { get; set; } = 0.00M;
/// <summary>
/// 单件出仓操作费
/// </summary>
public decimal SingleOutStorageAmount { get; set; } = 0.00M;
} }
} }
Write Preview
Loading…
Cancel
Save