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

.gitignore

@@ -5,3 +5,4 @@ packages/
 /Properties
 Mall.WindowsService/Properties/PublishProfiles/FolderProfile.pubxml
 Mall.Model/Entity/Sign/RB_Sign_Setting.cs
+Mall.WebApi/Properties/

Mall.Model/Extend/MarketingCenter/RB_Share_Friend_Extend.cs

@@ -68,5 +68,20 @@ namespace Mall.Model.Extend.MarketingCenter
         /// 商品名称
         /// </summary>
         public string GoodsName { get; set; }
+
+        /// <summary>
+        /// 一级分类名称
+        /// </summary>
+        public string FirstLevelName { get; set; }
+
+        /// <summary>
+        /// 二级分类名称
+        /// </summary>
+        public string SecondLevelName { get; set; }
+
+        /// <summary>
+        /// 三级分类名称
+        /// </summary>
+        public string ThirdLevelName { get; set; }
     }
 }
\ No newline at end of file

Mall.Module.MarketingCenter/ShareModule.cs

@@ -271,6 +271,18 @@ namespace Mall.Module.MarketingCenter
         public RB_Share_Friend_Extend GetShareFriendModule(object Id)
         {
             var extModel = share_FriendRepository.GetShareFriendEntityRepository(new RB_Share_Friend_Extend() { Id = Convert.ToInt32(Id) });
+            if (extModel != null)
+            {
+                var cateAllList = share_CategoryRepository.GetShareCategoryListRepository(new RB_Share_Category_Extend()
+                {
+                    MallBaseId = extModel.MallBaseId,
+                    TenantId = extModel.TenantId
+                });
+                var list = GetFatherList(cateAllList, extModel.CateId).OrderBy(qitem => qitem.Level).ToList();
+                extModel.FirstLevelName = list.Where(qitem => qitem.Level == 1)?.FirstOrDefault()?.Name ?? "";
+                extModel.SecondLevelName = list.Where(qitem => qitem.Level == 2)?.FirstOrDefault()?.Name ?? "";
+                extModel.ThirdLevelName = list.Where(qitem => qitem.Level == 3)?.FirstOrDefault()?.Name ?? "";
+            }
             return extModel;
        }
 

Mall.Module.Product/OrderModule.cs

@@ -9026,13 +9026,13 @@ namespace Mall.Module.Product
                 }
                 else
                 {
-                    keyValues.Add(nameof(RB_Goods_OrderDetail.RealMoney), (model.RealMoney ?? 0) + money);
+                    keyValues.Add(nameof(RB_Goods_OrderDetail.YFMoney), (model.YFMoney ?? 0) + money);
                 }
             }
             else {
                 if (otherType == 21)
                 {
-                    keyValues.Add(nameof(RB_Goods_OrderDetail.YFMoney), (model.YFMoney ?? 0) + money);
+                    keyValues.Add(nameof(RB_Goods_OrderDetail.RealMoney), (model.RealMoney ?? 0) + money);
                 }
                 else
                 {

Mall.Module.User/UserModule.cs

@@ -2412,6 +2412,8 @@ namespace Mall.Module.User
                     List<Model.Entity.Finance.RB_ECFinanceId_Relation> ECList = new List<Model.Entity.Finance.RB_ECFinanceId_Relation>();
                     if (!string.IsNullOrEmpty(remitModel.ReOrderIds) || !string.IsNullOrEmpty(remitModel.ReVipIds))
                     {
+                        if (string.IsNullOrEmpty(remitModel.ReOrderIds)) { remitModel.ReOrderIds = "[]"; }
+                        if (string.IsNullOrEmpty(remitModel.ReVipIds)) { remitModel.ReVipIds = "[]"; }
                         List<int> reorderIdList = JsonConvert.DeserializeObject<List<int>>(remitModel.ReOrderIds);
                         List<int> revipIdList = JsonConvert.DeserializeObject<List<int>>(remitModel.ReVipIds);
                         if (revipIdList.Any())

Mall.Repository/MarketingCenter/RB_Share_CategoryRepository.cs

@@ -102,15 +102,25 @@ WHERE 1=1 AND Status=0
         public List<RB_Share_Category_Extend> GetChildCategoryListRepository(RB_Share_Category_Extend query)
         {
             StringBuilder builder = new StringBuilder();
+            //            builder.AppendFormat(@"
+            //SELECT tabA.* 
+            //FROM (SELECT * FROM rb_share_category WHERE `Status`=0 AND ParentId>0) tabA,
+            //     (SELECT @pid := '{0}') pd 
+            //WHERE FIND_IN_SET(ParentId, @pid) > 0  AND @pid := concat(@pid, ',', id) 
+            //UNION
+            //SELECT * 
+            //FROM rb_share_category 
+            //WHERE `Status`=0 AND FIND_IN_SET(Id,@pid) > 0 ",query.QCateIds);
+
             builder.AppendFormat(@"
-SELECT tabA.* 
-FROM (SELECT * FROM rb_share_category WHERE `Status`=0 AND ParentId>0) tabA,
-     (SELECT @pid := '{0}') pd 
-WHERE FIND_IN_SET(ParentId, @pid) > 0  AND @pid := concat(@pid, ',', id) 
-UNION
-SELECT * 
-FROM rb_share_category 
-WHERE `Status`=0 AND FIND_IN_SET(Id,@pid) > 0 ",query.QCateIds);
+SELECT * FROM rb_share_category WHERE `Status`=0 AND ParentId IN({0})
+UNION ALL
+SELECT * FROM rb_share_category WHERE `Status`=0 AND ParentId IN(SELECT Id FROM rb_share_category WHERE `Status`=0 AND ParentId IN({0}) )
+UNION ALL 
+SELECT * FROM rb_share_category WHERE `Status`=0 AND ParentId IN(SELECT Id FROM rb_share_category WHERE `Status`=0 AND ParentId IN( SELECT Id FROM rb_share_category WHERE `Status`=0 AND ParentId IN({0})) )
+UNION ALL 
+SELECT * FROM rb_share_category WHERE `Status`=0 AND Id IN({0})
+", query.QCateIds);
             return Get<RB_Share_Category_Extend>(builder.ToString()).ToList();
         }
     }

Mall.Repository/User/RB_SmallShops_PriceRepository.cs

@@ -73,6 +73,9 @@ where {where} order by di.Id desc";
             {
                 where += $@" and g.{nameof(Model.Entity.Product.RB_Goods.Name)} like '%{demodel.GoodsName}%'";
             }
+            if (demodel.SmallShopsId > 0) {
+                where += $@" and sp.{nameof(RB_SmallShops_Price_Extend.SmallShopsId)}={demodel.SmallShopsId}";
+            }
 
             string sql = $@"
     SELECT sp.GoodsId FROM rb_smallshops_price sp