Commit d6fa7c5b authored by 吴春's avatar 吴春

提交代码

parent a937a406
......@@ -613,7 +613,7 @@ namespace Mall.WebApi.Controllers.MallBase
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);
miniProgramMsgModule.SendOrderRefundMsg(mallModel.TenantId.Value, mallModel.MallBaseId, userModel.OpenId, "已退款,请注意查收", omodel.OrderNo, (omodel.Income ?? 0).ToString(), goodsName);
}
bool flag = orderModule.SetOrderForcedToCancel(omodel, RefundOrderNo, req.TenantId, req.MallBaseId);
......@@ -816,7 +816,7 @@ namespace Mall.WebApi.Controllers.MallBase
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);
miniProgramMsgModule.SendOrderRefundMsg(mallModel.TenantId.Value, mallModel.MallBaseId, userModel.OpenId, "已退款,请注意查收", omodel.OrderNo, (omodel.Income ?? 0).ToString(), goodsName);
}
bool flag = orderModule.SetOrderApplyForCancelAudit(omodel, Type, Remark, RefundOrderNo, req.TenantId, req.MallBaseId);
if (flag)
......@@ -1614,32 +1614,6 @@ namespace Mall.WebApi.Controllers.MallBase
var Robj = new App_Code.PayUtil().Refund(pram, mallModel, _accessor);
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);
if (flag == false)
{
......@@ -1764,7 +1738,7 @@ namespace Mall.WebApi.Controllers.MallBase
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);
miniProgramMsgModule.SendOrderRefundMsg(mallModel.TenantId.Value, mallModel.MallBaseId, userModel.OpenId, "已退款,请注意查收", orderModel.OrderNo, (orderModel.Income ?? 0).ToString(), goodsName);
}
bool flag = orderModule.SetOrderAfterSaleForRefunds(ReOrderId, Refund, RefundOrderNo, req.TenantId, req.MallBaseId);
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