设置费率

Areas/Api/Controllers/Main/MerchantAddInfoController.cs

@@ -35,7 +35,15 @@ namespace MySystem.Areas.Api.Controllers.v1
             AppResultJson result = AddDo(value);
             return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
         }
-        public AppResultJson AddDo(string value)
+        public JsonResult AddSub(string value)
+        {
+            value = DesDecrypt(value);
+            value = value.Replace("null", "\"\"");
+            JsonData data = JsonMapper.ToObject(value);
+            AppResultJson result = AddDo(value, true);
+            return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
+        }
+        public AppResultJson AddDo(string value, bool sub = false)
         {
             function.WriteLog(value, "创客-首页-新增商户");
             JsonData data = JsonMapper.ToObject(value);
@@ -44,6 +52,11 @@ namespace MySystem.Areas.Api.Controllers.v1
             {
                 CybMakerCode = data.getItem("CybMakerCode").ToString();
             }
+            string SettleFee = "0.38";
+            if(value.Contains("SettleFee"))
+            {
+                SettleFee = data.getItem("SettleFee").ToString();
+            }
             string LicenseCopy = data.getItem("LicenseCopy").ToString(); //- 营业执照
             string CertMerchantName = data.getItem("CertMerchantName").ToString(); //- 商户名称
             string LicenseNumber = data.getItem("LicenseNumber").ToString(); //- 商户信用代码
@@ -210,7 +223,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 if (SubjectType == "SUBJECT_TYPE_SMALL")
                 {
                     // CertMerchantName += function.MD5_16(Guid.NewGuid().ToString("N"));
-                    var check = MerchantAddInfoService.Query(" CertMerchantName='" + CertMerchantName + "' and Status<1 and QueryCount<1 and BrandId=" + BrandId);
+                    var check = MerchantAddInfoService.Query(" CertMerchantName like '" + CertMerchantName + "%' and Status<1 and QueryCount<1 and BrandId=" + BrandId);
                     if (check.Id > 0)
                     {
                         return new AppResultJson() { Status = "-1", Info = "该商户已暂存或进件，勿重复进件！", Data = Obj };
@@ -241,18 +254,31 @@ namespace MySystem.Areas.Api.Controllers.v1
             }
             else
             {
-                if (SubjectType == "SUBJECT_TYPE_SMALL")
+                if(sub)
                 {
-                    CertMerchantName = MerchantInfoService.Query(MerchantAddInfoId).Name;
+                    Dictionary<string, object> Fiel = new Dictionary<string, object>();
+                    Fiel.Add("CertMerchantName", CertMerchantName);
+                    Fiel.Add("OutMchtNo", MerchantAddInfoService.Query(MerchantAddInfoId).OutMchtNo); //费率
+                    int AddInfoId = (int)MerchantAddInfoService.Add(Fiel, false).Data;
+
+                    Fiel = new Dictionary<string, object>();
+                    Fiel.Add("Id", AddInfoId);
+                    Fiel.Add("UserId", UserId);
+                    Fiel.Add("Name", CertMerchantName);
+                    MerchantInfoService.Add(Fiel, false);
                 }
                 else
                 {
-                    Fields.Add("CertMerchantName", CertMerchantName);
+                    if (SubjectType == "SUBJECT_TYPE_SMALL")
+                    {
+                        CertMerchantName = MerchantInfoService.Query(MerchantAddInfoId).Name;
+                    }
+                    else
+                    {
+                        Fields.Add("CertMerchantName", CertMerchantName);
+                    }
                 }
             }
-            // var ActivitiesId = "20191030111cff5b5e";
-            // var ActivitiesRate = "0.38";
-            // MerchantAddInfoUtil.EditMerchantAddInfo(query.Id, ContactName, ContactIdNumber, MobilePhone, ContactEmail, SubjectType, LicenseCopy, LicenseNumber, CertLegalPerson, CertMerchantName, CertLegalPerson, ServicePhone, BizStoreName, BizAddressCode, BizStoreAddress, StoreEntrancePic, IndoorPic, QualificationType, SettlementId, BankAccountType, AccountName, AccountBank, BankAddressCode, BankName, BankBranchId, AccountNumber, IdCardCopy, IdCardNational, IdCardName, IdCardNumber, IdCardAddress, CardPeriodBegin, CardPeriodEnd, MerchantShortname, Qualifications, ActivitiesId, ActivitiesRate, AlipayAccount, AlipayMccCode, ChannelKind, SalesScenesType, OpenAccountLicenses, RentAgreement, OperatorMcht, AgentProtocol, SignaturePicture, Support, CheckstandImg, ProductImg, Agreement, TaxImage, OrganizationCopy, IndustryLicense1, FaceRecognition, Extra1, BankCard, PersonWithIdCard, TakeCreditCard, MchtNo);
 
             Fields.Add("LicenseCopy", LicenseCopy); //- 营业执照
             if (!Fields.ContainsKey("CertMerchantName")) Fields.Add("CertMerchantName", CertMerchantName); //- 商户名称
@@ -329,6 +355,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             Fields.Add("PlaceType", PlaceType); // 小微商户经营场所类型(0 固定场所 1 流动动摊贩)
             Fields.Add("BrandId", BrandId); // 品牌(0 银联 1 好哒)
             Fields.Add("CybMakerCode", CybMakerCode); //创业帮创客编号
+            Fields.Add("FeeRate", SettleFee); //费率
             MerchantAddInfoId = (int)MerchantInfoUtil.EditMerchantInfo(MerchantAddInfoId, UserId, CertMerchantName, MobilePhone, BizAddressCode, BizStoreAddress, BindStatus, BrandId, CybMakerCode).Data;
             MerchantAddInfoUtil.EditMerchantAddInfo(Fields, MerchantAddInfoId);
             if (Finish == 1)
@@ -691,7 +718,29 @@ namespace MySystem.Areas.Api.Controllers.v1
         }
         #endregion
 
-
+        
+        #region 创客-首页-设置费率
+        // [Authorize]
+        public JsonResult SetFee(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            string SettleFee = data["SettleFee"].ToString(); //分类
+            int Id = int.Parse(function.CheckInt(data["Id"].ToString()));
+            if(SettleFee == "0.25") SettleFee = "0.25";
+            else if(SettleFee == "0.30") SettleFee = "0.30";
+            else SettleFee = "0.38";
+            MerchantAddInfo add = maindb.MerchantAddInfo.FirstOrDefault(m => m.Id == Id);
+            if(add != null)
+            {
+                add.FeeRate = SettleFee;
+                maindb.SaveChanges();
+                RedisDbconn.Instance.AddList("HaoDaFeeQueue", Id.ToString());
+                return Json(new AppResultJson() { Status = "1", Info = "" });
+            }
+            return Json(new AppResultJson() { Status = "-1", Info = "设置失败" });
+        }
+        #endregion
 
 
 

Areas/Api/Controllers/Main/MerchantInfoController.cs

@@ -403,6 +403,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             Obj.Add("TotalAmount", merchant.TotalAmount.ToString("f2")); //总交易额
             Obj.Add("ActivationStatus", merchant.ActivationStatus); //达标状态
             Obj.Add("IsAct", merchant.IsAct); //是否激活(0 否 1 是)
+            Obj.Add("SettleFee", addinfo.FeeRate);
             if (merchant.IsAct == 1)
             {
                 var orderInfo = MerchantDepositOrderService.Query(" 1=1 and Status>0 and MerchantId=" + Id + "");

Models/Main/MerchantAddInfo.cs

@@ -151,5 +151,6 @@ namespace MySystem.Models.Main
         public int PlaceType { get; set; }
         public int BrandId { get; set; }
         public string CybMakerCode { get; set; }
+        public string FeeRate { get; set; }
     }
 }

Models/Main/MerchantFeeRecord.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Main
+{
+    public partial class MerchantFeeRecord
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SettleFee { get; set; }
+        public int MerchantId { get; set; }
+        public int UserId { get; set; }
+        public string Remark { get; set; }
+    }
+}

Models/Main/UserAmountSummaryAfter.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Main
+{
+    public partial class UserAmountSummaryAfter
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int PayMode { get; set; }
+        public decimal TotalAmount { get; set; }
+        public string TradeMonth { get; set; }
+        public string TradeDate { get; set; }
+        public int UserId { get; set; }
+        public int TradeCount { get; set; }
+        public int IsAct { get; set; }
+    }
+}

Models/Main/UserAmountSummaryBefore.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models.Main
+{
+    public partial class UserAmountSummaryBefore
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int PayMode { get; set; }
+        public decimal TotalAmount { get; set; }
+        public string TradeMonth { get; set; }
+        public string TradeDate { get; set; }
+        public int UserId { get; set; }
+        public int TradeCount { get; set; }
+        public int IsAct { get; set; }
+    }
+}

Models/Main/WebCMSEntities.cs

@@ -104,6 +104,7 @@ namespace MySystem.Models.Main
         public virtual DbSet<MerchantDepositReturns> MerchantDepositReturns { get; set; }
         public virtual DbSet<MerchantDepositSet> MerchantDepositSet { get; set; }
         public virtual DbSet<MerchantDiviSummay> MerchantDiviSummay { get; set; }
+        public virtual DbSet<MerchantFeeRecord> MerchantFeeRecord { get; set; }
         public virtual DbSet<MerchantForCode> MerchantForCode { get; set; }
         public virtual DbSet<MerchantForMobile> MerchantForMobile { get; set; }
         public virtual DbSet<MerchantForName> MerchantForName { get; set; }
@@ -244,6 +245,8 @@ namespace MySystem.Models.Main
         public virtual DbSet<UserAccountRecord> UserAccountRecord { get; set; }
         public virtual DbSet<UserAddress> UserAddress { get; set; }
         public virtual DbSet<UserAmountSummary> UserAmountSummary { get; set; }
+        public virtual DbSet<UserAmountSummaryAfter> UserAmountSummaryAfter { get; set; }
+        public virtual DbSet<UserAmountSummaryBefore> UserAmountSummaryBefore { get; set; }
         public virtual DbSet<UserAuthRecord> UserAuthRecord { get; set; }
         public virtual DbSet<UserBack> UserBack { get; set; }
         public virtual DbSet<UserBackKind> UserBackKind { get; set; }
@@ -5768,6 +5771,12 @@ namespace MySystem.Models.Main
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.FeeRate)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("费率")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.HdBindWeChat)
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'")
@@ -7153,6 +7162,53 @@ namespace MySystem.Models.Main
                     .HasComment("版本号");
             });
 
+            modelBuilder.Entity<MerchantFeeRecord>(entity =>
+            {
+                entity.HasComment("费率设置记录");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.MerchantId)
+                    .HasColumnType("int(11)")
+                    .HasComment("商户ID");
+
+                entity.Property(e => e.Remark)
+                    .HasColumnType("mediumtext")
+                    .HasComment("备注")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SettleFee)
+                    .HasColumnType("varchar(20)")
+                    .HasComment("费率值")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("修改时间");
+
+                entity.Property(e => e.UserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("创客ID");
+
+                entity.Property(e => e.Version)
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
             modelBuilder.Entity<MerchantForCode>(entity =>
             {
                 entity.HasKey(e => e.Code)
@@ -17079,6 +17135,114 @@ namespace MySystem.Models.Main
                 entity.Property(e => e.UserId).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<UserAmountSummaryAfter>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.IsAct)
+                    .HasColumnType("int(11)")
+                    .HasComment("是否活动");
+
+                entity.Property(e => e.PayMode).HasColumnType("int(11)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.TotalAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.TradeCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("交易笔数");
+
+                entity.Property(e => e.TradeDate)
+                    .HasColumnType("varchar(8)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.TradeMonth)
+                    .HasColumnType("varchar(6)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+            });
+
+            modelBuilder.Entity<UserAmountSummaryBefore>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.IsAct)
+                    .HasColumnType("int(11)")
+                    .HasComment("是否活动");
+
+                entity.Property(e => e.PayMode).HasColumnType("int(11)");
+
+                entity.Property(e => e.QueryCount).HasColumnType("int(11)");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort).HasColumnType("int(11)");
+
+                entity.Property(e => e.Status).HasColumnType("int(11)");
+
+                entity.Property(e => e.TotalAmount).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.TradeCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("交易笔数");
+
+                entity.Property(e => e.TradeDate)
+                    .HasColumnType("varchar(8)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.TradeMonth)
+                    .HasColumnType("varchar(6)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UpdateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+            });
+
             modelBuilder.Entity<UserAuthRecord>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");

Util/Main/MerchantAddInfoUtil.cs

@@ -298,6 +298,7 @@ namespace MySystem
             }
             Obj.Add("OpenBankRegionCode", OpenBankRegionCode); // 开户银行支行区域码
             Obj.Add("PlaceType", query.PlaceType); // 小微商户经营场所类型(0 固定场所 1 流动动摊贩)
+            Obj.Add("SettleFee", query.FeeRate);
 
             return Obj;
         }