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

Mall.Model/Entity/BaseSetUp/RB_FreeShipping.cs

@@ -46,6 +46,11 @@ namespace Mall.Model.Entity.BaseSetUp
             set;
         }
 
+        /// <summary>
+        /// 包邮规则名称
+        /// </summary>
+        public string Name { get; set; }
+
         /// <summary>
         /// 是否启用全局包邮
         /// </summary>

Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs

@@ -223,5 +223,10 @@ namespace Mall.Model.Entity.Product
         /// 赠送粉象等级期限（月）
         /// </summary>
         public int? PresentFXMonth { get; set; }
+
+        /// <summary>
+        /// 分类包邮规则备注
+        /// </summary>
+        public string FreeShippingRemarks { get; set; }
     }
 }

Mall.Model/Entity/Product/RB_Goods_OrderDetailFreeShipping.cs

+using VT.FW.DB;
+using Mall.Common.Enum.Goods;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品订单明细表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_OrderDetailFreeShipping
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 订单商品id
+        /// </summary>        
+        public int? OrderDetailId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 单品满件包邮
+        /// </summary>        
+        public int? FullNumPinkage
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 单品满额包邮
+        /// </summary>        
+        public decimal? FullMoneyPinkage
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 包邮规则名称
+        /// </summary>
+        public string Name { get; set; }
+
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 包邮规则对应的分类
+        /// </summary>
+        public int? Category { get; set; }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+
+    }
+}

Mall.Model/Entity/User/RB_Distributor_Basics.cs

@@ -215,5 +215,9 @@ namespace Mall.Model.Entity.User
         /// 是否启用粉象返佣   1是  2否
         /// </summary>
         public int? IsEnableFXGrade { get; set; }
+        /// <summary>
+        /// 是否启用无上级返佣
+        /// </summary>
+        public int? IsEnableNoSuperiorFY { get; set; }
     }
 }

Mall.Model/Extend/BaseSetUp/RB_FreeShipping_Extend.cs

@@ -17,5 +17,20 @@ namespace Mall.Model.Extend.BaseSetUp
         /// 分类列表
         /// </summary>
         public List<RB_FreeShippingCategory_Extend> CategoryList { get; set; }
+
+        /// <summary>
+        /// 商品分类包邮规则
+        /// </summary>
+        public string CategoryIds { get; set; }
+
+        /// <summary>
+        /// 是否启用包邮总规则0-否，1-是
+        /// </summary>
+        public int IsFreeShipping { get; set; }
+
+        /// <summary>
+        /// 商品分类ID
+        /// </summary>
+        public int CategoryId { get; set; }
     }
 }

Mall.Model/Extend/Product/RB_Goods_Extend.cs

@@ -3,6 +3,8 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using Mall.Model.Entity.Product;
+using Mall.Model.Entity.BaseSetUp;
+using Mall.Model.Extend.BaseSetUp;
 
 namespace Mall.Model.Extend.Product
 {
@@ -113,6 +115,8 @@ namespace Mall.Model.Extend.Product
         /// 商品分类
         /// </summary>
         public List<RB_Goods_Category_Extend> CategoryList { get; set; }
+
+
         /// <summary>
         /// 区域列表
         /// </summary>
@@ -183,5 +187,15 @@ namespace Mall.Model.Extend.Product
         /// </summary>
         public string SupplierIds { get; set; }
 
+        /// <summary>
+        /// 商品分类包邮规则
+        /// </summary>
+        public RB_FreeShipping_Extend FreeShippingModel { get; set; }
+
+        /// <summary>
+        /// 供应商-我的产品
+        /// </summary>
+        public List<object> SupplierSpecificationList { get; set; }
+
     }
 }

Mall.Model/Extend/Product/RB_Goods_OrderDetail_Extend.cs

@@ -103,6 +103,10 @@ namespace Mall.Model.Extend.Product
         /// 佣金金额
         /// </summary>
         public decimal CommissionPrice { get; set; }
+        /// <summary>
+        /// 正常商品金额
+        /// </summary>
+        public decimal NorGoodsMoney { get; set; }
 
         /// <summary>
         /// 积分赠送

Mall.Model/Extend/Product/RB_Goods_OrderIntroduction_Extend.cs

@@ -78,5 +78,11 @@ namespace Mall.Model.Extend.Product
         /// ids
         /// </summary>
         public string OrderDetailIds { get; set; }
+
+
+        /// <summary>
+        /// 返佣提现id
+        /// </summary>
+        public int BillId { get; set; }
     }
 }

Mall.Model/Extend/Product/RB_Goods_ShoppingCart_Extend.cs

@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using Mall.Model.Entity.Product;
+using Mall.Model.Extend.BaseSetUp;
 
 namespace Mall.Model.Extend.Product
 {
@@ -66,5 +67,15 @@ namespace Mall.Model.Extend.Product
         /// 库存数量
         /// </summary>
         public int? InventoryNum { get; set; }
+
+        /// <summary>
+        /// 供应商ids  2020-08-04 Add By:W
+        /// </summary>
+        public string SupplierIds { get; set; }
+
+        /// <summary>
+        /// 商品分类包邮规则
+        /// </summary>
+        public RB_FreeShipping_Extend FreeShippingModel { get; set; }
     }
 }

Mall.Module.BaseSetUp/MallBaseModule.cs

@@ -1002,6 +1002,20 @@ namespace Mall.Module.BaseSetUp
             return model;
         }
 
+
+        /// <summary>
+        /// 物流规则列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_FreeShipping_Extend> GetFreeShippingListByCategoryIds(RB_FreeShipping_Extend query)
+        {
+            return freeShippingRepository.GetFreeShippingListByCategoryIds(query);
+        }
+
         /// <summary>
         /// 新增/修改分类包邮基础信息
         /// </summary>
@@ -1191,6 +1205,31 @@ namespace Mall.Module.BaseSetUp
             return freeShippingCategoryRepository.GetFreeShippingCategoryList(query);
         }
 
+
+        /// <summary>
+        /// 验证重复
+        /// </summary>
+        /// <param name="ID"></param>
+        /// <param name="Name"></param>
+        /// <param name="RB_Group_Id"></param>
+        /// <param name="RB_Branch_Id"></param>
+        /// <returns></returns>
+        public bool ExistsName(int ID, string Name, int TenantId, int MallBaseId)
+        {
+            IList<WhereHelper> where = new List<WhereHelper>()
+            {
+                new WhereHelper() { FiledName = nameof(RB_FreeShipping.Status), FiledValue = 0, OperatorEnum = OperatorEnum.Equal },
+                new WhereHelper() { FiledName = nameof(RB_FreeShipping.Name), FiledValue = Name.Trim(), OperatorEnum = OperatorEnum.Equal  },
+                new WhereHelper() { FiledName = nameof(RB_FreeShipping.TenantId), FiledValue = TenantId, OperatorEnum = OperatorEnum.Equal  },
+                new WhereHelper() { FiledName = nameof(RB_FreeShipping.MallBaseId), FiledValue = MallBaseId, OperatorEnum = OperatorEnum.Equal },
+            };
+            if (ID > 0)
+            {
+                where.Add(new WhereHelper() { FiledName = nameof(RB_FreeShipping.ID), FiledValue = ID.ToString(), OperatorEnum = OperatorEnum.NotEqual });
+            }
+            return freeShippingRepository.Exists(where);
+        }
+
         #endregion
 
     }

Mall.Module.MarketingCenter/CouponModule.cs

@@ -986,7 +986,7 @@ namespace Mall.Module.MarketingCenter
                     }
                 }
             }
-            return true;
+            return false;
         }
         #endregion
 

Mall.Module.Product/ProductModule.cs

@@ -8,6 +8,7 @@ using Mall.Common.API;
 using Mall.Common.Plugin;
 using Mall.Model.Entity.Product;
 using Mall.Model.Entity.User;
+using Mall.Model.Extend.BaseSetUp;
 using Mall.Model.Extend.Product;
 using Mall.Model.Extend.User;
 using Mall.Model.Query;
@@ -16,6 +17,7 @@ using Mall.Repository.BaseSetUp;
 using Mall.Repository.Product;
 using Mall.Repository.User;
 using Newtonsoft.Json;
+using NPOI.SS.Formula.Functions;
 using VT.FW.DB;
 
 namespace Mall.Module.Product
@@ -158,7 +160,7 @@ namespace Mall.Module.Product
         /// </summary>
         private readonly RB_Distributor_FXGradeRepository distributor_FXGradeRepository = new RB_Distributor_FXGradeRepository();
 
-
+        private RB_FreeShippingRepository freeShippingRepository = new RB_FreeShippingRepository();
 
 
 
@@ -1049,6 +1051,36 @@ namespace Mall.Module.Product
             #region 基本信息
             //查询分类
             model.CategoryList = goods_CategoryRepository.GetList(new RB_Goods_Category_Extend() { GoodsId = goodsId, TenantId = TenantId, MallBaseId = MallBaseId });
+
+            //2020-08-05  根据分类查找商品对应的分类包邮规则 add by :W 
+            if (model.CategoryList != null && model.CategoryList.Any())
+            {
+                string categoryIds = string.Join(",", model.CategoryList.Select(x => x.CategoryId));
+                var freeShippingList = freeShippingRepository.GetFreeShippingListByCategoryIds(new RB_FreeShipping_Extend { MallBaseId = model.MallBaseId, TenantId = model.TenantId, CategoryIds = categoryIds });
+                if (freeShippingList != null && freeShippingList.Any())
+                {
+                    var fullNumPinkageModel = freeShippingList.Where(x => x.IsFreeShipping == 1 && x.IsEnable == 1 && x.FullNumPinkage > 0 && x.CategoryId > 0).OrderBy(x => x.FullNumPinkage).ThenByDescending(x=>x.ID).FirstOrDefault();
+                    if (fullNumPinkageModel == null || fullNumPinkageModel.ID <= 0)
+                    {
+                        fullNumPinkageModel = freeShippingList.Where(x => x.IsFreeShipping == 1 && x.IsEnable == 1 && x.FullMoneyPinkage > 0 && x.CategoryId > 0).OrderBy(x => x.FullMoneyPinkage).ThenByDescending(x => x.ID).FirstOrDefault();
+                    }
+                    if (fullNumPinkageModel == null || fullNumPinkageModel.ID <= 0)
+                    {
+                        fullNumPinkageModel = freeShippingList.Where(x => x.IsFreeShipping == 1 && x.IsEnable == 1 && x.FullNumPinkage > 0 && x.CategoryId == 0).OrderBy(x => x.FullNumPinkage).ThenByDescending(x => x.ID).FirstOrDefault();
+                    }
+                    if (fullNumPinkageModel == null || fullNumPinkageModel.ID <= 0)
+                    {
+                        fullNumPinkageModel = freeShippingList.Where(x => x.IsFreeShipping == 1 && x.IsEnable == 1 && x.FullMoneyPinkage > 0 && x.CategoryId == 0).OrderBy(x => x.FullMoneyPinkage).ThenByDescending(x => x.ID).FirstOrDefault();
+                    }
+                    model.FreeShippingModel = (fullNumPinkageModel == null || fullNumPinkageModel.ID <= 0) ? new RB_FreeShipping_Extend() : fullNumPinkageModel;
+                }
+                else
+                {
+                    model.FreeShippingModel = new RB_FreeShipping_Extend();
+                }
+            }
+
+
             //最大售价
             decimal MaxSellMoney = model.SellingPrice ?? 0;
             model.SpecificationList = new List<RB_Goods_Specification_Extend>();
@@ -1915,6 +1947,9 @@ namespace Mall.Module.Product
                     is_quick_shop = model.IsQuickBuy,
                     is_sell_well = model.IsSellWell,
                     is_negotiable = model.IsGoodsNegotiable,
+                    freeShippingName = model.FreeShippingModel.Name,
+                    fullMoneyPinkage = model.FreeShippingModel.FullMoneyPinkage ?? 0,
+                    fullNumPinkage = model.FreeShippingModel.FullNumPinkage ?? 0,
                     cats = model.CategoryList.Select(x => new
                     {
                         x.CategoryId,
@@ -6083,6 +6118,19 @@ namespace Mall.Module.Product
         #endregion
 
 
-
+        #region 分类包邮规则信息
+        /// <summary>
+        /// 物流规则列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_FreeShipping_Extend> GetFreeShippingListByCategoryIds(RB_FreeShipping_Extend query)
+        {
+            return freeShippingRepository.GetFreeShippingListByCategoryIds(query);
+        }
+        #endregion
     }
 }

Mall.Module.User/UserModule.cs

@@ -933,6 +933,7 @@ namespace Mall.Module.User
                     { nameof(RB_Distributor_Basics.IsCommissionResidue),demodel.IsCommissionResidue},
                     { nameof(RB_Distributor_Basics.IsWithdrawAll),demodel.IsWithdrawAll},
                     { nameof(RB_Distributor_Basics.IsEnableFXGrade),demodel.IsEnableFXGrade},
+                    { nameof(RB_Distributor_Basics.IsEnableNoSuperiorFY),demodel.IsEnableNoSuperiorFY},
                 };
                 List<WhereHelper> whereHelpers = new List<WhereHelper>() {
                     new WhereHelper(){
@@ -2419,7 +2420,7 @@ namespace Mall.Module.User
             }
 
             return flag;
-        }        
+        }
 
         /// <summary>
         /// 推荐生成提现单据
@@ -2456,7 +2457,7 @@ namespace Mall.Module.User
                             Number = 1,
                             OriginalMoney = unitmoney,
                             UnitPrice = unitmoney,
-                            Remark = "订单号：" + (qitem == "" ? "暂无" : qitem)
+                            Remark = "推荐返佣：" + (qitem == "" ? "暂无" : qitem)
                         });
                     }
                     item.IsPublic = 5;//默认平台虚拟账户
@@ -2474,7 +2475,7 @@ namespace Mall.Module.User
                         OrderSource = 16,
                         OtherType = 18,
                         ReFinanceId = BillId,
-                        Remark = "名称:" + umodel.Name + "（" + umodel.Id + "）" + "  姓名:" + DisModel.Name + "  手机:" + DisModel.Mobile + "   " + System.DateTime.Now.ToString("yyyy年MM月dd日") + "自动生成财务单据",
+                        Remark = "名称:" + umodel.Name + "（" + umodel.Id + "）" + "  姓名:" + DisModel.Name + "  手机:" + DisModel.Mobile + "   " + System.DateTime.Now.ToString("yyyy年MM月dd日") + "自动生成财务单据(推荐供应商返佣)",
                         detailList,
                         RB_Depart_Id = Config.ExpendDepartment
                     };
@@ -5481,7 +5482,7 @@ namespace Mall.Module.User
                     Id = 0,
                     MallBaseId = mallBaseId,
                     Money = totalMoney,
-                    Periods = DateTime.Now.ToString("yyyyMMdd"),
+                    Periods = DateTime.Now.ToString("yyyyMM"),
                     Remark = "",
                     Status = 0,
                     SupplierId = supplierId,
@@ -5669,10 +5670,12 @@ namespace Mall.Module.User
             };
             bool flag = distributor_BillRepository.Update(keyValues, wheres);
 
-            if (flag) {
+            if (flag)
+            {
                 //回滚 订单返佣状态
                 var dlist = distributor_BillDetailRepository.GetList(new RB_Distributor_BillDetail_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, BillId = billId });
-                if (dlist.Any()) {
+                if (dlist.Any())
+                {
                     //查询所有返佣列表
                     string introductionIds = string.Join(",", dlist.Select(x => x.CommissionId ?? 0));
                     var iList = goods_OrderIntroductionRepository.GetList(new RB_Goods_OrderIntroduction_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, IntroductionIds = introductionIds });
@@ -5763,6 +5766,62 @@ namespace Mall.Module.User
             return oclist;
         }
 
+        /// <summary>
+        /// 获取我的账单详情
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Goods_OrderIntroduction_Extend> GetOrderBilldetailPageList(int pageIndex, int pageSize, out long count, RB_Goods_OrderIntroduction_Extend demodel)
+        {
+            var oclist = goods_OrderIntroductionRepository.GetOrderBilldetailPageList(pageIndex, pageSize, out count, demodel);
+            if (oclist.Any())
+            {
+                //获取用户
+                var ulist = member_UserRepository.GetList(new RB_Member_User_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, UserIds = string.Join(",", oclist.Select(x => x.UserId).Distinct()) });
+
+                string orderIds = string.Join(",", oclist.Select(x => x.OrderId).Distinct());
+                //查询订单明细
+                var dlist = goods_OrderDetailRepository.GetOrderDetailList(new RB_Goods_OrderDetail_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, OrderIds = orderIds });
+                //查询图片
+                List<RB_Material_Info_Extend> Mlist = new List<RB_Material_Info_Extend>();
+                if (dlist.Any())
+                {
+                    foreach (var item in dlist)
+                    {
+                        item.CoverImagePath = item.CoverImage;
+                    }
+                }
+                foreach (var item in oclist)
+                {
+                    var umodel = ulist.Where(x => x.Id == item.UserId).FirstOrDefault();
+                    item.UserName = umodel?.Name ?? "";
+                    item.Mobile = umodel?.Moblie ?? "";
+                    item.Photo = umodel?.Photo ?? "";
+                    item.OrderDetailList = new List<RB_Goods_OrderDetail_Extend>();
+                    if (!string.IsNullOrWhiteSpace(item.OrderDetailIds))
+                    {
+                        var orderDetailIds = item.OrderDetailIds.Split(",");
+                        foreach (var itemOrderDetailId in orderDetailIds)
+                        {
+                            if (!string.IsNullOrWhiteSpace(itemOrderDetailId))
+                            {
+                                item.OrderDetailList.AddRange(dlist.Where(x => x.OrderId == item.OrderId && x.Id == Convert.ToInt32(itemOrderDetailId)));
+                            }
+                        }
+                    }
+                }
+            }
+
+            return oclist;
+        }
+
+
+
+
+
         /// <summary>
         /// 获取推荐供应商返佣账单列表
         /// </summary>
@@ -5784,7 +5843,7 @@ namespace Mall.Module.User
         public bool SetRecommendOrdersBillRemark(int billId, string remark, int tenantId, int mallBaseId, int empId)
         {
             Dictionary<string, object> keyValues = new Dictionary<string, object>() {
-                { nameof(RB_Distributor_Bill.Remark),remark},                
+                { nameof(RB_Distributor_Bill.Remark),remark},
                 { nameof(RB_Distributor_Bill.UpdateDate),DateTime.Now}
             };
             List<WhereHelper> wheres = new List<WhereHelper>() {
@@ -5803,7 +5862,8 @@ namespace Mall.Module.User
         /// </summary>
         /// <param name="Id"></param>
         /// <returns></returns>
-        public RB_Distributor_Bill GetBillModel(int Id) {
+        public RB_Distributor_Bill GetBillModel(int Id)
+        {
             var model = distributor_BillRepository.GetEntity(Id);
             return model;
         }
@@ -5843,7 +5903,8 @@ namespace Mall.Module.User
             {
                 return "";
             }
-            else {
+            else
+            {
                 return "保存失败";
             }
         }

Mall.Repository/BaseSetUp/RB_FreeShippingRepository.cs

@@ -73,5 +73,39 @@ namespace Mall.Repository.BaseSetUp
             }
             return Get<RB_FreeShipping_Extend>(builder.ToString()).ToList();
         }
+
+
+        /// <summary>
+        /// 物流规则列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_FreeShipping_Extend> GetFreeShippingListByCategoryIds(RB_FreeShipping_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(@$" SELECT a.*,b.CategoryId,c.IsFreeShipping from rb_freeshipping as a LEFT JOIN rb_freeshippingcategory as b on a.ID=b.FreeShippingId 
+INNER JOIN rb_mallbase as c on a.MallBaseId = c.ID and a.TenantId = c.TenantId WHERE a.{nameof(RB_FreeShipping_Extend.Status)}=0 ");
+            if (query != null)
+            {
+
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_FreeShipping_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_FreeShipping_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.CategoryIds))
+                {
+                    query.CategoryIds += query.CategoryIds + ",0";
+                    builder.Append($" AND b.{nameof(RB_FreeShippingCategory_Extend.CategoryId)} in({query.CategoryIds})");
+                }
+            }
+            return Get<RB_FreeShipping_Extend>(builder.ToString()).ToList();
+        }
     }
 }

Mall.Repository/Product/RB_Goods_OrderDetailFreeShippingRepository.cs

+using Mall.Model.Entity.Product;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.Product
+{
+    public class RB_Goods_OrderDetailFreeShippingRepository : BaseRepository<RB_Goods_OrderDetailFreeShipping>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Goods_OrderDetailFreeShipping); } }
+        /// <summary>
+        /// 物料规则列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Goods_OrderDetailFreeShipping> GetPageListRepository(int pageIndex, int pageSize, out long rowCount, RB_Goods_OrderDetailFreeShipping query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE  {nameof(RB_Goods_OrderDetailFreeShipping.Status)}=0");
+            if (query != null)
+            {
+                // where += $@" and {nameof(RB_Customer_InfoCreate.CustomerId)}={dmodel.CustomerId}";
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Goods_OrderDetailFreeShipping.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Goods_OrderDetailFreeShipping.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.OrderDetailId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Goods_OrderDetailFreeShipping.OrderDetailId)}={query.OrderDetailId}");
+                }
+            }
+            return GetPage<RB_Goods_OrderDetailFreeShipping>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 物流规则列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Goods_OrderDetailFreeShipping> GetLogisticsRulesList(RB_Goods_OrderDetailFreeShipping query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_Goods_OrderDetailFreeShipping.Status)}=0 ");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Goods_OrderDetailFreeShipping.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Goods_OrderDetailFreeShipping.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.OrderDetailId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Goods_OrderDetailFreeShipping.OrderDetailId)}={query.OrderDetailId}");
+                }
+            }
+            return Get<RB_Goods_OrderDetailFreeShipping>(builder.ToString()).ToList();
+        }
+
+    }
+}

Mall.Repository/Product/RB_Goods_OrderIntroductionRepository.cs

@@ -197,15 +197,15 @@ where  go.OrderStatus in(1,2,3,4,5,6) and go.`Status`=0  {where}";
             }
             if (!string.IsNullOrEmpty(dmodel.GoodsName))
             {
-                where += $@" and od.{nameof(RB_Goods_OrderDetail.GoodsName)}='{dmodel.GoodsName}'";
+                where += $@" and od.{nameof(RB_Goods_OrderDetail.GoodsName)} like'%{dmodel.GoodsName}%'";
             }
             if (dmodel.CommissionState > 0)
             {
                 switch (dmodel.CommissionState)
                 {
-                    case 2: where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)}={(int)OrderStatusEnum.Completed}"; break;
-                    case 1: where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)} in(2,3,4,6)"; break;
-                    case 3: where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)}=1 "; break;
+                    case 3: where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)}={(int)OrderStatusEnum.Completed}"; break;
+                    case 2: where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)} in(2,3,4,6)"; break;
+                    case 1: where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)}=1 "; break;
                 }
             }
             else
@@ -223,5 +223,76 @@ where {where} group by oc.OrderId,o.OrderNo order by oc.OrderId desc";
         }
 
 
+        /// <summary>
+        /// 获取用户返佣
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Goods_OrderIntroduction_Extend> GetOrderBilldetailPageList(int pageIndex, int pageSize, out long count, RB_Goods_OrderIntroduction_Extend dmodel)
+        {
+            string where = $" 1=1 ";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and oc.{nameof(RB_Goods_OrderCommission.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and oc.{nameof(RB_Goods_OrderCommission.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.OrderId > 0)
+            {
+                where += $@" and oc.{nameof(RB_Goods_OrderCommission.OrderId)}={dmodel.OrderId}";
+            }
+            if (dmodel.Type > 0)
+            {
+                where += $@" and oc.{nameof(RB_Goods_OrderCommission.Type)}={dmodel.Type}";
+            }
+            if (dmodel.UserId > 0)
+            {
+                where += $@" and oc.{nameof(RB_Goods_OrderCommission.UserId)}={dmodel.UserId}";
+            }
+            if (dmodel.BillId > 0)
+            {
+                where += $@" and a.{nameof(RB_Distributor_BillDetail.BillId)}={dmodel.BillId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.OrderIds))
+            {
+                where += $@" and oc.{nameof(RB_Goods_OrderCommission.OrderId)} in({dmodel.OrderIds})";
+            }
+            if (!string.IsNullOrEmpty(dmodel.OrderNo))
+            {
+                where += $@" and o.{nameof(RB_Goods_Order.OrderNo)}='{dmodel.OrderNo}'";
+            }
+
+            if (dmodel.SupplierId.HasValue && dmodel.SupplierId.Value > 0)
+            {
+                where += $@" and od.{nameof(RB_Goods_OrderDetail.SupplierId)}={dmodel.SupplierId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.StartTime))
+            {
+                where += $@" and o.{nameof(RB_Goods.CreateDate)} >='{dmodel.StartTime}'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.EndTime))
+            {
+                where += $@" and o.{nameof(RB_Goods.CreateDate)} <='{dmodel.EndTime + " 23:59:59"}'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.GoodsName))
+            {
+                where += $@" and od.{nameof(RB_Goods_OrderDetail.GoodsName)}='{dmodel.GoodsName}'";
+            }
+           
+
+            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_distributor_billdetail as a 
+LEFT JOIN rb_goods_orderintroduction as oc on a.CommissionId=oc.Id
+LEFT JOIN rb_goods_orderdetail as od on od.Id=a.OrderDetailId
+LEFT JOIN rb_goods_order as o on o.OrderId=od.OrderId
+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.WebApi/App_Code/PayUtil.cs

@@ -473,7 +473,7 @@ namespace Mall.WebApi.App_Code
         /// <param name="CustomerId"></param>
         /// <param name="openid"></param>
         /// <returns></returns>
-        public static bool GetTransfersOrder(string sOrderNo, decimal dPrice, string CustomerId, string openid, RB_MiniProgram_Extend model, IHttpContextAccessor _accessor)
+        public static bool GetTransfersOrder(string sOrderNo, decimal dPrice, string CustomerId, string openid, RB_MiniProgram_Extend model, IHttpContextAccessor _accessor, string Remark = "")
         {
             if (!System.IO.File.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "App_Data/Certs/WeChatApp/" + model.WeChatPayCertificateUrl)))
             {
@@ -489,7 +489,7 @@ namespace Mall.WebApi.App_Code
             req.SetParameter("openid", openid);
             req.SetParameter("check_name", "NO_CHECK");
             req.SetParameter("amount", (dPrice * 100).ToString("f0"));
-            req.SetParameter("desc", "赞羊商城佣金提现");
+            req.SetParameter("desc", Remark == "" ? "赞羊商城佣金提现" : Remark);
             req.SetParameter("sign", req.CreateMd5Sign(_accessor, model.WeChatApiSecret));
             var reqXml = req.ParseXml();
             var result = Common.Pay.WeChatPat.HttpHelper.Post(new HttpParam()

Mall.WebApi/Controllers/Finance/ERPOrderCommissionController.cs

@@ -224,7 +224,7 @@ namespace Mall.WebApi.Controllers.Finance
             {
                 var mallModel = userModule.GetMiniProgramExtend(MallBaseId);
                 var umodel = userModule.GetMemberUserInfo(bmodel.UserId ?? 0);
-                var flag = App_Code.PayUtil.GetTransfersOrder((bmodel.Periods ?? "") + bmodel.Id, bmodel.Money ?? 0, (bmodel.UserId ?? 0).ToString(), umodel.OpenId, mallModel, _accessor);
+                var flag = App_Code.PayUtil.GetTransfersOrder((bmodel.Periods ?? "") + bmodel.Id, bmodel.Money ?? 0, (bmodel.UserId ?? 0).ToString(), umodel.OpenId, mallModel, _accessor, "赞羊供应商佣金打款");
                 if (flag)
                 {
                     string msg = userModule.SetRecommendOrdersBillRemit(BillId, TenantId, MallBaseId, 0, "单据审核通过，已自动打款");
@@ -233,7 +233,7 @@ namespace Mall.WebApi.Controllers.Finance
                         LogHelper.Write("企业付款失败 账单BillId:" + BillId);
                     }
 
-                    new MiniProgramMsgModule().SendWithdrawSucceedMsg(TenantId, MallBaseId, umodel.OpenId, (bmodel.Money ?? 0).ToString(), "0", "自动打款", "已发放推荐佣金，请注意查收");
+                    new MiniProgramMsgModule().SendWithdrawSucceedMsg(TenantId, MallBaseId, umodel.OpenId, (bmodel.Money ?? 0).ToString(), "0", "自动打款", "已发放供应商佣金，请注意查收");
                     return ApiResult.Success();
                 }
                 else

Mall.WebApi/Controllers/MallBase/MallBaseController.cs

@@ -996,7 +996,8 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.FullMoneyPinkage,
                 x.FullNumPinkage,
                 x.CategoryList,
-                x.IsEnable
+                x.IsEnable,
+                x.Name
             });
             return ApiResult.Success("", pagelist);
         }
@@ -1058,7 +1059,12 @@ namespace Mall.WebApi.Controllers.MallBase
             }
             else
             {
-                if (((query.FullMoneyPinkage ?? 0)+ (query.FullNumPinkage ?? 0)) <= 0)
+                if (mallBaseModule.ExistsName(query.ID, query.Name, query.TenantId, query.MallBaseId))
+                {
+                    return ApiResult.Failed("分类包邮规则名称重复！");
+                }
+
+                if (((query.FullMoneyPinkage ?? 0) + (query.FullNumPinkage ?? 0)) <= 0)
                 {
                     return ApiResult.Failed("满减/满额不能同时为零");
                 }
@@ -1076,7 +1082,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 }
                 foreach (var item in query.CategoryList)
                 {
-                    if (categoryList.Any(x => x.CategoryId == item.CategoryId&&x.FreeShippingId!=query.ID))
+                    if (categoryList.Any(x => x.CategoryId == item.CategoryId && x.FreeShippingId != query.ID))
                     {
                         return ApiResult.Failed(item.CategoryName + "已添加包邮规则");
                     }
@@ -1151,7 +1157,7 @@ namespace Mall.WebApi.Controllers.MallBase
             }
         }
 
-        
+
         #endregion
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -63,7 +63,10 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.GoodsStatus,
                 x.TenantId,
                 x.MallBaseId,
-                CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
+                CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                FreeShippingName = x.FreeShippingModel.Name,
+                FreeShippingFullMoneyPinkage = x.FreeShippingModel.FullMoneyPinkage ?? 0,
+                FreeShippingFullNumPinkage = x.FreeShippingModel.FullNumPinkage ?? 0,
             });
             List<object> robj = new List<object>() {
                  new {
@@ -233,7 +236,8 @@ namespace Mall.WebApi.Controllers.MallBase
                     y.ProductCode,
                     y.Final_Price,
                     y.Number,
-                    y.IsComment
+                    y.IsComment,
+                    y.FreeShippingRemarks
                 }),
                 x.OrderStatus,
                 OrderStatusName = x.OrderStatus.GetEnumName(),
@@ -486,10 +490,11 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult SetAppletOrderCommissionInitialize() {
+        public ApiResult SetAppletOrderCommissionInitialize()
+        {
             var req = RequestParm;
             JObject parms = JObject.Parse(req.msg.ToString());
-            int OrderId = parms.GetInt("OrderId", 0);            
+            int OrderId = parms.GetInt("OrderId", 0);
 
             bool flag = orderModule.SetAppletOrderCommissionInitialize(OrderId);
             return ApiResult.Success("", flag);
@@ -632,10 +637,12 @@ namespace Mall.WebApi.Controllers.MallBase
 
             var detailModel = orderModule.GetOrderDetailInfo(demodel.OrderDetialId ?? 0);
             var omodel = orderModule.GetOrderInfo(detailModel?.OrderId ?? 0);
-            if (omodel == null) {
+            if (omodel == null)
+            {
                 return ApiResult.ParamIsNull("订单不存在");
             }
-            if (omodel.OrderStatus != Common.Enum.Goods.OrderStatusEnum.WaitReceiving && omodel.OrderStatus != Common.Enum.Goods.OrderStatusEnum.Received && omodel.OrderStatus != Common.Enum.Goods.OrderStatusEnum.Completed) {
+            if (omodel.OrderStatus != Common.Enum.Goods.OrderStatusEnum.WaitReceiving && omodel.OrderStatus != Common.Enum.Goods.OrderStatusEnum.Received && omodel.OrderStatus != Common.Enum.Goods.OrderStatusEnum.Completed)
+            {
                 return ApiResult.ParamIsNull("订单状态不正确");
             }
 
@@ -662,8 +669,10 @@ namespace Mall.WebApi.Controllers.MallBase
                         }
                     }
                 }
-                else {
-                    if (omodel.OrderStatus != Common.Enum.Goods.OrderStatusEnum.WaitReceiving) {
+                else
+                {
+                    if (omodel.OrderStatus != Common.Enum.Goods.OrderStatusEnum.WaitReceiving)
+                    {
                         return ApiResult.ParamIsNull("订单状态不正确");
                     }
                 }
@@ -1008,7 +1017,8 @@ namespace Mall.WebApi.Controllers.MallBase
                 if (Rparms.GetStringValue("Success").ToLower() == "true")
                 {
                     List<Model.Query.ExpressTraces> list = JsonConvert.DeserializeObject<List<Model.Query.ExpressTraces>>(Rparms.GetStringValue("Traces"));
-                    if (list.Any()) {
+                    if (list.Any())
+                    {
                         list = list.OrderByDescending(x => x.AcceptTime).ToList();
                     }
                     return ApiResult.Success("", list);

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -93,7 +93,8 @@ namespace Mall.WebApi.Controllers.MallBase
                     y.ProductCode,
                     y.Final_Price,
                     y.Number,
-                    y.IsBindExpress
+                    y.IsBindExpress,
+                    y.FreeShippingRemarks
                 }),
                 x.Consignee,
                 x.Mobile,

Mall.WebApi/Controllers/User/UserController.cs

@@ -785,6 +785,7 @@ namespace Mall.WebApi.Controllers.User
             demodel.HpReferralsGradeAudit ??= 2;
             demodel.IsWithdrawAll ??= 2;
             demodel.IsEnableFXGrade ??= 2;
+            demodel.IsEnableNoSuperiorFY ??= 1;
             demodel.TenantId = Convert.ToInt32(requestParm.uid);
             demodel.MallBaseId = requestParm.MallBaseId;
             demodel.CreateDate = DateTime.Now;
@@ -838,6 +839,7 @@ namespace Mall.WebApi.Controllers.User
                 model.HpReferralsGradeAudit,
                 model.IsWithdrawAll,
                 model.IsEnableFXGrade,
+                model.IsEnableNoSuperiorFY,
                 UpdateDate = model.UpdateDate.HasValue ? model.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
             });
         }
@@ -3011,7 +3013,7 @@ namespace Mall.WebApi.Controllers.User
             {
                 var mallModel = userModule.GetMiniProgramExtend(req.MallBaseId);
                 var umodel = userModule.GetMemberUserInfo(bmodel.UserId ?? 0);
-                var flag = App_Code.PayUtil.GetTransfersOrder((bmodel.Periods ?? "") + bmodel.Id, bmodel.Money ?? 0, (bmodel.UserId ?? 0).ToString(), umodel.OpenId, mallModel, _accessor);
+                var flag = App_Code.PayUtil.GetTransfersOrder((bmodel.Periods ?? "") + bmodel.Id, bmodel.Money ?? 0, (bmodel.UserId ?? 0).ToString(), umodel.OpenId, mallModel, _accessor,"赞羊供应商佣金打款");
                 if (flag)
                 {
                     string msg = userModule.SetRecommendOrdersBillRemit(BillId, req.TenantId, req.MallBaseId, req.EmpId);
@@ -3020,7 +3022,7 @@ namespace Mall.WebApi.Controllers.User
                         LogHelper.Write("企业付款失败 账单BillId:" + BillId);
                     }
 
-                    new MiniProgramMsgModule().SendWithdrawSucceedMsg(req.TenantId, req.MallBaseId, umodel.OpenId, (bmodel.Money ?? 0).ToString(), "0", "自动打款", "已发放推荐佣金，请注意查收");
+                    new MiniProgramMsgModule().SendWithdrawSucceedMsg(req.TenantId, req.MallBaseId, umodel.OpenId, (bmodel.Money ?? 0).ToString(), "0", "自动打款", "已发放供应商佣金，请注意查收");
                     return ApiResult.Success();
                 }
                 else

Mall.WebApi/Mall.WebApi.csproj

@@ -18,6 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Mall.AOP\Mall.AOP.csproj" />
     <ProjectReference Include="..\Mall.CacheManager\Mall.CacheManager.csproj" />
     <ProjectReference Include="..\Mall.Common\Mall.Common.csproj" />
     <ProjectReference Include="..\Mall.DataHelper\Mall.DataHelper.csproj" />

Mall.WindowsService/Module/FinanceModule.cs

@@ -22,6 +22,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using VT.FW.DB;
 
 namespace Mall.WindowsService.Module
 {