商邀费用录入

增加卡类型相关字段字段

OASystem/OASystem.Domain/Dtos/Groups/InvitationOfficialActivitiesListDto.cs

@@ -39,8 +39,38 @@ namespace OASystem.Domain.Dtos.Groups
         /// </summary>
         public int Status { get; set; }
 
-        //-------------------C表参数--------------------------
-
+        //-------------------    C表参数    --------------------------
+        //---------------------payType==刷卡--------------------------
+        /// <summary>
+        /// 卡类型
+        /// </summary>
+        public int CTDId { get; set; }
+        /// <summary>
+        /// 银行卡号
+        /// </summary>
+        public string BankNo { get; set; }
+        /// <summary>
+        /// 持卡人姓名
+        /// </summary>
+        public string CardholderName { get; set; }
+        //-------------------payType==转账Or现金 ---------------------
+        /// <summary>
+        /// 公司银行卡号
+        /// </summary>
+        public string CompanyBankNo { get; set; }
+        /// <summary>
+        /// 对方开户行
+        /// </summary>
+        public string OtherBankName { get; set; }
+        /// <summary>
+        /// 对方银行账号
+        /// </summary>
+        public string OtherSideNo { get; set; }
+        /// <summary>
+        /// 对方姓名
+        /// </summary>
+        public string OtherSideName { get; set; }
+        //---------------------金额-----------------------------------
         /// <summary>
         /// 总计费用
         /// </summary>

OASystem/OASystem.Domain/ViewModels/Groups/InvitationOfficialActivitiesByIdView.cs

@@ -82,6 +82,39 @@ namespace OASystem.Domain.ViewModels.Groups
 
     public class InvitationOfficialActivitiesByIdView
     {
+
+        //---------------------payType==刷卡--------------------------
+        /// <summary>
+        /// 卡类型
+        /// </summary>
+        public int CTDId { get; set; }
+        /// <summary>
+        /// 银行卡号
+        /// </summary>
+        public string BankNo { get; set; }
+        /// <summary>
+        /// 持卡人姓名
+        /// </summary>
+        public string CardholderName { get; set; }
+        //---------------------payType==转账Or现金--------------------------
+        /// <summary>
+        /// 公司银行卡号
+        /// </summary>
+        public string CompanyBankNo { get; set; }
+        /// <summary>
+        /// 对方开户行
+        /// </summary>
+        public string OtherBankName { get; set; }
+        /// <summary>
+        /// 对方银行账号
+        /// </summary>
+        public string OtherSideNo { get; set; }
+        /// <summary>
+        /// 对方姓名
+        /// </summary>
+        public string OtherSideName { get; set; }
+
+
         /// <summary>
         /// 付款金额
         /// </summary>

OASystem/OASystem.Infrastructure/Repositories/Groups/InvitationOfficialActivitiesRepository.cs

@@ -309,15 +309,15 @@ namespace OASystem.Infrastructure.Repositories.Groups
                             C.PayDId = dto.PayDId;
                             C.ConsumptionPatterns = "";
                             C.ConsumptionDate = "";
-                            C.CTDId = 0;
-                            C.BankNo = "";
-                            C.CardholderName = "";
+                            C.CTDId = dto.CTDId;
+                            C.BankNo = dto.BankNo;
+                            C.CardholderName = dto.CardholderName;
                             C.PayMoney = dto.PayMoney;
                             C.PaymentCurrency = dto.PaymentCurrency;
-                            C.CompanyBankNo = "";
-                            C.OtherBankName = "";
-                            C.OtherSideNo = "";
-                            C.OtherSideName = "";
+                            C.CompanyBankNo = dto.CompanyBankNo;
+                            C.OtherBankName = dto.OtherBankName;
+                            C.OtherSideNo = dto.OtherSideNo;
+                            C.OtherSideName = dto.OtherSideName;
                             C.Remark = "";
                             C.CreateUserId = dto.CreateUserId;
                             C.MFOperator = 0;
@@ -465,7 +465,13 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                                         .Where(a => a.Id == grp_CreditCardPayment.Id)
                                                         .SetColumns(a => new Grp_CreditCardPayment
                                                         {
-                                                            PayDId = dto.PayDId,
+                                                            CTDId = dto.CTDId,
+                                                            BankNo = dto.BankNo,
+                                                            CardholderName = dto.CardholderName,
+                                                            CompanyBankNo = dto.CompanyBankNo,
+                                                            OtherBankName = dto.OtherBankName,
+                                                            OtherSideNo = dto.OtherSideNo,
+                                                            OtherSideName = dto.OtherSideName,
                                                             PayMoney = grp_CreditCardPayment.PayMoney,
                                                             PaymentCurrency = grp_CreditCardPayment.PaymentCurrency,
                                                             Payee = grp_CreditCardPayment.Payee,