wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 18:03:27 +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

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

@@ -231,7 +231,7 @@ namespace CoreCms.Net.Services
//通过购物车生成订单信息和订单明细信息
List<CoreCmsOrderItem> orderItems;
var ids = CommonHelper.StringToIntArray(cartIds);
var orderRes = await FormatOrder(order, userId, ids, areaId, point, couponCode, false, receiptType, objectId);
var orderRes = await FormatOrder(order, userId, ids, areaId, point, couponCode, ushipId, receiptType, objectId);
if (!orderRes.status)
{
return orderRes;
@@ -487,17 +487,16 @@ namespace CoreCms.Net.Services
/// <param name="areaId">收货地区</param>
/// <param name="point">使用积分</param>
/// <param name="couponCode">使用优惠券</param>
/// <param name="freeFreight">是否包邮</param>
/// <param name="userShipId"></param>
/// <param name="deliveryType">收货方式,1快递物流，2同城配送，3门店自提</param>
/// <param name="groupId">团队明细</param>
/// <returns>返回订单明细信息</returns>
private async Task<WebApiCallBack> FormatOrder(CoreCmsOrder order, int userId, int[] cartIds, int areaId, int point,
string couponCode, bool freeFreight = false, int deliveryType = (int)GlobalEnumVars.OrderReceiptType.Logistics, int groupId = 0)
string couponCode, int userShipId = 0, int deliveryType = (int)GlobalEnumVars.OrderReceiptType.Logistics, int groupId = 0)
{
var res = new WebApiCallBack() { methodDescription = "生成订单信息及明细信息" };
var cartModel = await _cartServices.GetCartInfos(userId, cartIds, order.orderType, areaId, point, couponCode,
freeFreight, deliveryType, groupId);
var cartModel = await _cartServices.GetCartInfos(userId, cartIds, order.orderType, areaId, point, couponCode, deliveryType, userShipId, groupId);
if (!cartModel.status)
{
return cartModel;