wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2026-02-05 20:19:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

# 2022-02-12

Browse Source 
### 1.3.5 开源社区版：
无
### 0.1.7 会员专业版：
【新增】表【CoreCmsUserShip】增加【精度longitude】【纬度latitude】【街道street】三字段。
【新增】用户地址新增及编辑增加地图选择获取街道及经纬度坐标功能。
【新增】【平台设置-订单管理】，新增【同城配送运费设置】，可设置2公里内，5公里内，10公里内，15公里内，20公里内不同距离运费。根据用户地址坐标与门店坐标进行计算。
【新增】商品详情轮播图增加视频图片混播结合功能，类似淘宝打开商品详情后显示视频并支持播放，左右滑动切换图片，实现混播。
【新增】商品添加/删除面板增加视频上传功能。
This commit is contained in:
JianWeie
2022-02-12 02:25:01 +08:00
parent 534cf303ba
commit a07106127e
31 changed files with 924 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CoreCms.Net.Web.WebApi/Controllers/CartController.cs
View File

@@ -11,13 +11,13 @@
using CoreCms.Net.Auth.HttpContextUser;
using CoreCms.Net.IServices;
using CoreCms.Net.Model.FromBody;
using CoreCms.Net.Model.ViewModels.UI;
using CoreCms.Net.Model.ViewModels.DTO;
using CoreCms.Net.Utility.Helper;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using System.Threading.Tasks;
using CoreCms.Net.Configuration;
using CoreCms.Net.Model.ViewModels.DTO;
using CoreCms.Net.Model.ViewModels.UI;
namespace CoreCms.Net.Web.WebApi.Controllers
{
@@ -73,10 +73,9 @@ namespace CoreCms.Net.Web.WebApi.Controllers
public async Task<WebApiCallBack> GetList([FromBody] FMCartGetList entity)
{
var ids = CommonHelper.StringToIntArray(entity.ids);
//判断免费运费
var freeFreight = entity.receiptType != 1;
//获取数据
var jm = await _cartServices.GetCartInfos(_user.ID, ids, entity.type, entity.areaId, entity.point, entity.couponCode, freeFreight, entity.receiptType, entity.objectId);
var jm = await _cartServices.GetCartInfos(_user.ID, ids, entity.type, entity.areaId, entity.point, entity.couponCode, entity.receiptType, entity.userShipId, entity.objectId);
return jm;
}
@@ -139,5 +138,6 @@ namespace CoreCms.Net.Web.WebApi.Controllers
}
#endregion 根据提交的数据判断哪些购物券可以使用==================================================
}
}