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

Mall.Module.Product/OrderModule.cs

@@ -5359,16 +5359,16 @@ namespace Mall.Module.Product
                             string goodsName = dlist.FirstOrDefault().GoodsName;
                             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 {
-                                if (goodsName.Length > 18)
+                                if (goodsName.Length > 10)
                                 {
-                                    goodsName = goodsName.Substring(0, 18) + "..";
+                                    goodsName = goodsName.Substring(0, 10);
                                 }
                             }
                             if (demodel.Type == 1)
@@ -5591,17 +5591,17 @@ namespace Mall.Module.Product
                         string goodsName = detailList.FirstOrDefault().GoodsName;
                         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
                         {
-                            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);
@@ -5812,17 +5812,17 @@ namespace Mall.Module.Product
                     string goodsName = detailList.FirstOrDefault().GoodsName;
                     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
                     {
-                        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);

Mall.Module.User/UserCommonModule.cs

@@ -329,17 +329,17 @@ namespace Mall.Module.User
                 string goodsName = orderGoodsList.FirstOrDefault().GoodsName;
                 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
                 {
-                    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);

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -1649,9 +1649,9 @@ namespace Mall.WebApi.Controllers.MallBase
 
                     var detailModel = orderModule.GetOrderDetailInfo(ReModel.OrderDetialId ?? 0);
                     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);
                     if (goodsName != "" && umodel != null)