提交下单获取优惠券报错

Mall.Common/Enum/Finance/ClientTypeEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Common.Enum.Finance
+{
+    /// <summary>
+    /// 客户类型枚举
+    /// </summary>
+    public enum ClientTypeEnum
+    {
+        /// <summary>
+        ///酒店供应商
+        /// </summary>
+        [EnumField("酒店供应商")]
+        HotelSupplier = 1,
+        /// <summary>
+        /// 票卷供应商
+        /// </summary>
+        [EnumField("票卷供应商")]
+        TicketSupplier = 2,
+        /// <summary>
+        /// 餐厅供应商
+        /// </summary>
+        [EnumField("餐厅供应商")]
+        DiningSupplier = 3,
+        /// <summary>
+        /// 车辆供应商
+        /// </summary>
+        [EnumField("车辆供应商")]
+        CarSupplier = 4,
+        /// <summary>
+        /// 签证供应商
+        /// </summary>
+        [EnumField("签证供应商")]
+        VisaSupplier = 5,
+        /// <summary>
+        /// 机票供应商
+        /// </summary>
+        [EnumField("机票供应商")]
+        PlaneTicketSupplier = 6,
+        /// <summary>
+        /// 领队/导游
+        /// </summary>
+        [EnumField("领队/导游")]
+        Leader = 7,
+        /// <summary>
+        /// 我的客户
+        /// </summary>
+        [EnumField("我的客户")]
+        MyClient = 8,
+        ///// <summary>
+        ///// OP
+        ///// </summary>
+        //[EnumField("OP")]
+        //OP = 9,
+        /// <summary>
+        /// 员工
+        /// </summary>
+        [EnumField("员工")]
+        Employee = 9,
+        /// <summary>
+        /// 其他
+        /// </summary>
+        [EnumField("其他")]
+        Other = 10,
+        ///// <summary>
+        ///// 地接供应商
+        ///// </summary>
+        //[EnumField("地接供应商")]
+        //DiJie = 11
+    }
+}

Mall.Model/Entity/Finance/RB_ClientBankAccount.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Finance
+{
+    /// <summary>
+    /// 客户账户表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "FinanceConnection")]
+    public class RB_ClientBankAccount
+    {
+        /// <summary>
+        /// ID
+        /// </summary>        
+        public int ID
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 地接、OP、签证、票务、领队、工资提成、其他
+        /// </summary>        
+        public Common.Enum.Finance.ClientTypeEnum? Type
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 账户类型对应的对象编号
+        /// </summary>        
+        public int? ObjID
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 所属银行
+        /// </summary>        
+        public int? BankId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 开户支行
+        /// </summary>        
+        public string OpenBankName
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 开户人
+        /// </summary>        
+        public string AccountHolder
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 卡号
+        /// </summary>        
+        public string CardNum
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 账户别名
+        /// </summary>        
+        public string AccountAlias
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 状态
+        /// </summary>        
+        public Common.Enum.DateStateEnum Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 创建人
+        /// </summary>        
+        public int? CreateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 创建时间
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 集团
+        /// </summary>        
+        public int? RB_Group_Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 公司
+        /// </summary>        
+        public int? RB_Branch_Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 公私账户类型  1公  2私
+        /// </summary>
+        public int? AccountType
+        {
+            get; set;
+        }
+        /// <summary>
+        /// 账户分类  1平台  2银行  3虚拟账户  4微信支付宝
+        /// </summary>
+        public int? AccountClassify
+        {
+            get; set;
+        }
+    }
+}

Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs

@@ -188,5 +188,15 @@ namespace Mall.Model.Entity.Product
         /// </summary>
         public decimal? CouponMoney { get; set; }
 
+
+        /// <summary>
+        /// 运费成本
+        /// </summary>
+        public decimal? FreightCostMoney { get; set; }
+
+        /// <summary>
+        /// 供应商id
+        /// </summary>
+        public int SupplierId { get; set; }
     }
 }

Mall.Model/Entity/User/RB_Supplier.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.User
+{
+    /// <summary>
+    /// 供应商
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Supplier
+    {
+        public int ID { get; set; }
+
+        /// <summary>
+        /// 供应商名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        public string Mobile { get; set; }
+
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        public string Address { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>        
+        public int? Status
+        {
+            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;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 银行账户信息
+        /// </summary>
+        public int BankAccountId { get; set; }
+
+        /// <summary>
+        /// 供应商状态0-正常，1-禁用
+        /// </summary>
+        public int SupplierStatus { get; set; }
+
+    }
+}

Mall.Model/Extend/Finance/RB_ClientBankAccount_Extend.cs

+using Mall.Common.AOP;
+using Mall.Model.Entity.Finance;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.Finance
+{
+    /// <summary>
+    /// 客户账户表扩展
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "FinanceConnection")]
+    public class RB_ClientBankAccount_Extend : RB_ClientBankAccount
+    {
+        /// <summary>
+        /// 客户账户id
+        /// </summary>
+        public string ClientIdStr { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string ObjIdStr { get; set; }
+        /// <summary>
+        /// 客户名称
+        /// </summary>
+        public string ClientName { get; set; }
+        /// <summary>
+        /// 所属银行
+        /// </summary>
+        public string BankName { get; set; }
+
+        /// <summary>
+        /// 交易金额
+        /// </summary>
+        public decimal? PayMoney { get; set; }
+    }
+}

Mall.Model/Extend/User/RB_Supplier_Extend.cs

+using Mall.Model.Entity.Finance;
+using Mall.Model.Entity.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.User
+{
+    public class RB_Supplier_Extend : RB_Supplier
+    {
+        /// <summary>
+        /// 账户信息
+        /// </summary>
+        public RB_ClientBankAccount ClientBankAccount { get; set; }
+    }
+}

Mall.Repository/Finance/RB_ClientBankAccountRepository.cs

+using Mall.Common.Enum;
+using Mall.Model.Entity.Finance;
+using Mall.Model.Extend.Finance;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.Finance
+{
+    /// <summary>
+    /// 客户账户仓储
+    /// </summary>
+    public partial class RB_ClientBankAccountRepository : RepositoryBase<RB_ClientBankAccount>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_ClientBankAccount); } }
+        /// <summary>
+        /// 获取客户账户分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="model"></param>
+        /// <param name="count"></param>
+        /// <returns></returns>
+        public List<RB_ClientBankAccount_Extend> GetPageList(int pageIndex, int pageSize, RB_ClientBankAccount_Extend model, out long count)
+        {
+            string where = " WHERE 1=1 ";
+            where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.Status) + "={0}", (int)DateStateEnum.Normal);
+            if (model.RB_Group_Id > 0)
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.RB_Group_Id) + "={0}", model.RB_Group_Id);
+            }
+            if (model.RB_Branch_Id >= 0)
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.RB_Branch_Id) + "={0}", model.RB_Branch_Id);
+            }
+            if (model.Type > 0)
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.Type) + "={0}", (int)model.Type);
+            }
+            if (!string.IsNullOrEmpty(model.AccountAlias))
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.AccountAlias) + " like '%{0}%' ", model.AccountAlias);
+            }
+            if (!string.IsNullOrEmpty(model.OpenBankName))
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.OpenBankName) + " like '%{0}%' ", model.OpenBankName);
+            }
+            if (!string.IsNullOrEmpty(model.CardNum))
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.CardNum) + " like '%{0}%' ", model.CardNum);
+            }
+            if (!string.IsNullOrEmpty(model.AccountHolder))
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount_Extend.AccountHolder) + " like '%{0}%' ", model.AccountHolder);
+            }
+            return GetPage<RB_ClientBankAccount_Extend>(pageIndex, pageSize, out count, " select * from  " + TableName + "" + where).ToList();
+        }
+        /// <summary>
+        /// 获取客户账户列表
+        /// </summary>
+        /// <param name="model"></param>
+        /// <param name="AccountAlias"></param>
+        /// <param name="ClientIdStr"></param>
+        /// <returns></returns>
+        public List<RB_ClientBankAccount> GetList(RB_ClientBankAccount model, string AccountAlias = "", string ClientIdStr = "")
+        {
+            string where = " WHERE 1=1 ";
+            where += string.Format(" AND " + nameof(RB_ClientBankAccount.Status) + "={0} ", (int)DateStateEnum.Normal);
+            if (model.RB_Group_Id > 0)
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.RB_Group_Id) + "={0} ", model.RB_Group_Id);
+            }
+            if (model.RB_Branch_Id >= 0)
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.RB_Branch_Id) + "={0} ", model.RB_Branch_Id);
+            }
+            if (model.ID > 0)
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.ID) + "={0} ", model.ID);
+            }
+            if (ClientIdStr != "")
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.ID) + " in({0}) ", ClientIdStr);
+            }
+            if (model.Type > 0)
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.Type) + "={0}", (int)model.Type);
+            }
+            if (model.ObjID > 0)
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.ObjID) + "={0}", model.ObjID);
+            }
+            if (!string.IsNullOrEmpty(model.AccountAlias))
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.AccountAlias) + "='{0}'", model.AccountAlias);
+            }
+            if (AccountAlias != "")
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.AccountAlias) + " like'%{0}%'", AccountAlias);
+            }
+            if (!string.IsNullOrEmpty(model.CardNum))
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.CardNum) + " like '%{0}%' ", model.CardNum);
+            }
+            return Get<RB_ClientBankAccount>("select * from " + TableName + " " + where).ToList();
+        }
+
+        /// <summary>
+        /// 根据查询条件获取客户账户列表
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public List<RB_ClientBankAccount> GetList(RB_ClientBankAccount_Extend model)
+        {
+            string where = " WHERE 1=1 ";
+            where += string.Format(" AND " + nameof(RB_ClientBankAccount.Status) + "={0} ", (int)DateStateEnum.Normal);
+            if (model.RB_Group_Id > 0)
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.RB_Group_Id) + "={0} ", model.RB_Group_Id);
+            }
+            if (model.RB_Branch_Id >= 0)
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.RB_Branch_Id) + "={0} ", model.RB_Branch_Id);
+            }
+            if (model.ID > 0)
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.ID) + "={0} ", model.ID);
+            }
+            if (!string.IsNullOrWhiteSpace(model.ClientIdStr))
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.ID) + " in({0}) ", model.ClientIdStr);
+            }
+            if (model.Type > 0)
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.Type) + "={0}", (int)model.Type);
+            }
+            if (model.ObjID > 0)
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.ObjID) + "={0}", model.ObjID);
+            }
+            if (!string.IsNullOrWhiteSpace(model.ObjIdStr))
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.ObjID) + " in({0})", model.ObjIdStr);
+            }
+            if (!string.IsNullOrEmpty(model.AccountAlias))
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.AccountAlias) + "='{0}'", model.AccountAlias);
+            }
+            if (!string.IsNullOrEmpty(model.CardNum))
+            {
+                where += string.Format(" AND " + nameof(RB_ClientBankAccount.CardNum) + " like '%{0}%' ", model.CardNum);
+            }
+            return Get<RB_ClientBankAccount>("select * from " + TableName + " " + where).ToList();
+        }
+        
+    }
+}

Mall.Repository/MarketingCenter/RB_DiscountCouponRepository.cs

@@ -174,7 +174,7 @@ LEFT JOIN rb_discountcoupon_product as  c on c.DiscountCouponId=b.ID
 where a.UseType=2 and c.`Status`=0  {where} {goodsWhere}
 UNION all
 SELECT a.ID as MemberCouponId,a.UserId,b.`Name`,b.CouponType,b.UseType,b.MinConsumePrice,b.DiscountsPrice,b.MaxDiscountsPrice,b.`Describe`,a.StartDate,a.EndDate,b.ID from rb_member_discountcoupon as a 
- LEFT JOIN  rb_discountcoupon as cb on a.CouponId=b.ID
+ LEFT JOIN  rb_discountcoupon as b on a.CouponId=b.ID
  where   a.UseType=3   {where} {allWhere}";
             return Get<RB_DiscountCoupon_Extend>(sql).ToList();
         }

Mall.Repository/User/RB_SupplierRepository.cs

+using Mall.Model.Entity.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Repository.User
+{
+   public class RB_SupplierRepository:RepositoryBase<RB_Supplier>
+    {
+
+    }
+}