Skip to content

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

Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

parents abca7b79 ce69a476
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 22 deletions
Mall.Module.Product/OrderModule.cs
View file @ a937a406
...@@ -5359,16 +5359,16 @@ namespace Mall.Module.Product ...@@ -5359,16 +5359,16 @@ namespace Mall.Module.Product
string goodsName = dlist.FirstOrDefault().GoodsName; string goodsName = dlist.FirstOrDefault().GoodsName;
if (dlist.Count > 1) if (dlist.Count > 1)
{ {
if (goodsName.Length > 12) if (goodsName.Length > 6)
{ {
goodsName = goodsName.Substring(0, 12) + ".."; goodsName = goodsName.Substring(0, 6);
} }
goodsName += "等" + dlist.Count + "件商品"; goodsName += "等" + dlist.Count + "件";
} }
else { else {
if (goodsName.Length > 18) if (goodsName.Length > 10)
{ {
goodsName = goodsName.Substring(0, 18) + ".."; goodsName = goodsName.Substring(0, 10);
} }
} }
if (demodel.Type == 1) if (demodel.Type == 1)
...@@ -5591,17 +5591,17 @@ namespace Mall.Module.Product ...@@ -5591,17 +5591,17 @@ namespace Mall.Module.Product
string goodsName = detailList.FirstOrDefault().GoodsName; string goodsName = detailList.FirstOrDefault().GoodsName;
if (detailList.Count > 1) if (detailList.Count > 1)
{ {
if (goodsName.Length > 12) if (goodsName.Length > 6)
{ {
goodsName = goodsName.Substring(0, 12) + ".."; goodsName = goodsName.Substring(0, 6);
} }
goodsName += "等" + detailList.Count + "件商品"; goodsName += "等" + detailList.Count + "件";
} }
else else
{ {
if (goodsName.Length > 18) if (goodsName.Length > 10)
{ {
goodsName = goodsName.Substring(0, 18) + ".."; goodsName = goodsName.Substring(0, 10);
} }
} }
new MiniProgramMsgModule().SendOrderCancelMsg(tenantId, mallBaseId, umodel.OpenId, omodel.OrderNo, "订单已取消", (omodel.Income ?? 0).ToString(), goodsName); new MiniProgramMsgModule().SendOrderCancelMsg(tenantId, mallBaseId, umodel.OpenId, omodel.OrderNo, "订单已取消", (omodel.Income ?? 0).ToString(), goodsName);
...@@ -5812,17 +5812,17 @@ namespace Mall.Module.Product ...@@ -5812,17 +5812,17 @@ namespace Mall.Module.Product
string goodsName = detailList.FirstOrDefault().GoodsName; string goodsName = detailList.FirstOrDefault().GoodsName;
if (detailList.Count > 1) if (detailList.Count > 1)
{ {
if (goodsName.Length > 12) if (goodsName.Length > 6)
{ {
goodsName = goodsName.Substring(0, 12) + ".."; goodsName = goodsName.Substring(0, 6);
} }
goodsName += "等" + detailList.Count + "件商品"; goodsName += "等" + detailList.Count + "件";
} }
else else
{ {
if (goodsName.Length > 18) if (goodsName.Length > 10)
{ {
goodsName = goodsName.Substring(0, 18) + ".."; goodsName = goodsName.Substring(0, 10);
} }
} }
new MiniProgramMsgModule().SendOrderCancelMsg(tenantId, mallBaseId, umodel.OpenId, omodel.OrderNo, "订单已取消", (omodel.Income ?? 0).ToString(), goodsName); new MiniProgramMsgModule().SendOrderCancelMsg(tenantId, mallBaseId, umodel.OpenId, omodel.OrderNo, "订单已取消", (omodel.Income ?? 0).ToString(), goodsName);
......
Mall.Module.User/UserCommonModule.cs
View file @ a937a406
...@@ -329,17 +329,17 @@ namespace Mall.Module.User ...@@ -329,17 +329,17 @@ namespace Mall.Module.User
string goodsName = orderGoodsList.FirstOrDefault().GoodsName; string goodsName = orderGoodsList.FirstOrDefault().GoodsName;
if (orderGoodsList.Count > 1) if (orderGoodsList.Count > 1)
{ {
if (goodsName.Length > 12) if (goodsName.Length > 6)
{ {
goodsName = goodsName.Substring(0, 12) + ".."; goodsName = goodsName.Substring(0, 6);
} }
goodsName += "等" + orderGoodsList.Count + "件商品"; goodsName += "等" + orderGoodsList.Count + "件";
} }
else else
{ {
if (goodsName.Length > 18) if (goodsName.Length > 10)
{ {
goodsName = goodsName.Substring(0, 18) + ".."; goodsName = goodsName.Substring(0, 10);
} }
} }
appletWeChatModule.SendOrderSucceedMsg(oldOrder.TenantId, oldOrder.MallBaseId, umodel.OpenId, oldOrder.OrderNo, oldOrder.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss"), (oldOrder.Income ?? 0).ToString(), goodsName); appletWeChatModule.SendOrderSucceedMsg(oldOrder.TenantId, oldOrder.MallBaseId, umodel.OpenId, oldOrder.OrderNo, oldOrder.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss"), (oldOrder.Income ?? 0).ToString(), goodsName);
......
Mall.WebApi/Controllers/Product/OrderController.cs
View file @ a937a406
...@@ -1649,9 +1649,9 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1649,9 +1649,9 @@ namespace Mall.WebApi.Controllers.MallBase
var detailModel = orderModule.GetOrderDetailInfo(ReModel.OrderDetialId ?? 0); var detailModel = orderModule.GetOrderDetailInfo(ReModel.OrderDetialId ?? 0);
string goodsName = detailModel?.GoodsName ?? ""; string goodsName = detailModel?.GoodsName ?? "";
if (goodsName.Length > 18) if (goodsName.Length > 10)
{ {
goodsName = goodsName.Substring(0, 18) + ".."; goodsName = goodsName.Substring(0, 10);
} }
var umodel = orderModule.GetMemberUserInfo(orderModel.UserId ?? 0); var umodel = orderModule.GetMemberUserInfo(orderModel.UserId ?? 0);
if (goodsName != "" && umodel != null) if (goodsName != "" && umodel != null)
......
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