mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2025-12-06 22:43:25 +08:00
# 2022-01-22
### 开源社区版(会员专业版同步修改): --无修改 ### 0.1.1 会员专业版: 【新增】增加微信支付服务商配置,支付微信支付服务商及子商户功能。 【新增】增加根据不同下单类型,控制不同的下单送货模式的功能,如普通商品购买只需要【物流快递,同城配送】,团购秒杀只需要【同城配送,上门自提】,可后台自定义。 【新增】微信直播带货功能新增【上传图片】功能,可直接将本地图片上传至微信侧,获取cdn图片进行处理。 【更新】nuget更新组件。 【修复】修复首页商品组件图片高度被错写array的问题。 【修复】修复生成海报保存路径问题,调整开发版或者预览版小程序获取不到的二维码的报错问题。 【优化】调整订单详情商品tag未设置宽度,导致撑破容易的问题。 【修复】调整订单列表左侧图片大小,防止被遮挡。I4PP1F 【修复】修复微信自定义交易组件申请商品类目失败的问题。#I4QE17
This commit is contained in:
@@ -46,6 +46,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
|
||||
private readonly ICoreCmsLogisticsServices _logisticsServices;
|
||||
private readonly ICoreCmsGoodsServices _goodsServices;
|
||||
private readonly ICoreCmsStoreServices _storeServices;
|
||||
private readonly ICoreCmsOrderDistributionModelServices _orderDistributionModelServices;
|
||||
|
||||
/// <summary>
|
||||
/// 构造函数
|
||||
@@ -56,7 +57,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
|
||||
, ICoreCmsSettingServices settingServices
|
||||
, ICoreCmsAreaServices areaServices
|
||||
, ICoreCmsBillReshipServices reshipServices, ICoreCmsShipServices shipServices
|
||||
, ICoreCmsBillDeliveryServices billDeliveryServices, ICoreCmsLogisticsServices logisticsServices, ICoreCmsGoodsServices goodsServices, ICoreCmsStoreServices storeServices)
|
||||
, ICoreCmsBillDeliveryServices billDeliveryServices, ICoreCmsLogisticsServices logisticsServices, ICoreCmsGoodsServices goodsServices, ICoreCmsStoreServices storeServices, ICoreCmsOrderDistributionModelServices orderDistributionModelServices)
|
||||
{
|
||||
_user = user;
|
||||
_orderServices = orderServices;
|
||||
@@ -69,6 +70,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
|
||||
_logisticsServices = logisticsServices;
|
||||
_goodsServices = goodsServices;
|
||||
_storeServices = storeServices;
|
||||
_orderDistributionModelServices = orderDistributionModelServices;
|
||||
}
|
||||
|
||||
|
||||
@@ -77,6 +79,42 @@ namespace CoreCms.Net.Web.WebApi.Controllers
|
||||
|
||||
//验证接口====================================================================================================
|
||||
|
||||
#region 获取不同类型营销下单支持的配送方式==================================================
|
||||
/// <summary>
|
||||
/// 获取不同类型营销下单支持的配送方式
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
[Authorize]
|
||||
public async Task<WebApiCallBack> GetOrderDistributionModel([FromBody] FMIntId entity)
|
||||
{
|
||||
var jm = new WebApiCallBack() { status = true };
|
||||
|
||||
var cache = await _orderDistributionModelServices.GetCaChe();
|
||||
var model = cache.Find(p => p.orderType == entity.id);
|
||||
if (model == null)
|
||||
{
|
||||
jm.data = new
|
||||
{
|
||||
isOpenMailing = true,
|
||||
isOpenHomeDelivery = true,
|
||||
isOpenSelfDelivery = true
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
jm.data = new
|
||||
{
|
||||
model.isOpenMailing,
|
||||
model.isOpenHomeDelivery,
|
||||
model.isOpenSelfDelivery
|
||||
};
|
||||
}
|
||||
|
||||
return jm;
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 发票模糊查询==================================================
|
||||
/// <summary>
|
||||
/// 发票模糊查询
|
||||
|
||||
Reference in New Issue
Block a user