保修部分修改

OASystem/OASystem.Domain/ViewModels/Groups/CustomersView.cs

@@ -58,6 +58,9 @@ namespace OASystem.Domain.ViewModels.Groups
         public string IsAuditGMStr { get; set; }
 
         public string PayName { get; set; }
+
+
+        public string IsPayStr { get; set; }
     }
 
     public class CustomersByIdView
@@ -194,6 +197,11 @@ namespace OASystem.Domain.ViewModels.Groups
         /// C表备注
         /// </summary>
         public string Remark { get; set; }
+
+        /// <summary> 
+        /// 是否付款  0 否 1 是
+        /// </summary> 
+        public int IsPay { get; set; }
     }
 
     public class InsuranceCostView

OASystem/OASystem.Infrastructure/Repositories/Groups/CustomersRepository.cs

@@ -59,7 +59,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
             if (dto.PortType == 1)
             {
                 string sql = string.Format(@"select h.Id,h.ClientName,InsuranceCosts,Currency,s.Name as CurrencyStr,Attachment,c.OrbitalPrivateTransfer,
-                                                    u.CnName,c.IsAuditGM,s1.Name As 'PayName'
+                                                    u.CnName,c.IsAuditGM,s1.Name As 'PayName', CASE c.IsPay  when 0 then '未付款' when 1 then '已付款' ELSE '未付款' END as 'IsPayStr'
                                                 From Grp_Customers h 
                                                 Join Grp_CreditCardPayment c on h.Id=c.CId and c.CTable=82 and c.isdel=0
                                                 Left Join Sys_SetData s on  h.Currency=s.Id
@@ -369,12 +369,12 @@ namespace OASystem.Infrastructure.Repositories.Groups
             c.PayPercentage = 100;
             c.CTable = 82;
             c.CId = id;
-            c.IsAuditGM = 0;
+            c.IsAuditGM = 3;
             c.PayMoney = cus.InsuranceCosts;
             c.PaymentCurrency = cus.Currency;
 
-            if (c.PayDId == 72) c.IsPay = 1;
-            else c.IsPay = 0;
+            //if (c.PayDId == 72) c.IsPay = 1;
+            //else c.IsPay = 0;
 
             c.RMBPrice = cus.InsuranceCosts;
             c.DayRate = 1;
@@ -468,7 +468,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                                     BankNo = c.BankNo,
                                                     CardholderName = c.CardholderName,
                                                     Remark = c.Remark,
-
+                                                    IsAuditGM = c.IsAuditGM,
                                                 })
                                                 .ExecuteCommandAsync();
                     if (CTable == 0)

OASystem/OASystem.Infrastructure/Repositories/Groups/DecreasePaymentsRepository.cs

@@ -146,7 +146,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 supplier = _supplier,
                 supplierArea = _supplierArea
             };
-            return  new JsonView() { Code = 200, Msg = MsgTips.Status, Data = data };
+            return  new JsonView() { Code = 200, Msg = MsgTips.Succeed, Data = data };
 
         }