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

Mall.Model/Extend/MarketingCenter/RB_Coupon_SelfMotionMember_Extend.cs

@@ -16,7 +16,7 @@ namespace Mall.Model.Extend.MarketingCenter
         /// <summary>
         /// 会员名称
         /// </summary>
-        public string AliasName { get; set; }
+        public string Name { get; set; }
 
         /// <summary>
         /// 会员头像

Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs

@@ -137,6 +137,26 @@ namespace Mall.Model.Extend.MarketingCenter
         /// 文字位置
         /// </summary>
         public string textPosition { get; set; }
+
+        /// <summary>
+        /// 左边距
+        /// </summary>
+        public string left { get; set; }
+
+        /// <summary>
+        /// 右边距
+        /// </summary>
+        public string right { get; set; }
+
+        /// <summary>
+        /// 上边距
+        /// </summary>
+        public string top { get; set; }
+
+        /// <summary>
+        /// 下边距
+        /// </summary>
+        public string bottom { get; set; }
     }
 
     /// <summary>
@@ -587,6 +607,26 @@ namespace Mall.Model.Extend.MarketingCenter
         /// 选中的第几张图的小区域对应的数据
         /// </summary>
         public List<rubikDetailItem> list { get; set; }
+
+        /// <summary>
+        /// 左边距
+        /// </summary>
+        public string left { get; set; }
+
+        /// <summary>
+        /// 右边距
+        /// </summary>
+        public string right { get; set; }
+
+        /// <summary>
+        /// 上边距
+        /// </summary>
+        public string top { get; set; }
+
+        /// <summary>
+        /// 下边距
+        /// </summary>
+        public string bottom { get; set; }
     }
 
     /// <summary>

Mall.Module.Product/ProductModule.cs

@@ -3461,7 +3461,7 @@ namespace Mall.Module.Product
                             {
                                 PageId = thirdItem.Id + 100000,
                                 PageName = thirdItem.Name,
-                                PageUrl = "/pages/cats/cats?cat_id=" + thirdItem.Id,
+                                PageUrl = "/pages/goods/list?cat_id=" + thirdItem.Id,
                                 PageType = Common.Enum.MallBase.PageTypeEnum.DiyPage,
                                 IsParameter = 0,
                                 TipText = "",
@@ -3498,7 +3498,7 @@ namespace Mall.Module.Product
                         {
                             PageId = secondItem.Id + 100000,
                             PageName = secondItem.Name,
-                            PageUrl = "/pages/cats/cats?cat_id=" + secondItem.Id,
+                            PageUrl = "/pages/goods/list?cat_id=" + secondItem.Id,
                             PageType = Common.Enum.MallBase.PageTypeEnum.DiyPage,
                             IsParameter = 0,
                             TipText = "",
@@ -3526,7 +3526,7 @@ namespace Mall.Module.Product
                     {
                         PageId = firstItem.Id + 100000,
                         PageName = firstItem.Name,
-                        PageUrl = "/pages/cats/cats?cat_id=" + firstItem.Id,
+                        PageUrl = "/pages/cats/cats?cat_type=1&cat_id=" + firstItem.Id,
                         PageType = Common.Enum.MallBase.PageTypeEnum.DiyPage,
                         IsParameter = 0,
                         TipText = "",
@@ -3535,7 +3535,6 @@ namespace Mall.Module.Product
                         SubMenuList = secondResultList,
                     });
                 }
-
             }
             return resultList;
         }

Mall.Repository/MarketingCenter/RB_Coupon_SelfMotionMemberRepository.cs

@@ -27,7 +27,7 @@ namespace Mall.Repository.MarketingCenter
         public List<RB_Coupon_SelfMotionMember_Extend> GetListRepository(RB_Coupon_SelfMotionMember_Extend query)
         {
             StringBuilder builder = new StringBuilder();
-            builder.Append(@$" SELECT a.*,b.`AliasName`,b.Photo as GrandpaID FROM {TableName} as a 
+            builder.Append(@$" SELECT a.*,b.`Name`,b.Photo  FROM {TableName} as a 
 LEFT JOIN {UserTableName} as b on a.UserId = b.ID WHERE   a.{nameof(RB_Coupon_SelfMotionMember_Extend.Status)}=0");
             if (query != null)
             {

Mall.Repository/MarketingCenter/RB_DiscountCouponRepository.cs

@@ -48,6 +48,7 @@ namespace Mall.Repository.MarketingCenter
                     builder.Append($" AND {nameof(RB_DiscountCoupon_Extend.Name)} like '%{query.Name}%'");
                 }
             }
+            builder.Append($"  order by  {nameof(RB_DiscountCoupon_Extend.ID)} desc");
             return GetPage<RB_DiscountCoupon_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
         }
 

Mall.Repository/Product/RB_Goods_OrderIntroductionRepository.cs

@@ -217,12 +217,20 @@ where  go.OrderStatus in(1,2,3,4,5,6) and go.`Status`=0  {where}";
                 where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)} in(1,2,3,4,5,6)";
             }
 
+            //            string sql = $@"SELECT GROUP_CONCAT(oc.OrderDetailId) as OrderDetailIds,oc.OrderId,oc.OrderDetailId,o.OrderNo,o.UserId,oc.CommissionRatio,oc.Type,oc.CommissionState,o.OrderStatus as DistrbutionOrderSelectStatus,SUM(oc.Commission) as Commission 
+            //FROM RB_Goods_OrderIntroduction as  oc
+            //inner join rb_goods_order o on oc.OrderId = o.OrderId
+            //INNER JOIN rb_goods_orderdetail as od on od.Id=oc.OrderDetailId
+            //left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5)
+            //where {where} group by oc.OrderId,o.OrderNo order by oc.OrderId desc";
+
             string sql = $@"SELECT GROUP_CONCAT(oc.OrderDetailId) as OrderDetailIds,oc.OrderId,oc.OrderDetailId,o.OrderNo,o.UserId,oc.CommissionRatio,oc.Type,oc.CommissionState,o.OrderStatus as DistrbutionOrderSelectStatus,SUM(oc.Commission) as Commission 
-FROM RB_Goods_OrderIntroduction oc
+FROM rb_goods_orderdetail as od
+INNER JOIN RB_Goods_OrderIntroduction as  oc on od.Id=oc.OrderDetailId
 inner join rb_goods_order o on oc.OrderId = o.OrderId
-INNER JOIN rb_goods_orderdetail as od on od.Id=oc.OrderDetailId
 left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5)
 where {where} group by oc.OrderId,o.OrderNo order by oc.OrderId desc";
+
             return GetPage<RB_Goods_OrderIntroduction_Extend>(pageIndex, pageSize, out count, sql).ToList();
         }
 

Mall.Repository/User/RB_Distributor_InfoRepository.cs

@@ -105,7 +105,7 @@ where {where} order by di.CreateDate desc";
             }
             if (!string.IsNullOrEmpty(dmodel.Name))
             {
-                where += $@" and di.{nameof(RB_Distributor_Info.Name)} like '%{dmodel.Name}%'";
+                where += $@" and (mu.{nameof(RB_Member_User.Name)} like '%{dmodel.Name}%' or di.{nameof(RB_Distributor_Info.Name)} like '%{dmodel.Name}%' )";
             }
 
             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";

Mall.WebApi/Controllers/User/SupplierController.cs

@@ -58,7 +58,7 @@ namespace Mall.WebApi.Controllers.User
                 x.Name,
                 x.Mobile,
                 x.Address,
-                IntroducerName = string.IsNullOrWhiteSpace(x.IntroducerName) ? x.MemberUserName : x.IntroducerName,
+                IntroducerName =  x.MemberUserName ,
                 CardNum = x.ClientBankAccount != null ? x.ClientBankAccount.CardNum : "",
                 OpenBankName = x.ClientBankAccount != null ? x.ClientBankAccount.OpenBankName : "",
                 AccountAlias = x.ClientBankAccount != null ? x.ClientBankAccount.AccountAlias : "",