提交代码

Mall.Model/Extend/User/RB_Distributor_Info_Extend.cs

@@ -28,6 +28,11 @@ namespace Mall.Model.Extend.User
         /// </summary>
         public string NickName { get; set; }
 
+          /// <summary>
+        /// 会员名称
+        /// </summary>
+        public string MemberUserName { get; set; }
+
         /// <summary>
         /// 头像
         /// </summary>

Mall.Model/Extend/User/RB_Supplier_Extend.cs

@@ -22,6 +22,11 @@ namespace Mall.Model.Extend.User
         /// </summary>
         public string IntroducerName { get; set; }
 
+        /// <summary>
+        /// 会员名称
+        /// </summary>
+        public string MemberUserName { get; set; }
+
         public List<RB_SupplierCommission> SupplierCommissionList { get; set; }
     } 
 }

Mall.Repository/User/RB_Distributor_InfoRepository.cs

@@ -108,7 +108,7 @@ where {where} order by di.CreateDate desc";
                 where += $@" and di.{nameof(RB_Distributor_Info.Name)} like '%{dmodel.Name}%'";
             }
 
-            string sql = $@"select di.*,mu.OpenId from RB_Distributor_Info di LEFT JOIN rb_member_user as mu on di.UserId=mu.Id where {where} order by di.CreateDate desc";
+            string sql = $@"select di.*,mu.OpenId,mu.Name as MemberUserName from RB_Distributor_Info di LEFT JOIN rb_member_user as mu on di.UserId=mu.Id where {where} order by di.CreateDate desc";
             return Get<RB_Distributor_Info_Extend>(sql).ToList();
         }
 

Mall.Repository/User/RB_SupplierRepository.cs

@@ -37,7 +37,8 @@ namespace Mall.Repository.User
             {
                 where += $@" and a.{nameof(RB_Supplier.Name)} like '%{dmodel.Name}%'";
             }
-            string sql = $@"select a.*,b.`Name` as IntroducerName from {TableName} as a LEFT JOIN rb_distributor_info as b on a.Introducer=b.UserId {where} order by a.Id desc";
+            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";
             return GetPage<RB_Supplier_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
         }
 
@@ -69,7 +70,8 @@ namespace Mall.Repository.User
             {
                 where += $@" and a.{nameof(RB_Supplier.ID)} in({dmodel.SupplierIds})";
             }
-            string sql = $@"select a.*,b.`Name` as IntroducerName from {TableName} as a LEFT JOIN rb_distributor_info as b on a.Introducer=b.UserId {where} order by a.Id desc";
+            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";
             return Get<RB_Supplier_Extend>(sql).ToList();
         }
     }

Mall.WebApi/Controllers/User/SupplierController.cs

@@ -58,7 +58,7 @@ namespace Mall.WebApi.Controllers.User
                 x.Name,
                 x.Mobile,
                 x.Address,
-                x.IntroducerName,
+                IntroducerName = string.IsNullOrWhiteSpace(x.IntroducerName) ? x.MemberUserName : x.IntroducerName,
                 CardNum = x.ClientBankAccount != null ? x.ClientBankAccount.CardNum : "",
                 OpenBankName = x.ClientBankAccount != null ? x.ClientBankAccount.OpenBankName : "",
                 AccountAlias = x.ClientBankAccount != null ? x.ClientBankAccount.AccountAlias : "",
@@ -224,6 +224,10 @@ namespace Mall.WebApi.Controllers.User
             query.MallBaseId = parms.MallBaseId;
             query.AuditStatus = Common.Enum.User.DistributorAuditStatusEnum.Audited;
             var oldLogisticsList = orderModule.GetDistributorInfoList(query);
+            if (oldLogisticsList != null && oldLogisticsList.Any())
+            {
+                oldLogisticsList.ForEach(x => x.Name = (string.IsNullOrWhiteSpace(x.Name) ? x.MemberUserName : x.Name));
+            }
             return ApiResult.Success("", oldLogisticsList);
         }
 
@@ -342,8 +346,8 @@ namespace Mall.WebApi.Controllers.User
                                 GoodsName = orderGoodsItem.GoodsName,
                                 OrderNo = orderGoodsItem.OrderNo,
                                 Id = orderGoodsItem.Id,
-                                CostMoney= orderGoodsItem.CostMoney,
-                                FreightCostMoney=orderGoodsItem.FreightCostMoney
+                                CostMoney = orderGoodsItem.CostMoney,
+                                FreightCostMoney = orderGoodsItem.FreightCostMoney
                             };
                             result.Add(newOrderGoods);
                         }