Skip to content

S
ShopERP
Commit c6f845dd by PC-20220610JUCQ\Administrator
Options

<develop>:(ShopERP 端)<无> ShopERP 创建对外的 API 接口。

parent 8649c712
Showing with 5 additions and 240 deletions
CoreCms.Net.Configuration/GlobalEnumVars.cs
...@@ -565,11 +565,7 @@ namespace CoreCms.Net.Configuration ...@@ -565,11 +565,7 @@ namespace CoreCms.Net.Configuration
/// </summary> /// </summary>
[Description("普通")] [Description("普通")]
Common = 1, Common = 1,
/// <summary>
/// 拼团
/// </summary>
[Description("拼团")]
PinTuan = 2,
/// <summary> /// <summary>
/// 团购 /// 团购
/// </summary> /// </summary>
......
CoreCms.Net.IServices/Cart/ICoreCmsCartServices.cs
...@@ -13,19 +13,7 @@ namespace CoreCms.Net.IServices ...@@ -13,19 +13,7 @@ namespace CoreCms.Net.IServices
public interface ICoreCmsCartServices : IBaseServices<CoreCmsCart> public interface ICoreCmsCartServices : IBaseServices<CoreCmsCart>
{ {
/// <summary> /// <summary>
/// 设置购物车商品数量 ///重写删除指定ID集合的数据(批量删除)
/// </summary>
/// <param name="id"></param>
/// <param name="nums"></param>
/// <param name="userId"></param>
/// <param name="numType"></param>
/// <param name="type"></param>
/// <returns></returns>
Task<WebApiCallBack> SetCartNum(int id, int nums, int userId, int numType, int type = 1);
/// <summary>
/// 重写删除指定ID集合的数据(批量删除)
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id"></param>
/// <param name="userId"></param> /// <param name="userId"></param>
...@@ -34,7 +22,7 @@ namespace CoreCms.Net.IServices ...@@ -34,7 +22,7 @@ namespace CoreCms.Net.IServices
/// <summary> /// <summary>
/// 添加单个货品到购物车 /// 添加单个货品到购物车
/// </summary> /// </summary>
/// <param name="userId">用户id</param> /// <param name="userId">用户id</param>
/// <param name="productId">货品序号</param> /// <param name="productId">货品序号</param>
...@@ -45,19 +33,8 @@ namespace CoreCms.Net.IServices ...@@ -45,19 +33,8 @@ namespace CoreCms.Net.IServices
/// <returns></returns> /// <returns></returns>
Task<WebApiCallBack> Add(int userId, int productId, int nums, int numType, int cartTypes = 1, int objectId = 0); Task<WebApiCallBack> Add(int userId, int productId, int nums, int numType, int cartTypes = 1, int objectId = 0);
/// <summary> /// <summary>
/// 在加入购物车的时候，判断是否有参加拼团的商品 /// 获取购物车列表
/// </summary>
/// <param name="productId"></param>
/// <param name="userId">用户序列</param>
/// <param name="nums">加入购物车数量</param>
/// <param name="teamId">团队序列</param>
Task<WebApiCallBack> AddCartHavePinTuan(int productId, int userId = 0, int nums = 1, int teamId = 0);
/// <summary>
/// 获取购物车列表
/// </summary> /// </summary>
/// <param name="userId">用户序号</param> /// <param name="userId">用户序号</param>
/// <param name="ids">已选择货号</param> /// <param name="ids">已选择货号</param>
...@@ -69,7 +46,7 @@ namespace CoreCms.Net.IServices ...@@ -69,7 +46,7 @@ namespace CoreCms.Net.IServices
/// <summary> /// <summary>
/// 获取处理后的购物车信息 /// 获取处理后的购物车信息
/// </summary> /// </summary>
/// <param name="userId">用户序列</param> /// <param name="userId">用户序列</param>
/// <param name="ids">选中的购物车商品</param> /// <param name="ids">选中的购物车商品</param>
...@@ -85,50 +62,5 @@ namespace CoreCms.Net.IServices ...@@ -85,50 +62,5 @@ namespace CoreCms.Net.IServices
string couponCode, bool freeFreight = false, string couponCode, bool freeFreight = false,
int deliveryType = (int)GlobalEnumVars.OrderReceiptType.Logistics, int objectId = 0); int deliveryType = (int)GlobalEnumVars.OrderReceiptType.Logistics, int objectId = 0);
/// <summary>
/// 算运费
/// </summary>
/// <param name="cartDto">购物车信息</param>
/// <param name="areaId">收货地址id</param>
/// <param name="freeFreight">是否包邮，默认false</param>
/// <returns></returns>
bool CartFreight(CartDto cartDto, int areaId, bool freeFreight = false);
/// <summary>
/// 购物车中使用优惠券
/// </summary>
/// <param name="cartDto">购物车数据</param>
/// <param name="couponCode">优惠券码</param>
/// <returns></returns>
Task<bool> CartCoupon(CartDto cartDto, string couponCode);
/// <summary>
/// 购物车中使用积分
/// </summary>
/// <param name="cartDto"></param>
/// <param name="userId"></param>
/// <param name="point"></param>
/// <returns></returns>
Task<WebApiCallBack> CartPoint(CartDto cartDto, int userId, int point);
/// <summary>
/// 获取购物车用户数据总数
/// </summary>
/// <returns></returns>
Task<int> GetCountAsync(int userId);
/// <summary>
/// 根据提交的数据判断哪些购物券可以使用
/// </summary>
/// <param name="userId"></param>
/// <param name="ids"></param>
/// <param name="promotionId"></param>
/// <returns></returns>
Task<WebApiCallBack> GetCartAvailableCoupon(int userId, int[] ids = null);
} }
} }
\ No newline at end of file
CoreCms.Net.Services/Order/CoreCmsOrderServices.cs
...@@ -334,14 +334,6 @@ namespace CoreCms.Net.Services ...@@ -334,14 +334,6 @@ namespace CoreCms.Net.Services
case (int)GlobalEnumVars.OrderType.Common: case (int)GlobalEnumVars.OrderType.Common:
//标准模式不需要修改订单数据和商品数据 //标准模式不需要修改订单数据和商品数据
break; break;
case (int)GlobalEnumVars.OrderType.PinTuan:
//拼团模式去校验拼团是否存在，并添加拼团记录
var pinTuanRes = await _pinTuanRecordServices.OrderAdd(order, avaliableOrderItems, teamId);
if (pinTuanRes.status == false)
{
return pinTuanRes;
}
break;
case (int)GlobalEnumVars.OrderType.Group: case (int)GlobalEnumVars.OrderType.Group:
var groupRes = await _promotionRecordServices.OrderAdd(order, avaliableOrderItems, objectId, orderType); var groupRes = await _promotionRecordServices.OrderAdd(order, avaliableOrderItems, objectId, orderType);
if (groupRes.status == false) if (groupRes.status == false)
......
CoreCms.Net.Web.WebApi/Controllers/CartController.cs
...@@ -31,10 +31,6 @@ namespace CoreCms.Net.Web.WebApi.Controllers ...@@ -31,10 +31,6 @@ namespace CoreCms.Net.Web.WebApi.Controllers
_cartServices = cartServices; _cartServices = cartServices;
} }
//公共接口====================================================================================================
//验证接口====================================================================================================
#region 添加单个货品到购物车 #region 添加单个货品到购物车
/// <summary> /// <summary>
...@@ -53,7 +49,6 @@ namespace CoreCms.Net.Web.WebApi.Controllers ...@@ -53,7 +49,6 @@ namespace CoreCms.Net.Web.WebApi.Controllers
#endregion 添加单个货品到购物车 #endregion 添加单个货品到购物车
#region 获取购物车列表====================================================================== #region 获取购物车列表======================================================================
/// <summary> /// <summary>
/// 获取购物车列表 /// 获取购物车列表
/// </summary> /// </summary>
...@@ -74,7 +69,6 @@ namespace CoreCms.Net.Web.WebApi.Controllers ...@@ -74,7 +69,6 @@ namespace CoreCms.Net.Web.WebApi.Controllers
#endregion 获取购物车列表====================================================================== #endregion 获取购物车列表======================================================================
#region 删除购物车信息 #region 删除购物车信息
/// <summary> /// <summary>
/// 获取购物车列表 /// 获取购物车列表
/// </summary> /// </summary>
...@@ -91,43 +85,9 @@ namespace CoreCms.Net.Web.WebApi.Controllers ...@@ -91,43 +85,9 @@ namespace CoreCms.Net.Web.WebApi.Controllers
return jm; return jm;
} }
jm = await _cartServices.DeleteByIdsAsync(entity.id, _user.ID); jm = await _cartServices.DeleteByIdsAsync(entity.id, _user.ID);
return jm; return jm;
} }
#endregion 删除购物车信息 #endregion 删除购物车信息
#region 设置购物车商品数量
/// <summary>
/// 设置购物车商品数量
/// </summary>
/// <returns></returns>
[HttpPost]
[Authorize]
public async Task<WebApiCallBack> SetCartNum([FromBody] FMSetCartNum entity)
{
var jm = await _cartServices.SetCartNum(entity.id, entity.nums, _user.ID, 2, 1);
return jm;
}
#endregion 设置购物车商品数量
#region 根据提交的数据判断哪些购物券可以使用==================================================
/// <summary>
/// 根据提交的数据判断哪些购物券可以使用
/// </summary>
/// <returns></returns>
[HttpPost]
[Authorize]
public async Task<WebApiCallBack> GetCartAvailableCoupon([FromBody] FMCouponForUserCouponPost entity)
{
var ids = CommonHelper.StringToIntArray(entity.ids);
var jm = await _cartServices.GetCartAvailableCoupon(_user.ID, ids);
return jm;
}
#endregion 根据提交的数据判断哪些购物券可以使用==================================================
} }
} }
\ No newline at end of file
CoreCms.Net.Web.WebApi/Controllers/OrderController.cs
...@@ -125,7 +125,6 @@ namespace CoreCms.Net.Web.WebApi.Controllers ...@@ -125,7 +125,6 @@ namespace CoreCms.Net.Web.WebApi.Controllers
#endregion #endregion
#region 获取个人订单列表======================================================= #region 获取个人订单列表=======================================================
/// <summary> /// <summary>
/// 获取个人订单列表 /// 获取个人订单列表
/// </summary> /// </summary>
...@@ -164,86 +163,5 @@ namespace CoreCms.Net.Web.WebApi.Controllers ...@@ -164,86 +163,5 @@ namespace CoreCms.Net.Web.WebApi.Controllers
} }
#endregion #endregion
#region 删除订单====================================================
/// <summary>
/// 删除订单
/// </summary>
/// <returns></returns>
[HttpPost]
[Authorize]
public async Task<WebApiCallBack> DeleteOrder([FromBody] FMStringId entity)
{
var jm = new WebApiCallBack();
if (string.IsNullOrEmpty(entity.id))
{
jm.msg = "请提交要取消的订单号";
return jm;
}
var ids = entity.id.Split(",");
jm.status = await _orderServices.DeleteAsync(p => ids.Contains(p.orderId) && p.userId == _user.ID);
jm.msg = jm.status ? "删除成功" : "删除失败";
return jm;
}
#endregion
#region 确认签收订单====================================================
/// <summary>
/// 确认签收订单
/// </summary>
/// <returns></returns>
[HttpPost]
[Authorize]
public async Task<WebApiCallBack> OrderConfirm([FromBody] FMStringId entity)
{
var jm = new WebApiCallBack();
if (string.IsNullOrEmpty(entity.id))
{
jm.msg = "请提交要确认签收的订单号";
return jm;
}
jm = await _orderServices.ConfirmOrder(entity.id, Convert.ToInt32(entity.data));
return jm;
}
#endregion
#region 前台物流查询接口=======================================================
/// <summary>
/// 前台物流查询接口
/// </summary>
/// <returns></returns>
[HttpPost]
[Authorize]
public async Task<WebApiCallBack> LogisticsByApi([FromBody] FMApiLogisticsByApiPost entity)
{
var jm = new WebApiCallBack();
if (string.IsNullOrEmpty(entity.code) || string.IsNullOrEmpty(entity.no))
{
jm.msg = GlobalErrorCodeVars.Code13225;
return jm;
}
var systemLogistics = SystemSettingDictionary.GetSystemLogistics();
foreach (var p in systemLogistics)
{
if (entity.code == p.sKey)
{
jm.msg = p.sDescription + "不支持轨迹查询";
return jm;
}
}
jm = await _logisticsServices.ExpressPoll(entity.code, entity.no, entity.mobile);
return jm;
}
#endregion
} }
} }
\ No newline at end of file
CoreCms.Net.Web.WebApi/Doc.xml
...@@ -33,18 +33,6 @@ ...@@ -33,18 +33,6 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:CoreCms.Net.Web.WebApi.Controllers.CartController.SetCartNum(CoreCms.Net.Model.ViewModels.DTO.FMSetCartNum)">
<summary>
设置购物车商品数量
</summary>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.WebApi.Controllers.CartController.GetCartAvailableCoupon(CoreCms.Net.Model.FromBody.FMCouponForUserCouponPost)">
<summary>
根据提交的数据判断哪些购物券可以使用
</summary>
<returns></returns>
</member>
<member name="T:CoreCms.Net.Web.WebApi.Controllers.OrderController"> <member name="T:CoreCms.Net.Web.WebApi.Controllers.OrderController">
<summary> <summary>
订单调用接口数据 订单调用接口数据
...@@ -73,24 +61,6 @@ ...@@ -73,24 +61,6 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:CoreCms.Net.Web.WebApi.Controllers.OrderController.DeleteOrder(CoreCms.Net.Model.FromBody.FMStringId)">
<summary>
删除订单
</summary>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.WebApi.Controllers.OrderController.OrderConfirm(CoreCms.Net.Model.FromBody.FMStringId)">
<summary>
确认签收订单
</summary>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.WebApi.Controllers.OrderController.LogisticsByApi(CoreCms.Net.Model.FromBody.FMApiLogisticsByApiPost)">
<summary>
前台物流查询接口
</summary>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.WebApi.Infrastructure.ApiExplorerIgnores.Apply(Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel)"> <member name="M:CoreCms.Net.Web.WebApi.Infrastructure.ApiExplorerIgnores.Apply(Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel)">
<summary> <summary>
自带的Controller与swagger3.0冲突，在此排除扫描 自带的Controller与swagger3.0冲突，在此排除扫描
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment