Skip to content

M
mall.oytour.com
Commit abca7b79 authored by 吴春's avatar 吴春
Browse files
Options

提交代码

parent 1eff8cd4
Hide whitespace changes
Inline Side-by-side
Showing with 124 additions and 2 deletions
Mall.Module.Product/OrderModule.cs
View file @ abca7b79
...@@ -7693,6 +7693,20 @@ namespace Mall.Module.Product ...@@ -7693,6 +7693,20 @@ namespace Mall.Module.Product
{ {
return goods_OrderDetailRepository.GetSupplierOrderList(dmodel); return goods_OrderDetailRepository.GetSupplierOrderList(dmodel);
} }
#endregion
}
/// <summary>
/// 获取订单明细列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="count"></param>
/// <param name="dmodel"></param>
/// <returns></returns>
public List<RB_Goods_OrderDetail_Extend> GetOrderDetailList(RB_Goods_OrderDetail_Extend dmodel)
{
return goods_OrderDetailRepository.GetOrderDetailList(dmodel);
}
#endregion
}
} }
Mall.WebApi/App_Code/PayUtil.cs
View file @ abca7b79
...@@ -351,6 +351,8 @@ namespace Mall.WebApi.App_Code ...@@ -351,6 +351,8 @@ namespace Mall.WebApi.App_Code
{"OrderNumber", outTradeNo} {"OrderNumber", outTradeNo}
} }
}; };
} }
} }
......
Mall.WebApi/Controllers/Product/OrderController.cs
View file @ abca7b79
...@@ -42,6 +42,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -42,6 +42,7 @@ namespace Mall.WebApi.Controllers.MallBase
private readonly OrderModule orderModule = new OrderModule(); private readonly OrderModule orderModule = new OrderModule();
private readonly MiniProgramMsgModule miniProgramMsgModule = new MiniProgramMsgModule();
#region 订单列表 #region 订单列表
...@@ -588,6 +589,33 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -588,6 +589,33 @@ namespace Mall.WebApi.Controllers.MallBase
var Robj = new App_Code.PayUtil().Refund(pram, mallModel, _accessor); var Robj = new App_Code.PayUtil().Refund(pram, mallModel, _accessor);
if (Robj.IsSuccess) if (Robj.IsSuccess)
{ {
//获取商品信息
var orderGoodsList = orderModule.GetOrderDetailList(new RB_Goods_OrderDetail_Extend { TenantId= omodel .TenantId,MallBaseId= omodel .MallBaseId,OrderId= omodel .OrderId});
string goodsName = orderGoodsList.FirstOrDefault().GoodsName;
if (orderGoodsList.Count > 1)
{
if (goodsName.Length > 12)
{
goodsName = goodsName.Substring(0, 11) + "..";
}
goodsName += "等" + orderGoodsList.Count + "件商品";
}
else
{
if (goodsName.Length > 18)
{
goodsName = goodsName.Substring(0, 18) + "..";
}
}
//退款成功发送退款成功的订阅消息
//根据订单下单人获取openid
var userModel = orderModule.GetMemberUserInfo(omodel.UserId.Value);
if (userModel!=null)
{
miniProgramMsgModule.SendOrderRefundMsg(mallModel.TenantId.Value, mallModel.MallBaseId, userModel.OpenId, omodel.CancelRemark, omodel.OrderNo, (omodel.Income ?? 0).ToString(), goodsName);
}
bool flag = orderModule.SetOrderForcedToCancel(omodel, RefundOrderNo, req.TenantId, req.MallBaseId); bool flag = orderModule.SetOrderForcedToCancel(omodel, RefundOrderNo, req.TenantId, req.MallBaseId);
if (flag) if (flag)
{ {
...@@ -764,6 +792,32 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -764,6 +792,32 @@ namespace Mall.WebApi.Controllers.MallBase
var Robj = new App_Code.PayUtil().Refund(pram, mallModel, _accessor); var Robj = new App_Code.PayUtil().Refund(pram, mallModel, _accessor);
if (Robj.IsSuccess) if (Robj.IsSuccess)
{ {
//获取商品信息
var orderGoodsList = orderModule.GetOrderDetailList(new RB_Goods_OrderDetail_Extend { TenantId = omodel.TenantId, MallBaseId = omodel.MallBaseId, OrderId = omodel.OrderId });
string goodsName = orderGoodsList.FirstOrDefault().GoodsName;
if (orderGoodsList.Count > 1)
{
if (goodsName.Length > 12)
{
goodsName = goodsName.Substring(0, 11) + "..";
}
goodsName += "等" + orderGoodsList.Count + "件商品";
}
else
{
if (goodsName.Length > 18)
{
goodsName = goodsName.Substring(0, 18) + "..";
}
}
//退款成功发送退款成功的订阅消息
//根据订单下单人获取openid
var userModel = orderModule.GetMemberUserInfo(omodel.UserId.Value);
if (userModel != null)
{
miniProgramMsgModule.SendOrderRefundMsg(mallModel.TenantId.Value, mallModel.MallBaseId, userModel.OpenId, omodel.CancelRemark, omodel.OrderNo, (omodel.Income ?? 0).ToString(), goodsName);
}
bool flag = orderModule.SetOrderApplyForCancelAudit(omodel, Type, Remark, RefundOrderNo, req.TenantId, req.MallBaseId); bool flag = orderModule.SetOrderApplyForCancelAudit(omodel, Type, Remark, RefundOrderNo, req.TenantId, req.MallBaseId);
if (flag) if (flag)
{ {
...@@ -1560,6 +1614,32 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1560,6 +1614,32 @@ namespace Mall.WebApi.Controllers.MallBase
var Robj = new App_Code.PayUtil().Refund(pram, mallModel, _accessor); var Robj = new App_Code.PayUtil().Refund(pram, mallModel, _accessor);
if (Robj.IsSuccess) if (Robj.IsSuccess)
{ {
//获取商品信息
var orderGoodsList = orderModule.GetOrderDetailList(new RB_Goods_OrderDetail_Extend { TenantId = orderModel.TenantId, MallBaseId = orderModel.MallBaseId, OrderId = orderModel.OrderId });
string goodsName = orderGoodsList.FirstOrDefault().GoodsName;
if (orderGoodsList.Count > 1)
{
if (goodsName.Length > 12)
{
goodsName = goodsName.Substring(0, 11) + "..";
}
goodsName += "等" + orderGoodsList.Count + "件商品";
}
else
{
if (goodsName.Length > 18)
{
goodsName = goodsName.Substring(0, 18) + "..";
}
}
//退款成功发送退款成功的订阅消息
//根据订单下单人获取openid
var userModel = orderModule.GetMemberUserInfo(orderModel.UserId.Value);
if (userModel != null)
{
miniProgramMsgModule.SendOrderRefundMsg(mallModel.TenantId.Value, mallModel.MallBaseId, userModel.OpenId, orderModel.CancelRemark, orderModel.OrderNo, (orderModel.Income ?? 0).ToString(), goodsName);
}
bool flag = orderModule.SetOrderAfterSaleForRefunds(ReOrderId, Refund, RefundOrderNo, req.TenantId, req.MallBaseId); bool flag = orderModule.SetOrderAfterSaleForRefunds(ReOrderId, Refund, RefundOrderNo, req.TenantId, req.MallBaseId);
if (flag == false) if (flag == false)
{ {
...@@ -1660,6 +1740,32 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1660,6 +1740,32 @@ namespace Mall.WebApi.Controllers.MallBase
var Robj = new App_Code.PayUtil().Refund(pram, mallModel, _accessor); var Robj = new App_Code.PayUtil().Refund(pram, mallModel, _accessor);
if (Robj.IsSuccess) if (Robj.IsSuccess)
{ {
//获取商品信息
var orderGoodsList = orderModule.GetOrderDetailList(new RB_Goods_OrderDetail_Extend { TenantId = orderModel.TenantId, MallBaseId = orderModel.MallBaseId, OrderId = orderModel.OrderId });
string goodsName = orderGoodsList.FirstOrDefault().GoodsName;
if (orderGoodsList.Count > 1)
{
if (goodsName.Length > 12)
{
goodsName = goodsName.Substring(0, 11) + "..";
}
goodsName += "等" + orderGoodsList.Count + "件商品";
}
else
{
if (goodsName.Length > 18)
{
goodsName = goodsName.Substring(0, 18) + "..";
}
}
//退款成功发送退款成功的订阅消息
//根据订单下单人获取openid
var userModel = orderModule.GetMemberUserInfo(orderModel.UserId.Value);
if (userModel != null)
{
miniProgramMsgModule.SendOrderRefundMsg(mallModel.TenantId.Value, mallModel.MallBaseId, userModel.OpenId, orderModel.CancelRemark, orderModel.OrderNo, (orderModel.Income ?? 0).ToString(), goodsName);
}
bool flag = orderModule.SetOrderAfterSaleForRefunds(ReOrderId, Refund, RefundOrderNo, req.TenantId, req.MallBaseId); bool flag = orderModule.SetOrderAfterSaleForRefunds(ReOrderId, Refund, RefundOrderNo, req.TenantId, req.MallBaseId);
if (flag == false) if (flag == false)
{ {
......
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