提交代码

Mall.Model/Extend/User/RB_Supplier_Extend.cs

@@ -27,6 +27,11 @@ namespace Mall.Model.Extend.User
         /// </summary>
         public string MemberUserName { get; set; }
 
+        /// <summary>
+        /// 商户名称
+        /// </summary>
+        public string TenantName { get; set; }
+
         public List<RB_SupplierCommission> SupplierCommissionList { get; set; }
-    } 
+    }
 }

Mall.Repository/User/RB_SupplierRepository.cs

@@ -70,8 +70,8 @@ LEFT JOIN rb_member_user as c on c.Id=b.UserId {where} order by a.Id desc";
             {
                 where += $@" and a.{nameof(RB_Supplier.ID)} in({dmodel.SupplierIds})";
             }
-            string sql = $@"select a.*,b.`Name` as IntroducerName,c.`Name` as MemberUserName from {TableName} as a LEFT JOIN rb_distributor_info as b on a.Introducer=b.UserId
-LEFT JOIN rb_member_user as c on c.Id=b.UserId {where} order by a.Id desc";
+            string sql = $@"select t.`Name` as TenantName ,a.*,b.`Name` as IntroducerName,c.`Name` as MemberUserName from {TableName} as a LEFT JOIN rb_distributor_info as b on a.Introducer=b.UserId
+LEFT JOIN rb_member_user as c on c.Id=b.UserId   LEFT JOIN rb_tenant as t on a.TenantId=t.TenantId {where} order by a.Id desc";
             return Get<RB_Supplier_Extend>(sql).ToList();
         }
     }

Mall.WebApi/Controllers/Product/ProductController.cs

@@ -3208,6 +3208,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 model.SourceGoodsId = item.Id;
                 model.RetailStore = 0;
                 model.Id = 0;
+                model.SupplierId = 0;
                 model.CreateDate = System.DateTime.Now;
                 model.UpdateDate = System.DateTime.Now;
                 newGoodsList.Add(model);

Mall.WebApi/Controllers/User/SupplierController.cs

@@ -209,6 +209,7 @@ namespace Mall.WebApi.Controllers.User
           //  query.TenantId = UserInfo.TenantId;
            // query.MallBaseId = parms.MallBaseId;
             var oldLogisticsList = supplierModule.GetList(query);
+            oldLogisticsList.ForEach(x => x.Name = "【"+x.TenantName + "】" + x.Name);
             return ApiResult.Success("", oldLogisticsList);
         }