达标创客规则调整

AppStart/Helper/StatService.cs

@@ -2404,6 +2404,11 @@ namespace MySystem
                                     OperateDate = DateTime.Now, //操作时间
                                     Status = 1,
                                 });
+                                Users user = db.Users.FirstOrDefault(m => m.Id == subuser.Id);
+                                if(user != null)
+                                {
+                                    user.Version = 3;
+                                }
                                 db.SaveChanges();
                             }
                         }

MpMainModels/BusinessScope.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels
+{
+    public partial class BusinessScope
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int KindId { get; set; }
+        public string Name { get; set; }
+    }
+}

MpMainModels/BusinessScopeType.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels
+{
+    public partial class BusinessScopeType
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string KindName { get; set; }
+    }
+}

MpMainModels/ConsumerOrders.cs

@@ -28,5 +28,11 @@ namespace MySystem.MpMainModels
         public int MerchantId { get; set; }
         public ulong IsAct { get; set; }
         public int UserId { get; set; }
+        public decimal MerchantActualAmount { get; set; }
+        public string DivideLog { get; set; }
+        public string TradePayNo { get; set; }
+        public int SetRecordId { get; set; }
+        public int DivideFlag { get; set; }
+        public DateTime? DivideDate { get; set; }
     }
 }

MpMainModels/CustomQuery.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels
+{
+    public partial class CustomQuery
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string AdminNames { get; set; }
+        public string Title { get; set; }
+        public string SqlContent { get; set; }
+    }
+}

MpMainModels/ExportExcels.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels
+{
+    public partial class ExportExcels
+    {
+        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 string FileName { get; set; }
+        public int SysId { get; set; }
+        public string FileUrl { get; set; }
+    }
+}

MpMainModels/HaoDaAreaCode.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels
+{
+    public partial class HaoDaAreaCode
+    {
+        public string CityName { get; set; }
+        public string CityCode { get; set; }
+    }
+}

MpMainModels/MerchantAccountLinkInfo.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels
+{
+    public partial class MerchantAccountLinkInfo
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int MerchantId { get; set; }
+        public int Kind { get; set; }
+        public int LoginId { get; set; }
+    }
+}

MpMainModels/MerchantAddInfo.cs

@@ -103,5 +103,47 @@ namespace MySystem.MpMainModels
         public string AlipaySignUrl { get; set; }
         public string AlipayAuthToken { get; set; }
         public string AlipayPid { get; set; }
+        public string Extra1 { get; set; }
+        public string FaceRecognition { get; set; }
+        public string IndustryLicense1 { get; set; }
+        public string TaxImage { get; set; }
+        public string Agreement { get; set; }
+        public string ProductImg { get; set; }
+        public string CheckstandImg { get; set; }
+        public string ShopFrontImg { get; set; }
+        public string Support { get; set; }
+        public string SignaturePicture { get; set; }
+        public string AgentIdCardBack { get; set; }
+        public string AgentIdCardFront { get; set; }
+        public string AgentCardIdPicture { get; set; }
+        public string HoldAgentProtocol { get; set; }
+        public string AgentProtocol { get; set; }
+        public string OperatorMcht { get; set; }
+        public string RentAgreement { get; set; }
+        public string OpenAccountLicenses { get; set; }
+        public string ChannelKind { get; set; }
+        public string TakeCreditCard { get; set; }
+        public string BankCard { get; set; }
+        public string PersonWithIdCard { get; set; }
+        public string BusinessId { get; set; }
+        public string AreaNo { get; set; }
+        public string OpenUnionNo { get; set; }
+        public string OpenCollectBankCode { get; set; }
+        public string OpenBankRegionCode { get; set; }
+        public string OpenBankAccout { get; set; }
+        public string OpenBankAccName { get; set; }
+        public string ZbankRegionCode { get; set; }
+        public string ZbankNo { get; set; }
+        public string AccountType { get; set; }
+        public string LicenceType { get; set; }
+        public string ResserveMobile { get; set; }
+        public string MchtNo { get; set; }
+        public string ToAcctNo { get; set; }
+        public int OpenAct { get; set; }
+        public string StoreNo { get; set; }
+        public string OutMchtNo { get; set; }
+        public string AliMerchantId { get; set; }
+        public string WeChatMerchantId { get; set; }
+        public string MerchantType { get; set; }
     }
 }

MpMainModels/MerchantDepositBack.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels
+{
+    public partial class MerchantDepositBack
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string Remark { get; set; }
+        public int UserId { get; set; }
+        public string ApplyNo { get; set; }
+        public int ReturnWay { get; set; }
+        public decimal ReturnAmount { get; set; }
+        public string BankCardNo { get; set; }
+        public string AlipayAccountNo { get; set; }
+        public int MerchantId { get; set; }
+    }
+}

MpMainModels/MerchantDepositOrder.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels
+{
+    public partial class MerchantDepositOrder
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string OrderNo { get; set; }
+        public decimal ActPayPrice { get; set; }
+        public int UserId { get; set; }
+        public int MerchantId { get; set; }
+    }
+}

MpMainModels/MerchantDiviSummay.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels
+{
+    public partial class MerchantDiviSummay
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public decimal DiviAmount { get; set; }
+        public decimal TotalDiviAmount { get; set; }
+        public int MerchantId { get; set; }
+        public string TradeDate { get; set; }
+        public string TradeMonth { get; set; }
+    }
+}

MpMainModels/MerchantInfo.cs

@@ -40,5 +40,13 @@ namespace MySystem.MpMainModels
         public int ActivationStatus { get; set; }
         public decimal TotalActActual { get; set; }
         public decimal TotalActAmount { get; set; }
+        public int ActStat { get; set; }
+        public DateTime? SignDate { get; set; }
+        public decimal AllocationAmount { get; set; }
+        public decimal ActMaxAmount { get; set; }
+        public decimal ActCurrentAmount { get; set; }
+        public int IsAct { get; set; }
+        public int ExamineStatus { get; set; }
+        public int Months { get; set; }
     }
 }

MpMainModels/MerchantLoginInfo.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels
+{
+    public partial class MerchantLoginInfo
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public string LoginPwd { get; set; }
+        public string LoginMobile { get; set; }
+    }
+}

MpMainModels/MerchantParamSetRecord.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels
+{
+    public partial class MerchantParamSetRecord
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int AfterDiviPersons { get; set; }
+        public decimal AfterDiviPercent { get; set; }
+        public int AfterProfitDays { get; set; }
+        public decimal AfterGetPercent { get; set; }
+        public decimal AfterMinPayMoney { get; set; }
+        public int AfterIsAll { get; set; }
+        public int MerchantId { get; set; }
+        public int BeforeDiviPersons { get; set; }
+        public decimal BeforeDiviPercent { get; set; }
+        public int BeforeProfitDays { get; set; }
+        public decimal BeforeGetPercent { get; set; }
+        public decimal BeforeMinPayMoney { get; set; }
+        public int BeforeIsAll { get; set; }
+    }
+}

MpMainModels/MerchantTradeSummary.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels
+{
+    public partial class MerchantTradeSummary
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public decimal AliPayInFactAmount { get; set; }
+        public decimal WeChatInfactAmount { get; set; }
+        public int OderCount { get; set; }
+        public decimal InFactAmount { get; set; }
+        public decimal TradeAmount { get; set; }
+        public string TradeDate { get; set; }
+        public string TradeMonth { get; set; }
+        public int MerchantId { get; set; }
+        public decimal ActAmount { get; set; }
+        public decimal NonActAmount { get; set; }
+    }
+}

MpMainModels/OpenBankAll.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels
+{
+    public partial class OpenBankAll
+    {
+        public string BankChild { get; set; }
+        public string BankChildNo { get; set; }
+        public string BankParentNo { get; set; }
+        public string BankParent { get; set; }
+    }
+}

Util/Utils.cs

@@ -85,14 +85,50 @@ namespace MySystem
         public bool IsStandardUser(int UserId)
         {
             WebCMSEntities db = new WebCMSEntities();
-            int ActiveCount = db.PosMachinesTwo.Count(m => m.BuyUserId == UserId && m.ActivationState == 1); //判断是否拥有3台激活机（不限购买或赠送）
-            int couponCount = db.PosCoupons.Count(m => m.UserId == UserId && m.IsUse == 0); //判断是否拥有3张券
+            MpMainModels.WebCMSEntities mpdb = new MpMainModels.WebCMSEntities();
+            MpMainModels2.WebCMSEntities mpdb2 = new MpMainModels2.WebCMSEntities();
+            int couponCount = db.PosCoupons.Count(m => m.UserId == UserId && m.IsUse == 0); //1. 个人名下电签兑换券 + 大机兑换券 ≥ 3
             // TODO:待确认条件
-            db.Dispose();
-            if(ActiveCount + couponCount >= 3)
+            if(couponCount >= 3)
             {
+                db.Dispose();
+                mpdb.Dispose();
+                mpdb2.Dispose();
                 return true;
             }
+            else
+            {
+                List<int> ids = new List<int>();
+                ids.Add(10);
+                ids.Add(10);
+                ids.Add(77);
+                ids.Add(78);
+                ids.Add(79);
+                bool orderCheck = db.Orders.Any(m => m.UserId == UserId && ids.Contains(m.ProductId)); //1. 商城下单过id为10、11、77、78、79的商品
+                if(orderCheck)
+                {
+                    db.Dispose();
+                    mpdb.Dispose();
+                    mpdb2.Dispose();
+                    return true;
+                }
+                else
+                {
+                    //1. 激活POS机数量 + 激活来客吧商户数量 + 激活广电卡数量 ≥ 3
+                    int ActiveCount = db.PosMachinesTwo.Count(m => m.BuyUserId == UserId && m.ActivationState == 1);
+                    int ActMerchantCount = mpdb.MerchantDepositOrder.Count(m => m.UserId == UserId && m.Status > 0) + mpdb2.MerchantDepositOrder.Count(m => m.UserId == UserId && m.Status > 0);
+                    if(ActiveCount + ActMerchantCount >= 3)
+                    {
+                        db.Dispose();
+                        mpdb.Dispose();
+                        mpdb2.Dispose();
+                        return true;
+                    }
+                }
+            }
+            db.Dispose();
+            mpdb.Dispose();
+            mpdb2.Dispose();
             return false;
         }