wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2026-03-24 18:57:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

升级自定义交易组件常用商品接口，spu接口，品牌接口，订单接口，物流接口。

Browse Source
This commit is contained in:
大灰灰
2022-06-30 22:42:19 +08:00
parent 43a691d1be
commit dc408b8596
27 changed files with 1070 additions and 667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
CoreCms.Net.Web.WebApi/Controllers/OrderController.cs
View File

@@ -18,8 +18,8 @@ using CoreCms.Net.IServices;
using CoreCms.Net.Model.Entities;
using CoreCms.Net.Model.Entities.Expression;
using CoreCms.Net.Model.FromBody;
using CoreCms.Net.Model.ViewModels.UI;
using CoreCms.Net.Model.ViewModels.DTO;
using CoreCms.Net.Model.ViewModels.UI;
using CoreCms.Net.Utility.Extensions;
using CoreCms.Net.Utility.Helper;
using Microsoft.AspNetCore.Authorization;
@@ -48,6 +48,8 @@ namespace CoreCms.Net.Web.WebApi.Controllers
private readonly ICoreCmsStoreServices _storeServices;
private readonly ICoreCmsOrderDistributionModelServices _orderDistributionModelServices;
/// <summary>
/// 构造函数
/// </summary>
@@ -76,8 +78,19 @@ namespace CoreCms.Net.Web.WebApi.Controllers
//公共接口====================================================================================================
//验证接口====================================================================================================
#region 发票模糊查询==================================================
/// <summary>
/// 发票模糊查询
/// </summary>
/// <returns></returns>
[HttpPost]
[Authorize]
public async Task<WebApiCallBack> GetOrderTypeModel([FromBody] GetTaxCodePost entity)
{
var jm = await _orderServices.GetTaxCode(entity.name);
return jm;
}
#endregion
#region 获取不同类型营销下单支持的配送方式==================================================
/// <summary>
@@ -115,6 +128,8 @@ namespace CoreCms.Net.Web.WebApi.Controllers
}
#endregion
//验证接口====================================================================================================
#region 发票模糊查询==================================================
/// <summary>
/// 发票模糊查询
@@ -184,8 +199,8 @@ namespace CoreCms.Net.Web.WebApi.Controllers
jm = await _orderServices.ToAdd(_user.ID, entity.orderType, entity.cartIds, entity.receiptType,
entity.ushipId, entity.storeId, entity.ladingName, entity.ladingMobile, entity.memo,
entity.point, entity.couponCode, entity.source, entity.scene, entity.taxType, entity.taxName,
entity.taxCode, entity.objectId, entity.teamId);
jm.otherData = entity;
entity.taxCode, entity.objectId, entity.teamId, entity.requireOrder, entity.requiredFundType, entity.traceId);
//jm.otherData = entity;
return jm;
}
@@ -358,6 +373,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
}
jm = await _aftersalesServices.ToAdd(_user.ID, entity.orderId, entity.type, entity.items, entity.images,
entity.reason, entity.refund);
jm.otherData = entity;
return jm;
}
@@ -381,7 +397,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
var where = PredicateBuilder.True<CoreCmsBillAftersales>();
where = where.And(p => p.userId == _user.ID);
if (!string.IsNullOrEmpty(entity.order))
if (!string.IsNullOrEmpty(entity.id))
{
where = where.And(p => p.orderId == entity.id);
}

13
CoreCms.Net.Web.WebApi/Controllers/WeChatOAuth/WxOpenController.cs
View File

@@ -146,7 +146,6 @@ namespace CoreCms.Net.Web.WebApi.Controllers.WeChatOAuth
#endregion
#region 处理xml内容
/// <summary>
/// 对解密后的xml数据进行筛选并分发处理结果
@@ -214,6 +213,17 @@ namespace CoreCms.Net.Web.WebApi.Controllers.WeChatOAuth
var openProductBrandAuditEvent = client.DeserializeEventFromXml<SKIT.FlurlHttpClient.Wechat.Api.Events.OpenProductBrandAuditEvent>(msgXml);
callBack = await _mediator.Send(new OpenProductBrandAuditEventCommand() { EventObj = openProductBrandAuditEvent });
break;
//自定义交易组件支付回调
case EventType.OpenProductOrderPay:
var openProductOrderPayEvent = client.DeserializeEventFromXml<SKIT.FlurlHttpClient.Wechat.Api.Events.OpenProductOrderPayEvent>(msgXml);
callBack = await _mediator.Send(new OpenProductOrderPayEventCommand() { EventObj = openProductOrderPayEvent });
break;
//自定交易组件-用户确认收货
case EventType.OpenProductOrderConfirm:
var openProductOrderConfirmEvent = client.DeserializeEventFromXml<SKIT.FlurlHttpClient.Wechat.Api.Events.OpenProductOrderConfirmEvent>(msgXml);
callBack = await _mediator.Send(new OpenProductOrderConfirmEventCommand() { EventObj = openProductOrderConfirmEvent });
break;
default:
NLogUtil.WriteFileLog(LogLevel.Info, LogType.WxPost, "接收服务器推送（处理xml内容/Event无匹配）", JsonConvert.SerializeObject(sourceXml));
break;
@@ -235,7 +245,6 @@ namespace CoreCms.Net.Web.WebApi.Controllers.WeChatOAuth
}
#endregion
#region 初始化获取xml文本数据
/// <summary>