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

1

qianyi
shanji 3 years ago
parent
23ad95f638
commit
962275680f
6 changed files with 91 additions and 60 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      BBWY.Client/Models/Enums.cs
  2. 44
      BBWY.Client/Models/Order/Order.cs
  3. 44
      BBWY.Client/ViewModels/Order/OrderListViewModel.cs
  4. 2
      BBWY.Client/Views/Order/OrderList.xaml
  5. 6
      BBWY.Server.Business/Order/OrderBusiness.cs
  6. 27
      BBWY.Server.Model/Enums.cs

28
BBWY.Client/Models/Enums.cs
View File

@ -152,14 +152,17 @@
}
/// <summary>
/// 服务单处理方式
/// 服务单处理结果
/// </summary>
public enum ServiceResult
{
退货 = 0,
换新 = 1,
原返 = 2,
线下换新 = 3
线下换新 = 3,
维修 = 4,
商品补发 = 5,
仅退款 = 6
}
/// <summary>
@ -167,9 +170,22 @@
/// </summary>
public enum ProductResult
{
退款退货 = 0,
商品入库 = 1,
报损 = 2,
换新 = 3
一件代发_退回厂家 = 0,
退回齐越仓 = 1,
退回京仓 = 2,
退回云仓 = 3,
客户无退货 = 4
}
/// <summary>
/// 商品情况
/// </summary>
public enum ProductHealth
{
可二次销售 = 0,
残次品_无法二次销售 = 1,
厂家退货退款 = 2,
客户无退货 = 3,
破损 = 4
}
}

44
BBWY.Client/Models/Order/Order.cs
View File

@ -196,14 +196,14 @@ namespace BBWY.Client.Models
/// </summary>
public IList<OrderDropShipping> OrderDropShippingList { get; set; }
/// <summary>
/*/// <summary>
/// 售后信息
/// </summary>
public List<AfterSaleOrder> AfterSaleOrderList { get; set; }
/// </summary>*/
//public List<AfterSaleOrder> AfterSaleOrderList { get; set; }
public void LocalConvert()
{
ConvertAfterSaleOrderSku();
//ConvertAfterSaleOrderSku();
ConvertOrderCostDetailToGroup();
}
@ -223,26 +223,28 @@ namespace BBWY.Client.Models
}
}
/*
/// <summary>
/// 处理售后集合，如果Sku没有售后，则赋值一个空对象进行占位，保持售后信息和Sku对位
/// </summary>
private void ConvertAfterSaleOrderSku()
{
if (!IsAfterSaleOrder || AfterSaleOrderList == null || AfterSaleOrderList.Count() == 0 || (ItemList.Count() == AfterSaleOrderList.Count()))
return;
var asoList = new List<AfterSaleOrder>();
asoList.AddRange(AfterSaleOrderList);
AfterSaleOrderList.Clear();
foreach (var sku in ItemList)
{
var afterSaleOrderSku = asoList.FirstOrDefault(aso => aso.SkuId == sku.Id);
if (afterSaleOrderSku == null)
afterSaleOrderSku = new AfterSaleOrder() { IsPlaceholder = true };
AfterSaleOrderList.Add(afterSaleOrderSku);
}
asoList.Clear();
}
*/
//private void ConvertAfterSaleOrderSku()
//{
// if (!IsAfterSaleOrder || AfterSaleOrderList == null || AfterSaleOrderList.Count() == 0 || (ItemList.Count() == AfterSaleOrderList.Count()))
// return;
// var asoList = new List<AfterSaleOrder>();
// asoList.AddRange(AfterSaleOrderList);
// AfterSaleOrderList.Clear();
// foreach (var sku in ItemList)
// {
// var afterSaleOrderSku = asoList.FirstOrDefault(aso => aso.SkuId == sku.Id);
// if (afterSaleOrderSku == null)
// afterSaleOrderSku = new AfterSaleOrder() { IsPlaceholder = true };
// AfterSaleOrderList.Add(afterSaleOrderSku);
// }
// asoList.Clear();
//}
}
public class OrderList

44
BBWY.Client/ViewModels/Order/OrderListViewModel.cs
View File

@ -743,28 +743,28 @@ namespace BBWY.Client.ViewModels
private void EditAfterSaleOrder(object param)
{
var paramList = (object[])param;
var orderId = paramList[0].ToString();
var skuId = paramList[1].ToString();
var order = OrderList.FirstOrDefault(o => o.Id == orderId);
var sku = order.ItemList.FirstOrDefault(s => s.Id == skuId);
var afterSaleOrderSku = order.AfterSaleOrderList.FirstOrDefault(aso => aso.OrderId == orderId && aso.SkuId == skuId);
if (afterSaleOrderSku == null)
{
afterSaleOrderSku = new AfterSaleOrder()
{
Id = 0,
SkuId = skuId,
OrderId = orderId,
ProductId = sku.ProductId,
ShopId = globalContext.User.Shop.ShopId
};
}
var editAfterSaleOrderSku = new EditAfterSaleOrderSku(afterSaleOrderSku);
editAfterSaleOrderSku.Closed += EditAfterSaleOrderSku_Closed;
editAfterSaleOrderSku.ShowDialog();
//var paramList = (object[])param;
//var orderId = paramList[0].ToString();
//var skuId = paramList[1].ToString();
//var order = OrderList.FirstOrDefault(o => o.Id == orderId);
//var sku = order.ItemList.FirstOrDefault(s => s.Id == skuId);
//var afterSaleOrderSku = order.AfterSaleOrderList.FirstOrDefault(aso => aso.OrderId == orderId && aso.SkuId == skuId);
//if (afterSaleOrderSku == null)
//{
// afterSaleOrderSku = new AfterSaleOrder()
// {
// Id = 0,
// SkuId = skuId,
// OrderId = orderId,
// ProductId = sku.ProductId,
// ShopId = globalContext.User.Shop.ShopId
// };
//}
//var editAfterSaleOrderSku = new EditAfterSaleOrderSku(afterSaleOrderSku);
//editAfterSaleOrderSku.Closed += EditAfterSaleOrderSku_Closed;
//editAfterSaleOrderSku.ShowDialog();
}
private void EditAfterSaleOrderSku_Closed(object sender, EventArgs e)

2
BBWY.Client/Views/Order/OrderList.xaml
View File

@ -143,7 +143,7 @@
<c:BButton Content="近3天" Width="50" Height="25" Margin="5,0,0,0"
Command="{Binding SetSearchDateCommand}"
CommandParameter="{StaticResource d3}"/>
<c:BButton Content="近7天" Width="50" Height="25" Margin="5,0,0,0"
<c:BButton Content="近7天" Width="50" Height="24" Margin="5,0,0,0"
Command="{Binding SetSearchDateCommand}"
CommandParameter="{StaticResource d7}"/>
<c:BButton Content="近15天" Width="50" Height="25" Margin="5,0,0,0"

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

@ -1039,7 +1039,7 @@ namespace BBWY.Server.Business
afterSaleOrderSkuList.Add(afterSaleOrder);
}
var refundAfterSaleOrderSkuIds = afterSaleOrderSkuList.Where(aso => aso.RefundAmount != 0 && aso.ProductResult == Enums.ProductResult.退款退货).Select(aso => aso.SkuId);
//var refundAfterSaleOrderSkuIds = afterSaleOrderSkuList.Where(aso => aso.RefundAmount != 0 && aso.ProductResult == Enums.ProductResult.退款退货).Select(aso => aso.SkuId);
dbOrderCost.RefundAmount = afterSaleOrderSkuList.Sum(aso => aso.RefundAmount ?? 0);
@ -1048,9 +1048,7 @@ namespace BBWY.Server.Business
dbOrderCost.ReissueAfterSaleAmount = afterSaleOrderSkuList.Sum(aso => aso.ReissueAfterSaleAmount ?? 0);
//退款采购货款
dbOrderCost.RefundPurchaseAmount = fsql.Select<OrderCostDetail>().Where(ocd => ocd.OrderId == editAfterSaleOrderSkuRequest.OrderId &&
refundAfterSaleOrderSkuIds.Contains(ocd.SkuId))
.Sum(ocd => ocd.TotalCost);
//dbOrderCost.RefundPurchaseAmount = fsql.Select<OrderCostDetail>().Where(ocd => ocd.OrderId == editAfterSaleOrderSkuRequest.OrderId && refundAfterSaleOrderSkuIds.Contains(ocd.SkuId)).Sum(ocd => ocd.TotalCost);
//退款之后平台扣点
dbOrderCost.PlatformCommissionAmount = (dbOrder.OrderSellerPrice - dbOrderCost.RefundAmount) * (dbOrderCost?.PlatformCommissionRatio ?? 0.05M);

27
BBWY.Server.Model/Enums.cs
View File

@ -112,7 +112,7 @@
}
/// <summary>
/// 服务单处理方式
/// 服务单处理结果
/// </summary>
public enum ServiceResult
{
@ -120,7 +120,9 @@
换新 = 1,
原返 = 2,
线下换新 = 3,
补发 = 4
维修 = 4,
商品补发 = 5,
仅退款 = 6
}
/// <summary>
@ -128,10 +130,23 @@
/// </summary>
public enum ProductResult
{
退款退货 = 0,
商品入库 = 1,
报损 = 2,
换新 = 3
一件代发_退回厂家 = 0,
退回齐越仓 = 1,
退回京仓 = 2,
退回云仓 = 3,
客户无退货 = 4
}
/// <summary>
/// 商品情况
/// </summary>
public enum ProductHealth
{
可二次销售 = 0,
残次品_无法二次销售 = 1,
厂家退货退款 = 2,
客户无退货 = 3,
破损 = 4
}
/// <summary>

Write Preview
Loading…
Cancel
Save