Ver código fonte

添加盈利期0.6版块

lichunlei 1 ano atrás
pai
commit
b2eb067a00
100 arquivos alterados com 3185 adições e 9 exclusões
  1. 5 1
      AppStart/Helper/Profit/ProfitCheckHelper.cs
  2. 1 1
      AppStart/Helper/Profit/ProfitHelper.cs
  3. 130 4
      AppStart/Helper/Profit/ProfitHelperV2.cs
  4. 197 0
      AppStart/Helper/StatService.cs
  5. 13 3
      AppStart/Helper/SycnSpServer/SycnSpTradeService.cs
  6. 49 0
      MpMainModels2/ActiveReward.cs
  7. 26 0
      MpMainModels2/ActivityEnrolRecord.cs
  8. 37 0
      MpMainModels2/ActivityInfo.cs
  9. 32 0
      MpMainModels2/ActivityPrizeDetail.cs
  10. 24 0
      MpMainModels2/ActivityRedPackageJoins.cs
  11. 24 0
      MpMainModels2/ActivityRedPackageStock.cs
  12. 25 0
      MpMainModels2/ActivityRedPackageTop10.cs
  13. 26 0
      MpMainModels2/Advertisment.cs
  14. 25 0
      MpMainModels2/AgentLevelSet.cs
  15. 32 0
      MpMainModels2/AppBottomNavs.cs
  16. 28 0
      MpMainModels2/AppVersion.cs
  17. 24 0
      MpMainModels2/AppVideo.cs
  18. 26 0
      MpMainModels2/AppVideoList.cs
  19. 28 0
      MpMainModels2/BackEndOpRecord.cs
  20. 26 0
      MpMainModels2/BankInfo.cs
  21. 47 0
      MpMainModels2/BrokenMachineChange.cs
  22. 34 0
      MpMainModels2/BrokenMachineChangeDetail.cs
  23. 28 0
      MpMainModels2/BusinessActSummary.cs
  24. 26 0
      MpMainModels2/BusinessPartner.cs
  25. 25 0
      MpMainModels2/BusinessPartnerMerchant.cs
  26. 25 0
      MpMainModels2/BusinessPartnerPos.cs
  27. 23 0
      MpMainModels2/BusinessScope.cs
  28. 22 0
      MpMainModels2/BusinessScopeType.cs
  29. 67 0
      MpMainModels2/BusinessTradeSummary.cs
  30. 37 0
      MpMainModels2/Col.cs
  31. 11 0
      MpMainModels2/ConsumerOpenIds.cs
  32. 11 0
      MpMainModels2/ConsumerOrderForNo.cs
  33. 38 0
      MpMainModels2/ConsumerOrders.cs
  34. 25 0
      MpMainModels2/ConsumerProfit.cs
  35. 36 0
      MpMainModels2/Consumers.cs
  36. 33 0
      MpMainModels2/CouponAssignRecords.cs
  37. 48 0
      MpMainModels2/Coupons.cs
  38. 26 0
      MpMainModels2/CouponsForUser.cs
  39. 24 0
      MpMainModels2/CustomTagSet.cs
  40. 24 0
      MpMainModels2/ErpCompanys.cs
  41. 24 0
      MpMainModels2/FileUpdateInfo.cs
  42. 43 0
      MpMainModels2/FluxProfitDetail.cs
  43. 30 0
      MpMainModels2/FluxProfitSummary.cs
  44. 11 0
      MpMainModels2/HaoDaAreaCode.cs
  45. 33 0
      MpMainModels2/HelpProfitAccountRecord.cs
  46. 23 0
      MpMainModels2/HelpProfitAmountSummary.cs
  47. 23 0
      MpMainModels2/HelpProfitExchange.cs
  48. 25 0
      MpMainModels2/HelpProfitExchangeDetail.cs
  49. 11 0
      MpMainModels2/HelpProfitMerIds.cs
  50. 22 0
      MpMainModels2/HelpProfitMerTradeMonthSummay.cs
  51. 26 0
      MpMainModels2/HelpProfitMerTradeSummay.cs
  52. 24 0
      MpMainModels2/HelpProfitMerchantForUser.cs
  53. 29 0
      MpMainModels2/HelpProfitRebateDetail.cs
  54. 36 0
      MpMainModels2/HelpProfitReward.cs
  55. 47 0
      MpMainModels2/HelpProfitRewardDetail.cs
  56. 24 0
      MpMainModels2/IndexIconList.cs
  57. 23 0
      MpMainModels2/KqProductBrand.cs
  58. 23 0
      MpMainModels2/KqProductOrgs.cs
  59. 68 0
      MpMainModels2/KqProductRuleSet.cs
  60. 22 0
      MpMainModels2/KqProducts.cs
  61. 33 0
      MpMainModels2/LeaderAccountRecord.cs
  62. 28 0
      MpMainModels2/LeaderReserveRecord.cs
  63. 20 0
      MpMainModels2/Leaders.cs
  64. 60 0
      MpMainModels2/MachineApply.cs
  65. 36 0
      MpMainModels2/MachineApplyDetail.cs
  66. 47 0
      MpMainModels2/MachineChange.cs
  67. 34 0
      MpMainModels2/MachineChangeDetail.cs
  68. 11 0
      MpMainModels2/MachineForMerNo.cs
  69. 14 0
      MpMainModels2/MachineForQrCode.cs
  70. 11 0
      MpMainModels2/MachineForSnNo.cs
  71. 36 0
      MpMainModels2/MachineRenew.cs
  72. 31 0
      MpMainModels2/MachineReturn.cs
  73. 26 0
      MpMainModels2/MachineUnBind.cs
  74. 11 0
      MpMainModels2/MenuRight.cs
  75. 24 0
      MpMainModels2/MerchantAccountLinkInfo.cs
  76. 152 0
      MpMainModels2/MerchantAddInfo.cs
  77. 31 0
      MpMainModels2/MerchantAdmin.cs
  78. 26 0
      MpMainModels2/MerchantAmountSummay.cs
  79. 35 0
      MpMainModels2/MerchantAuth.cs
  80. 24 0
      MpMainModels2/MerchantClass.cs
  81. 29 0
      MpMainModels2/MerchantCol.cs
  82. 27 0
      MpMainModels2/MerchantComment.cs
  83. 29 0
      MpMainModels2/MerchantDepositBack.cs
  84. 25 0
      MpMainModels2/MerchantDepositOrder.cs
  85. 23 0
      MpMainModels2/MerchantDepositReturns.cs
  86. 23 0
      MpMainModels2/MerchantDepositSet.cs
  87. 26 0
      MpMainModels2/MerchantDiviSummay.cs
  88. 11 0
      MpMainModels2/MerchantForCode.cs
  89. 11 0
      MpMainModels2/MerchantForMobile.cs
  90. 11 0
      MpMainModels2/MerchantForName.cs
  91. 52 0
      MpMainModels2/MerchantInfo.cs
  92. 23 0
      MpMainModels2/MerchantLoginInfo.cs
  93. 27 0
      MpMainModels2/MerchantParamSet.cs
  94. 34 0
      MpMainModels2/MerchantParamSetRecord.cs
  95. 25 0
      MpMainModels2/MerchantQrCode.cs
  96. 39 0
      MpMainModels2/MerchantRebateDetail.cs
  97. 31 0
      MpMainModels2/MerchantTradeSummary.cs
  98. 41 0
      MpMainModels2/Merchants.cs
  99. 13 0
      MpMainModels2/MobileCodeCheck.cs
  100. 40 0
      MpMainModels2/MsgAlert.cs

+ 5 - 1
AppStart/Helper/Profit/ProfitCheckHelper.cs

@@ -40,7 +40,7 @@ namespace MySystem
             WebCMSEntities db = new WebCMSEntities();
             string StartId = function.CheckInt(function.ReadInstance("/PublicParam/ProfitRewardRecordId/" + Month + ".txt"));
             OtherMySqlConn.connstr = Library.ConfigurationManager.AppSettings["Pxc1SqlConnStr"].ToString();
-            DataTable dt = OtherMySqlConn.dtable("select u.MakerCode,u.RealName,u.UserLevel,r.Rank,(case when ProfitType=1 then '直营' else '团队' end) as DirectFlag,k.Name,BrandId,CreditTradeAmt,CreditTradeProfit,QrCreditTradeAmt,QrCreditTradeProfit,NonQrCreditTradeAmt,NonQrCreditTradeProfit,HelpCreditTradeAmt,HelpCreditTradeProfit,NotHelpCreditTradeAmt,NotHelpCreditTradeProfit,ProfitCreditTradeAmt,ProfitCreditTradeProfit,DebitTradeAmt,DebitTradeProfit from (select UserId,ProfitType,BrandId,sum(CreditTradeAmt) as CreditTradeAmt,sum(CreditTradeProfit) as CreditTradeProfit,sum(QrCreditTradeAmt) as QrCreditTradeAmt,sum(QrCreditTradeProfit) as QrCreditTradeProfit,sum(NonQrCreditTradeAmt) as NonQrCreditTradeAmt,sum(NonQrCreditTradeProfit) as NonQrCreditTradeProfit,sum(HelpCreditTradeAmt) as HelpCreditTradeAmt,sum(HelpCreditTradeProfit) as HelpCreditTradeProfit,sum(NotHelpCreditTradeAmt) as NotHelpCreditTradeAmt,sum(NotHelpCreditTradeProfit) as NotHelpCreditTradeProfit,sum(ProfitCreditTradeAmt) as ProfitCreditTradeAmt,sum(ProfitCreditTradeProfit) as ProfitCreditTradeProfit,sum(DebitNonCapTradeAmt+DebitCapTradeAmt) as DebitTradeAmt,sum(DebitNonTradeCapProfit+DebitTradeCapProfit) as DebitTradeProfit from ProfitRewardRecord where Id>=" + StartId + " and TradeMonth='" + Month + "' GROUP BY UserId,ProfitType,BrandId) tb left join Users u on tb.UserId=u.Id LEFT JOIN KqProducts k ON k.Id=tb.BrandId left join UserRankWhite r on u.Id=r.Id and r.CreateDate<'" + DateTime.Now.ToString("yyyy-MM") + "-01 00:00:00' and r.UpdateDate>'" + DateTime.Now.ToString("yyyy-MM") + "-01 00:00:00' ORDER BY u.MakerCode");
+            DataTable dt = OtherMySqlConn.dtable("select u.MakerCode,u.RealName,u.UserLevel,r.Rank,(case when ProfitType=1 then '直营' else '团队' end) as DirectFlag,k.Name,BrandId,CreditTradeAmt,CreditTradeProfit,QrCreditTradeAmt,QrCreditTradeProfit,NonQrCreditTradeAmt,NonQrCreditTradeProfit,HelpCreditTradeAmt,HelpCreditTradeProfit,NotHelpCreditTradeAmt,NotHelpCreditTradeProfit,ProfitCreditTradeAmt,ProfitCreditTradeProfit,DebitTradeAmt,DebitTradeProfit from (select UserId,ProfitType,BrandId,sum(CreditTradeAmt) as CreditTradeAmt,sum(CreditTradeProfit) as CreditTradeProfit,sum(QrCreditTradeAmt) as QrCreditTradeAmt,sum(QrCreditTradeProfit) as QrCreditTradeProfit,sum(NonQrCreditTradeAmt) as NonQrCreditTradeAmt,sum(NonQrCreditTradeProfit) as NonQrCreditTradeProfit,sum(HelpCreditTradeAmt) as HelpCreditTradeAmt,sum(HelpCreditTradeProfit) as HelpCreditTradeProfit,sum(NotHelpCreditTradeAmt) as NotHelpCreditTradeAmt,sum(NotHelpCreditTradeProfit) as NotHelpCreditTradeProfit,sum(ProfitCreditTradeAmt) as ProfitCreditTradeAmt,sum(ProfitCreditTradeProfit) as ProfitCreditTradeProfit,sum(ProfitCreditTradeAmt2) as ProfitCreditTradeAmt2,sum(ProfitCreditTradeProfit2) as ProfitCreditTradeProfit2,sum(DebitNonCapTradeAmt+DebitCapTradeAmt) as DebitTradeAmt,sum(DebitNonTradeCapProfit+DebitTradeCapProfit) as DebitTradeProfit from ProfitRewardRecord where Id>=" + StartId + " and TradeMonth='" + Month + "' GROUP BY UserId,ProfitType,BrandId) tb left join Users u on tb.UserId=u.Id LEFT JOIN KqProducts k ON k.Id=tb.BrandId left join UserRankWhite r on u.Id=r.Id and r.CreateDate<'" + DateTime.Now.ToString("yyyy-MM") + "-01 00:00:00' and r.UpdateDate>'" + DateTime.Now.ToString("yyyy-MM") + "-01 00:00:00' ORDER BY u.MakerCode");
             function.WriteLog(DateTime.Now.ToString() + ":" + dt.Rows.Count, "分润结果检查");
             int index = 0;
             foreach(DataRow dr in dt.Rows)
@@ -65,6 +65,8 @@ namespace MySystem
                 decimal NotHelpCreditTradeProfit = decimal.Parse(function.CheckNum(dr["NotHelpCreditTradeProfit"].ToString()));
                 decimal ProfitCreditTradeAmt = decimal.Parse(function.CheckNum(dr["ProfitCreditTradeAmt"].ToString()));
                 decimal ProfitCreditTradeProfit = decimal.Parse(function.CheckNum(dr["ProfitCreditTradeProfit"].ToString()));
+                decimal ProfitCreditTradeAmt2 = decimal.Parse(function.CheckNum(dr["ProfitCreditTradeAmt2"].ToString()));
+                decimal ProfitCreditTradeProfit2 = decimal.Parse(function.CheckNum(dr["ProfitCreditTradeProfit2"].ToString()));
                 decimal DebitTradeAmt = decimal.Parse(function.CheckNum(dr["DebitTradeAmt"].ToString()));
                 decimal DebitTradeProfit = decimal.Parse(function.CheckNum(dr["DebitTradeProfit"].ToString()));
                 db.ProfitRewardExport.Add(new ProfitRewardExport()
@@ -90,6 +92,8 @@ namespace MySystem
                     NotHelpCreditTradeProfit = NotHelpCreditTradeProfit,
                     ProfitCreditTradeAmt = ProfitCreditTradeAmt,
                     ProfitCreditTradeProfit = ProfitCreditTradeProfit,
+                    ProfitCreditTradeAmt2 = ProfitCreditTradeAmt2,
+                    ProfitCreditTradeProfit2 = ProfitCreditTradeProfit2,
                     DebitTradeAmt = DebitTradeAmt,
                     DebitTradeProfit = DebitTradeProfit,
                 });

+ 1 - 1
AppStart/Helper/Profit/ProfitHelper.cs

@@ -1829,7 +1829,7 @@ namespace MySystem
             }
             db.Dispose();
 
-            // HelpProfitHelper.Instance.StatProfitEveryDay(DateTime.Now.AddMonths(-1).ToString("yyyyMM")); //助利宝分润
+            HelpProfitHelper.Instance.StatProfitEveryDay(DateTime.Now.AddMonths(-1).ToString("yyyyMM")); //助利宝分润
             ProfitCheckHelper.Instance.Start();
         }
         public List<ProfitResult> StartProftForPosByMonth(int BrandId, int BankCardType, string Month, int PageNum = 1)

+ 130 - 4
AppStart/Helper/Profit/ProfitHelperV2.cs

@@ -151,6 +151,9 @@ namespace MySystem
                                         decimal ProfitCreditTradeProfit = 0;
                                         decimal ProfitCreditProfitRate = 0;
                                         decimal ProfitCreditTradeAmt = 0;
+                                        decimal ProfitCreditTradeProfit2 = 0;
+                                        decimal ProfitCreditProfitRate2 = 0;
+                                        decimal ProfitCreditTradeAmt2 = 0;
                                         decimal ProfitDebitNonCapTradeAmt = 0;
                                         decimal ProfitDebitNonTradeCapProfit = 0;
                                         decimal ProfitDebitProfitRate = 0;
@@ -176,9 +179,15 @@ namespace MySystem
                                                 }
                                                 else if(sub.HelpFlag == 2)
                                                 {
-                                                    ProfitCreditTradeProfit = ProfitAmt; //(扶持期)(非云闪付)贷记卡分润总金额
-                                                    ProfitCreditProfitRate = ProfitRate; //(扶持期)(非云闪付)贷记卡商户交易对应分润比例
-                                                    ProfitCreditTradeAmt = TradeAmt; //(扶持期)(非云闪付)贷记卡交易总金额
+                                                    ProfitCreditTradeProfit = ProfitAmt; //(盈利期)(非云闪付)贷记卡分润总金额
+                                                    ProfitCreditProfitRate = ProfitRate; //(盈利期)(非云闪付)贷记卡商户交易对应分润比例
+                                                    ProfitCreditTradeAmt = TradeAmt; //(盈利期)(非云闪付)贷记卡交易总金额
+                                                }
+                                                else if(sub.HelpFlag == 3)
+                                                {
+                                                    ProfitCreditTradeProfit2 = ProfitAmt; //(盈利期)(非云闪付)贷记卡分润总金额
+                                                    ProfitCreditProfitRate2 = ProfitRate; //(盈利期)(非云闪付)贷记卡商户交易对应分润比例
+                                                    ProfitCreditTradeAmt2 = TradeAmt; //(盈利期)(非云闪付)贷记卡交易总金额
                                                 }
                                                 else
                                                 {
@@ -226,7 +235,7 @@ namespace MySystem
                                                     }
                                                     HelpDebitProfitRate = ProfitRate; //(扶持期)(非云闪付)借记卡商户交易对应分润比例
                                                 }
-                                                else if (sub.HelpFlag == 2)
+                                                else if (sub.HelpFlag >= 2)
                                                 {
                                                     if (sub.Money < 1)
                                                     {
@@ -303,6 +312,9 @@ namespace MySystem
                                             ProfitCreditTradeProfit = ProfitCreditTradeProfit,  //(盈利期)(非云闪付)贷记卡分润总金额
                                             ProfitCreditProfitRate = ProfitCreditProfitRate, //(盈利期)(非云闪付)贷记卡商户交易对应分润比例
                                             ProfitCreditTradeAmt = ProfitCreditTradeAmt, //(盈利期)(非云闪付)贷记卡交易总金额
+                                            ProfitCreditTradeProfit2 = ProfitCreditTradeProfit2,  //(盈利期)(非云闪付)贷记卡分润总金额
+                                            ProfitCreditProfitRate2 = ProfitCreditProfitRate2, //(盈利期)(非云闪付)贷记卡商户交易对应分润比例
+                                            ProfitCreditTradeAmt2 = ProfitCreditTradeAmt2, //(盈利期)(非云闪付)贷记卡交易总金额
                                             ProfitDebitNonCapTradeAmt = ProfitDebitNonCapTradeAmt, //(盈利期)(非云闪付)借记卡非封顶交易总金额
                                             ProfitDebitNonTradeCapProfit = ProfitDebitNonTradeCapProfit, //(盈利期)(非云闪付)借记卡非封顶交易分润总金额
                                             ProfitDebitProfitRate = ProfitDebitProfitRate, //(盈利期)(非云闪付)借记卡商户交易对应分润比例
@@ -699,6 +711,120 @@ namespace MySystem
                         dbnew.Dispose();
                     }
                 }
+
+
+                sqlstr = "";
+                if (BankCardType == 1)
+                {
+                    sqlstr = "select UserId,QrPayFlag,ProfitDirectTradeAmt from CreditTradeDaySummary2" + Month + " where BrandId=" + BrandId + LimitString;
+                }
+                function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + ":" + sqlstr, "分润监控日志");
+                dt = GetDataTable(sqlstr);
+                function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + ":" + dt.Rows.Count.ToString(), "分润监控日志");
+                if(dt.Rows.Count > 0)
+                {
+                    foreach (DataRow dr in dt.Rows)
+                    {
+                        WebCMSEntities dbnew = new WebCMSEntities();
+                        try
+                        {
+                            int UserId = int.Parse(dr["UserId"].ToString());
+                            int QrPayFlag = int.Parse(dr["QrPayFlag"].ToString());
+                            List<UserLevelSet> levels = dbnew.UserLevelSet.ToList();
+                            SubUser selfUser = GetUser(UserId, Month) ?? new SubUser();
+                            function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + ":贷记卡", "分润监控日志");
+                            decimal ProfitDirectTradeAmt = decimal.Parse(dr[2].ToString()); //贷记卡盈利期期交易额
+                            int maxLevel = obj.MaxLevel; //最大等级
+                            decimal diffLevelProfit = 0;  //等级级差
+                            int curLevel = 0; //当前层级的会员等级
+                            string ParentNav = selfUser.ParentNav;
+                            if (string.IsNullOrEmpty(ParentNav))
+                            {
+                                ParentNav = ",0,";
+                            }
+                            function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + ":" + ParentNav, "分润监控日志");
+                            if (!string.IsNullOrEmpty(ParentNav))
+                            {
+                                ParentNav += "," + UserId + ",";
+                                string[] ParentNavList = ParentNav.Trim(',').Replace(",,", ",").Split(',');
+                                Array.Reverse(ParentNavList); //反转顺序
+                                int level = 0;
+                                DateTime now = DateTime.Now;
+                                DateTime ThisMonth = DateTime.Parse(DateTime.Now.ToString("yyyy-MM") + "-01 00:00:00");                                
+                                function.WriteLog("------------------------", "分润监控日志");
+                                function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + ":盈利期2:" + ProfitDirectTradeAmt, "分润监控日志");
+                                if (ProfitDirectTradeAmt > 0)
+                                {
+                                    level = 0;
+                                    curLevel = 0;
+                                    diffLevelProfit = 0;  //等级级差
+                                    foreach (string UserIdString in ParentNavList)
+                                    {
+                                        level += 1;
+                                        int uid = int.Parse(UserIdString);
+                                        SubUser user = GetUser(uid, Month) ?? new SubUser();
+                                        int UserLevel = user.PreUserLevel > user.UserLevel ? user.PreUserLevel : user.UserLevel; //当前会员等级
+                                        if (curLevel == maxLevel) //判断当前创客是否有直推的激活机具,并且在活动时间内
+                                        {
+                                            break;
+                                        }
+                                        if (UserLevel <= maxLevel && UserLevel > curLevel)
+                                        {
+                                            int LevelKindId = GetLevelKindId(BrandId, 2, 1);
+                                            ProfitObjectLevels objlevel = RedisDbconn.Instance.Get<ProfitObjectLevels>("pobjlv" + LevelKindId + ":" + UserLevel); //获取当前等级参数
+                                            if (objlevel != null)
+                                            {
+                                                decimal getLevelProfit = 0;  //等级分润
+                                                if (objlevel.Percents > 0)
+                                                {
+                                                    getLevelProfit += ProfitDirectTradeAmt * objlevel.Percents;
+                                                }
+                                                if (objlevel.AddProfitVal > 0)
+                                                {
+                                                    getLevelProfit += objlevel.AddProfitVal;
+                                                }
+                                                decimal money = getLevelProfit;
+                                                getLevelProfit -= diffLevelProfit;
+                                                if (objlevel.LevelDiff == 1)  //判断是否有级差
+                                                {
+                                                    diffLevelProfit = money;
+                                                }
+                                                if (getLevelProfit >= obj.MinProfitVal)
+                                                {
+                                                    result.Add(new ProfitResult()
+                                                    {
+                                                        UserId = user.Id,
+                                                        UserNav = user.ParentNav,
+                                                        Money = PublicFunction.NumberFormat(getLevelProfit),
+                                                        ProfitRate = objlevel.Percents,
+                                                        Message = "交易分润",
+                                                        BankCardType = BankCardType,
+                                                        QrPayFlag = QrPayFlag,
+                                                        BrandId = BrandId,
+                                                        DirectFlag = selfUser.Id == user.Id ? 1 : 0,
+                                                        IsSubsidy = 0,
+                                                        TradeAmount = ProfitDirectTradeAmt,
+                                                        HelpFlag = 3,
+                                                    });
+                                                }
+                                            }
+                                        }
+                                        if(curLevel < UserLevel)
+                                        {
+                                            curLevel = UserLevel;
+                                        }
+                                    }
+                                }
+                            }
+                            function.WriteLog(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + ":over", "分润监控日志");
+                        }
+                        catch (Exception ex)
+                        {
+                            function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString(), "每月统计分润异常");
+                        }
+                        dbnew.Dispose();
+                    }
+                }
             }
             return result;
         }

+ 197 - 0
AppStart/Helper/StatService.cs

@@ -2184,6 +2184,203 @@ namespace MySystem
             RedisDbconn.Instance.AddList("DoTableEveryMonthQueue", "1");
         }
 
+        public void StatUserLevelStartNew()
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            MpMainModels.WebCMSEntities mpmaindb = new MpMainModels.WebCMSEntities();
+            MpMainModels2.WebCMSEntities mpmaindb2 = new MpMainModels2.WebCMSEntities();
+            try
+            {
+                OtherMySqlConn.connstr = Library.ConfigurationManager.AppSettings["Pxc1SqlConnStr"].ToString();
+                function.WriteLog(DateTime.Now.ToString(), "创客升级日志");
+                DateTime start = DateTime.Parse(DateTime.Now.AddMonths(-1).ToString("yyyy-MM") + "-01 00:00:00");
+                DateTime end = start.AddDays(1);
+                string TradeMonth = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
+                List<UserLevelSet> sets = db.UserLevelSet.ToList();
+                bool op = true;
+                int startid = 0;
+                while(op)
+                {
+                    var users = db.Users.Select(m => new { m.Id, m.AuthFlag }).Where(m => m.Id > startid && m.AuthFlag == 1).OrderBy(m => m.Id).Take(500).ToList();
+                    function.WriteLog(users.Count.ToString(), "创客升级日志");
+                    if(users.Count > 0)
+                    {
+                        foreach (var subuser in users)
+                        {
+                            Users user = db.Users.FirstOrDefault(m => m.Id == subuser.Id);
+                            if (user != null)
+                            {
+                                int BeforeLevel = user.UserLevel;
+                                int AfterLevel = 0;
+                                decimal TradeAmount = 0;
+                                //创客团队交易额
+                                bool check = db.TradeDaySummary.Any(m => m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team");
+                                if (check)
+                                {
+                                    TradeAmount += db.TradeDaySummary.Where(m => m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team").Sum(m => m.HelpNonDirectTradeAmt + m.HelpNonDirectDebitTradeAmt + m.NotHelpNonDirectTradeAmt + m.NotHelpNonDirectDebitTradeAmt + m.ProfitNonDirectTradeAmt + m.ProfitNonDirectDebitTradeAmt);
+                                }
+                                //助利宝团队交易额
+                                DataTable checkdt = OtherMySqlConn.dtable("SELECT SUM(TradeAmount) TradeAmount FROM HelpProfitMerTradeSummay WHERE (MerchantId IN(SELECT MerchantId FROM HelpProfitMerIds WHERE UserId IN(SELECT Id from Users WHERE ParentNav like '%," + user.Id + ",%' OR Id=" + user.Id + "))) AND TradeMonth=" + TradeMonth + "");
+                                if (checkdt.Rows.Count > 0)
+                                {
+                                    TradeAmount += decimal.Parse(function.CheckNum(checkdt.Rows[0]["TradeAmount"].ToString()));
+                                }
+                                //码牌团队交易额(直联)
+                                check = mpmaindb.UserAmountSummary.Any(m => m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team");
+                                if (check)
+                                {
+                                    TradeAmount += mpmaindb.UserAmountSummary.Where(m => m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team" && m.IsAct == 1).Sum(m => m.TotalAmount) * 4;
+                                }
+                                //码牌团队交易额(银联)
+                                check = mpmaindb2.UserAmountSummary.Any(m => m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team");
+                                if (check)
+                                {
+                                    TradeAmount += mpmaindb2.UserAmountSummary.Where(m => m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team" && m.IsAct == 1).Sum(m => m.TotalAmount) * 4;
+                                }
+                                //广电卡扶持期按1万/张计入职级
+                                check = db.UserTradeMonthSummary.Any(m => m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team" && m.BrandId == 14);
+                                if (check)
+                                {
+                                    TradeAmount += db.UserTradeMonthSummary.Where(m => m.UserId == user.Id && m.TradeMonth == TradeMonth && m.SeoTitle == "team" && m.BrandId == 14).Sum(m => m.ActiveBuddyMerStatus) * 10000;
+                                }
+                                UserLevelSet set = sets.FirstOrDefault(m => m.UpLevelGrowth <= TradeAmount && m.UpLevelIntegral > TradeAmount);
+                                if (set != null)
+                                {
+                                    AfterLevel = set.Id;
+                                }
+
+                                // K6以上计算小市场是否达标
+                                // 升级逻辑
+                                bool upFlag = true;
+                                if(AfterLevel > 5)
+                                {
+                                    DataTable dt = OtherMySqlConn.dtable("select UserId,sum(HelpNonDirectTradeAmt+NotHelpNonDirectTradeAmt+ProfitNonDirectTradeAmt+HelpNonDirectDebitTradeAmt+NotHelpNonDirectDebitTradeAmt+ProfitNonDirectDebitTradeAmt) from TradeDaySummary where UserId in (select Id from Users where ParentUserId=" + user.Id + ") and TradeMonth='" + TradeMonth + "' and SeoTitle='team' group by UserId order by sum(HelpNonDirectTradeAmt+NotHelpNonDirectTradeAmt+ProfitNonDirectTradeAmt+HelpNonDirectDebitTradeAmt+ProfitNonDirectDebitTradeAmt) desc");
+                                    int index = 0;
+                                    decimal TradeAmt = 0;
+                                    decimal BigTradeAmt = 0;
+                                    foreach(DataRow dr in dt.Rows)
+                                    {
+                                        index += 1;
+                                        if(index == 1)
+                                        {
+                                            BigTradeAmt = decimal.Parse(dr[1].ToString());
+                                        }
+                                        else if(index > 1)
+                                        {
+                                            TradeAmt += decimal.Parse(dr[1].ToString());
+                                        }
+                                    }
+                                    if(TradeAmt < 12000000 || BigTradeAmt < 30000000)
+                                    {
+                                        if(AfterLevel > BeforeLevel && BeforeLevel >= 5) //保级,只升不降
+                                        {
+                                            AfterLevel = BeforeLevel;
+                                        }
+                                        else if(AfterLevel > BeforeLevel && BeforeLevel < 5)
+                                        {
+                                            AfterLevel = 5;
+                                        }
+                                        else if(BeforeLevel > 5)
+                                        {
+                                            AfterLevel = 5;
+                                        }
+                                        else
+                                        {
+                                            upFlag = false;
+                                        }
+                                    }
+                                }
+                                if (AfterLevel > BeforeLevel && AfterLevel > 1 && upFlag)
+                                {
+                                    function.WriteLog("升级:" + user.Id.ToString() + BeforeLevel + "->" + AfterLevel, "创客升级日志");
+                                    user.UserLevel = AfterLevel;
+                                    DateTime checkTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM") + "-01 00:00:00");
+                                    UserRank rank = db.UserRank.FirstOrDefault(m => m.CreateDate >= checkTime && m.UserId == user.Id);
+                                    if(rank == null)
+                                    {
+                                        db.UserRank.Add(new UserRank()
+                                        {
+                                            CreateDate = DateTime.Now,
+                                            UpdateDate = DateTime.Now,
+                                            UserId = user.Id, //创客
+                                            WhiteRank = BeforeLevel,
+                                            Rank = AfterLevel, //当前等级
+                                            StatYear = DateTime.Now.Year, //统计年份
+                                            StatMonth = DateTime.Now.Month, //统计月份
+                                            TradeAmt = TradeAmount, //团队交易总额
+                                            UpgradeFlag = 1, //升级标识
+                                            OperateDate = DateTime.Now, //操作时间
+                                            Status = 1,
+                                        });
+                                        db.SaveChanges();
+                                    }
+                                    else
+                                    {
+                                        rank.TradeAmt = TradeAmount;
+                                        rank.Rank = AfterLevel;
+                                        db.SaveChanges();
+                                    }
+                                }
+                                // 降级逻辑
+                                if(!upFlag && AfterLevel > 5)
+                                {
+                                    AfterLevel = 5;
+                                }
+                                if (AfterLevel < BeforeLevel && BeforeLevel > 1)
+                                {
+                                    function.WriteLog(user.MakerCode + "-" + user.RealName + ":K" + BeforeLevel + "->K" + AfterLevel, "创客降级日志");
+                                    user.UserLevel = AfterLevel;
+                                    DateTime checkTime = DateTime.Parse(DateTime.Now.ToString("yyyy-MM") + "-01 00:00:00");
+                                    UserRank rank = db.UserRank.FirstOrDefault(m => m.CreateDate >= checkTime && m.UserId == user.Id);
+                                    if(rank == null)
+                                    {
+                                        db.UserRank.Add(new UserRank()
+                                        {
+                                            CreateDate = DateTime.Now,
+                                            UpdateDate = DateTime.Now,
+                                            UserId = user.Id, //创客
+                                            WhiteRank = BeforeLevel,
+                                            Rank = AfterLevel, //当前等级
+                                            StatYear = DateTime.Now.Year, //统计年份
+                                            StatMonth = DateTime.Now.Month, //统计月份
+                                            TradeAmt = TradeAmount, //团队交易总额
+                                            UpgradeFlag = 0, //升级标识
+                                            OperateDate = DateTime.Now, //操作时间
+                                            Status = 1,
+                                        });
+                                        db.SaveChanges();
+                                    }
+                                    else
+                                    {
+                                        rank.TradeAmt = TradeAmount;
+                                        rank.Rank = AfterLevel;
+                                        rank.Status = 1;
+                                        db.SaveChanges();
+                                    }
+                                }
+                            }
+                            startid = subuser.Id;
+                        }
+                        function.WriteLog(startid.ToString(), "创客升级日志");
+                    }
+                    else
+                    {
+                        op = false;
+                    }
+                }
+                function.WriteLog(DateTime.Now.ToString(), "创客升级日志");
+            }
+            catch (Exception ex)
+            {
+                function.WriteLog(ex.ToString(), "创客升级异常");
+            }
+            db.Dispose();
+            mpmaindb.Dispose();
+            mpmaindb2.Dispose();
+
+            RedisDbconn.Instance.AddList("DoTableEveryMonthQueue", "1");
+        }
+
 
         // 统计创客激活数
         public void StartPosActNum()

+ 13 - 3
AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -349,7 +349,14 @@ namespace MySystem
                                             decimal DepositAmt = decimal.Parse(function.CheckNum(pos.SeoKeyword));
                                             if (pos.DownFeeFlag == 1)
                                             {
-                                                MerHelpFlag = 2;
+                                                if (pos.DownFee == 0.6M)
+                                                {
+                                                    MerHelpFlag = 3;
+                                                }
+                                                else
+                                                {
+                                                    MerHelpFlag = 2;
+                                                }
                                             }
                                             else if ((DepositAmt > 0 && pos.IsFirst == 1) || pos.BrandId == 14)
                                             {
@@ -383,6 +390,9 @@ namespace MySystem
                                             // {
                                             //     ActStatus = GetLeShuaHaiKe(pos.UserId, BrandId);
                                             // }
+                                            int Version = 0;
+                                            if(MerHelpFlag == 2) Version = 1;
+                                            if(MerHelpFlag == 3) Version = 2;
                                             PxcModels.TradeRecord add = db.TradeRecord.Add(new PxcModels.TradeRecord()
                                             {
                                                 ParentNav = user.ParentNav,
@@ -392,7 +402,7 @@ namespace MySystem
                                                 UserId = pos.UserId, //创客
                                                 MerchantId = pos.BindMerchantId, //商户
                                                 MerNo = trade.MerNo, //渠道商户编号
-                                                MerHelpFlag = MerHelpFlag == 2 ? 1 : MerHelpFlag, //1扶持周,0稳定期,2盈利期
+                                                MerHelpFlag = MerHelpFlag >= 2 ? 1 : MerHelpFlag, //1扶持周,0稳定期,2盈利期
                                                 HelpMonthCount = 0, //扶持第几个月
                                                 MerBuddyType = user.MerchantType, //商户创客类型
                                                 SnNo = trade.TradeSnNo, //渠道SN号
@@ -408,7 +418,7 @@ namespace MySystem
                                                 TopUserId = TopUserId, //顶级创客
                                                 MerUserId = pos.UserId, //商户直属创客
                                                 SeoTitle = HelpProfitFlag,
-                                                Version = MerHelpFlag == 2 ? 1 : 0,
+                                                Version = Version,
                                                 ActStatus = ActStatus,
                                             }).Entity;
                                             db.SaveChanges();

+ 49 - 0
MpMainModels2/ActiveReward.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class ActiveReward
+    {
+        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 ParentParentUserId { get; set; }
+        public int ParentUserId { get; set; }
+        public int MerUserId { get; set; }
+        public int TopUserId { get; set; }
+        public DateTime? ActDate { get; set; }
+        public string Remark { get; set; }
+        public string City { get; set; }
+        public string Province { get; set; }
+        public string RewardTips { get; set; }
+        public int RewardRef { get; set; }
+        public int SnStoreId { get; set; }
+        public string ActTypeDesc { get; set; }
+        public int ActType { get; set; }
+        public int SnApplyUserId { get; set; }
+        public int SnType { get; set; }
+        public string KqSnNo { get; set; }
+        public string KqMerNo { get; set; }
+        public string MerUserNav { get; set; }
+        public int DirectBuddyNo { get; set; }
+        public string UserNav { get; set; }
+        public int BrandId { get; set; }
+        public decimal RuleRewardAmount { get; set; }
+        public decimal DivideAmount { get; set; }
+        public decimal RewardAmount { get; set; }
+        public int RewardSourceUserId { get; set; }
+        public DateTime? StandardDate { get; set; }
+        public int MerchantId { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 26 - 0
MpMainModels2/ActivityEnrolRecord.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class ActivityEnrolRecord
+    {
+        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 EffectEndTime { get; set; }
+        public string EffectStartTime { get; set; }
+        public string EnrolMonth { get; set; }
+        public int UserId { get; set; }
+        public int ActId { get; set; }
+    }
+}

+ 37 - 0
MpMainModels2/ActivityInfo.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class ActivityInfo
+    {
+        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 string ActContent { get; set; }
+        public string ActBanner { get; set; }
+        public string ActReferUrl { get; set; }
+        public string EnrolEndTime { get; set; }
+        public string EnrolStartTime { get; set; }
+        public DateTime? EnrolEndDate { get; set; }
+        public DateTime? EnrolStartDate { get; set; }
+        public DateTime? EffectEndDate { get; set; }
+        public DateTime? EffectStartDate { get; set; }
+        public int IsTop { get; set; }
+        public string LimitTopBuddy { get; set; }
+        public string BrandId { get; set; }
+        public string ActName { get; set; }
+        public int ActType { get; set; }
+        public string ActCode { get; set; }
+    }
+}

+ 32 - 0
MpMainModels2/ActivityPrizeDetail.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class ActivityPrizeDetail
+    {
+        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 TopUserId { get; set; }
+        public decimal ProfitRate { get; set; }
+        public decimal ActRewardAmt { get; set; }
+        public decimal CreditTradeAmt { get; set; }
+        public decimal OtherProdCreditTradeAmt { get; set; }
+        public string TradeMonth { get; set; }
+        public int CheckStatus { get; set; }
+        public decimal TradeAmt { get; set; }
+        public int BrandId { get; set; }
+        public int UserId { get; set; }
+        public int ActivityId { get; set; }
+    }
+}

+ 24 - 0
MpMainModels2/ActivityRedPackageJoins.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class ActivityRedPackageJoins
+    {
+        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 PrizeAmt { get; set; }
+        public string ActivityDate { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 24 - 0
MpMainModels2/ActivityRedPackageStock.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class ActivityRedPackageStock
+    {
+        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 ActivityDate { get; set; }
+        public decimal PrizeAmt { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 25 - 0
MpMainModels2/ActivityRedPackageTop10.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class ActivityRedPackageTop10
+    {
+        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 Kind { get; set; }
+        public int TimeNum { get; set; }
+        public decimal PrizeAmt { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 26 - 0
MpMainModels2/Advertisment.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class Advertisment
+    {
+        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 Url { get; set; }
+        public string Contents { get; set; }
+        public string PicPath { get; set; }
+        public string ColId { get; set; }
+        public string Title { get; set; }
+    }
+}

+ 25 - 0
MpMainModels2/AgentLevelSet.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class AgentLevelSet
+    {
+        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 AreasProfitPercent { get; set; }
+        public ulong LevelDiff { get; set; }
+        public decimal ProfitPercent { get; set; }
+        public string Name { get; set; }
+    }
+}

+ 32 - 0
MpMainModels2/AppBottomNavs.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class AppBottomNavs
+    {
+        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 BgColor { get; set; }
+        public string NoPageHint { get; set; }
+        public string PageName { get; set; }
+        public string NormalTextColor { get; set; }
+        public string SelectTextColor { get; set; }
+        public string NormalIcon { get; set; }
+        public string SelectIcon { get; set; }
+        public string Title { get; set; }
+        public string PagPath { get; set; }
+        public string ScrollerAnimationImages { get; set; }
+        public string Style { get; set; }
+    }
+}

+ 28 - 0
MpMainModels2/AppVersion.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class AppVersion
+    {
+        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 DownloadUrl { get; set; }
+        public string CancelText { get; set; }
+        public string ConfirmText { get; set; }
+        public string Info { get; set; }
+        public string Title { get; set; }
+        public string VersionNum { get; set; }
+        public string TerminalKind { get; set; }
+    }
+}

+ 24 - 0
MpMainModels2/AppVideo.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class AppVideo
+    {
+        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 string BannerPic { get; set; }
+        public string Name { get; set; }
+    }
+}

+ 26 - 0
MpMainModels2/AppVideoList.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class AppVideoList
+    {
+        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 BgPic { get; set; }
+        public int VideoId { get; set; }
+        public string Remark { get; set; }
+        public string VideoUrl { get; set; }
+        public string Title { get; set; }
+    }
+}

+ 28 - 0
MpMainModels2/BackEndOpRecord.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class BackEndOpRecord
+    {
+        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 Remark { get; set; }
+        public string AfterData { get; set; }
+        public string BeforeData { get; set; }
+        public string TableEnName { get; set; }
+        public string TableChName { get; set; }
+        public string SysRealName { get; set; }
+        public string SysUserName { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public int Version { get; set; }
+    }
+}

+ 26 - 0
MpMainModels2/BankInfo.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class BankInfo
+    {
+        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 BankNameAbbr { get; set; }
+        public string UnitedBankName { get; set; }
+        public string UnitedBankNo { get; set; }
+        public string BankCode { get; set; }
+        public string BankName { get; set; }
+    }
+}

+ 47 - 0
MpMainModels2/BrokenMachineChange.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class BrokenMachineChange
+    {
+        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 OutStoreManagerMobile { get; set; }
+        public string OutStoreManager { get; set; }
+        public string OutStoreAddress { get; set; }
+        public string OutStoreAreas { get; set; }
+        public string OutStoreName { get; set; }
+        public int OutStoreId { get; set; }
+        public string OutProductName { get; set; }
+        public int OutProductType { get; set; }
+        public int BackStoreUserId { get; set; }
+        public string Remark { get; set; }
+        public string BackStoreName { get; set; }
+        public int BackStoreId { get; set; }
+        public string ChangeSnExpand { get; set; }
+        public string OrderExpand { get; set; }
+        public DateTime? CompleteTime { get; set; }
+        public string AuditRemark { get; set; }
+        public int AuditResult { get; set; }
+        public DateTime? AuditTime { get; set; }
+        public string AuditBy { get; set; }
+        public DateTime? ChangeTime { get; set; }
+        public int ChangeDeviceNum { get; set; }
+        public string ChangeDeviceName { get; set; }
+        public string BackProductName { get; set; }
+        public int BackProductType { get; set; }
+        public int UserId { get; set; }
+        public string ChangeNo { get; set; }
+    }
+}

+ 34 - 0
MpMainModels2/BrokenMachineChangeDetail.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class BrokenMachineChangeDetail
+    {
+        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 BackSnType { get; set; }
+        public string Remark { get; set; }
+        public int OutSnType { get; set; }
+        public string OutSnNo { get; set; }
+        public string OutProductName { get; set; }
+        public int OutProductType { get; set; }
+        public int BackDeviceStatus { get; set; }
+        public string BackSnNo { get; set; }
+        public int UserId { get; set; }
+        public string BackProductName { get; set; }
+        public int BackProductType { get; set; }
+        public int ChangeId { get; set; }
+        public string ChangeNo { get; set; }
+    }
+}

+ 28 - 0
MpMainModels2/BusinessActSummary.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class BusinessActSummary
+    {
+        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 UserId { get; set; }
+        public string TradeDate { get; set; }
+        public string Remark { get; set; }
+        public int ActCount { get; set; }
+        public int BrandId { get; set; }
+        public string TradeMonth { get; set; }
+        public int PartnerId { get; set; }
+    }
+}

+ 26 - 0
MpMainModels2/BusinessPartner.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class BusinessPartner
+    {
+        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 UserId { get; set; }
+        public decimal ThisMonthTrade { get; set; }
+        public string LoginPassword { get; set; }
+        public string Name { get; set; }
+        public string Mobile { get; set; }
+    }
+}

+ 25 - 0
MpMainModels2/BusinessPartnerMerchant.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class BusinessPartnerMerchant
+    {
+        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 MerNo { get; set; }
+        public int MerchantId { get; set; }
+        public int PartnerId { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 25 - 0
MpMainModels2/BusinessPartnerPos.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class BusinessPartnerPos
+    {
+        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 PosSn { get; set; }
+        public int PosId { get; set; }
+        public int PartnerId { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 23 - 0
MpMainModels2/BusinessScope.cs

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

+ 22 - 0
MpMainModels2/BusinessScopeType.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    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; }
+    }
+}

+ 67 - 0
MpMainModels2/BusinessTradeSummary.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class BusinessTradeSummary
+    {
+        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 UserId { get; set; }
+        public int PayType { get; set; }
+        public int VipFlag { get; set; }
+        public int TopUserId { get; set; }
+        public decimal HelpNonDirectNonQrDebitTradeAmt { get; set; }
+        public decimal HelpDirectNonQrDebitTradeAmt { get; set; }
+        public decimal HelpNonDirectQrDebitTradeAmt { get; set; }
+        public decimal HelpDirectQrDebitTradeAmt { get; set; }
+        public decimal HelpNonDirectDebitCapNum { get; set; }
+        public decimal HelpNonDirectDebitCapTradeAmt { get; set; }
+        public decimal HelpNonDirectDebitTradeAmt { get; set; }
+        public decimal HelpDirectDebitCapNum { get; set; }
+        public decimal HelpDirectDebitCapTradeAmt { get; set; }
+        public decimal HelpDirectDebitTradeAmt { get; set; }
+        public decimal HelpNonDirectNonQrCreditTradeAmt { get; set; }
+        public decimal HelpDirectNonQrCreditTradeAmt { get; set; }
+        public decimal HelpNonDirectQrCreditTradeAmt { get; set; }
+        public decimal HelpDirectQrCreditTradeAmt { get; set; }
+        public decimal HelpNonDirectCreditTradeAmt { get; set; }
+        public decimal HelpDirectCreditTradeAmt { get; set; }
+        public decimal HelpNonDirectTradeAmt { get; set; }
+        public decimal HelpDirectTradeAmt { get; set; }
+        public decimal NotHelpNonDirectNonQrDebitTradeAmt { get; set; }
+        public decimal NotHelpDirectNonQrDebitTradeAmt { get; set; }
+        public decimal NotHelpNonDirectQrDebitTradeAmt { get; set; }
+        public decimal NotHelpDirectQrDebitTradeAmt { get; set; }
+        public int NotHelpNonDirectDebitCapNum { get; set; }
+        public decimal NotHelpNonDirectDebitCapTradeAmt { get; set; }
+        public decimal NotHelpNonDirectDebitTradeAmt { get; set; }
+        public int NotHelpDirectDebitCapNum { get; set; }
+        public decimal NotHelpDirectDebitCapTradeAmt { get; set; }
+        public decimal NotHelpDirectDebitTradeAmt { get; set; }
+        public decimal NotHelpNonDirectNonQrCreditTradeAmt { get; set; }
+        public decimal NotHelpDirectNonQrCreditTradeAmt { get; set; }
+        public decimal NotHelpNonDirectQrCreditTradeAmt { get; set; }
+        public decimal NotHelpDirectQrCreditTradeAmt { get; set; }
+        public decimal NotHelpNonDirectCreditTradeAmt { get; set; }
+        public decimal NotHelpDirectCreditTradeAmt { get; set; }
+        public decimal NotHelpNonDirectTradeAmt { get; set; }
+        public decimal NotHelpDirectTradeAmt { get; set; }
+        public string MgrName { get; set; }
+        public string MgrNo { get; set; }
+        public int BrandId { get; set; }
+        public string TradeMonth { get; set; }
+        public string TradeDate { get; set; }
+        public int PartnerId { get; set; }
+    }
+}

+ 37 - 0
MpMainModels2/Col.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class Col
+    {
+        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 ClassName { get; set; }
+        public string ColEnNav { get; set; }
+        public int ParentId { get; set; }
+        public int ListPageCount { get; set; }
+        public string DetailTempM { get; set; }
+        public string ListTempM { get; set; }
+        public string DetailTemp { get; set; }
+        public string ListTemp { get; set; }
+        public string Url { get; set; }
+        public string Contents { get; set; }
+        public string ColEnName { get; set; }
+        public ulong Recommend { get; set; }
+        public string ColDetail { get; set; }
+        public string ColPicPath { get; set; }
+        public string ColName { get; set; }
+        public string ColId { get; set; }
+    }
+}

+ 11 - 0
MpMainModels2/ConsumerOpenIds.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class ConsumerOpenIds
+    {
+        public string OpenId { get; set; }
+        public int ConsumerId { get; set; }
+    }
+}

+ 11 - 0
MpMainModels2/ConsumerOrderForNo.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class ConsumerOrderForNo
+    {
+        public string OrderNo { get; set; }
+        public int OrderIds { get; set; }
+    }
+}

+ 38 - 0
MpMainModels2/ConsumerOrders.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class ConsumerOrders
+    {
+        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 CurDivi { get; set; }
+        public decimal MaxDivi { get; set; }
+        public string SnNo { get; set; }
+        public decimal ReturnMoney { get; set; }
+        public decimal PayMoney { get; set; }
+        public int PayMode { get; set; }
+        public string OrderNo { get; set; }
+        public int ConsumerId { get; set; }
+        public int MerchantId { get; set; }
+        public ulong IsAct { get; set; }
+        public int UserId { get; set; }
+        public decimal MerchantActualAmount { get; set; }
+        public int DivideFlag { get; set; }
+        public DateTime? DivideDate { get; set; }
+        public string DivideLog { get; set; }
+        public string TradePayNo { get; set; }
+        public int SetRecordId { get; set; }
+    }
+}

+ 25 - 0
MpMainModels2/ConsumerProfit.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class ConsumerProfit
+    {
+        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 OrderId { get; set; }
+        public decimal GetMoney { get; set; }
+        public int MerchantId { get; set; }
+        public int ConsumerId { get; set; }
+    }
+}

+ 36 - 0
MpMainModels2/Consumers.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class Consumers
+    {
+        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 WechatOpenId { get; set; }
+        public ulong CardFlag { get; set; }
+        public ulong AlipayFlag { get; set; }
+        public ulong WeChatPayFlag { get; set; }
+        public DateTime? LastConsumDate { get; set; }
+        public int TotalConsumCount { get; set; }
+        public decimal TotalAmount { get; set; }
+        public string AlipayUserId { get; set; }
+        public string WechatUnionid { get; set; }
+        public int CurIntgegral { get; set; }
+        public int TotalIntegral { get; set; }
+        public decimal TotalDividend { get; set; }
+        public string Mobile { get; set; }
+        public string HeadPhoto { get; set; }
+        public string NickName { get; set; }
+    }
+}

+ 33 - 0
MpMainModels2/CouponAssignRecords.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class CouponAssignRecords
+    {
+        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 CouponIds { get; set; }
+        public string Mobile { get; set; }
+        public string Areas { get; set; }
+        public string UserGroupId { get; set; }
+        public decimal CurMoneyMax { get; set; }
+        public decimal CurMoneyMin { get; set; }
+        public decimal TotalUseIntegralMax { get; set; }
+        public decimal TotalUseIntegralMin { get; set; }
+        public decimal TotalOrderMoneyMax { get; set; }
+        public decimal TotalOrderMoneyMin { get; set; }
+        public int UserMaxLevel { get; set; }
+        public int UserMinLevel { get; set; }
+    }
+}

+ 48 - 0
MpMainModels2/Coupons.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class Coupons
+    {
+        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 DateTime? ExpireEndDate { get; set; }
+        public DateTime? ExpireStartDate { get; set; }
+        public decimal FullReduceData { get; set; }
+        public decimal FullReduceMoney { get; set; }
+        public ulong AndPromotion { get; set; }
+        public ulong IsSuperpose { get; set; }
+        public int PublicMaxByDay { get; set; }
+        public int PublicMax { get; set; }
+        public DateTime? PublicEndDate { get; set; }
+        public DateTime? PublicStartDate { get; set; }
+        public ulong IsReUse { get; set; }
+        public string RepeatCondition { get; set; }
+        public int RepeatType { get; set; }
+        public ulong IsRepeat { get; set; }
+        public DateTime? UseEndDate { get; set; }
+        public DateTime? UseStartDate { get; set; }
+        public int UserMinLevel { get; set; }
+        public int UserMaxLevel { get; set; }
+        public string ProductId { get; set; }
+        public string ProductColId { get; set; }
+        public string MerchantId { get; set; }
+        public int Kind { get; set; }
+        public decimal Stock { get; set; }
+        public ulong IsPublic { get; set; }
+        public ulong IsNewUser { get; set; }
+        public string Explanation { get; set; }
+        public string Name { get; set; }
+    }
+}

+ 26 - 0
MpMainModels2/CouponsForUser.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class CouponsForUser
+    {
+        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 DateTime? UseDate { get; set; }
+        public ulong IsLock { get; set; }
+        public ulong IsUse { get; set; }
+        public int CouponId { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 24 - 0
MpMainModels2/CustomTagSet.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class CustomTagSet
+    {
+        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 Contents { get; set; }
+        public string Title { get; set; }
+        public string Tags { get; set; }
+    }
+}

+ 24 - 0
MpMainModels2/ErpCompanys.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class ErpCompanys
+    {
+        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 Phone { get; set; }
+        public string Code { get; set; }
+        public string Name { get; set; }
+    }
+}

+ 24 - 0
MpMainModels2/FileUpdateInfo.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class FileUpdateInfo
+    {
+        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 FileName { get; set; }
+        public string Path { get; set; }
+        public int VersionNum { get; set; }
+    }
+}

+ 43 - 0
MpMainModels2/FluxProfitDetail.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class FluxProfitDetail
+    {
+        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 MerUserType { get; set; }
+        public int TopUserId { get; set; }
+        public int BrandId { get; set; }
+        public string Remark { get; set; }
+        public string PosType { get; set; }
+        public decimal FluxProfitAmt { get; set; }
+        public string FluxEndDate { get; set; }
+        public string FluxStartDate { get; set; }
+        public decimal FluxFeeAmt { get; set; }
+        public decimal TradeAmt { get; set; }
+        public string TradeOrderNo { get; set; }
+        public string FluxOrderNo { get; set; }
+        public int ProfitType { get; set; }
+        public string SnNo { get; set; }
+        public string MerNo { get; set; }
+        public int MerchantUserId { get; set; }
+        public int MerchantId { get; set; }
+        public int UserId { get; set; }
+        public string TradeMonth { get; set; }
+        public string TradeTime { get; set; }
+        public string TradeDate { get; set; }
+        public string RecordNo { get; set; }
+    }
+}

+ 30 - 0
MpMainModels2/FluxProfitSummary.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class FluxProfitSummary
+    {
+        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 BrandId { get; set; }
+        public string Remark { get; set; }
+        public int CheckStatus { get; set; }
+        public int FluxTradeNum { get; set; }
+        public decimal FluxProfitAmt { get; set; }
+        public int MerUserType { get; set; }
+        public string TradeMonth { get; set; }
+        public int TopUserId { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 11 - 0
MpMainModels2/HaoDaAreaCode.cs

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

+ 33 - 0
MpMainModels2/HelpProfitAccountRecord.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class HelpProfitAccountRecord
+    {
+        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 TransRecordNo { get; set; }
+        public string Remark { get; set; }
+        public decimal AfterBalanceAmount { get; set; }
+        public decimal BeforeBalanceAmount { get; set; }
+        public decimal AfterFreezeAmount { get; set; }
+        public decimal BeforeFreezeAmount { get; set; }
+        public decimal AfterTotalAmount { get; set; }
+        public decimal BeforeTotalAmount { get; set; }
+        public decimal ChangeAmount { get; set; }
+        public int ProductType { get; set; }
+        public int ChangeType { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 23 - 0
MpMainModels2/HelpProfitAmountSummary.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class HelpProfitAmountSummary
+    {
+        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 decimal TradeAmount { get; set; }
+        public decimal MaxAmount { get; set; }
+        public int MerCount { get; set; }
+        public string TradeMonth { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 23 - 0
MpMainModels2/HelpProfitExchange.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class HelpProfitExchange
+    {
+        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 ExchangeCount { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 25 - 0
MpMainModels2/HelpProfitExchangeDetail.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class HelpProfitExchangeDetail
+    {
+        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 RecordId { get; set; }
+        public string ExchangeCode { get; set; }
+        public int PosCouponId { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 11 - 0
MpMainModels2/HelpProfitMerIds.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class HelpProfitMerIds
+    {
+        public int MerchantId { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 22 - 0
MpMainModels2/HelpProfitMerTradeMonthSummay.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class HelpProfitMerTradeMonthSummay
+    {
+        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 BrandId { get; set; }
+        public decimal TradeAmount { get; set; }
+        public string TradeMonth { get; set; }
+        public int MerchantId { get; set; }
+    }
+}

+ 26 - 0
MpMainModels2/HelpProfitMerTradeSummay.cs

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

+ 24 - 0
MpMainModels2/HelpProfitMerchantForUser.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class HelpProfitMerchantForUser
+    {
+        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 MerNo { get; set; }
+        public int MerchantId { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 29 - 0
MpMainModels2/HelpProfitRebateDetail.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class HelpProfitRebateDetail
+    {
+        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 decimal DebitRewardAmount { get; set; }
+        public decimal CreditRewardAmount { get; set; }
+        public int MerchantId { get; set; }
+        public int ProductType { get; set; }
+        public int UserId { get; set; }
+        public string TradeDate { get; set; }
+        public string TradeMonth { get; set; }
+    }
+}

+ 36 - 0
MpMainModels2/HelpProfitReward.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class HelpProfitReward
+    {
+        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 TopUserId { get; set; }
+        public int CheckStatus { get; set; }
+        public int RewardMerCount { get; set; }
+        public string Remark { get; set; }
+        public string RewardDesc { get; set; }
+        public string OpenRewardNo { get; set; }
+        public decimal DebitRewardAmount { get; set; }
+        public decimal CreditRewardAmount { get; set; }
+        public decimal DebitTradeAmt { get; set; }
+        public decimal CreditTradeAmt { get; set; }
+        public int RewardType { get; set; }
+        public int BrandId { get; set; }
+        public int UserId { get; set; }
+        public DateTime? TradeDate { get; set; }
+        public string TradeMonth { get; set; }
+    }
+}

+ 47 - 0
MpMainModels2/HelpProfitRewardDetail.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class HelpProfitRewardDetail
+    {
+        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 TopUserId { get; set; }
+        public int CheckStatus { get; set; }
+        public string OpenDetailRec { get; set; }
+        public string Remark { get; set; }
+        public string RewardDesc { get; set; }
+        public string OpenRewardNo { get; set; }
+        public decimal DebitRewardAmount { get; set; }
+        public decimal CreditRewardAmount { get; set; }
+        public decimal DebitTradeAmt { get; set; }
+        public decimal CreditTradeAmt { get; set; }
+        public string RewardTips { get; set; }
+        public int RewardType { get; set; }
+        public int MerBuddyType { get; set; }
+        public int SnStoreId { get; set; }
+        public DateTime? StandardDate { get; set; }
+        public int SnApplyUserId { get; set; }
+        public int SnType { get; set; }
+        public string MerNo { get; set; }
+        public string SnNo { get; set; }
+        public int DirectUserId { get; set; }
+        public int MerchantId { get; set; }
+        public string ProductName { get; set; }
+        public int BrandId { get; set; }
+        public int UserId { get; set; }
+        public DateTime? TradeDate { get; set; }
+        public string TradeMonth { get; set; }
+    }
+}

+ 24 - 0
MpMainModels2/IndexIconList.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class IndexIconList
+    {
+        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 Url { get; set; }
+        public string Title { get; set; }
+        public string Icon { get; set; }
+    }
+}

+ 23 - 0
MpMainModels2/KqProductBrand.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class KqProductBrand
+    {
+        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 Name { get; set; }
+        public int ProductId { get; set; }
+    }
+}

+ 23 - 0
MpMainModels2/KqProductOrgs.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class KqProductOrgs
+    {
+        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 Name { get; set; }
+        public int BrandId { get; set; }
+    }
+}

+ 68 - 0
MpMainModels2/KqProductRuleSet.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class KqProductRuleSet
+    {
+        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 FeeRate { get; set; }
+        public decimal FeeFixed { get; set; }
+        public int FeeBindDays { get; set; }
+        public decimal HelpSteadyFee { get; set; }
+        public decimal HelpFee { get; set; }
+        public int HelpMonths { get; set; }
+        public DateTime? HelpEndDate { get; set; }
+        public DateTime? HelpStartDate { get; set; }
+        public decimal FlowCardDirectProfit { get; set; }
+        public DateTime? FeeOfDays { get; set; }
+        public decimal FlowCardFee { get; set; }
+        public int FlowCardFreeDays { get; set; }
+        public DateTime? FlowCardEndDate { get; set; }
+        public DateTime? FlowCardStartDate { get; set; }
+        public DateTime? SubsidyEndDate { get; set; }
+        public DateTime? SubsidyStartDate { get; set; }
+        public int BigExtendCycleDays { get; set; }
+        public decimal BigTotalAmount { get; set; }
+        public int PullNewExtendDays { get; set; }
+        public DateTime? PullNewEndDate { get; set; }
+        public DateTime? PullNewStartDate { get; set; }
+        public int CyclePosDays { get; set; }
+        public ulong CycleIsOther { get; set; }
+        public DateTime? CycleEndDate { get; set; }
+        public DateTime? CycleStartDate { get; set; }
+        public decimal OpenStaPrize2 { get; set; }
+        public decimal OpenStaPrize { get; set; }
+        public decimal OpenStaTrade { get; set; }
+        public int OpenStaDays { get; set; }
+        public DateTime? OpenEndDate { get; set; }
+        public DateTime? OpenStartDate { get; set; }
+        public int ActPosCount { get; set; }
+        public decimal ActPrize { get; set; }
+        public decimal ActFirstDeposit { get; set; }
+        public decimal ActFirst { get; set; }
+        public decimal ActDeposit { get; set; }
+        public DateTime? ActEndDate { get; set; }
+        public DateTime? ActStartDate { get; set; }
+        public decimal MerStaTradeForMonth { get; set; }
+        public int MerStaMonths { get; set; }
+        public decimal MerStaProfit { get; set; }
+        public DateTime? MerStaEndDate { get; set; }
+        public DateTime? MerStaStartDate { get; set; }
+        public decimal ActivePrice { get; set; }
+        public int ActiveCount { get; set; }
+        public decimal Deposit { get; set; }
+        public int OrgId { get; set; }
+    }
+}

+ 22 - 0
MpMainModels2/KqProducts.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class KqProducts
+    {
+        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 Name { get; set; }
+    }
+}

+ 33 - 0
MpMainModels2/LeaderAccountRecord.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class LeaderAccountRecord
+    {
+        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 TransRecordNo { get; set; }
+        public string Remark { get; set; }
+        public decimal AfterBalanceAmount { get; set; }
+        public decimal BeforeBalanceAmount { get; set; }
+        public decimal AfterFreezeAmount { get; set; }
+        public decimal BeforeFreezeAmount { get; set; }
+        public decimal AfterTotalAmount { get; set; }
+        public decimal BeforeTotalAmount { get; set; }
+        public decimal ChangeAmount { get; set; }
+        public int ProductType { get; set; }
+        public int ChangeType { get; set; }
+        public int UserId { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public int Version { get; set; }
+    }
+}

+ 28 - 0
MpMainModels2/LeaderReserveRecord.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class LeaderReserveRecord
+    {
+        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 ChangeType { get; set; }
+        public int OrderId { get; set; }
+        public int SourceUserId { get; set; }
+        public string Remark { get; set; }
+        public decimal AfterAmt { get; set; }
+        public decimal BeforeAmt { get; set; }
+        public decimal ChangeAmt { get; set; }
+        public string TradeDate { get; set; }
+        public string TradeMonth { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 20 - 0
MpMainModels2/Leaders.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class Leaders
+    {
+        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 LeaderLevel { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 60 - 0
MpMainModels2/MachineApply.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MachineApply
+    {
+        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 SendSn { get; set; }
+        public int TopUserId { get; set; }
+        public DateTime? SendDate { get; set; }
+        public int StoreType { get; set; }
+        public int StoreUserId { get; set; }
+        public string Remark { get; set; }
+        public string StoreManagerMobile { get; set; }
+        public string StoreManager { get; set; }
+        public string StoreAddress { get; set; }
+        public string StoreAreas { get; set; }
+        public string StoreName { get; set; }
+        public int StoreId { get; set; }
+        public string SwapSnExpand { get; set; }
+        public string OrderExpand { get; set; }
+        public string SwapActProName { get; set; }
+        public int SwapActProType { get; set; }
+        public int DeliveryType { get; set; }
+        public string ExpressName { get; set; }
+        public string ExpressNo { get; set; }
+        public int ReturnStatus { get; set; }
+        public string ReturnOrderNo { get; set; }
+        public int SendStatus { get; set; }
+        public DateTime? CompleteTime { get; set; }
+        public string AuditRemark { get; set; }
+        public int AuditResult { get; set; }
+        public DateTime? AuditTime { get; set; }
+        public string AuditBy { get; set; }
+        public DateTime? ApplyTime { get; set; }
+        public int ApplyDeviceNum { get; set; }
+        public string ApplyDeviceName { get; set; }
+        public string Mobile { get; set; }
+        public string RealName { get; set; }
+        public string Address { get; set; }
+        public string Areas { get; set; }
+        public string ProductName { get; set; }
+        public int BrandId { get; set; }
+        public int UserId { get; set; }
+        public string ApplyNo { get; set; }
+        public int OperateId { get; set; }
+    }
+}

+ 36 - 0
MpMainModels2/MachineApplyDetail.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MachineApplyDetail
+    {
+        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 SourceSnType { get; set; }
+        public string SourceSnNo { get; set; }
+        public string UpSrcProName { get; set; }
+        public int UpSrcProType { get; set; }
+        public string DeviceDesc { get; set; }
+        public string DeviceModel { get; set; }
+        public string DeviceVendor { get; set; }
+        public int DeviceStatus { get; set; }
+        public string DeviceSnNo { get; set; }
+        public int UserId { get; set; }
+        public string ProductName { get; set; }
+        public int ProductType { get; set; }
+        public int ApplyId { get; set; }
+        public string ApplyNo { get; set; }
+    }
+}

+ 47 - 0
MpMainModels2/MachineChange.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MachineChange
+    {
+        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 OutStoreManagerMobile { get; set; }
+        public string OutStoreManager { get; set; }
+        public string OutStoreAddress { get; set; }
+        public string OutStoreAreas { get; set; }
+        public string OutStoreName { get; set; }
+        public int OutStoreId { get; set; }
+        public string OutProductName { get; set; }
+        public int OutProductType { get; set; }
+        public int BackStoreUserId { get; set; }
+        public string Remark { get; set; }
+        public string BackStoreName { get; set; }
+        public int BackStoreId { get; set; }
+        public string ChangeSnExpand { get; set; }
+        public string OrderExpand { get; set; }
+        public DateTime? CompleteTime { get; set; }
+        public string AuditRemark { get; set; }
+        public int AuditResult { get; set; }
+        public DateTime? AuditTime { get; set; }
+        public string AuditBy { get; set; }
+        public DateTime? ChangeTime { get; set; }
+        public int ChangeDeviceNum { get; set; }
+        public string ChangeDeviceName { get; set; }
+        public string BackProductName { get; set; }
+        public int BackProductType { get; set; }
+        public int UserId { get; set; }
+        public string ChangeNo { get; set; }
+    }
+}

+ 34 - 0
MpMainModels2/MachineChangeDetail.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MachineChangeDetail
+    {
+        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 BackSnType { get; set; }
+        public string Remark { get; set; }
+        public int OutSnType { get; set; }
+        public string OutSnNo { get; set; }
+        public string OutProductName { get; set; }
+        public int OutProductType { get; set; }
+        public int BackDeviceStatus { get; set; }
+        public string BackSnNo { get; set; }
+        public int UserId { get; set; }
+        public string BackProductName { get; set; }
+        public int BackProductType { get; set; }
+        public int ChangeId { get; set; }
+        public string ChangeNo { get; set; }
+    }
+}

+ 11 - 0
MpMainModels2/MachineForMerNo.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MachineForMerNo
+    {
+        public string MerNo { get; set; }
+        public int SnId { get; set; }
+    }
+}

+ 14 - 0
MpMainModels2/MachineForQrCode.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MachineForQrCode
+    {
+        public string DataId { get; set; }
+        public int MerchantId { get; set; }
+        public string MachineSnNo { get; set; }
+        public string SnNo { get; set; }
+        public DateTime? BindDate { get; set; }
+    }
+}

+ 11 - 0
MpMainModels2/MachineForSnNo.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MachineForSnNo
+    {
+        public string SnNo { get; set; }
+        public int SnId { get; set; }
+    }
+}

+ 36 - 0
MpMainModels2/MachineRenew.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MachineRenew
+    {
+        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 DateTime? AuditDate { get; set; }
+        public string AuditDesc { get; set; }
+        public int AuditStatus { get; set; }
+        public string DemandDesc { get; set; }
+        public string DeliverSnNo { get; set; }
+        public int DeliverBrandId { get; set; }
+        public int ReplaceSnType { get; set; }
+        public string ReplaceSnNo { get; set; }
+        public int ReplaceBrandId { get; set; }
+        public int DamagedSnType { get; set; }
+        public string DamagedSnNo { get; set; }
+        public int DamagedBrandId { get; set; }
+        public int UserId { get; set; }
+        public string ApplyDate { get; set; }
+        public string ApplyNo { get; set; }
+    }
+}

+ 31 - 0
MpMainModels2/MachineReturn.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MachineReturn
+    {
+        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 string Operator { get; set; }
+        public int AuditStatus { get; set; }
+        public string DeviceDesc { get; set; }
+        public int ToStoreId { get; set; }
+        public string DeviceSnNos { get; set; }
+        public int DeviceNum { get; set; }
+        public int BrandId { get; set; }
+        public int UserId { get; set; }
+        public string ApplyNo { get; set; }
+    }
+}

+ 26 - 0
MpMainModels2/MachineUnBind.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MachineUnBind
+    {
+        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 MerchantId { get; set; }
+        public DateTime? AuditDate { get; set; }
+        public string AuditDesc { get; set; }
+        public int AuditStatus { get; set; }
+        public string SnNo { get; set; }
+        public int BrandId { get; set; }
+        public int UserId { get; set; }
+        public string ApplyNo { get; set; }
+    }
+}

+ 11 - 0
MpMainModels2/MenuRight.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MenuRight
+    {
+        public string MenuId { get; set; }
+        public string Name { get; set; }
+    }
+}

+ 24 - 0
MpMainModels2/MerchantAccountLinkInfo.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    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; }
+    }
+}

+ 152 - 0
MpMainModels2/MerchantAddInfo.cs

@@ -0,0 +1,152 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MerchantAddInfo
+    {
+        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 DateTime? CardPeriodEnd { get; set; }
+        public DateTime? CardPeriodBegin { get; set; }
+        public string IdCardNumber { get; set; }
+        public string IdCardName { get; set; }
+        public string IdCardNational { get; set; }
+        public string IdCardCopy { get; set; }
+        public string AuditDetail { get; set; }
+        public string ApplymentState { get; set; }
+        public string SignUrl { get; set; }
+        public string SubMchid { get; set; }
+        public string ApplymentId { get; set; }
+        public string AccountNumber { get; set; }
+        public string BankName { get; set; }
+        public string BankBranchId { get; set; }
+        public string BankAddressCode { get; set; }
+        public string AccountBank { get; set; }
+        public string AccountName { get; set; }
+        public string BankAccountType { get; set; }
+        public string ActivitiesRate { get; set; }
+        public string ActivitiesId { get; set; }
+        public string Qualifications { get; set; }
+        public string QualificationType { get; set; }
+        public string SettlementId { get; set; }
+        public string WeworkPics { get; set; }
+        public string SubCorpId { get; set; }
+        public string WebAppId { get; set; }
+        public string WebAuthorisation { get; set; }
+        public string WebDomain { get; set; }
+        public string AppPics { get; set; }
+        public string AppSubAppid { get; set; }
+        public string AppAppid { get; set; }
+        public string MiniProgramPics { get; set; }
+        public string MiniProgramSubAppid { get; set; }
+        public string MiniProgramAppid { get; set; }
+        public string MpPics { get; set; }
+        public string MpSubAppid { get; set; }
+        public string MpAppid { get; set; }
+        public string BizSubAppid { get; set; }
+        public string IndoorPic { get; set; }
+        public string StoreEntrancePic { get; set; }
+        public string BizStoreAddress { get; set; }
+        public string BizAddressCode { get; set; }
+        public string BizStoreName { get; set; }
+        public string SalesScenesType { get; set; }
+        public string ServicePhone { get; set; }
+        public string MerchantShortname { get; set; }
+        public DateTime? UboInfoIdPeriodEnd { get; set; }
+        public DateTime? UboInfoIdPeriodBegin { get; set; }
+        public string UboInfoIdNumber { get; set; }
+        public string UboInfoName { get; set; }
+        public string UboInfoIdDocCopy { get; set; }
+        public string UboInfoIdCardNational { get; set; }
+        public string UboInfoIdCardCopy { get; set; }
+        public string UboInfoIdType { get; set; }
+        public ulong Owner { get; set; }
+        public string IdDocType { get; set; }
+        public string CertificateLetterCopy { get; set; }
+        public DateTime? OrgPeriodEnd { get; set; }
+        public DateTime? OrgPeriodBegin { get; set; }
+        public string OrganizationCode { get; set; }
+        public string OrganizationCopy { get; set; }
+        public DateTime? PeriodEnd { get; set; }
+        public DateTime? PeriodBegin { get; set; }
+        public string CertLegalPerson { get; set; }
+        public string CompanyAddress { get; set; }
+        public string CertMerchantName { get; set; }
+        public string CertNumber { get; set; }
+        public string CertType { get; set; }
+        public string CertCopy { get; set; }
+        public string LegalPerson { get; set; }
+        public string LicenseNumber { get; set; }
+        public string LicenseCopy { get; set; }
+        public string SubjectType { get; set; }
+        public string ContactEmail { get; set; }
+        public string MobilePhone { get; set; }
+        public string OpenId { get; set; }
+        public string ContactIdNumber { get; set; }
+        public string ContactName { get; set; }
+        public string BusinessCode { get; set; }
+        public string IdCardAddress { get; set; }
+        public string WeChatRemark { get; set; }
+        public string AlipayRemark { get; set; }
+        public string WeChatSignUrl { get; set; }
+        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 int HdStatus { get; set; }
+        public DateTime? HdPassDate { get; set; }
+        public ulong HdBindWeChat { get; set; }
+        public string MerchantType { get; set; }
+    }
+}

+ 31 - 0
MpMainModels2/MerchantAdmin.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MerchantAdmin
+    {
+        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 string Note { get; set; }
+        public string Qq { get; set; }
+        public string Email { get; set; }
+        public string Mobile { get; set; }
+        public DateTime? LastLoginDate { get; set; }
+        public string RightInfo { get; set; }
+        public string RealName { get; set; }
+        public string Password { get; set; }
+        public string AdminName { get; set; }
+    }
+}

+ 26 - 0
MpMainModels2/MerchantAmountSummay.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    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; }
+        public int TradeCount { get; set; }
+        public int IsAct { get; set; }
+    }
+}

+ 35 - 0
MpMainModels2/MerchantAuth.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MerchantAuth
+    {
+        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 AuthType { get; set; }
+        public string ReturnMsg { get; set; }
+        public string ReturnCode { get; set; }
+        public string RespData { get; set; }
+        public string ReqData { get; set; }
+        public string BankMobile { get; set; }
+        public string BankName { get; set; }
+        public string BankCardAccount { get; set; }
+        public string IdCardNo { get; set; }
+        public string RealName { get; set; }
+        public string MerNo { get; set; }
+        public string ChannelName { get; set; }
+        public string ChannelCode { get; set; }
+    }
+}

+ 24 - 0
MpMainModels2/MerchantClass.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MerchantClass
+    {
+        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 ParentId { get; set; }
+        public string ColName { get; set; }
+    }
+}

+ 29 - 0
MpMainModels2/MerchantCol.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MerchantCol
+    {
+        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 ParentId { get; set; }
+        public string ColEnName { get; set; }
+        public ulong Recommend { get; set; }
+        public string ColDetail { get; set; }
+        public string ColPicPath { get; set; }
+        public string ColName { get; set; }
+        public string ColId { get; set; }
+    }
+}

+ 27 - 0
MpMainModels2/MerchantComment.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MerchantComment
+    {
+        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 StarNum3 { get; set; }
+        public int StarNum2 { get; set; }
+        public int StarNum1 { get; set; }
+        public int OrderId { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 29 - 0
MpMainModels2/MerchantDepositBack.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    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; }
+    }
+}

+ 25 - 0
MpMainModels2/MerchantDepositOrder.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    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; }
+    }
+}

+ 23 - 0
MpMainModels2/MerchantDepositReturns.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MerchantDepositReturns
+    {
+        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 UserId { get; set; }
+        public string OperateMan { get; set; }
+        public decimal ReturnAmount { get; set; }
+        public string AlipayAccountNo { get; set; }
+        public int MerchantId { get; set; }
+    }
+}

+ 23 - 0
MpMainModels2/MerchantDepositSet.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MerchantDepositSet
+    {
+        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 ReturnNote { get; set; }
+        public decimal DepositAmount { get; set; }
+        public string SnNo { get; set; }
+        public string MerNo { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 26 - 0
MpMainModels2/MerchantDiviSummay.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    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; }
+    }
+}

+ 11 - 0
MpMainModels2/MerchantForCode.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MerchantForCode
+    {
+        public string Code { get; set; }
+        public int MerchantId { get; set; }
+    }
+}

+ 11 - 0
MpMainModels2/MerchantForMobile.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MerchantForMobile
+    {
+        public string Mobile { get; set; }
+        public int MerchantId { get; set; }
+    }
+}

+ 11 - 0
MpMainModels2/MerchantForName.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MerchantForName
+    {
+        public string Name { get; set; }
+        public int MerchantId { get; set; }
+    }
+}

+ 52 - 0
MpMainModels2/MerchantInfo.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MerchantInfo
+    {
+        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 ParentUserNav { get; set; }
+        public int UserId { get; set; }
+        public DateTime? LastConsumeDate { get; set; }
+        public int TotalConsumeCount { get; set; }
+        public DateTime? LastAddConsumerDate { get; set; }
+        public decimal TotalActual { get; set; }
+        public string Logo { get; set; }
+        public string LoginPwd { get; set; }
+        public int TotalUser { get; set; }
+        public int TotalCustomer { get; set; }
+        public int TotalOrder { get; set; }
+        public decimal TotalAmount { get; set; }
+        public ulong IsAuth { get; set; }
+        public string Address { get; set; }
+        public string Areas { get; set; }
+        public string Mobile { get; set; }
+        public string Name { get; set; }
+        public DateTime? BindDate { get; set; }
+        public int BindStatus { get; set; }
+        public DateTime? ActivationDate { get; set; }
+        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 ExamineStatus { get; set; }
+        public int Months { get; set; }
+        public int IsAct { get; set; }
+    }
+}

+ 23 - 0
MpMainModels2/MerchantLoginInfo.cs

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

+ 27 - 0
MpMainModels2/MerchantParamSet.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MerchantParamSet
+    {
+        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 DiviPersons { get; set; }
+        public decimal DiviPercent { get; set; }
+        public int ProfitDays { get; set; }
+        public decimal GetPercent { get; set; }
+        public decimal MinPayMoney { get; set; }
+        public int IsAll { get; set; }
+    }
+}

+ 34 - 0
MpMainModels2/MerchantParamSetRecord.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    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; }
+    }
+}

+ 25 - 0
MpMainModels2/MerchantQrCode.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MerchantQrCode
+    {
+        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 SnNo { get; set; }
+        public int MachineId { get; set; }
+        public string QrCodeContent { get; set; }
+        public int MerchantId { get; set; }
+    }
+}

+ 39 - 0
MpMainModels2/MerchantRebateDetail.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MerchantRebateDetail
+    {
+        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 string RewardDesc { get; set; }
+        public int SyncStatus { get; set; }
+        public decimal DebitRewardAmount { get; set; }
+        public decimal CreditRewardAmount { get; set; }
+        public decimal DebitTradeAmt { get; set; }
+        public decimal CreditTradeAmt { get; set; }
+        public string MmpUserName { get; set; }
+        public string MmpUserNo { get; set; }
+        public int MerchantId { get; set; }
+        public DateTime? MerStandardDate { get; set; }
+        public DateTime? MerRegTime { get; set; }
+        public string SnNo { get; set; }
+        public string MerNo { get; set; }
+        public string TradeDate { get; set; }
+        public string TradeMonth { get; set; }
+        public string ProductName { get; set; }
+        public int BrandId { get; set; }
+    }
+}

+ 31 - 0
MpMainModels2/MerchantTradeSummary.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    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; }
+    }
+}

+ 41 - 0
MpMainModels2/Merchants.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class Merchants
+    {
+        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 Province { get; set; }
+        public string Title2 { get; set; }
+        public string Title { get; set; }
+        public ulong IsRecommend { get; set; }
+        public string PayPwd { get; set; }
+        public string LoginPwd { get; set; }
+        public string UserName { get; set; }
+        public decimal StarNum3 { get; set; }
+        public decimal StarNum2 { get; set; }
+        public string Address { get; set; }
+        public int CommentCount { get; set; }
+        public ulong IsAuth { get; set; }
+        public int FollowCount { get; set; }
+        public decimal StarNum1 { get; set; }
+        public string BusinessLicense { get; set; }
+        public string Phone { get; set; }
+        public string Principal { get; set; }
+        public string Areas { get; set; }
+        public string Logo { get; set; }
+        public string Name { get; set; }
+    }
+}

+ 13 - 0
MpMainModels2/MobileCodeCheck.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MobileCodeCheck
+    {
+        public string Mobile { get; set; }
+        public DateTime? CheckCodeTime { get; set; }
+        public string CheckNo { get; set; }
+        public string CheckCode { get; set; }
+    }
+}

+ 40 - 0
MpMainModels2/MsgAlert.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.MpMainModels2
+{
+    public partial class MsgAlert
+    {
+        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 ulong IsWeekend { get; set; }
+        public ulong AlertFlag { get; set; }
+        public int TimeByDay { get; set; }
+        public string BtnText { get; set; }
+        public string Url { get; set; }
+        public string UrlParam { get; set; }
+        public string ExtendColumn { get; set; }
+        public DateTime? PushTime { get; set; }
+        public string PushParam { get; set; }
+        public int PushFlag { get; set; }
+        public int PushType { get; set; }
+        public string BgPic { get; set; }
+        public DateTime? EffectEndDate { get; set; }
+        public DateTime? EffectStartDate { get; set; }
+        public ulong IsTop { get; set; }
+        public string Content { get; set; }
+        public string Summary { get; set; }
+        public string Title { get; set; }
+        public int MsgType { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public int Version { get; set; }
+    }
+}

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff