解决冲突

.gitignore

@@ -6,3 +6,4 @@ PublishProfiles/
 Mall.WindowsService/Properties/PublishProfiles/FolderProfile.pubxml
 Mall.Model/Entity/Sign/RB_Sign_Setting.cs
 Mall.Education/lib/
+Mall.Common/Mall.Common.csproj.user

Mall.Common/API/RequestParm.cs

@@ -22,6 +22,11 @@ namespace Mall.Common.API
         /// </summary>
         public int MallBaseId { get; set; }
 
+        /// <summary>
+        /// 是否开启校园版
+        /// </summary>
+        public int IsOpenSchool { get; set; }
+
         /// <summary>
         /// 命令
         /// </summary>

Mall.Common/API/UserInfo.cs

@@ -29,6 +29,11 @@ namespace Mall.Common
             set;
         }
 
+        /// <summary>
+        /// 是否开启校园版(1-开启)
+        /// </summary>
+        public int IsOpenSchool { get; set; }
+
         /// <summary>
         /// 账号
         /// </summary>        

Mall.Model/Entity/GuideCar/RB_GuideCar_Site.cs

@@ -6,7 +6,7 @@ using VT.FW.DB;
 namespace Mall.Model.Entity.GuideCar
 {
     /// <summary>
-    /// 司导-站点实体表
+    /// 司导站点实体类
     /// </summary>
     [Serializable]
     [DB(ConnectionName = "DefaultConnection")]

Mall.Model/Entity/MarketingCenter/RB_Coupon_SelfMotion.cs

@@ -31,6 +31,11 @@ namespace Mall.Model.Entity.MarketingCenter
         public DateTime CreateDate { get; set; }
         public DateTime UpdateDate { get; set; }
 
+        /// <summary>
+        /// 新人购买并付款的注册时间
+        /// </summary>
+        public DateTime? RegisterDate { get; set; }
+
         /// <summary>
         /// 触发事件，1-分享，2-购买并付款，3-新人领券
         /// </summary>

Mall.Model/Entity/MarketingCenter/RB_Miniprogram_Page_Templ.cs

@@ -102,6 +102,10 @@ namespace Mall.Model.Entity.MarketingCenter
             get;
             set;
         }
-    }
 
+        /// <summary>
+        /// 是否为校园版首页
+        /// </summary>
+        public int IsSchoolHomePage { get; set; }
+    }
 }

Mall.Model/Entity/User/RB_MiniProgram.cs

@@ -422,5 +422,10 @@ namespace Mall.Model.Entity.User
         /// 是否回收
         /// </summary>
         public int Is_Recycle { get; set; }
+
+        /// <summary>
+        /// 是否开启校园版(1-开启)
+        /// </summary>
+        public int IsOpenSchool { get; set; }
     }
 }

Mall.Model/Entity/User/RB_MiniProgram_FenXiaoPoster.cs

@@ -102,5 +102,9 @@ namespace Mall.Model.Entity.User
         /// </summary>
         public int QrCodeType { get; set; }
 
+        /// <summary>
+        /// 是否开启校园版(1-开启)
+        /// </summary>
+        public int IsOpenSchool { get; set; }
     }
 }

Mall.Model/Entity/User/RB_MiniProgram_GoodPoster.cs

@@ -38,5 +38,10 @@ namespace Mall.Model.Entity.User
         /// 商品图片数量
         /// </summary>
         public string GoodsImgCount { get; set; }
+
+        /// <summary>
+        /// 是否开启校园版(1-开启);
+        /// </summary>
+        public int IsOpenSchool { get; set; }
     }
 }

Mall.Model/Extend/MarketingCenter/RB_DiscountCoupon_Extend.cs

@@ -34,7 +34,7 @@ namespace Mall.Model.Extend.MarketingCenter
         public int GrantNum { get; set; }
 
         /// <summary>
-        /// 触发事件，1-分享，2-购买并付款，3-新人领券
+        /// 触发事件，1-分享，2-购买并付款，3-新人领券,4-新人购买并付款
         /// </summary>
         public int TriggerType { get; set; }
         /// <summary>
@@ -93,5 +93,8 @@ namespace Mall.Model.Extend.MarketingCenter
         /// 微店名称
         /// </summary>
         public string SmallShopName { get; set; }
+
+
+        public DateTime? RegisterDate { get; set; }
     }
 }

Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs

@@ -157,6 +157,11 @@ namespace Mall.Model.Extend.MarketingCenter
         /// 下边距
         /// </summary>
         public string bottom { get; set; }
+
+        /// <summary>
+        /// 搜索框位置(0-默认，1-顶部)
+        /// </summary>
+        public int searchPosition { get; set; }
     }
 
     /// <summary>

Mall.Model/Extend/Product/RB_Goods_OrderDetail_Extend.cs

@@ -34,6 +34,12 @@ namespace Mall.Model.Extend.Product
         /// 单据状态  1已制单   2未制单
         /// </summary>
         public int? FinanceStatus { get; set; }
+
+
+        /// <summary>
+        /// 是否出库0-否， 1-是
+        /// </summary>
+        public int IsOut { get; set; }
         /// <summary>
         /// 会员优惠
         /// </summary>

Mall.Model/Extend/Product/RB_Goods_Order_Extend.cs

@@ -71,6 +71,10 @@ namespace Mall.Model.Extend.Product
         /// 商品id
         /// </summary>
         public int? GoodsId { get; set; }
+
+        public int PayMemerNum { get; set; }
+
+        public int TotalPayMemerNum { get; set; }
         /// <summary>
         /// 分销用户id
         /// </summary>

Mall.Model/Extend/Property/RB_WarehouseOut_Apply_Extend.cs

@@ -36,5 +36,10 @@ namespace Mall.Model.Extend.Property
 
         public string TenantName { get; set; }
 
+        /// <summary>
+        /// 0-未出库，1-已出库
+        /// </summary>
+        public int IsOut { get; set; }
+
     }
 }

Mall.Module.MarketingCenter/CouponModule.cs

@@ -889,13 +889,17 @@ namespace Mall.Module.MarketingCenter
             }
             //根据发放类型获取对应的优惠券信息
             model.SmallShopId = memberUserModel.SmallShopId;
+            if (model.TriggerType == 4)
+            {
+                model.RegisterDate = memberUserModel.CreateDate;
+            }
             var couponList = discountCouponRepository.GetSelfmotionCouponList(model);
             if (couponList != null && couponList.Any(x => x.TotalNum == -1 || x.TotalNum > 0))//存在满足条件的优惠券可以发放
             {
                 bool isReceive = false;
                 //查询已发放的优惠券信息
                 var memberCouponList = memberCouponRepository.GetAutoMemberCouponPageList(new RB_Member_DiscountCoupon_Extend { UserId = model.UserId, GetType = model.TriggerType, TenantId = model.TenantId, MallBaseId = model.MallBaseId });
-                foreach (var item in couponList.Where(x => x.TotalNum == -1 || x.TotalNum  > 0))//判断当前优惠券是否已超过领取数
+                foreach (var item in couponList.Where(x => x.TotalNum == -1 || x.TotalNum > 0))//判断当前优惠券是否已超过领取数
                 {
                     int membercouponCoun = memberCouponList.Where(x => x.CouponId == item.ID).Count();
                     if (!isReceive && membercouponCoun < item.GrantNum)//此次没有领取，并且当前优惠券没有超过领取数量

Mall.Module.MarketingCenter/MiniprogramPageTemplModule.cs

@@ -81,10 +81,11 @@ namespace Mall.Module.MarketingCenter
         /// </summary>
         /// <param name="query">查询条件</param>
         /// <param name="isGetHome">是否查询首页页面</param>
+        /// <param name="isGetSchoolPage">是否查询校园版首页页面</param>
         /// <returns></returns>
-        public RB_Miniprogram_Page_Templ_Extend GetMiniprogramPageTemplModule(RB_Miniprogram_Page_Templ_Extend query, bool isGetHome = false)
+        public RB_Miniprogram_Page_Templ_Extend GetMiniprogramPageTemplModule(RB_Miniprogram_Page_Templ_Extend query, bool isGetHome = false,bool isGetSchoolPage=false)
         {
-            var extModel = pageRepository.GetMiniprogramPageTemplRepository(query, isGetHome: isGetHome);
+            var extModel = pageRepository.GetMiniprogramPageTemplRepository(query, isGetHome: isGetHome,isGetSchoolPage:isGetSchoolPage);
             if (extModel == null)
             {
                 extModel = new RB_Miniprogram_Page_Templ_Extend();
@@ -173,6 +174,24 @@ namespace Mall.Module.MarketingCenter
             return flag;
         }
 
+        /// <summary>
+        /// 更新模板是否设为校园首页
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <param name="IsSchoolHomePage"></param>
+        /// <param name="MallBaseId">小程序Id</param>
+        /// <returns></returns>
+        public bool SetMiniprogramPageTemplSchoolIsHomeModule(object Id, int IsSchoolHomePage, int MallBaseId)
+        {
+            bool flag = pageRepository.UpdateSchoolIsHomeRepository(MallBaseId);
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Miniprogram_Page_Templ_Extend.IsSchoolHomePage),IsSchoolHomePage }
+            };
+            flag = pageRepository.Update(fileds, new WhereHelper(nameof(RB_Miniprogram_Page_Templ_Extend.Id), Id));
+            return flag;
+        }
+
         /// <summary>
         /// 更新自定义页面状态
         /// </summary>

Mall.Module.MarketingCenter/StatisticsModule.cs

@@ -285,9 +285,14 @@ namespace Mall.Module.MarketingCenter
             DataStatistics_Query model = new DataStatistics_Query();
             if (List != null && List.Any())
             {
-                model.OrderPay = List.Count();
+                model.OrderNum = List.Sum(x => x.OrderNum ?? 0); //List.Count();
                 model.PayMoney = List.Sum(x => x.Income ?? 0);
-                model.PayMemerNum = List.GroupBy(x => x.UserId).Count();
+                model.PayMemerNum = List.Sum(x => x.PayMemerNum); // List.GroupBy(x => x.UserId).Count();
+                model.GoodsNum = List.Sum(x => x.GoodsTotalNum);
+                model.MemberNum = List.Max(x => x.TotalPayMemerNum);
+                model.OrderPay = List.Count();
+                //model.PayMoney = List.Sum(x => x.Income ?? 0);
+                //model.PayMemerNum = List.Sum(x => x.PayMemerNum );
                 model.BuyNum = List.Sum(x => x.GoodsTotalNum);
                 model.OrderLineList = new List<OrderLine>();
                 if (dmodel.IsYesterday == 1)//同一天
@@ -413,10 +418,11 @@ namespace Mall.Module.MarketingCenter
             DataStatistics_Query model = new DataStatistics_Query();
             if (List != null && List.Any())
             {
-                model.OrderNum = List.Count();
+                model.OrderNum = List.Sum(x => x.OrderNum ?? 0); //List.Count();
                 model.PayMoney = List.Sum(x => x.Income ?? 0);
-                model.PayMemerNum = List.GroupBy(x => x.UserId).Count();
+                model.PayMemerNum = List.Sum(x => x.PayMemerNum); // List.GroupBy(x => x.UserId).Count();
                 model.GoodsNum = List.Sum(x => x.GoodsTotalNum);
+                model.MemberNum = List.Max(x => x.TotalPayMemerNum);
             }
             return model;
         }

Mall.Module.Product/ProductModule.cs

@@ -1217,8 +1217,13 @@ namespace Mall.Module.Product
         /// <summary>
         /// 获取商品分享
         /// </summary>
+        /// <param name="goodsId"></param>
+        /// <param name="userId"></param>
+        /// <param name="path"></param>
+        /// <param name="mallBaseId"></param>
+        /// <param name="IsOpenSchool">是否开启校园版(1-开启)</param>
         /// <returns></returns>
-        public object GetAppletGoodsShareInfo(int goodsId, int userId, string path, int mallBaseId)
+        public object GetAppletGoodsShareInfo(int goodsId, int userId, string path, int mallBaseId, int IsOpenSchool = 0)
         {
             string QRPath = GetWeiXinQRCode(path, 430, mallBaseId);
             var umodel = member_UserRepository.GetEntity(userId);
@@ -1227,7 +1232,11 @@ namespace Mall.Module.Product
             var config = new object();
             //商品信息
             var info = new object();
-            var goodsPoster = miniProgram_GoodPosterRepository.GetEntityExtRepository(new RB_MiniProgram_GoodPoster_Extend() { MallBaseId = mallBaseId });
+            var goodsPoster = miniProgram_GoodPosterRepository.GetEntityExtRepository(new RB_MiniProgram_GoodPoster_Extend()
+            {
+                MallBaseId = mallBaseId,
+                IsOpenSchool = IsOpenSchool
+            });
             config = new
             {
                 poster_style = goodsPoster?.PosterStyleList ?? new List<int>() { 1 },

Mall.Module.User/PosterModule.cs

@@ -61,6 +61,8 @@ namespace Mall.Module.User
                     { nameof(RB_MiniProgram_FenXiaoPoster_Extend.QrCodePaddingTop),extModel.QrCodePaddingTop},
                     { nameof(RB_MiniProgram_FenXiaoPoster_Extend.QrCodePaddingLeft),extModel.QrCodePaddingLeft},
                     { nameof(RB_MiniProgram_FenXiaoPoster_Extend.QrCodeType),extModel.QrCodeType},
+                    { nameof(RB_MiniProgram_FenXiaoPoster_Extend.IsOpenSchool),extModel.IsOpenSchool},
+
                 };
                 flag = fenXiaoPosterRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_FenXiaoPoster_Extend.Id), extModel.Id));
             }
@@ -97,6 +99,7 @@ namespace Mall.Module.User
                 {
                     { nameof(RB_MiniProgram_GoodPoster_Extend.PosterStyle),extModel.PosterStyle},
                     { nameof(RB_MiniProgram_GoodPoster_Extend.GoodsImgCount),extModel.GoodsImgCount},
+                    { nameof(RB_MiniProgram_GoodPoster_Extend.IsOpenSchool),extModel.IsOpenSchool},
                 };
                 flag = goodPosterRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_GoodPoster_Extend.Id), extModel.Id));
             }

Mall.Repository/MarketingCenter/RB_DiscountCouponRepository.cs

@@ -332,6 +332,10 @@ on a.CouponId=b.ID {where} ";
                 if (query.TriggerType > 0)
                 {
                     builder.Append($" AND b.{nameof(RB_DiscountCoupon_Extend.TriggerType)}={query.TriggerType}");
+                    if (query.TriggerType == 4 && query.RegisterDate.HasValue)
+                    {
+                        builder.Append($" AND DATE_FORMAT(b.{nameof(RB_DiscountCoupon_Extend.RegisterDate)},'%Y-%m-%d' )<= DATE_FORMAT('{query.RegisterDate}','%Y-%m-%d' )");
+                    }
                 }
                 if (query.UserId > 0)
                 {

Mall.Repository/MarketingCenter/RB_Miniprogram_Page_TemplRepository.cs

@@ -54,6 +54,18 @@ namespace Mall.Repository.MarketingCenter
             return base.Execute(builder.ToString())>0;
         }
 
+        /// <summary>
+        /// 设置不为校园首页
+        /// </summary>
+        /// <param name="MallBaseId">小程序ID</param>
+        /// <returns></returns>
+        public bool UpdateSchoolIsHomeRepository(int MallBaseId)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(" UPDATE RB_Miniprogram_Page_Templ SET IsSchoolHomePage=0 WHERE MallBaseId={0} ", MallBaseId);
+            return base.Execute(builder.ToString()) > 0;
+        }
+
 
         /// <summary>
         /// 小程序自定义页面列表
@@ -87,8 +99,9 @@ namespace Mall.Repository.MarketingCenter
         /// </summary>
         /// <param name="query">查询条件</param>
         /// <param name="isGetHome">是否查询首页页面</param>
+        /// <param name="isGetSchoolPage">是否查询校园版首页页面</param>
         /// <returns></returns>
-        public RB_Miniprogram_Page_Templ_Extend GetMiniprogramPageTemplRepository(RB_Miniprogram_Page_Templ_Extend query,bool isGetHome=false)
+        public RB_Miniprogram_Page_Templ_Extend GetMiniprogramPageTemplRepository(RB_Miniprogram_Page_Templ_Extend query,bool isGetHome=false,bool isGetSchoolPage = false)
         {
             StringBuilder builder = new StringBuilder();
             builder.Append($" SELECT * FROM RB_Miniprogram_Page_Templ WHERE 1=1 ");
@@ -114,6 +127,10 @@ namespace Mall.Repository.MarketingCenter
                 {
                     builder.Append($" AND {nameof(RB_Miniprogram_Page_Templ_Extend.IsHome)}=1 ");
                 }
+                if (isGetSchoolPage)
+                {
+                    builder.Append($" AND {nameof(RB_Miniprogram_Page_Templ_Extend.IsSchoolHomePage)}=1 ");
+                }
             }
             return Get<RB_Miniprogram_Page_Templ_Extend>(builder.ToString()).FirstOrDefault();
         }

Mall.Repository/Product/RB_Goods_OrderDetailRepository.cs

@@ -410,7 +410,15 @@ where {where}  order by o.CreateDate desc";
         /// <returns></returns>
         public List<RB_Goods_OrderDetail_Extend> GetOrderGoodsList(RB_Goods_OrderDetail_Extend dmodel)
         {
-            string where = $" 1=1 and o.{nameof(RB_Goods_Order.Status)}=0 and o.OrderStatus=2";
+            string where = "";
+            if (dmodel.IsOut == 0)
+            {
+                where = $" 1=1 and o.{nameof(RB_Goods_Order.Status)}=0 and o.OrderStatus =2";
+            }
+            else
+            {
+                where = $" 1=1 and o.{nameof(RB_Goods_Order.Status)}=0 and o.OrderStatus in(2,3,4,5,6)";
+            }
             string childreWhere = "";
             if (dmodel.TenantId > 0)
             {
@@ -471,8 +479,10 @@ where {where}  order by o.CreateDate desc";
             {
                 where += $@" and od.{nameof(RB_Goods_OrderDetail.ProductCode)} like '%{dmodel.ProductCode}%'";
             }
-
-            where += $"and od.Id not in (SELECT OrderDetailId from rb_goods_expressrelevance where 1=1 {childreWhere})";
+            if (dmodel.IsOut == 0)
+            {
+                where += $"and od.Id not in (SELECT OrderDetailId from rb_goods_expressrelevance where 1=1 {childreWhere})";
+            }
             string sql = $@"SELECT od.*,o.OrderNo FROM rb_goods_orderdetail od
 INNER JOIN rb_goods_order o on o.OrderId=od.OrderId  
 where {where}  order by o.CreateDate desc";
@@ -490,7 +500,16 @@ where {where}  order by o.CreateDate desc";
         /// <returns></returns>
         public List<RB_Goods_OrderDetail_Extend> GetNoOutOrderGoodsList(int pageIndex, int pageSize, out long count, RB_Goods_OrderDetail_Extend dmodel)
         {
-            string where = $" 1=1 and o.{nameof(RB_Goods_Order.Status)}=0 and o.OrderStatus=2";
+            string where = "";
+            if (dmodel.IsOut == 0)
+            {
+                where = $" 1=1 and o.{nameof(RB_Goods_Order.Status)}=0 and o.OrderStatus =2";
+            }
+            else
+            {
+                where = $" 1=1 and o.{nameof(RB_Goods_Order.Status)}=0 and o.OrderStatus in(2,3,4,5,6)";
+            }
+
             string childreWhere = "";
             string outWhere = "";
             if (dmodel.TenantId > 0)
@@ -555,8 +574,16 @@ where {where}  order by o.CreateDate desc";
                 where += $@" and od.{nameof(RB_Goods_OrderDetail.ProductCode)} like '%{dmodel.ProductCode}%'";
             }
 
-            where += $" and od.Id not in (SELECT OrderDetailId from rb_goods_expressrelevance where 1=1 {childreWhere})";
-            where += @$" AND od.Id NOT IN (SELECT OrderGoodsId	FROM	{Config.PropertyDB}.rb_warehouseout_goods AS g LEFT JOIN {Config.PropertyDB}.rb_warehouseout_apply AS ap ON g.applyId = ap.id WHERE ap.ApplyStatus in (1,2) {outWhere} )";
+            if (dmodel.IsOut == 0)
+            {
+                where += $" and od.Id not in (SELECT OrderDetailId from rb_goods_expressrelevance where 1=1 {childreWhere})";
+                where += @$" AND od.Id NOT IN (SELECT OrderGoodsId	FROM	{Config.PropertyDB}.rb_warehouseout_goods AS g LEFT JOIN {Config.PropertyDB}.rb_warehouseout_apply AS ap ON g.applyId = ap.id WHERE ap.ApplyStatus in (1,2) {outWhere} )";
+            }
+            else if (dmodel.IsOut == 1)
+            {
+                where += $" and( od.Id  in (SELECT OrderDetailId from rb_goods_expressrelevance where 1=1 {childreWhere})";
+                where += @$" or  od.Id  IN (SELECT OrderGoodsId	FROM	{Config.PropertyDB}.rb_warehouseout_goods AS g LEFT JOIN {Config.PropertyDB}.rb_warehouseout_apply AS ap ON g.applyId = ap.id WHERE ap.ApplyStatus in (1,2) {outWhere} ))";
+            }
             string sql = $@"SELECT od.*,o.OrderNo FROM rb_goods_orderdetail od
 INNER JOIN rb_goods_order o on o.OrderId=od.OrderId  
 where {where}  order by o.CreateDate desc";

Mall.Repository/Product/RB_Goods_OrderRepository.cs

@@ -838,19 +838,26 @@ SELECT 0 as Total,0 as MemberNum, 0 as GoodsNum,0 as OrderNum,
         /// <returns></returns>
         public List<RB_Goods_Order_Extend> GetWeeklyOrder(DataStatistics_Query dmodel)
         {
-            string where = $"   where 1=1  and  a.OrderStatus in(2,3,4,6,5)";
+            string where = "where 1=1 and (a.OrderStatus in(2,3,4,5,6) or (a.OrderStatus=7 and a.PaymentTime is not NULL and a.CancelTime is not NULL and DATE_FORMAT(a.PaymentTime,'%Y-%m-%d' )<DATE_FORMAT(a.CancelTime,'%Y-%m-%d' ) ) ) ";
+            // string where = $"   where 1=1  and  (a.OrderStatus in(2,3,4,6,5)  or( a.{nameof(RB_Goods_Order.OrderStatus)}=7 and a.{nameof(RB_Goods_Order.PaymentTime)} is not NULL))";
+            //string payMemerNumWhere = $" and  (OrderStatus in(2,3,4,6,5)  or( {nameof(RB_Goods_Order.OrderStatus)}=7 and {nameof(RB_Goods_Order.PaymentTime)} is not NULL)) ";
+            string payMemerNumWhere = " and (OrderStatus in(2,3,4,5,6) or (OrderStatus=7 and PaymentTime is not NULL and CancelTime is not NULL and DATE_FORMAT(PaymentTime,'%Y-%m-%d' )<DATE_FORMAT(CancelTime,'%Y-%m-%d' ) ) ) ";
             string orderTypeWhere = "";
+            string sql = "";
             if (dmodel.TenantId > 0)
             {
                 where += $@" and a.{nameof(RB_Goods_Order.TenantId)}={dmodel.TenantId}";
+                payMemerNumWhere += $@" and {nameof(RB_Goods_Order.TenantId)}={dmodel.TenantId}";
             }
             if (dmodel.MallBaseId > 0)
             {
                 where += $@" and a.{nameof(RB_Goods_Order.MallBaseId)}={dmodel.MallBaseId}";
+                payMemerNumWhere += $@" and {nameof(RB_Goods_Order.MallBaseId)}={dmodel.MallBaseId}";
             }
             if (dmodel.PlatformType > 0)
             {
                 where += $@" and a.{nameof(RB_Goods_Order.OrderSource)}={(int)dmodel.PlatformType}";
+                payMemerNumWhere += $@" and {nameof(RB_Goods_Order.OrderSource)}={(int)dmodel.PlatformType}";
             }
             if (dmodel.OrderType > 0)
             {
@@ -859,13 +866,27 @@ SELECT 0 as Total,0 as MemberNum, 0 as GoodsNum,0 as OrderNum,
             if (!string.IsNullOrWhiteSpace(dmodel.StartDate))
             {
                 where += $" AND DATE_FORMAT(a.{nameof(RB_Goods_Order.CreateDate)},'%Y-%m-%d' )>= DATE_FORMAT('{dmodel.StartDate}','%Y-%m-%d' )";
+                payMemerNumWhere += $" AND DATE_FORMAT({nameof(RB_Goods_OrderAfterSale.CreateDate)},'%Y-%m-%d' )>= DATE_FORMAT('{dmodel.StartDate}','%Y-%m-%d' )";
             }
             if (!string.IsNullOrWhiteSpace(dmodel.EndDate))
             {
                 where += $" AND DATE_FORMAT(a.{nameof(RB_Goods_Order.CreateDate)},'%Y-%m-%d' )<= DATE_FORMAT('{dmodel.EndDate}','%Y-%m-%d' )";
+                payMemerNumWhere += $" AND DATE_FORMAT({nameof(RB_Goods_OrderAfterSale.CreateDate)},'%Y-%m-%d' )<= DATE_FORMAT('{dmodel.EndDate}','%Y-%m-%d' )";
             }
-            string sql = $@" select a.*,b.GoodsTotalNum from  rb_goods_order as a LEFT JOIN (SELECT OrderId,COUNT(*) as GoodsTotalNum from rb_goods_orderdetail where 1=1 {orderTypeWhere}  GROUP BY OrderId)as b
-on a.OrderId=b.OrderId {where}";
+
+            sql = $@"SELECT t.CreateDate,SUM(t.GoodsTotalNum)as GoodsTotalNum ,COUNT(t.OrderId)as OrderNum ,SUM(t.Income)as Income,
+ (SELECT COUNT(DISTINCT UserId)  from rb_goods_order  where 1=1 {payMemerNumWhere} ) as TotalPayMemerNum,
+COUNT(DISTINCT t.UserId) as PayMemerNum,GROUP_CONCAT(DISTINCT t.UserId) as UserIds
+from (SELECT DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )as CreateDate,b.GoodsTotalNum,a.UserId,a.Income,a.OrderId from rb_goods_order as  a
+ LEFT JOIN (SELECT OrderId,SUM(Number)as GoodsTotalNum from rb_goods_orderdetail where 1=1 {orderTypeWhere} GROUP BY OrderId)as b on a.OrderId=b.OrderId 
+ {where} )
+as t GROUP BY t.CreateDate desc";
+            //            sql = $@"SELECT t.CreateDate,SUM(t.GoodsTotalNum)as GoodsTotalNum ,COUNT(t.OrderId)as OrderNum ,SUM(t.Income)as Income,MAX(t.PayMemerNum) as PayMemerNum,GROUP_CONCAT(DISTINCT t.UserId) as UserIds
+            //from (SELECT DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )as CreateDate,b.GoodsTotalNum,a.UserId,a.Income,a.OrderId,c.PayMemerNum from rb_goods_order as  a
+            // LEFT JOIN (SELECT OrderId,SUM(Number)as GoodsTotalNum from rb_goods_orderdetail where 1=1 {orderTypeWhere} GROUP BY OrderId)as b on a.OrderId=b.OrderId 
+            //LEFT JOIN (SELECT COUNT(DISTINCT UserId) as PayMemerNum, DATE_FORMAT(CreateDate,'%Y-%m-%d' ) as CreateDate from rb_goods_order  where 1=1 {payMemerNumWhere} GROUP BY DATE_FORMAT(CreateDate,'%Y-%m-%d' ))
+            //as c on c.CreateDate=DATE_FORMAT(a.CreateDate,'%Y-%m-%d' ) {where} )
+            //as t GROUP BY t.CreateDate desc";
             return Get<RB_Goods_Order_Extend>(sql).ToList();
         }
 
@@ -968,8 +989,8 @@ LEFT JOIN rb_member_user as c on b.UserId=c.Id
             }
             if (dmodel.OrderStatus == 1 || dmodel.OrderStatus == 0)
             {
-                where += $@" and a.{nameof(RB_Goods_Order.OrderStatus)}  in (2,4,3,5,6)";
-                payMemerNumWhere += $@" and {nameof(RB_Goods_Order.OrderStatus)} in (2,4,5,3,6)";
+                 where += $"      and (a.OrderStatus in(2,3,4,5,6) or (a.OrderStatus=7 and a.PaymentTime is not NULL and a.CancelTime is not NULL and DATE_FORMAT(a.PaymentTime,'%Y-%m-%d' )<DATE_FORMAT(a.CancelTime,'%Y-%m-%d' ) ) )";
+                 payMemerNumWhere = $"and (OrderStatus in(2,3,4,5,6) or (OrderStatus=7 and PaymentTime is not NULL and CancelTime is not NULL and DATE_FORMAT(PaymentTime,'%Y-%m-%d' )<DATE_FORMAT(CancelTime,'%Y-%m-%d' ) ) ) ";
             }
             else if (dmodel.OrderStatus == 2)
             {
@@ -978,8 +999,8 @@ LEFT JOIN rb_member_user as c on b.UserId=c.Id
             }
             else if (dmodel.OrderStatus == 3)
             {
-                where += $@" and a.{nameof(RB_Goods_Order.OrderStatus)}=7";
-                payMemerNumWhere += $@" and {nameof(RB_Goods_Order.OrderStatus)}=7";
+                where += $@" and a.{nameof(RB_Goods_Order.OrderStatus)}=7 and a.{nameof(RB_Goods_Order.PaymentTime)} is not NULL";
+                payMemerNumWhere += $@" and {nameof(RB_Goods_Order.OrderStatus)}=7 and a.{nameof(RB_Goods_Order.PaymentTime)} is not NULL";
             }
             else if (dmodel.OrderStatus == 4)//后面做因为现在还没有售后表
             {
@@ -1003,25 +1024,17 @@ LEFT JOIN rb_member_user as c on b.UserId=c.Id
             }
             if (dmodel.OrderStatus == 0 || dmodel.OrderStatus == 1 || dmodel.OrderStatus == 2 || dmodel.OrderStatus == 3)
             {
-                //                sql = $@"SELECT t.CreateDate,SUM(t.GoodsNum)as GoodsNum ,COUNT(t.OrderId)as OrderNum ,SUM(t.Income)as PayMoney,MAX(t.PayMemerNum) as PayMemerNum,MAX(t.RepurchaseNum) as RepurchaseNum
-                //from (SELECT DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )as CreateDate,b.GoodsNum,a.UserId,a.Income,a.OrderId,c.PayMemerNum,d.RepurchaseNum from rb_goods_order as  a
+                //                sql = $@"SELECT t.CreateDate,SUM(t.GoodsNum)as GoodsNum ,COUNT(t.OrderId)as OrderNum ,SUM(t.Income)as PayMoney,MAX(t.PayMemerNum) as PayMemerNum,GROUP_CONCAT(DISTINCT t.UserId) as UserIds
+                //from (SELECT DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )as CreateDate,b.GoodsNum,a.UserId,a.Income,a.OrderId,c.PayMemerNum from rb_goods_order as  a
                 // LEFT JOIN (SELECT OrderId,SUM(Number)as GoodsNum from rb_goods_orderdetail where 1=1 {orderTypeWhere} GROUP BY OrderId)as b on a.OrderId=b.OrderId 
                 //LEFT JOIN (SELECT COUNT(DISTINCT UserId) as PayMemerNum, DATE_FORMAT(CreateDate,'%Y-%m-%d' ) as CreateDate from rb_goods_order  where 1=1 {payMemerNumWhere} GROUP BY DATE_FORMAT(CreateDate,'%Y-%m-%d' ))
-                //as c on c.CreateDate=DATE_FORMAT(a.CreateDate,'%Y-%m-%d' ) 
-                //LEFT JOIN (SELECT temp.CreateDate,COUNT(UserId) as RepurchaseNum from (SELECT UserId,COUNT(DISTINCT UserId) as RepurchaseNum, DATE_FORMAT(CreateDate,'%Y-%m-%d' ) as CreateDate from rb_goods_order where 1=1 
-                //{payMemerNumWhere}  GROUP BY UserId,DATE_FORMAT(CreateDate,'%Y-%m-%d' ) having count(UserId) > 1) as temp GROUP BY temp.CreateDate
-                //)
-                //as d on d.CreateDate=DATE_FORMAT(a.CreateDate,'%Y-%m-%d' ) 
-                //{where} )
+                //as c on c.CreateDate=DATE_FORMAT(a.CreateDate,'%Y-%m-%d' ) {where} )
                 //as t GROUP BY t.CreateDate desc";
-                sql = $@"SELECT t.CreateDate,SUM(t.GoodsNum)as GoodsNum ,COUNT(t.OrderId)as OrderNum ,SUM(t.Income)as PayMoney,MAX(t.PayMemerNum) as PayMemerNum,GROUP_CONCAT(DISTINCT t.UserId) as UserIds
-from (SELECT DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )as CreateDate,b.GoodsNum,a.UserId,a.Income,a.OrderId,c.PayMemerNum from rb_goods_order as  a
- LEFT JOIN (SELECT OrderId,SUM(Number)as GoodsNum from rb_goods_orderdetail where 1=1 {orderTypeWhere} GROUP BY OrderId)as b on a.OrderId=b.OrderId 
-LEFT JOIN (SELECT COUNT(DISTINCT UserId) as PayMemerNum, DATE_FORMAT(CreateDate,'%Y-%m-%d' ) as CreateDate from rb_goods_order  where 1=1 {payMemerNumWhere} GROUP BY DATE_FORMAT(CreateDate,'%Y-%m-%d' ))
-as c on c.CreateDate=DATE_FORMAT(a.CreateDate,'%Y-%m-%d' ) {where} )
+                sql = $@"SELECT t.CreateDate,SUM(t.GoodsNum)as GoodsNum ,COUNT(t.OrderId)as OrderNum ,SUM(t.Income)as PayMoney,COUNT(DISTINCT t.UserId) as PayMemerNum,GROUP_CONCAT(DISTINCT t.UserId) as UserIds
+from (SELECT DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )as CreateDate,b.GoodsNum,a.UserId,a.Income,a.OrderId from rb_goods_order as  a
+ LEFT JOIN (SELECT OrderId,SUM(Number)as GoodsNum from rb_goods_orderdetail where 1=1 {orderTypeWhere} GROUP BY OrderId)as b on a.OrderId=b.OrderId  {where} )
 as t GROUP BY t.CreateDate desc";
 
-
             }
             else
             {

Mall.Repository/User/RB_MiniProgram_FenXiaoPosterRepository.cs

@@ -35,6 +35,10 @@ namespace Mall.Repository.User
                 {
                     builder.AppendFormat(" AND Id={0} ", query.Id);
                 }
+                if (query.IsOpenSchool >= 0)
+                {
+                    builder.AppendFormat(" AND IsOpenSchool={0} ", query.IsOpenSchool);
+                }
             }
             return Get<RB_MiniProgram_FenXiaoPoster_Extend>(builder.ToString()).FirstOrDefault();
         }

Mall.Repository/User/RB_MiniProgram_GoodPosterRepository.cs

@@ -35,6 +35,10 @@ namespace Mall.Repository.User
                 {
                     builder.AppendFormat(" AND Id={0} ", query.Id);
                 }
+                if (query.IsOpenSchool >= 0)
+                {
+                    builder.AppendFormat(" AND IsOpenSchool={0} ", query.IsOpenSchool);
+                }
             }
             return Get<RB_MiniProgram_GoodPoster_Extend>(builder.ToString()).FirstOrDefault();
         }

Mall.WebApi/Controllers/Mall/MallController.cs

@@ -94,7 +94,9 @@ namespace Mall.WebApi.Controllers.MallBase
                 Common.Plugin.LogHelper.Write(ex,"MallController_GetHome");
             }
 
-            int page_id = parms.GetInt("page_id");            
+            int page_id = parms.GetInt("page_id");
+            //是否开启校园版【1-是】
+            int isOpenSchool = parms.GetInt("open_school",0);
             //首页数据
             var homePage = new object();
             //底部导航
@@ -130,6 +132,9 @@ namespace Mall.WebApi.Controllers.MallBase
                 //分销商设置
                 share_setting_custom = MallHelper.GetDistributorCustomInfo(miniProgram);
             }
+
+            #region 首页页面数据解析
+            
             if (page_id > 0)
             {
                 var targetPage = miniprogramPageTemplModule.GetMiniprogramPageTemplModule(new RB_Miniprogram_Page_Templ_Extend()
@@ -137,7 +142,7 @@ namespace Mall.WebApi.Controllers.MallBase
                     MallBaseId = miniProgram.MallBaseId,
                     TenantId = miniProgram.TenantId,
                     Id = page_id
-                }, isGetHome: false);
+                }, isGetHome: false,isGetSchoolPage:false);
                 List<object> list = new List<object>();
                 //自定义首页
                 if (targetPage != null && targetPage.Id > 0)
@@ -192,38 +197,24 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 if (miniProgram != null && miniProgram.MallBaseId > 0)
                 {
-
-                    //底部导航
-                    navbar = new
+                    RB_Miniprogram_Page_Templ_Extend selfHomePage = new RB_Miniprogram_Page_Templ_Extend();
+                    if (isOpenSchool == 1)
                     {
-                        //底部导航背景颜色
-                        bottom_background_color = miniProgram.BottomNavBgColor,
-                        //顶部导航背景颜色
-                        top_background_color = miniProgram.TopNavBgColor,
-                        //顶部标题文字颜色
-                        top_text_color = miniProgram.TopNavWordColor,
-                        //导航底部是否开启阴影效果(0-未开启，1-开启)
-                        shadow = miniProgram.BottomNavIsShadow,
-                        //导航栏
-                        navs = miniProgram.BottomTagList.Select(qitem => new
+                        selfHomePage = miniprogramPageTemplModule.GetMiniprogramPageTemplModule(new RB_Miniprogram_Page_Templ_Extend()
                         {
-                            active_color = qitem.CheckedColor,
-                            active_icon = qitem.CheckedIcon,
-                            color = qitem.DefaultColor,
-                            text = qitem.TagName,
-                            icon = qitem.DefaultIcon,
-                            url = qitem.TagLink,
-                            open_type = "redirect",
-                            key = qitem.TagLink == "/pages/live/index" ? "live" : "",
-                        }),
-                    };
-                  
-
-                    var selfHomePage = miniprogramPageTemplModule.GetMiniprogramPageTemplModule(new RB_Miniprogram_Page_Templ_Extend()
+                            MallBaseId = miniProgram.MallBaseId,
+                            TenantId = miniProgram.TenantId,
+                        }, isGetHome: false,isGetSchoolPage:true);
+                    }
+                    //判断是否存在校园版首页
+                    if (selfHomePage == null||(selfHomePage!=null && selfHomePage.Id<=0))
                     {
-                        MallBaseId = miniProgram.MallBaseId,
-                        TenantId = miniProgram.TenantId,
-                    }, isGetHome: true);
+                        selfHomePage = miniprogramPageTemplModule.GetMiniprogramPageTemplModule(new RB_Miniprogram_Page_Templ_Extend()
+                        {
+                            MallBaseId = miniProgram.MallBaseId,
+                            TenantId = miniProgram.TenantId,
+                        }, isGetHome: true, isGetSchoolPage: false);
+                    }
                     List<object> list = new List<object>();
                     //自定义首页
                     if (selfHomePage != null && selfHomePage.Id > 0)
@@ -306,13 +297,50 @@ namespace Mall.WebApi.Controllers.MallBase
                         }
                     }
                 }
+            }
+           
+            #endregion
 
-                if (RequestParm.OpenId != null && !string.IsNullOrWhiteSpace(RequestParm.OpenId))
+            #region 底部导航
+            if (miniProgram != null && miniProgram.MallBaseId > 0)
+            {
+                //底部导航
+                navbar = new
                 {
-                    var memberModel = userModule.GetAppletUserCenterStatistics(RequestParm.OpenId);
-                    user_info = memberModel;
-                }
+                    //底部导航背景颜色
+                    bottom_background_color = miniProgram.BottomNavBgColor,
+                    //顶部导航背景颜色
+                    top_background_color = miniProgram.TopNavBgColor,
+                    //顶部标题文字颜色
+                    top_text_color = miniProgram.TopNavWordColor,
+                    //导航底部是否开启阴影效果(0-未开启，1-开启)
+                    shadow = miniProgram.BottomNavIsShadow,
+                    //导航栏
+                    navs = miniProgram.BottomTagList.Select(qitem => new
+                    {
+                        active_color = qitem.CheckedColor,
+                        active_icon = qitem.CheckedIcon,
+                        color = qitem.DefaultColor,
+                        text = qitem.TagName,
+                        icon = qitem.DefaultIcon,
+                        url = qitem.TagLink,
+                        open_type = "redirect",
+                        key = qitem.TagLink == "/pages/live/index" ? "live" : "",
+                    }),
+                };
             }
+            #endregion
+
+            #region 用户信息
+
+            if (RequestParm.OpenId != null && !string.IsNullOrWhiteSpace(RequestParm.OpenId))
+            {
+                var memberModel = userModule.GetAppletUserCenterStatistics(RequestParm.OpenId);
+                user_info = memberModel;
+            }
+
+            #endregion
+
             #region 商品分类样式
             var productCategoryStyle = productModule.GetProductCategoryStyleInfo(miniProgram.TenantId ?? 0, miniProgram.MallBaseId);
             cat_style = new
@@ -340,6 +368,8 @@ namespace Mall.WebApi.Controllers.MallBase
                 option = new List<object>(),
                 setting,
             };
+
+            #region 授权页面热区
             //授权页面热区
             var hotspotCancel = new object();
             var hotspotLogin = new object();
@@ -390,6 +420,8 @@ namespace Mall.WebApi.Controllers.MallBase
                 hotspot = hotspotLogin,
                 hotspot_cancel = hotspotCancel
             };
+            #endregion
+
             var liveConfigModel = programModule.GetLiveConfigModule(new Model.Extend.AppletWeChat.RB_Live_Config_Extend() { MallBaseId = miniProgram.MallBaseId, TenantId = miniProgram.TenantId });
             liveConfig = new
             {
@@ -658,7 +690,9 @@ namespace Mall.WebApi.Controllers.MallBase
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
             int goodsId = parms.GetInt("goodsId");
             string path = parms.GetStringValue("path");
-            var obj = productModule.GetAppletGoodsShareInfo(goodsId, RequestParm.UserId, path, (miniProgram?.MallBaseId ?? 0));
+            //HK 2020-09-22新增【是否开启校园版分享-(1-开启)】
+            int IsOpenSchool = parms.GetInt("IsOpenSchool",0);
+            var obj = productModule.GetAppletGoodsShareInfo(goodsId, RequestParm.UserId, path, (miniProgram?.MallBaseId ?? 0),IsOpenSchool:IsOpenSchool);
             return ApiResult.Success(data: obj);
         }
     }

Mall.WebApi/Controllers/MarketingCenter/TemplateController.cs

@@ -224,6 +224,19 @@ namespace Mall.WebApi.Controllers.MarketingCenter
         }
 
 
+        /// <summary>
+        /// 更新模板是否设为校园版首页
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetMiniprogramPageSchoolIsHome()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var Id = parms.GetInt("Id", 0);
+            var IsSchoolHomePage = parms.GetInt("IsSchoolHomePage", 1);
+            var flag = miniprogramPageTemplModule.SetMiniprogramPageTemplSchoolIsHomeModule(Id, IsSchoolHomePage, RequestParm.MallBaseId);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
         /// <summary>
         /// 更新自定义页面状态
         /// </summary>

Mall.WebApi/Controllers/Property/WarehouseOutController.cs

@@ -111,7 +111,8 @@ namespace Mall.WebApi.Controllers.Property
 
             //根据订单商品id查询商品信息
             var orderGoodsIds = string.Join(",", demodel.WarehouseOutGoodsList.Select(x => x.OrderGoodsId));
-            var orderGoodsList = orderModule.GetOrderGoodsList(new Model.Extend.Product.RB_Goods_OrderDetail_Extend { TenantId = requestParm.TenantId, MallBaseId = requestParm.MallBaseId, IdList = demodel.WarehouseOutGoodsList.Select(x => x.OrderGoodsId).ToList() });
+            
+            var    orderGoodsList = orderModule.GetOrderGoodsList(new Model.Extend.Product.RB_Goods_OrderDetail_Extend { IsOut=demodel.IsOut,TenantId = requestParm.TenantId, MallBaseId = requestParm.MallBaseId, IdList = demodel.WarehouseOutGoodsList.Select(x => x.OrderGoodsId).ToList() });
             if (demodel.WarehouseOutGoodsList.GroupBy(x => x.OrderGoodsId).Count() != orderGoodsList.Count)
             {
                 List<int> chajiList = demodel.WarehouseOutGoodsList.Select(x => x.OrderGoodsId).Except(orderGoodsList.Select(x => x.Id)).ToList();
@@ -126,24 +127,27 @@ namespace Mall.WebApi.Controllers.Property
                 }
                 return ApiResult.Failed("订单号：" + msg + "的商品已出库/已取消");
             }
-
-            //判断商品是否出库中
-            var oldOutGoods = warehouseOutModule.GetWarehouseOutListByIds(new RB_WarehouseOut_Goods_Extend { OrderGoodsIds = String.Join(",", demodel.WarehouseOutGoodsList.Select(x => x.OrderGoodsId)), TenantId = requestParm.TenantId, MallBaseId = requestParm.MallBaseId });
-            if (oldOutGoods != null && oldOutGoods.Any())
+            if (demodel.IsOut == 0)
             {
-
-                string msg = "";
-                foreach (var item in oldOutGoods)
+                //判断商品是否出库中
+                var oldOutGoods = warehouseOutModule.GetWarehouseOutListByIds(new RB_WarehouseOut_Goods_Extend { OrderGoodsIds = String.Join(",", demodel.WarehouseOutGoodsList.Select(x => x.OrderGoodsId)), TenantId = requestParm.TenantId, MallBaseId = requestParm.MallBaseId });
+                if (oldOutGoods != null && oldOutGoods.Any())
                 {
-                    msg += orderGoodsList.Where(x => x.Id == item.OrderGoodsId).FirstOrDefault()?.OrderNo + ",";
-                }
-                if (!string.IsNullOrWhiteSpace(msg))
-                {
-                    msg = msg.TrimEnd(',');
+
+                    string msg = "";
+                    foreach (var item in oldOutGoods)
+                    {
+                        msg += orderGoodsList.Where(x => x.Id == item.OrderGoodsId).FirstOrDefault()?.OrderNo + ",";
+                    }
+                    if (!string.IsNullOrWhiteSpace(msg))
+                    {
+                        msg = msg.TrimEnd(',');
+                    }
+                    return ApiResult.Failed("订单号：" + msg + "的商品已申请出库,请勿重复申请");
                 }
-                return ApiResult.Failed("订单号：" + msg + "的商品已申请出库,请勿重复申请");
             }
 
+
             //获取商品的出库规格物料信息
             var goodsIds = string.Join(",", demodel.WarehouseOutGoodsList.Select(x => x.NewGoodsId));
             // var materialList = propertyModule.GetSuppliesMaterialList(new RB_Supplies_Material_Extend { GoodsIds = goodsIds, RB_Group_Id = requestParm.ERPGroupId, TenantId = requestParm.TenantId, MallBaseId = requestParm.MallBaseId });

Mall.WebApi/Controllers/User/AppletUserController.cs

@@ -245,7 +245,7 @@ namespace Mall.WebApi.Controllers.User
                 return ApiResult.Failed();
             }
         }
-
+            
 
         /// <summary>
         /// 设置地址默认
@@ -344,8 +344,7 @@ namespace Mall.WebApi.Controllers.User
                 x.Name,
                 x.CoverImage,
                 x.SellingPrice,
-                x.SalesNum,
-                x.GoodsClassify
+                x.SalesNum
             });
 
             return ApiResult.Success("", pagelist);
@@ -733,7 +732,7 @@ namespace Mall.WebApi.Controllers.User
             var req = RequestParm;
             JObject parms = JObject.Parse(req.msg.ToString());
             //是否直属
-            int IsDirect = parms.GetInt("IsDirect", 0);
+            int IsDirect= parms.GetInt("IsDirect", 0);
             var obj = userModule.GerUserMyTeamTitelListForFX(userInfo, IsDirect: IsDirect);
             return ApiResult.Success("", obj);
         }
@@ -752,17 +751,17 @@ namespace Mall.WebApi.Controllers.User
             demodel.TenantId = userInfo.TenantId;
             demodel.MallBaseId = userInfo.MallBaseId;
             demodel.UserId = userInfo.UserId;
-            demodel.IsDirect = prams.GetInt("IsDirect", 1);
+            demodel.IsDirect = prams.GetInt("IsDirect", 0);
             int NewUserId = 0;
             //HK 2020-08-27新增
             JObject parms = JObject.Parse(req.msg.ToString());
             if (parms.GetInt("NewUserId") > 0)
             {
                 demodel.UserId = parms.GetInt("NewUserId");
-                NewUserId = parms.GetInt("NewUserId");
+                NewUserId= parms.GetInt("NewUserId");
             }
-            var list = userModule.GetUserMyTeamPageListForFX(pageModel.pageIndex, pageModel.pageSize, out long count, demodel, NewUserId: NewUserId);
-
+            var list= userModule.GetUserMyTeamPageListForFX(pageModel.pageIndex, pageModel.pageSize, out long count, demodel,NewUserId: NewUserId);
+           
 
             pageModel.count = Convert.ToInt32(count);
             pageModel.pageData = list;
@@ -945,7 +944,6 @@ namespace Mall.WebApi.Controllers.User
                 x.GoodsName,
                 x.GoodsImgPath,
                 x.Price,
-                x.GoodsClassify,
                 CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd") : ""
             });
 
@@ -1093,7 +1091,7 @@ namespace Mall.WebApi.Controllers.User
                 }
                 if (allMemberInfo.SmallShopId == 0)
                 {
-                    if (oldLogisticsModel.SmallShopId > 0)
+                    if (oldLogisticsModel.SmallShopId > 0 )
                     {
                         return ApiResult.Failed("您不属于当前店铺");
                     }
@@ -1240,27 +1238,14 @@ namespace Mall.WebApi.Controllers.User
             RB_DiscountCoupon_Extend resultModel = new RB_DiscountCoupon_Extend();
             if (query.TriggerType == 2)
             {
-                //先判断是否是新人购买并付款
-                var orderList = productModule.GetOrderListByOrderStatus(new RB_Goods_Order_Extend { TenantId = query.TenantId, MallBaseId = query.MallBaseId, UserId = query.UserId });
-                //查询当前订单号信息
-                var orderModel = orderList.Where(x => x.OrderId == query.OrderId).FirstOrDefault();
 
-                //判断这个订单号之前有没有付款成功的订单信息
-                if (orderList.Where(x => x.OrderId != orderModel.OrderId && (int)x.OrderStatus > 1).Count() > 0)
+                query.TriggerType = 4;
+                resultModel = couponModule.AutoCoupon(query);
+                if (resultModel == null || resultModel.ID == 0)
                 {
                     query.TriggerType = 2;
                     resultModel = couponModule.AutoCoupon(query);
                 }
-                else
-                {
-                    query.TriggerType = 4;
-                    resultModel = couponModule.AutoCoupon(query);
-                    if (resultModel == null || resultModel.ID == 0)
-                    {
-                        query.TriggerType = 2;
-                        resultModel = couponModule.AutoCoupon(query);
-                    }
-                }
             }
             else
             {
@@ -1268,12 +1253,22 @@ namespace Mall.WebApi.Controllers.User
             }
             if (resultModel != null && resultModel.ID > 0)
             {
-                return ApiResult.CouponSuccess(ResultCode.Success, 1, resultModel.Name);
+                return ApiResult.CouponSuccess(ResultCode.Success, resultModel.Name);
             }
             else
             {
-                return ApiResult.CouponFailed(ResultCode.Fail, 1, "");
+                return ApiResult.CouponFailed(ResultCode.Fail, "");
             }
+
+            //RB_DiscountCoupon_Extend resultModel = couponModule.AutoCoupon(query);
+            //if (resultModel != null && resultModel.ID > 0)
+            //{
+            //    return ApiResult.CouponSuccess(ResultCode.Success, "", resultModel.Name);
+            //}
+            //else
+            //{
+            //    return ApiResult.CouponFailed(ResultCode.Fail, "", "");
+            //}
         }
 
 
@@ -1405,9 +1400,11 @@ namespace Mall.WebApi.Controllers.User
         public ApiResult GetFenXiaoPoster()
         {
             var userInfo = AppletUserInfo;
+            JObject jobj = JObject.Parse(RequestParm.msg.ToString());
             var extModel = JsonConvert.DeserializeObject<RB_MiniProgram_FenXiaoPoster_Extend>(RequestParm.msg.ToString());
             extModel.TenantId = userInfo.TenantId;
             extModel.MallBaseId = userInfo.MallBaseId;
+            extModel.IsOpenSchool = jobj.GetInt("IsOpenSchool", 0);
             var result = userModule.GetFenXiaoPosterEntityModule(extModel);
             return ApiResult.Success(data: result);
         }
@@ -1798,7 +1795,7 @@ namespace Mall.WebApi.Controllers.User
             demodel.UserId = userInfo.UserId;
             List<RB_Member_User_Extend> memberList = new List<RB_Member_User_Extend>();
             var list = userModule.GetOrderIntroductionPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
-
+ 
             pagelist.count = Convert.ToInt32(count);
             pagelist.pageData = list.Select(x => new
             {
@@ -1817,7 +1814,7 @@ namespace Mall.WebApi.Controllers.User
                     y.Number
                 }),
                 x.UserId,
-
+                
                 x.UserName,
                 x.Photo,
                 x.Mobile,

Mall.WebApi/Controllers/User/TenantController.cs

@@ -184,7 +184,8 @@ namespace Mall.WebApi.Controllers.User
                     erptoken = erptoken,
                     ERPEmpId = (erpUserInfo?.EmployeeId??0),
                     ERPBranchId = (erpUserInfo?.RB_Branch_id??-1),
-                    ERPGroupId = (erpUserInfo?.RB_Group_id??0)
+                    ERPGroupId = (erpUserInfo?.RB_Group_id??0),
+                    IsOpenSchool=0,
                 };
                 UserReidsCache.UserInfoSet(UserModuleCacheKeyConfig.Mall_Login_Info + model.TenantId, obj, Config.JwtExpirTime);
                 return ApiResult.Success("", obj);