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

Mall.Model/Extend/Product/RB_Groupbuy_Activity_Extend.cs

@@ -136,5 +136,15 @@ namespace Mall.Model.Extend.Product
         /// 区域列表
         /// </summary>
         public List<RB_GroupBuy_Area_Extend> AreaList { get; set; }
+
+        /// <summary>
+        /// 运费名称
+        /// </summary>
+        public string FreightName { get; set; }
+
+        /// <summary>
+        /// 表单名称
+        /// </summary>
+        public string FormsName { get; set; }
     }
 }

Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs

@@ -256,24 +256,73 @@ namespace Mall.Module.MarketingCenter
                                        
                                     }
                                 }
-                                subData.list.Add(new rubikDetailItem()
+                                try
                                 {
-                                    w = w,
-                                    h = h2,
-                                    x = x,
-                                    y = y,
-                                    link = links,
-                                    width = subItem["width"].ToString(),
-                                    height = subItem["height"].ToString(),
-                                    left = subItem["left"].ToString(),
-                                    top = subItem["top"].ToString(),
-                                    pic_url = Common.Config.GetFileUrl(subItem["pic_url"].ToString()) ,
-                                    backgroundImage = subItem["backgroundImage"].ToString(),
-                                    backgroundRepeat = subItem["backgroundRepeat"].ToString(),
-                                    backgroundSize = subItem["backgroundSize"].ToString(),
-                                    backgroundPosition = subItem["backgroundPosition"].ToString(),
-                                    zIndex = zIndex
-                                }); ;
+                                    var rubikModel = new rubikDetailItem()
+                                    {
+                                        w = w,
+                                        h = h2,
+                                        x = x,
+                                        y = y,
+                                        link = links,
+                                        zIndex = zIndex,
+                                        width = "",
+                                        height = "",
+                                        left = "",
+                                        top = "",
+                                        pic_url = "",
+                                        backgroundImage = "",
+                                        backgroundRepeat = "",
+                                        backgroundSize = "",
+                                        backgroundPosition = "",
+                                        backgroundColor = ""
+                                    };
+                                    if (subItem["width"] != null && !string.IsNullOrWhiteSpace(subItem["width"].ToString()))
+                                    {
+                                        rubikModel.width = subItem["width"].ToString();
+                                    }
+                                    if (subItem["height"] != null && !string.IsNullOrWhiteSpace(subItem["height"].ToString()))
+                                    {
+                                        rubikModel.height = subItem["height"].ToString();
+                                    }
+                                    if (subItem["left"] != null && !string.IsNullOrWhiteSpace(subItem["left"].ToString()))
+                                    {
+                                        rubikModel.left = subItem["left"].ToString();
+                                    }
+                                    if (subItem["top"] != null && !string.IsNullOrWhiteSpace(subItem["top"].ToString()))
+                                    {
+                                        rubikModel.top = subItem["top"].ToString();
+                                    }
+                                    if (subItem["pic_url"] != null && !string.IsNullOrWhiteSpace(subItem["pic_url"].ToString()))
+                                    {
+                                        rubikModel.pic_url = Common.Config.GetFileUrl(subItem["pic_url"].ToString());
+                                    }
+                                    if (subItem["backgroundImage"] != null && !string.IsNullOrWhiteSpace(subItem["backgroundImage"].ToString()))
+                                    {
+                                        rubikModel.backgroundImage = Common.Config.GetFileUrl(subItem["backgroundImage"].ToString());
+                                    }
+                                    if (subItem["backgroundRepeat"] != null && !string.IsNullOrWhiteSpace(subItem["backgroundRepeat"].ToString()))
+                                    {
+                                        rubikModel.backgroundRepeat = subItem["backgroundRepeat"].ToString();
+                                    }
+                                    if (subItem["backgroundSize"] != null && !string.IsNullOrWhiteSpace(subItem["backgroundSize"].ToString()))
+                                    {
+                                        rubikModel.backgroundSize = subItem["backgroundSize"].ToString();
+                                    }
+                                    if (subItem["backgroundPosition"] != null && !string.IsNullOrWhiteSpace(subItem["backgroundPosition"].ToString()))
+                                    {
+                                        rubikModel.backgroundPosition = subItem["backgroundPosition"].ToString();
+                                    }
+                                    if (subItem["backgroundColor"] != null && !string.IsNullOrWhiteSpace(subItem["backgroundColor"].ToString()))
+                                    {
+                                        rubikModel.backgroundColor = subItem["backgroundColor"].ToString();
+                                    }
+                                    subData.list.Add(rubikModel);
+                                }
+                                catch
+                                {
+
+                                }
                             }
                         }
                     }

Mall.Module.Product/GroupBuyActivityModule_Query.cs

 using Mall.Model.Entity.Product;
 using Mall.Model.Extend.Product;
+using Mall.Repository.BaseSetUp;
 using Mall.Repository.Product;
 using System;
 using System.Collections.Generic;
@@ -58,6 +59,11 @@ namespace Mall.Module.Product
         /// </summary>
         private readonly RB_GroupBuy_AreaRepository groupbuy_AreaRepository = new RB_GroupBuy_AreaRepository();
 
+        /// <summary>
+        /// 运费
+        /// </summary>
+        private readonly RB_Logistics_RulesRepository logistics_RulesRepository = new RB_Logistics_RulesRepository();
+
 
         /// <summary>
         /// 根据查询条件获取地区信息
@@ -354,6 +360,24 @@ namespace Mall.Module.Product
                         GoodsId = extModel.GoodId,
                     });
                 }
+                //运费
+                if (extModel.FreightId > 0)
+                {
+                    extModel.FreightName = logistics_RulesRepository.GetEntity(extModel.FreightId)?.RulesName ?? "";
+                }
+                else
+                {
+                    extModel.FreightName = "默认运费";
+                }
+                //表单
+                if (extModel.FormsId > 0)
+                {
+                    extModel.FormsName = "未建表";
+                }
+                else
+                {
+                    extModel.FormsName = "默认表单";
+                }
                 extModel.SpecificationList = specificationList;
                 extModel.SpecificationPriceList = specPriceList;
                 extModel.GroupList = groupStepList;