调整成功，进件签约成功

AppStart/Helper/CheckWeChatSignService.cs

@@ -29,7 +29,12 @@ namespace MySystem
                 string content = RedisDbconn.Instance.RPop<string>("WeChatSignQueue");
                 if (!string.IsNullOrEmpty(content))
                 {
-                    StartDo(Newtonsoft.Json.JsonConvert.DeserializeObject<MerchantSign>(content));
+                    string result = StartDo(Newtonsoft.Json.JsonConvert.DeserializeObject<MerchantSign>(content));
+                    if(result == "wait")
+                    {
+                        Thread.Sleep(10000);
+                        RedisDbconn.Instance.AddList("WeChatSignQueue", content);
+                    }
                 }
                 else
                 {
@@ -38,7 +43,7 @@ namespace MySystem
             }
         }
 
-        public void StartDo(MerchantSign sign)
+        public string StartDo(MerchantSign sign)
         {
             try
             {
@@ -69,6 +74,7 @@ namespace MySystem
                         }
                         db.SaveChanges();
                     }
+                    return "wait";
                 }
                 else if (dic["applyment_state"].ToString() == "APPLYMENT_STATE_FINISHED")
                 { 
@@ -123,6 +129,10 @@ namespace MySystem
                         deletes.Add(sign);
                     }
                 }
+                else if (dic["applyment_state"].ToString() == "APPLYMENT_STATE_AUDITING")
+                {
+                    return "wait";
+                }
                 else
                 {
                     string sub_mchid = "";
@@ -142,6 +152,7 @@ namespace MySystem
             {
                 function.WriteLog(DateTime.Now.ToString() + ":" + ex.ToString(), "微信进件回调队列异常");
             }
+            return "";
         }
     }
 }

AppStart/WeChatFunction.cs

@@ -31,6 +31,7 @@ namespace MySystem
             PxcModels.WebCMSEntities dbpxc = new PxcModels.WebCMSEntities();
             //超级管理员信息
             Dictionary<string, object> contact_info = new Dictionary<string, object>();
+            contact_info.Add("contact_type", "LEGAL"); //超级管理员姓名
             contact_info.Add("contact_name", RSAEncrypt(info.ContactName)); //超级管理员姓名
             contact_info.Add("contact_id_number", RSAEncrypt(info.ContactIdNumber)); //超级管理员身份证件号码
             // contact_info.Add("openid", info.OpenId); //超级管理员微信openid
@@ -43,14 +44,14 @@ namespace MySystem
             subject_info.Add("subject_type", info.SubjectType); //主体类型
 
             Dictionary<string, object> business_license_info = new Dictionary<string, object>();
-            business_license_info.Add("license_copy", GetMediaId("/bsserver_com" + info.LicenseCopy)); //营业执照照片
+            business_license_info.Add("license_copy", GetMediaId("/" + info.LicenseCopy)); //营业执照照片
             business_license_info.Add("license_number", info.LicenseNumber); //注册号/统一社会信用代码
             business_license_info.Add("merchant_name", merchant.Name); //商户名称
             business_license_info.Add("legal_person", info.LegalPerson); //个体户经营者/法人姓名
             subject_info.Add("business_license_info", business_license_info); //营业执照
 
             // Dictionary<string, object> certificate_info = new Dictionary<string, object>();
-            // certificate_info.Add("cert_copy", GetMediaId("/bsserver_com" + info.CertCopy)); //登记证书照片
+            // certificate_info.Add("cert_copy", GetMediaId("/" + info.CertCopy)); //登记证书照片
             // certificate_info.Add("cert_type", info.CertType); //登记证书类型
             // certificate_info.Add("cert_number", info.CertNumber); //证书号
             // certificate_info.Add("merchant_name", info.CertMerchantName); //商户名称
@@ -61,22 +62,24 @@ namespace MySystem
             // subject_info.Add("certificate_info", certificate_info); //登记证书
 
             // Dictionary<string, object> organization_info = new Dictionary<string, object>();
-            // organization_info.Add("organization_copy", GetMediaId("/bsserver_com" + info.OrganizationCopy)); //组织机构代码证照片
+            // organization_info.Add("organization_copy", GetMediaId("/" + info.OrganizationCopy)); //组织机构代码证照片
             // organization_info.Add("organization_code", info.OrganizationCode); //组织机构代码
             // organization_info.Add("org_period_begin", CheckForever(info.OrgPeriodBegin)); //组织机构代码证有效期开始日期
             // organization_info.Add("org_period_end", CheckForever(info.OrgPeriodEnd)); //组织机构代码证有效期结束日期
             // subject_info.Add("organization_info", organization_info); //组织机构代码证
 
-            // subject_info.Add("certificate_letter_copy", GetMediaId("/bsserver_com" + info.CertificateLetterCopy)); //单位证明函照片
+            // subject_info.Add("certificate_letter_copy", GetMediaId("/" + info.CertificateLetterCopy)); //单位证明函照片
 
             Dictionary<string, object> identity_info = new Dictionary<string, object>();
             info.IdDocType = "IDENTIFICATION_TYPE_IDCARD";
+            identity_info.Add("id_holder_type", "LEGAL"); //证件持有人类型
             identity_info.Add("id_doc_type", info.IdDocType); //证件类型
             Dictionary<string, object> id_card_info = new Dictionary<string, object>();
-            id_card_info.Add("id_card_copy", GetMediaId("/bsserver_com" + info.IdCardCopy)); //身份证人像面照片
-            id_card_info.Add("id_card_national", GetMediaId("/bsserver_com" + info.IdCardNational)); //身份证人像面照片
+            id_card_info.Add("id_card_copy", GetMediaId("/" + info.IdCardCopy)); //身份证人像面照片
+            id_card_info.Add("id_card_national", GetMediaId("/" + info.IdCardNational)); //身份证人像面照片
             id_card_info.Add("id_card_name", RSAEncrypt(info.IdCardName)); //身份证姓名
             id_card_info.Add("id_card_number", RSAEncrypt(info.IdCardNumber)); //身份证号码
+            id_card_info.Add("id_card_address", RSAEncrypt(info.IdCardAddress)); //身份证居住地址
             id_card_info.Add("card_period_begin", CheckForever(info.CardPeriodBegin)); //身份证有效期开始时间
             id_card_info.Add("card_period_end", CheckForever(info.CardPeriodEnd)); //身份证有效期结束时间
             identity_info.Add("id_card_info", id_card_info); //身份证信息
@@ -88,9 +91,9 @@ namespace MySystem
             // {
             //     Dictionary<string, object> ubo_info = new Dictionary<string, object>();
             //     ubo_info.Add("id_type", info.UboInfoIdType); //证件类型
-            //     ubo_info.Add("id_card_copy", GetMediaId("/bsserver_com" + info.UboInfoIdCardCopy)); //身份证人像面照片
-            //     ubo_info.Add("id_card_national", GetMediaId("/bsserver_com" + info.UboInfoIdCardNational)); //身份证国徽面照片
-            //     ubo_info.Add("id_doc_copy", GetMediaId("/bsserver_com" + info.UboInfoIdDocCopy)); //证件照片
+            //     ubo_info.Add("id_card_copy", GetMediaId("/" + info.UboInfoIdCardCopy)); //身份证人像面照片
+            //     ubo_info.Add("id_card_national", GetMediaId("/" + info.UboInfoIdCardNational)); //身份证国徽面照片
+            //     ubo_info.Add("id_doc_copy", GetMediaId("/" + info.UboInfoIdDocCopy)); //证件照片
             //     ubo_info.Add("name", RSAEncrypt(info.UboInfoName)); //受益人姓名
             //     ubo_info.Add("id_number", RSAEncrypt(info.UboInfoIdNumber)); //证件号码
             //     ubo_info.Add("id_period_begin", CheckForever(info.UboInfoIdPeriodBegin)); //证件有效期开始时间
@@ -115,10 +118,10 @@ namespace MySystem
             biz_store_info.Add("biz_address_code", BizAddress.Code); //门店省市编码
             biz_store_info.Add("biz_store_address", info.BizStoreAddress); //门店地址
             List<string> store_entrance_pic = new List<string>();
-            store_entrance_pic.Add(GetMediaId("/bsserver_com" + info.StoreEntrancePic));
+            store_entrance_pic.Add(GetMediaId("/" + info.StoreEntrancePic));
             biz_store_info.Add("store_entrance_pic", store_entrance_pic); //门店门头照片
             List<string> indoor_pic = new List<string>();
-            indoor_pic.Add(GetMediaId("/bsserver_com" + info.IndoorPic));
+            indoor_pic.Add(GetMediaId("/" + info.IndoorPic));
             biz_store_info.Add("indoor_pic", indoor_pic); //店内环境照片
             biz_store_info.Add("biz_sub_appid", info.BizSubAppid); //线下场所对应的商家APPID
             sales_info.Add("biz_store_info", biz_store_info); //线下门店场景
@@ -126,30 +129,30 @@ namespace MySystem
             // Dictionary<string, object> mp_info = new Dictionary<string, object>();
             // mp_info.Add("mp_appid", info.MpAppid); //服务商公众号APPID
             // mp_info.Add("mp_sub_appid", info.MpSubAppid); //商家公众号APPID
-            // mp_info.Add("mp_pics", GetMediaId("/bsserver_com" + info.MpPics)); //公众号页面截图
+            // mp_info.Add("mp_pics", GetMediaId("/" + info.MpPics)); //公众号页面截图
             // sales_info.Add("mp_info", mp_info); //公众号场景
 
             // Dictionary<string, object> mini_program_info = new Dictionary<string, object>();
             // mini_program_info.Add("mini_program_appid", info.MiniProgramAppid); //服务商小程序APPID
             // mini_program_info.Add("mini_program_sub_appid", info.MiniProgramSubAppid); //商家小程序APPID
-            // mini_program_info.Add("mini_program_pics", GetMediaId("/bsserver_com" + info.MiniProgramPics)); //小程序截图
+            // mini_program_info.Add("mini_program_pics", GetMediaId("/" + info.MiniProgramPics)); //小程序截图
             // sales_info.Add("mini_program_info", mini_program_info); //小程序场景
 
             // Dictionary<string, object> app_info = new Dictionary<string, object>();
             // app_info.Add("app_appid", info.AppAppid); //服务商应用APPID
             // app_info.Add("app_sub_appid", info.AppSubAppid); //商家应用APPID
-            // app_info.Add("app_pics", GetMediaId("/bsserver_com" + info.AppPics)); //商家应用APPID
+            // app_info.Add("app_pics", GetMediaId("/" + info.AppPics)); //商家应用APPID
             // sales_info.Add("app_info", app_info); //APP场景
 
             // Dictionary<string, object> web_info = new Dictionary<string, object>();
             // web_info.Add("domain", info.WebDomain); //互联网网站域名
-            // web_info.Add("web_authorisation", GetMediaId("/bsserver_com" + info.WebAuthorisation)); //网站授权函
+            // web_info.Add("web_authorisation", GetMediaId("/" + info.WebAuthorisation)); //网站授权函
             // web_info.Add("web_appid", info.WebAppId); //互联网网站对应的商家APPID
             // sales_info.Add("web_info", web_info); //互联网网站场景
 
             // Dictionary<string, object> wework_info = new Dictionary<string, object>();
             // wework_info.Add("sub_corp_id", info.SubCorpId); //商家企业微信CorpID
-            // wework_info.Add("wework_pics", GetMediaId("/bsserver_com" + info.WeworkPics)); //企业微信页面截图
+            // wework_info.Add("wework_pics", GetMediaId("/" + info.WeworkPics)); //企业微信页面截图
             // sales_info.Add("wework_info", wework_info); //企业微信场景
 
             business_info.Add("sales_info", sales_info); //经营场景
@@ -168,7 +171,7 @@ namespace MySystem
             if (!string.IsNullOrEmpty(info.Qualifications))
             {
                 List<string> Qualifications = new List<string>();
-                Qualifications.Add(GetMediaId("/bsserver_com" + info.Qualifications));
+                Qualifications.Add(GetMediaId("/" + info.Qualifications));
                 settlement_info.Add("qualifications", Qualifications); //特殊资质图片
             }
             settlement_info.Add("activities_id", info.ActivitiesId); //优惠费率活动ID
@@ -376,6 +379,10 @@ namespace MySystem
             {
                 return "";
             }
+            if (imgPath.Contains(","))
+            {
+                imgPath = imgPath.Split(',')[0];
+            }
             string key = "wechatpic:" + function.MD5_16(imgPath);
             string media_id = RedisDbconn.Instance.Get<string>(key);
             if (!string.IsNullOrEmpty(media_id))

Models/ConsumerOrders.cs

@@ -27,5 +27,6 @@ namespace MySystem.Models
         public int ConsumerId { get; set; }
         public int MerchantId { get; set; }
         public ulong IsAct { get; set; }
+        public int UserId { get; set; }
     }
 }

Models/MerchantAddInfo.cs

@@ -96,5 +96,6 @@ namespace MySystem.Models
         public string ContactIdNumber { get; set; }
         public string ContactName { get; set; }
         public string BusinessCode { get; set; }
+        public string IdCardAddress { get; set; }
     }
 }

Models/MerchantAmountSummay.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class MerchantAmountSummay
+    {
+        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 TotalActual { get; set; }
+        public decimal TradeAmount { get; set; }
+        public string TradeDate { get; set; }
+        public string TradeMonth { get; set; }
+        public int MerchantId { get; set; }
+    }
+}

Models/PosMerchantInfoBak.cs

@@ -43,5 +43,7 @@ namespace MySystem.Models
         public string MerchantMobile { get; set; }
         public string MerchantName { get; set; }
         public string MerchantNo { get; set; }
+        public int StandardMonths { get; set; }
+        public int StandardStatus { get; set; }
     }
 }

Models/UserAmountSummary.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class UserAmountSummary
+    {
+        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; }
+    }
+}

Models/WebCMSEntities.cs

@@ -83,6 +83,7 @@ namespace MySystem.Models
         public virtual DbSet<MenuRight> MenuRight { get; set; }
         public virtual DbSet<MerchantAddInfo> MerchantAddInfo { get; set; }
         public virtual DbSet<MerchantAdmin> MerchantAdmin { get; set; }
+        public virtual DbSet<MerchantAmountSummay> MerchantAmountSummay { get; set; }
         public virtual DbSet<MerchantAuth> MerchantAuth { get; set; }
         public virtual DbSet<MerchantClass> MerchantClass { get; set; }
         public virtual DbSet<MerchantCol> MerchantCol { get; set; }
@@ -221,6 +222,7 @@ namespace MySystem.Models
         public virtual DbSet<UserAccount> UserAccount { get; set; }
         public virtual DbSet<UserAccountRecord> UserAccountRecord { get; set; }
         public virtual DbSet<UserAddress> UserAddress { get; set; }
+        public virtual DbSet<UserAmountSummary> UserAmountSummary { get; set; }
         public virtual DbSet<UserAuthRecord> UserAuthRecord { get; set; }
         public virtual DbSet<UserBack> UserBack { get; set; }
         public virtual DbSet<UserBackKind> UserBackKind { get; set; }
@@ -2160,6 +2162,8 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.UserId).HasColumnType("int(11)");
+
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
@@ -5063,6 +5067,11 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.IdCardAddress)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.IdCardCopy)
                     .HasColumnType("varchar(200)")
                     .HasCharSet("utf8")
@@ -5397,6 +5406,54 @@ namespace MySystem.Models
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<MerchantAmountSummay>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                entity.Property(e => e.MerchantId).HasColumnType("int(11)");
+
+                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.TotalActual).HasColumnType("decimal(18,2)");
+
+                entity.Property(e => e.TradeAmount).HasColumnType("decimal(18,2)");
+
+                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");
+            });
+
             modelBuilder.Entity<MerchantAuth>(entity =>
             {
                 entity.Property(e => e.Id).HasColumnType("int(11)");
@@ -8859,6 +8916,9 @@ namespace MySystem.Models
 
             modelBuilder.Entity<PosMerchantInfoBak>(entity =>
             {
+                entity.HasIndex(e => new { e.KqSnNo, e.KqMerNo })
+                    .HasName("PosMerchantInfoBakIndex");
+
                 entity.Property(e => e.Id).HasColumnType("int(11)");
 
                 entity.Property(e => e.ActType).HasColumnType("int(11)");
@@ -8975,6 +9035,10 @@ namespace MySystem.Models
 
                 entity.Property(e => e.Sort).HasColumnType("int(11)");
 
+                entity.Property(e => e.StandardMonths).HasColumnType("int(11)");
+
+                entity.Property(e => e.StandardStatus).HasColumnType("int(11)");
+
                 entity.Property(e => e.Status).HasColumnType("int(11)");
 
                 entity.Property(e => e.TopUserId).HasColumnType("int(11)");
@@ -10012,9 +10076,9 @@ namespace MySystem.Models
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
-                entity.Property(e => e.DebitAddProfitVal).HasColumnType("decimal(18,2)");
+                entity.Property(e => e.DebitAddProfitVal).HasColumnType("decimal(18,6)");
 
-                entity.Property(e => e.DebitPercents).HasColumnType("decimal(18,2)");
+                entity.Property(e => e.DebitPercents).HasColumnType("decimal(18,6)");
 
                 entity.Property(e => e.KindId).HasColumnType("int(11)");
 
@@ -15041,6 +15105,52 @@ namespace MySystem.Models
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<UserAmountSummary>(entity =>
+            {
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate).HasColumnType("datetime");
+
+                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.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)");

PxcModels/MerchantAddInfo.cs

@@ -96,5 +96,6 @@ namespace MySystem.PxcModels
         public string ContactIdNumber { get; set; }
         public string ContactName { get; set; }
         public string BusinessCode { get; set; }
+        public string IdCardAddress { get; set; }
     }
 }

PxcModels/WebCMSEntities.cs

@@ -5067,6 +5067,11 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.IdCardAddress)
+                    .HasColumnType("varchar(50)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.IdCardCopy)
                     .HasColumnType("varchar(200)")
                     .HasCharSet("utf8")
@@ -10071,9 +10076,9 @@ namespace MySystem.PxcModels
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
-                entity.Property(e => e.DebitAddProfitVal).HasColumnType("decimal(18,2)");
+                entity.Property(e => e.DebitAddProfitVal).HasColumnType("decimal(18,6)");
 
-                entity.Property(e => e.DebitPercents).HasColumnType("decimal(18,2)");
+                entity.Property(e => e.DebitPercents).HasColumnType("decimal(18,6)");
 
                 entity.Property(e => e.KindId).HasColumnType("int(11)");