wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 17:13:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

【优化】调整运费计算逻辑为异步处理。

Browse Source
This commit is contained in:
jianweie code
2023-04-03 02:30:16 +08:00
parent a87569c36d
commit 8b7377de63
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CoreCms.Net.IServices/Cart/ICoreCmsCartServices.cs
View File

@@ -99,7 +99,7 @@ namespace CoreCms.Net.IServices
/// <param name="cartDto">购物车信息</param> /// <param name="cartDto">购物车信息</param>
/// <param name="areaId">收货地址id</param> /// <param name="areaId">收货地址id</param>
/// <returns></returns> /// <returns></returns>
bool CartFreight(CartDto cartDto, int areaId); Task<bool> CartFreight(CartDto cartDto, int areaId);
/// <summary> /// <summary>

4
CoreCms.Net.IServices/Shop/ICoreCmsShipServices.cs
View File

@@ -59,7 +59,7 @@ namespace CoreCms.Net.IServices
/// <param name="weight">重量,单位g</param> /// <param name="weight">重量,单位g</param>
/// <param name="totalmoney">商品总价</param> /// <param name="totalmoney">商品总价</param>
/// <returns></returns> /// <returns></returns>
decimal GetShipCost(int areaId = 0, decimal weight = 0, decimal totalmoney = 0); Task<decimal> GetShipCost(int areaId = 0, decimal weight = 0, decimal totalmoney = 0);
/// <summary> /// <summary>
@@ -75,7 +75,7 @@ namespace CoreCms.Net.IServices
/// <summary> /// <summary>
/// 根据地区获取配送方式 /// 根据地区获取配送方式
/// </summary> /// </summary>
CoreCmsShip GetShip(int areaId = 0); Task<CoreCmsShip> GetShip(int areaId = 0);
#region 重写增删改查操作=========================================================== #region 重写增删改查操作===========================================================

8
CoreCms.Net.Services/Cart/CoreCmsCartServices.cs
View File

@@ -600,7 +600,8 @@ namespace CoreCms.Net.Services
else if (deliveryType == (int)GlobalEnumVars.OrderReceiptType.Logistics) else if (deliveryType == (int)GlobalEnumVars.OrderReceiptType.Logistics)
{ {
// 运费判断 // 运费判断
if (CartFreight(cartDto, areaId) == false) var blFreight = await CartFreight(cartDto, areaId);
if (blFreight == false)
{ {
jm.data = cartDto; jm.data = cartDto;
jm.msg = "运费判断"; jm.msg = "运费判断";
@@ -665,17 +666,18 @@ namespace CoreCms.Net.Services
#endregion #endregion
#region 算运费 #region 算运费
/// <summary> /// <summary>
/// 算运费 /// 算运费
/// </summary> /// </summary>
/// <param name="cartDto">购物车信息</param> /// <param name="cartDto">购物车信息</param>
/// <param name="areaId">收货地址id</param> /// <param name="areaId">收货地址id</param>
/// <returns></returns> /// <returns></returns>
public bool CartFreight(CartDto cartDto, int areaId) public async Task<bool> CartFreight(CartDto cartDto, int areaId)
{ {
if (areaId > 0) if (areaId > 0)
{ {
cartDto.costFreight = _shipServices.GetShipCost(areaId, cartDto.weight, cartDto.goodsAmount); cartDto.costFreight =await _shipServices.GetShipCost(areaId, cartDto.weight, cartDto.goodsAmount);
cartDto.amount = Math.Round(cartDto.amount + cartDto.costFreight, 2); cartDto.amount = Math.Round(cartDto.amount + cartDto.costFreight, 2);
} }
return true; return true;

2
CoreCms.Net.Services/Order/CoreCmsOrderServices.cs
View File

@@ -583,7 +583,7 @@ namespace CoreCms.Net.Services
order.shipName = userShipInfo.name; order.shipName = userShipInfo.name;
order.shipMobile = userShipInfo.mobile; order.shipMobile = userShipInfo.mobile;
var ship = _shipServices.GetShip(userShipInfo.areaId); var ship = await _shipServices.GetShip(userShipInfo.areaId);
if (ship != null) if (ship != null)
{ {
order.logisticsId = ship.id; order.logisticsId = ship.id;

20
CoreCms.Net.Services/Shop/CoreCmsShipServices.cs
View File

@@ -116,24 +116,24 @@ namespace CoreCms.Net.Services
/// <param name="weight">重量,单位g</param> /// <param name="weight">重量,单位g</param>
/// <param name="totalmoney">商品总价</param> /// <param name="totalmoney">商品总价</param>
/// <returns></returns> /// <returns></returns>
public decimal GetShipCost(int areaId = 0, decimal weight = 0, decimal totalmoney = 0) public async Task<decimal> GetShipCost(int areaId = 0, decimal weight = 0, decimal totalmoney = 0)
{ {
decimal postfee = 0; decimal postfee = 0;
var idStr = areaId.ToString(); var idStr = areaId.ToString();
//先判断是否子地区满足条件 //先判断是否子地区满足条件
var def = base.QueryByClause(p => var def = await _dal.QueryByClauseAsync(p =>
p.status == (int)GlobalEnumVars.ShipStatus.Yes && p.status == (int)GlobalEnumVars.ShipStatus.Yes &&
p.areaType == (int)GlobalEnumVars.ShipAreaType.Part && p.areaFee.Contains(idStr)); p.areaType == (int)GlobalEnumVars.ShipAreaType.Part && p.areaFee.Contains(idStr));
//没有子地区取默认 //没有子地区取默认
if (def == null) if (def == null)
{ {
def = base.QueryByClause(p => p.isDefault == true && p.status == (int)GlobalEnumVars.ShipStatus.Yes); def = await _dal.QueryByClauseAsync(p => p.isDefault == true && p.status == (int)GlobalEnumVars.ShipStatus.Yes);
} }
//没有默认取启用状态 //没有默认取启用状态
if (def == null) if (def == null)
{ {
def = base.QueryByClause(p => p.status == (int)GlobalEnumVars.ShipStatus.Yes); def = await _dal.QueryByClauseAsync(p => p.status == (int)GlobalEnumVars.ShipStatus.Yes);
if (def == null) if (def == null)
{//没有配送方式，返回0 {//没有配送方式，返回0
return postfee; return postfee;
@@ -226,22 +226,22 @@ namespace CoreCms.Net.Services
/// <summary> /// <summary>
/// 根据地区获取配送方式 /// 根据地区获取配送方式
/// </summary> /// </summary>
public CoreCmsShip GetShip(int areaId = 0) public async Task<CoreCmsShip> GetShip(int areaId = 0)
{ {
var idStr = areaId.ToString(); var idStr = areaId.ToString();
//先判断是否子地区满足条件 //先判断是否子地区满足条件
var def = base.QueryByClause(p => var def = await _dal.QueryByClauseAsync(p =>
p.status == (int)GlobalEnumVars.ShipStatus.Yes && p.status == (int)GlobalEnumVars.ShipStatus.Yes &&
p.areaType == (int)GlobalEnumVars.ShipAreaType.Part && p.areaFee.Contains(idStr)); p.areaType == (int)GlobalEnumVars.ShipAreaType.Part && p.areaFee.Contains(idStr));
//没有子地区取默认 //没有子地区取默认
if (def == null) if (def == null)
{ {
def = base.QueryByClause(p => p.isDefault == true && p.status == (int)GlobalEnumVars.ShipStatus.Yes); def = await _dal.QueryByClauseAsync(p => p.isDefault == true && p.status == (int)GlobalEnumVars.ShipStatus.Yes);
} }
//没有默认取启用状态 //没有默认取启用状态
if (def == null) if (def == null)
{ {
def = base.QueryByClause(p => p.status == (int)GlobalEnumVars.ShipStatus.Yes); def = await _dal.QueryByClauseAsync(p => p.status == (int)GlobalEnumVars.ShipStatus.Yes);
return def; return def;
} }
return def; return def;