Browse Source

商邀费用录入
增加 消费方式,消费时间相关字段

leiy 11 months ago
parent
commit
3b294a4bb5

+ 10 - 0
OASystem/OASystem.Domain/Dtos/Groups/InvitationOfficialActivitiesListDto.cs

@@ -40,6 +40,16 @@ namespace OASystem.Domain.Dtos.Groups
         public int Status { get; set; }
 
         //-------------------    C表参数    --------------------------
+        //------------------ 消费方式及时间 --------------------------
+        /// <summary>
+        /// 消费方式
+        /// </summary>
+        public string ConsumptionPatterns { get; set; }
+        /// <summary>
+        /// 消费日期
+        /// </summary>
+        public string ConsumptionDate { get; set; }
+
         //---------------------payType==刷卡--------------------------
         /// <summary>
         /// 卡类型

+ 9 - 0
OASystem/OASystem.Domain/ViewModels/Groups/InvitationOfficialActivitiesByIdView.cs

@@ -82,6 +82,15 @@ namespace OASystem.Domain.ViewModels.Groups
 
     public class InvitationOfficialActivitiesByIdView
     {
+        //------------------ 消费方式及时间 --------------------------
+        /// <summary>
+        /// 消费方式
+        /// </summary>
+        public string ConsumptionPatterns { get; set; }
+        /// <summary>
+        /// 消费日期
+        /// </summary>
+        public string ConsumptionDate { get; set; }
 
         //---------------------payType==刷卡--------------------------
         /// <summary>

+ 6 - 2
OASystem/OASystem.Infrastructure/Repositories/Groups/InvitationOfficialActivitiesRepository.cs

@@ -55,6 +55,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     {
                         InvitationOfficialActivitiesByIdView invitation = _mapper.Map<InvitationOfficialActivitiesByIdView>(grp_Invitation);
                         res_InvitationOfficialActivityData ??= new Res_InvitationOfficialActivityData();
+                        invitation.ConsumptionPatterns = grp_CreditCard.ConsumptionPatterns;
+                        invitation.ConsumptionDate = grp_CreditCard.ConsumptionDate;
                         invitation.PayDId = grp_CreditCard.PayDId;
                         invitation.OrbitalPrivateTransfer = grp_CreditCard.OrbitalPrivateTransfer;
                         invitation.Payee = grp_CreditCard.Payee;
@@ -307,8 +309,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
                             Grp_CreditCardPayment C = new Grp_CreditCardPayment();
                             C.PayDId = dto.PayDId;
-                            C.ConsumptionPatterns = "";
-                            C.ConsumptionDate = "";
+                            C.ConsumptionPatterns = dto.ConsumptionPatterns;
+                            C.ConsumptionDate = dto.ConsumptionDate;
                             C.CTDId = dto.CTDId;
                             C.BankNo = dto.BankNo;
                             C.CardholderName = dto.CardholderName;
@@ -465,6 +467,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                                         .Where(a => a.Id == grp_CreditCardPayment.Id)
                                                         .SetColumns(a => new Grp_CreditCardPayment
                                                         {
+                                                            ConsumptionPatterns = dto.ConsumptionPatterns,
+                                                            ConsumptionDate = dto.ConsumptionDate,
                                                             CTDId = dto.CTDId,
                                                             BankNo = dto.BankNo,
                                                             CardholderName = dto.CardholderName,