提交代码

Mall.Model/Entity/BaseSetUp/RB_MicroShop_Basics.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.BaseSetUp
+{
+    /// <summary>
+    /// 微店基础设置
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_MicroShop_Basics
+    {
+        public int ID { get; set; }
+
+        /// <summary>
+        /// 商户id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+
+        public int Status { get; set; }
+
+        public DateTime CreateDate { get; set; }
+        public DateTime UpdateDate { get; set; }
+
+        /// <summary>
+        /// 是否开开启 1-未开启，2-开启
+        /// </summary>
+        public int IsOpen { get; set; }
+
+
+        /// <summary>
+        /// 是否需要审核1-未开启，2-开启
+        /// </summary>
+        public int IsExamine { get; set; }
+
+        /// <summary>
+        /// 申请条件 0-不限，1-普通分销商，2-粉象分销商
+        /// </summary>
+        public int ApplyCondition { get; set; }
+
+        /// <summary>
+        /// 申请等级 对应申请条件中的分销商等级 0-为不限
+        /// </summary>
+        public int ApplyMemberLevel { get; set; }
+
+        /// <summary>
+        /// 1-自定义区间价格百分比，2-固定价格
+        /// </summary>
+        public int PriceType { get; set; }
+
+        /// <summary>
+        /// 自定义区间价格百分比
+        /// </summary>
+        public decimal? CustomMinPriceRate { get; set; }
+
+        /// <summary>
+        /// 自定义区间价格百分比
+        /// </summary>
+        public decimal? CustomMaxPriceRate { get; set; }
+
+
+        /// <summary>
+        /// 固定价格
+        /// </summary>
+        public decimal? FixedPrice { get; set; }
+
+        /// <summary>
+        /// 结算方式 1-用户自提，2-系统自动现结（微信），3-转入余额
+        /// </summary>
+        public int SettlementType { get; set; }
+
+
+        /// <summary>
+        /// 最少提现
+        /// </summary>
+        public decimal? MinWithdrawal { get; set; }
+
+        /// <summary>
+        /// 提现上限
+        /// </summary>
+        public decimal? MaxWithdrawal { get; set; }
+
+
+        /// <summary>
+        /// 提现手续费
+        /// </summary>
+        public decimal? WithdrawalFree { get; set; }
+
+
+        /// <summary>
+        /// 申请协议
+        /// </summary>
+        public string ApplyAgreement { get; set; }
+
+
+        /// <summary>
+        /// 用户须知
+        /// </summary>
+        public string UserNotice { get; set; }
+    }
+}

Mall.Model/Entity/Product/RB_Goods_OrderCommission.cs

@@ -120,6 +120,8 @@ namespace Mall.Model.Entity.Product
         }
 
         public int? IsRemit { get; set; }
+
+
     }
 
     /// <summary>

Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs

@@ -167,6 +167,12 @@ namespace Mall.Model.Entity.Product
         /// 成本价
         /// </summary>
         public decimal? CostMoney { get; set; }
+
+        /// <summary>
+        /// 已付成本价（已付商品成本+已付运费成本）
+        /// </summary>
+        public decimal? PaidCostMoney { get; set; }
+
         /// <summary>
         /// 是否评论   1是  2否
         /// </summary>

Mall.Model/Extend/Finance/RB_Finance_RecordDetail_Extend.cs

+using Mall.Model.Entity.Finance;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.Finance
+{
+   public class RB_Finance_RecordDetail_Extend: RB_Finance_RecordDetail
+    {
+        public decimal OrderDetailPaid { get; set; }
+    }
+}

Mall.Model/Extend/Finance/RB_Finance_Record_Extend.cs

@@ -17,6 +17,6 @@ namespace Mall.Model.Extend.Finance
         /// <summary>
         /// 详情
         /// </summary>
-        public List<RB_Finance_RecordDetail> RecordDetailList { get; set; }
+        public List<RB_Finance_RecordDetail_Extend> RecordDetailList { get; set; }
     }
 }

Mall.Model/Extend/Product/RB_Goods_OrderDetail_Extend.cs

@@ -212,5 +212,11 @@ namespace Mall.Model.Extend.Product
         /// </summary>
         public string NewGoodsName { get; set; }
 
+
+        /// <summary>
+        /// 财务单据创建人
+        /// </summary>
+        public int FinanceCreateBy { get; set; }
+
     }
 }

Mall.Model/Query/OrderStatistics_Query.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Mall.Model.Extend.Product;
 
 namespace Mall.Model.Query
 {
@@ -14,6 +15,13 @@ namespace Mall.Model.Query
     public class OrderStatistics_Query
     {
 
+        public int Id { get; set; }
+        public int OrderId { get; set; }
+
+        /// <summary>
+        /// 订单商品已付成本（商品成本+运费成本）
+        /// </summary>
+        public decimal PaidCostMoney { get; set; }
         public int TenantId { get; set; }
 
         public int MallBaseId { get; set; }
@@ -112,7 +120,10 @@ namespace Mall.Model.Query
         /// </summary>
         public string GeneralAgentName { get; set; }
 
-
+        /// <summary>
+        /// 粉象总返佣
+        /// </summary>
+        public decimal FXCommission { get; set; }
 
         /// <summary>
         /// 结算款
@@ -192,7 +203,7 @@ namespace Mall.Model.Query
         /// </summary>
         public decimal Paid { get; set; }
         /// <summary>
-        /// 未付
+        /// 应付
         /// </summary>
         public decimal NoPaid { get; set; }
 
@@ -217,5 +228,25 @@ namespace Mall.Model.Query
         /// 结束时间
         /// </summary>
         public string EndDate { get; set; }
+
+        /// <summary>
+        /// 0-普通，1-粉象
+        /// </summary>
+        public int IsFxCommission { get; set; }
+        /// <summary>
+        /// 订单返佣列表
+        /// </summary>
+        public List<RB_Goods_OrderCommission_Extend> OrderCommissionList { get; set; }
+
+        /// <summary>
+        /// 主要针对粉象查粉象返佣信息
+        /// </summary>
+        public int IsSelectOrderCommission { get; set; }
+
+        /// <summary>
+        /// 已提现返佣金额
+        /// </summary>
+        public decimal RemitFXCommission { get; set; }
+
     }
 }

Mall.Module.BaseSetUp/MallBaseModule.cs

@@ -29,6 +29,8 @@ namespace Mall.Module.BaseSetUp
         private RB_FreeShippingCategoryRepository freeShippingCategoryRepository = new RB_FreeShippingCategoryRepository();
         private RB_FreeShippingRepository freeShippingRepository = new RB_FreeShippingRepository();
 
+        private RB_MicroShop_BasicsRepository microShopBasicsRepository = new RB_MicroShop_BasicsRepository();
+
         #region 基础设置
         /// <summary>
         /// 获取小程序列表
@@ -1232,5 +1234,49 @@ namespace Mall.Module.BaseSetUp
 
         #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_MicroShop_Basics> GetMicroShopBasicsPageList(int pageIndex, int pageSize, out long rowCount, RB_MicroShop_Basics query)
+        {
+            return microShopBasicsRepository.GetMicroShopBasicsPageList(pageIndex, pageSize, out rowCount, query);
+        }
+
+
+        /// <summary>
+        /// 微店基础配置
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_MicroShop_Basics> GetMicroShopBasicsList(RB_MicroShop_Basics query)
+        {
+            return microShopBasicsRepository.GetMicroShopBasicsList(query);
+        }
+
+        public bool AddOrUpdateMicroShopBasics(RB_MicroShop_Basics model)
+        {
+            if (model.ID == 0)
+            {
+                return microShopBasicsRepository.Insert(model) > 0;
+            }
+            else
+            {
+                return microShopBasicsRepository.Update(model);
+            }
+        }
+
+        #endregion
+
+
     }
 }

Mall.Module.Product/FinanceModule.cs

@@ -258,7 +258,8 @@ namespace Mall.Module.Finance
                     {
                         Dictionary<string, object> keyValues = new Dictionary<string, object>()
                             {
-                                { nameof(RB_Goods_OrderDetail.CostFinanceId),model.FinanceId}
+                                { nameof(RB_Goods_OrderDetail.CostFinanceId),model.FinanceId},
+                                  { nameof(RB_Goods_OrderDetail.PaidCostMoney),item.OrderDetailPaid}
                             };
                         List<WhereHelper> whereHelpers = new List<WhereHelper>() { new WhereHelper()
                                 {

Mall.Repository/BaseSetUp/RB_MicroShop_BasicsRepository.cs

+using Mall.Model.Entity.BaseSetUp;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.BaseSetUp
+{
+    /// <summary>
+    /// 微店基础设置仓储层
+    /// </summary>
+    public class RB_MicroShop_BasicsRepository : BaseRepository<RB_MicroShop_Basics>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_MicroShop_Basics); } }
+
+
+
+        /// <summary>
+        /// 微店基础配置
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_MicroShop_Basics> GetMicroShopBasicsPageList(int pageIndex, int pageSize, out long rowCount, RB_MicroShop_Basics query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE  {nameof(RB_MicroShop_Basics.Status)}=0");
+            if (query != null)
+            {
+                // where += $@" and {nameof(RB_Customer_InfoCreate.CustomerId)}={dmodel.CustomerId}";
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_MicroShop_Basics.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_MicroShop_Basics.MallBaseId)}={query.MallBaseId}");
+                }
+               
+            }
+            return GetPage<RB_MicroShop_Basics>(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_MicroShop_Basics> GetMicroShopBasicsList(RB_MicroShop_Basics query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_MicroShop_Basics.Status)}=0 ");
+            if (query != null)
+            {
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND {nameof(RB_MicroShop_Basics.ID)}={query.ID}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_MicroShop_Basics.TenantId)}={query.TenantId}");
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_MicroShop_Basics.MallBaseId)}={query.MallBaseId}");
+                }
+               
+            }
+            return Get<RB_MicroShop_Basics>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/Finance/RB_Finance_RecordDetailRepository.cs

 using Mall.Model.Entity.Finance;
+using Mall.Model.Extend.Finance;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -44,7 +45,7 @@ namespace Mall.Repository.Finance
         /// </summary>
         /// <param name="dmodel"></param>
         /// <returns></returns>
-        public List<RB_Finance_RecordDetail> GetListByOrderIds(string orderIds, RB_Finance_RecordDetail dmodel)
+        public List<RB_Finance_RecordDetail_Extend> GetListByOrderIds(string orderIds, RB_Finance_RecordDetail_Extend dmodel)
         {
             string where = $" where 1=1  ";
             if (dmodel.TenantId > 0)
@@ -65,7 +66,7 @@ namespace Mall.Repository.Finance
                 where += $@" and {nameof(RB_Finance_RecordDetail.OrderId)} in ({orderIds})";
             }
             string sql = $@"SELECT * FROM {TableName}  {where} order by Id asc";
-            return Get<RB_Finance_RecordDetail>(sql).ToList();
+            return Get<RB_Finance_RecordDetail_Extend>(sql).ToList();
         }
     }
 }

Mall.Repository/Product/RB_Goods_OrderCommissionRepository.cs

@@ -74,6 +74,10 @@ where {where} order by oc.Id asc";
             {
                 where += $@" and oc.{nameof(RB_Goods_OrderCommission.UserId)}={dmodel.UserId}";
             }
+            if (dmodel.OrderDetailId > 0)
+            {
+                where += $@" and oc.{nameof(RB_Goods_OrderCommission.OrderDetailId)}={dmodel.OrderDetailId}";
+            }
             if (!string.IsNullOrEmpty(dmodel.OrderIds))
             {
                 where += $@" and oc.{nameof(RB_Goods_OrderCommission.OrderId)} in({dmodel.OrderIds})";

Mall.WebApi/Controllers/MallBase/MallBaseController.cs

@@ -500,7 +500,6 @@ namespace Mall.WebApi.Controllers.MallBase
 
         #endregion
 
-
         #region 退货地址
         /// <summary>
         /// 退货地址列表
@@ -659,7 +658,6 @@ namespace Mall.WebApi.Controllers.MallBase
 
         #endregion
 
-
         #region 区域购买
         public ApiResult GetAreaBuyInfo()
         {
@@ -716,7 +714,6 @@ namespace Mall.WebApi.Controllers.MallBase
         }
         #endregion
 
-
         #region 获取快递公司信息
         public ApiResult GetExpressInfo()
         {
@@ -735,7 +732,6 @@ namespace Mall.WebApi.Controllers.MallBase
         }
         #endregion
 
-
         #region 电子面单
         /// <summary>
         /// 获取电子面单分页
@@ -972,9 +968,6 @@ namespace Mall.WebApi.Controllers.MallBase
 
         #endregion
 
-
-
-
         #region 包邮规则
         /// <summary>
         /// 列表
@@ -1160,5 +1153,79 @@ namespace Mall.WebApi.Controllers.MallBase
 
 
         #endregion
+
+        #region 微店基础设置
+        /// <summary>
+        /// 新增/修改微店基础信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult AddOrUpdateMicroShopBasics()
+        {
+            var parms = RequestParm;
+            var query = JsonConvert.DeserializeObject<RB_MicroShop_Basics>(RequestParm.msg.ToString());
+
+            if (query == null)
+            {
+                return ApiResult.Failed("请传入需要操作的小程序");
+            }
+            else
+            {
+                if (query.ApplyCondition == 0)
+                {
+                    query.ApplyMemberLevel = 0;
+                }
+                if (query.PriceType == 1)
+                {
+                    query.FixedPrice = 0;
+                }
+                else if (query.PriceType == 2)
+                {
+                    query.CustomMinPriceRate = 0;
+                    query.CustomMaxPriceRate = 0;
+                }
+                if (query.ID == 0)
+                {
+                    query.TenantId = UserInfo.TenantId;
+                    query.MallBaseId = parms.MallBaseId;
+                    query.CreateDate = System.DateTime.Now;
+                    query.Status = 0;
+                }
+                query.UpdateDate = System.DateTime.Now;
+
+                bool result = mallBaseModule.AddOrUpdateMicroShopBasics(query);
+                if (result)
+                {
+                    return ApiResult.Success("基础信息保存成功");
+                }
+                else
+                {
+                    return ApiResult.Failed("基础信息保存失败");
+                }
+
+            }
+        }
+
+
+        /// <summary>
+        /// 获取微店基础信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetMicroShopBasicsInfo()
+        {
+            var parms = RequestParm;
+            var query = new RB_MicroShop_Basics();
+            query.TenantId = UserInfo.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            //获取小程序的商城名称
+            var microShopBasics = mallBaseModule.GetMicroShopBasicsList(new RB_MicroShop_Basics { TenantId = query.TenantId, MallBaseId = query.MallBaseId }).FirstOrDefault();
+            if (microShopBasics == null)
+            {
+                microShopBasics = new RB_MicroShop_Basics();
+            }
+            return ApiResult.Success("获取成功", microShopBasics);
+        }
+        #endregion
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/User/AppletUserController.cs

@@ -1695,5 +1695,9 @@ namespace Mall.WebApi.Controllers.User
             return ApiResult.Success("", pagelist);
         }
         #endregion
+
+        #region 开店申请
+
+        #endregion
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/User/SupplierController.cs

@@ -58,7 +58,7 @@ namespace Mall.WebApi.Controllers.User
                 x.Name,
                 x.Mobile,
                 x.Address,
-                IntroducerName =  x.MemberUserName ,
+                IntroducerName = x.MemberUserName,
                 CardNum = x.ClientBankAccount != null ? x.ClientBankAccount.CardNum : "",
                 OpenBankName = x.ClientBankAccount != null ? x.ClientBankAccount.OpenBankName : "",
                 AccountAlias = x.ClientBankAccount != null ? x.ClientBankAccount.AccountAlias : "",
@@ -289,7 +289,7 @@ namespace Mall.WebApi.Controllers.User
             record.Type = 2;
             record.IsFinanceAll = demodel.IsSelectAll;
             record.CreateDate = System.DateTime.Now;
-            record.RecordDetailList = new List<RB_Finance_RecordDetail>();
+            record.RecordDetailList = new List<RB_Finance_RecordDetail_Extend>();
 
             if (list != null && list.Any())
             {
@@ -308,6 +308,7 @@ namespace Mall.WebApi.Controllers.User
                 }
                 foreach (var orderGoodsItem in list)
                 {
+                    decimal OrderDetailPaid = (orderGoodsItem.PaidCostMoney ?? 0);
                     if (demodel.IsSelectAll == 0 || demodel.IsSelectAll == 1)
                     {
                         if (orderGoodsItem.CostMoney > 0 && orderGoodsItem.CostFinanceId <= 0)
@@ -327,6 +328,7 @@ namespace Mall.WebApi.Controllers.User
                                 CostMoney = orderGoodsItem.CostMoney,
                                 FreightCostMoney = orderGoodsItem.FreightCostMoney
                             };
+                            OrderDetailPaid += ((orderGoodsItem.CostMoney ?? 0) * (orderGoodsItem.Number ?? 0));
                             result.Add(newOrderGoods);
                         }
                     }
@@ -349,10 +351,11 @@ namespace Mall.WebApi.Controllers.User
                                 CostMoney = orderGoodsItem.CostMoney,
                                 FreightCostMoney = orderGoodsItem.FreightCostMoney
                             };
+                            OrderDetailPaid += (orderGoodsItem.FreightCostMoney ?? 0);
                             result.Add(newOrderGoods);
                         }
                     }
-                    RB_Finance_RecordDetail financeRecordDetail = new RB_Finance_RecordDetail
+                    RB_Finance_RecordDetail_Extend financeRecordDetail = new RB_Finance_RecordDetail_Extend
                     {
 
                         ID = 0,
@@ -368,7 +371,8 @@ namespace Mall.WebApi.Controllers.User
                         GoodsPrice = ((orderGoodsItem.CostMoney ?? 0) * (orderGoodsItem.Number ?? 0)),
                         FreightMoney = orderGoodsItem.FreightCostMoney,
                         Unit_Price = orderGoodsItem.CostMoney,
-                        Number = orderGoodsItem.Number
+                        Number = orderGoodsItem.Number,
+                        OrderDetailPaid = OrderDetailPaid,
                     };
                     record.RecordDetailList.Add(financeRecordDetail);
                 }
@@ -378,7 +382,7 @@ namespace Mall.WebApi.Controllers.User
                     Number = x.FinanceType == 1 ? x.Number : 1,
                     OriginalMoney = x.FinanceType == 1 ? ((x.CostMoney ?? 0) * (x.Number ?? 0)) : x.FreightCostMoney,
                     UnitPrice = x.FinanceType == 1 ? ((x.CostMoney ?? 0)) : x.FreightCostMoney,
-                    Remark = x.GoodsName +x.Specification+ x.OrderNo
+                    Remark = x.GoodsName + x.Specification + x.OrderNo
                 });
 
                 decimal totalMonry = 0;
@@ -397,7 +401,7 @@ namespace Mall.WebApi.Controllers.User
                 }
                 var financeObj = new
                 {
-                    CreateBy = UserInfo.ERPEmpId==0? Config.ExpendDirector:UserInfo.ERPEmpId.ToString(),
+                    CreateBy = demodel.FinanceCreateBy == 0 ? Config.ExpendDirector : demodel.FinanceCreateBy.ToString(),
                     IsPublic = demodel.IsPublic,//  supplierModel.ClientBankAccount.AccountType, //financeConfigurineModel.AccountType,
                     ClientType = supplierModel.ClientBankAccount.Type,
                     ClientID = supplierModel.BankAccountId,

Mall.WebApi/Controllers/User/UserController.cs

@@ -3258,6 +3258,55 @@ namespace Mall.WebApi.Controllers.User
 
 
 
+        #endregion
+
+        #region 微店基础设置获取分销等级
+        [HttpPost]
+        public ApiResult GetGradeByType()
+        {
+            var re = RequestParm;
+            var parms = JObject.Parse(re.msg.ToString());
+            int GradeType = parms.GetInt("GradeType", 0);
+            if (GradeType == 1)
+            {
+                RB_Distributor_Grade_Extend demodel = JsonConvert.DeserializeObject<RB_Distributor_Grade_Extend>(re.msg.ToString());
+
+                demodel.TenantId = Convert.ToInt32(re.uid);
+                demodel.MallBaseId = re.MallBaseId;
+                var list = userModule.GetDistributorGradeDropdownList(demodel);
+
+                return ApiResult.Success("", list.Select(x => new
+                {
+                    x.Id,
+                    x.Name,
+                    x.Grade
+                }));
+            }
+            else if (GradeType == 2)
+            {
+                RB_Distributor_FXGrade_Extend demodel = JsonConvert.DeserializeObject<RB_Distributor_FXGrade_Extend>(re.msg.ToString());
+
+                demodel.TenantId = Convert.ToInt32(re.uid);
+                demodel.MallBaseId = re.MallBaseId;
+                var list = userModule.GetFXDistributorGradeList(demodel);
+
+                return ApiResult.Success("", list.Select(x => new
+                {
+                    x.Id,
+                    Name = x.GradeName,
+                    x.Grade
+                }));
+            }
+            else {
+                List<RB_Distributor_Grade_Extend> list = new List<RB_Distributor_Grade_Extend>();
+                return ApiResult.Success("", list.Select(x => new
+                {
+                    x.Id,
+                    x.Name,
+                    x.Grade
+                }));
+            }
+        }
         #endregion
     }
 }
\ No newline at end of file

Mall.WindowsService/Module/FinanceModule.cs

@@ -182,14 +182,14 @@ and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
                                 record.TenantId = item.TenantId;
                                 record.Type = 1;
                                 record.CreateDate = System.DateTime.Now;
-                                record.RecordDetailList = new List<RB_Finance_RecordDetail>();
+                                record.RecordDetailList = new List<RB_Finance_RecordDetail_Extend>();
 
 
-                                List<RB_Finance_RecordDetail> orderGoodsList = new List<RB_Finance_RecordDetail>();
+                                List<RB_Finance_RecordDetail_Extend> orderGoodsList = new List<RB_Finance_RecordDetail_Extend>();
                                 if (goodsDetailList != null && goodsDetailList.Any())//获取当前需要生成入款单的订单是否已经生成财务单据
                                 {
                                     string orderIds = string.Join(",", goodsDetailList.Select(x => x.OrderId));
-                                    orderGoodsList = financeRecordDetailRepository.GetListByOrderIds(orderIds, new RB_Finance_RecordDetail { TenantId = item.TenantId, MallBaseId = item.MallBaseId, Type = 1 });
+                                    orderGoodsList = financeRecordDetailRepository.GetListByOrderIds(orderIds, new RB_Finance_RecordDetail_Extend { TenantId = item.TenantId, MallBaseId = item.MallBaseId, Type = 1 });
                                 }
                                 else
                                 {
@@ -244,7 +244,7 @@ and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
                                             };
                                             result.Add(newOrderGoods);
                                         }
-                                        RB_Finance_RecordDetail financeRecordDetail = new RB_Finance_RecordDetail
+                                        RB_Finance_RecordDetail_Extend financeRecordDetail = new RB_Finance_RecordDetail_Extend
                                         {
 
                                             ID = 0,
@@ -1356,7 +1356,7 @@ and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
                                     record.Type = 3;
                                     record.CreateDate = System.DateTime.Now;
                                     record.FinanceId = 0;
-                                    record.RecordDetailList = new List<RB_Finance_RecordDetail>();
+                                    record.RecordDetailList = new List<RB_Finance_RecordDetail_Extend>();
                                     int recordId = financeRecordRepository.Insert(record);
                                 }
                             }
@@ -1395,7 +1395,7 @@ and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
                     record.TenantId = item.TenantId;
                     record.Type = 3;
                     record.CreateDate = System.DateTime.Now;
-                    record.RecordDetailList = new List<RB_Finance_RecordDetail>();
+                    record.RecordDetailList = new List<RB_Finance_RecordDetail_Extend>();
 
                     decimal TotalMoney = 0;
                     var detailList = new List<object>();
@@ -1419,7 +1419,7 @@ and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
                             }
                         );
 
-                        RB_Finance_RecordDetail financeRecordDetail = new RB_Finance_RecordDetail
+                        RB_Finance_RecordDetail_Extend financeRecordDetail = new RB_Finance_RecordDetail_Extend
                         {
 
                             ID = 0,
@@ -1463,7 +1463,7 @@ and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
                             }
                         );
 
-                        RB_Finance_RecordDetail financeRecordDetail = new RB_Finance_RecordDetail
+                        RB_Finance_RecordDetail_Extend financeRecordDetail = new RB_Finance_RecordDetail_Extend
                         {
 
                             ID = 0,