提交代码

Mall.Model/Extend/Product/RB_Goods_Extend.cs

@@ -58,7 +58,7 @@ namespace Mall.Model.Extend.Product
         /// 教师id
         /// </summary>
         public int TeacherId { get; set; }
-        
+
 
         #region 司导信息
         /// <summary>
@@ -218,6 +218,12 @@ namespace Mall.Model.Extend.Product
         /// 商品ids
         /// </summary>
         public string GoodsIds { get; set; }
+
+
+        /// <summary>
+        /// 分享来源商品ids
+        /// </summary>
+        public string SourceGoodsIdIds { get; set; }
         /// <summary>
         /// 商品str
         /// </summary>
@@ -359,6 +365,11 @@ namespace Mall.Model.Extend.Product
         /// 门店名称
         /// </summary>
         public List<string> StoreNameList { get; set; }
+
+        /// <summary>
+        /// 供应商名称
+        /// </summary>
+        public string SupplierName { get; set; }
     }
 
     /// <summary>

Mall.Module.Product/ProductModule.cs

@@ -7214,6 +7214,7 @@ namespace Mall.Module.Product
                         { nameof(RB_Goods.FatCode),demodel.FatCode },
                         { nameof(RB_Goods.GoodsUrl),demodel.GoodsUrl },
                         { nameof(RB_Goods.goodsLogo),demodel.goodsLogo },
+                        { nameof(RB_Goods.RetailStore),demodel.RetailStore },
                     };
                     if (goodsModel.IsProcurement == 1)
                     {
@@ -7251,6 +7252,7 @@ namespace Mall.Module.Product
                         { nameof(RB_Goods.EnjoyMember),demodel.EnjoyMember},
                         { nameof(RB_Goods.SeparateSetMember),demodel.SeparateSetMember},
                         { nameof(RB_Goods.IsQuickBuy),demodel.IsQuickBuy},
+                         { nameof(RB_Goods.RetailStore),demodel.RetailStore },
 
                     };
                     }

Mall.Repository/Product/RB_GoodsRepository.cs

@@ -103,6 +103,10 @@ namespace Mall.Repository.Product
             {
                 where += $@" and g.{nameof(RB_Goods_Extend.SupplierId)}={dmodel.SupplierId}";
             }
+            if (dmodel.CreateBy > -1)
+            {
+                where += $@" and g.{nameof(RB_Goods_Extend.CreateBy)}={dmodel.CreateBy}";
+            }
             if (dmodel.MinProfitRate > 0)
             {
                 where += $@" and g.{nameof(RB_Goods_Extend.MinProfitRate)} <{dmodel.MinProfitRate}";
@@ -160,8 +164,9 @@ namespace Mall.Repository.Product
                 orderBy = " g.InventoryNum desc";
             }
 
-            string sql = $@"select g.* from RB_Goods g
+            string sql = $@"select g.*,s.`Name` as SupplierName from RB_Goods g
 inner join rb_goods_category c on g.Id=c.GoodsId 
+LEFT JOIN rb_supplier as s on g.SupplierId=s.ID
 where {where} group by g.Id order by {orderBy}";
             return GetPage<RB_Goods_Extend>(pageIndex, pageSize, out rowCount, sql, parameters).ToList();
         }
@@ -579,6 +584,10 @@ where {where} group by g.Id order by {orderBy}";
             {
                 where += $@" and g.{nameof(RB_Goods_Extend.Id)} in({dmodel.GoodsIds})";
             }
+            if (!string.IsNullOrEmpty(dmodel.SourceGoodsIdIds))
+            {
+                where += $@" and g.{nameof(RB_Goods_Extend.SourceGoodsId)} in({dmodel.SourceGoodsIdIds})";
+            }
             if (!string.IsNullOrEmpty(dmodel.StoresIds))
             {
                 where += $@" and locate(',{dmodel.StoresIds},', CONCAT(',',g.{nameof(RB_Goods_Extend.StoresIds)},',') )";