页面修改

Mall.Model/Extend/User/RB_Member_User_Extend.cs

@@ -156,6 +156,16 @@ namespace Mall.Model.Extend.User
         /// 店铺名称
         /// </summary>
         public string ShopName { get; set; }
+
+        /// <summary>
+        /// 真实订单数量
+        /// </summary>
+        public int RealOrderNum { get; set; }
+
+        /// <summary>
+        /// 实收金额
+        /// </summary>
+        public decimal Income { get; set; }
     }
 
 

Mall.Module.Product/ProductModule.cs

@@ -16,6 +16,7 @@ using Mall.Model.Extend.User;
 using Mall.Model.Query;
 using Mall.Repository;
 using Mall.Repository.BaseSetUp;
+using Mall.Repository.MarketingCenter;
 using Mall.Repository.Product;
 using Mall.Repository.Reserve;
 using Mall.Repository.User;
@@ -205,6 +206,11 @@ namespace Mall.Module.Product
         /// </summary>
         private readonly RB_StoresRepository storesRepository = new RB_StoresRepository();
 
+        /// <summary>
+        /// 分享仓储层对象
+        /// </summary>
+        private readonly RB_Share_FriendRepository share_FriendRepository = new RB_Share_FriendRepository();
+
         #region 小程序接口
 
         /// <summary>
@@ -1465,6 +1471,8 @@ namespace Mall.Module.Product
         public object GetAppletGoodsInfo_V2(int goodsId, int UserId, int SmallShopsId, int TenantId, int MallBaseId)
         {
             var model = goodsRepository.GetEntity(goodsId).RefMapperTo<RB_Goods_Extend>();
+            //是否商品有分销信息
+            int IsExistsShare = 0;
             if (model == null || model.TenantId != TenantId || model.MallBaseId != MallBaseId)
             {
                 return null;
@@ -1478,6 +1486,14 @@ namespace Mall.Module.Product
                     //封面图
                     model.CoverImage = CarouselIdList[0];
                 }
+                var shareModel = share_FriendRepository.GetShareFriendEntityRepository(new Model.Extend.MarketingCenter.RB_Share_Friend_Extend()
+                {
+                    GoodsId = goodsId
+                });
+                if (shareModel != null && shareModel.Id > 0)
+                {
+                    IsExistsShare = 1;
+                }
             }
             //小程序名称
             model.MallName = programRepository.GetEntity(model.MallBaseId)?.MallName ?? "";
@@ -2429,6 +2445,7 @@ namespace Mall.Module.Product
             {
                 goods = new
                 {
+                    friendUrl= IsExistsShare==1? "/pages/quick_share/index?GoodsId=" +model.Id+ "&KeyWords="+model.Name:"",
                     id = model.Id,
                     mall_id = model.MallBaseId,
                     mch_id = model.TenantId,//暂  商户id

Mall.Module.User/UserModule.cs

@@ -4147,12 +4147,12 @@ namespace Mall.Module.User
                 //获取推广人数
                 var tList = member_UserRepository.GetDistributorReferralsNum(userIds, 1, demodel.TenantId, demodel.MallBaseId);
                 //获取消费金额 + 订单数量
-                var oList = goods_OrderRepository.GetUserOrderNumAndMoney(userIds, demodel.TenantId, demodel.MallBaseId);
+                //var oList = goods_OrderRepository.GetUserOrderNumAndMoney(userIds, demodel.TenantId, demodel.MallBaseId);
 
                 foreach (var item in list.Where(qitem => qitem.Id != NewUserId))
                 {
                     int tgNum = tList.Where(x => x.SuperiorId == item.Id).FirstOrDefault()?.ReferralsNum ?? 0;
-                    var orderModel = oList.Where(x => x.UserId == item.Id).FirstOrDefault();
+                    //var orderModel = oList.Where(x => x.UserId == item.Id).FirstOrDefault();
                     RList.Add(new
                     {
                         UserId = item.Id,
@@ -4160,8 +4160,8 @@ namespace Mall.Module.User
                         item.Photo,
                         CreateDate = item.CreateDate.HasValue ? item.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                         GeneralizeNum = tgNum,
-                        OrderNum = orderModel?.OrderNum ?? 0,
-                        Income = orderModel?.Income ?? 0,
+                        OrderNum = item.RealOrderNum,
+                        Income = item.Income,
                     });
                 }
             }

Mall.Repository/MarketingCenter/RB_Share_FriendRepository.cs

@@ -35,7 +35,6 @@ WHERE 1=1 AND A.Status=0
             if (IsUse)
             {
                 builder.AppendFormat(" AND A.{0}=1 ", nameof(RB_Share_Friend_Extend.IsUse));
-                // A.IsTop DESC,A.SortNum ASC,
                 orderBy = " ORDER BY A.CreateDate DESC ";
             }
             else
@@ -72,6 +71,10 @@ WHERE 1=1 AND A.Status=0
                 {
                     builder.AppendFormat(" AND A.{0}<='{1} 23:59:59' ", nameof(RB_Share_Friend_Extend.CreateDate), Convert.ToDateTime(query.QEndDate).ToString("yyyy-MM-dd"));
                 }
+                if (query.GoodsId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Share_Friend_Extend.GoodsId), query.GoodsId);
+                }
             }
             builder.AppendFormat(orderBy);
             return GetPage<RB_Share_Friend_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
@@ -172,6 +175,10 @@ WHERE 1=1 AND A.Status=0
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Share_Friend_Extend.Id), query.Id);
                 }
+                if (query.GoodsId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Share_Friend_Extend.GoodsId), query.GoodsId);
+                }
             }
             return Get<RB_Share_Friend_Extend>(builder.ToString()).FirstOrDefault();
         }

Mall.Repository/User/RB_Member_UserRepository.cs

@@ -298,14 +298,18 @@ select * from RB_Member_User where {where}  order by CreateDate desc
 
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT u.*
+SELECT u.*,IFNULL(C.Income,0) AS Income,IFNULL(C.OrderNum,0) AS RealOrderNum
 FROM RB_Member_User u INNER JOIN rb_distributor_info d on u.Id =d.UserId
      LEFT JOIN (
                    SELECT u.SuperiorId,COUNT(0) AS ReferralsNum 
                    FROM rb_member_user u 
                    WHERE 1=1 {1}  
                    GROUP BY u.SuperiorId
-                ) AS B ON U.Id=B.SuperiorId
+               )  AS B ON U.Id=B.SuperiorId
+    LEFT JOIN (
+				SELECT UserId,SUM(Income) as Income,count(0) as OrderNum FROM rb_goods_order 
+				WHERE OrderStatus in (2,3,4,5,6) and Recycled=2  GROUP BY UserId
+              ) AS C ON U.Id=C.UserId
 WHERE 1=1 {0} 
 ", where, where2);
             string orderBy = " order by u.CreateDate desc ";
@@ -321,6 +325,14 @@ WHERE 1=1 {0}
             {
                 orderBy = " order by B.ReferralsNum ASC ";
             }
+            else if (dmodel.SortNum == 4)
+            {
+                orderBy = " order by IFNULL(C.Income,0) ASC ";
+            }
+            else if (dmodel.SortNum == 5)
+            {
+                orderBy = " order by IFNULL(C.Income,0) DESC ";
+            }
             builder.AppendFormat(orderBy);
 
             return GetPage<RB_Member_User_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();