فهرست منبع

添加CardType字段,判断广电卡类型,是否发奖励和循环资格

lichunlei 1 سال پیش
والد
کامیت
6e196d99c3

+ 5 - 5
AppStart/Helper/SycnSpServer/SycnSpBindService.cs

@@ -234,6 +234,10 @@ namespace MySystem
                                 pos.BindMerchantId = add.Id;
                                 pos.LastMerchantId = add.Id;
                                 pos.IsFirst = 1;
+                                if(pos.CardType == 0)
+                                {
+                                    pos.IsPurchase = 1;
+                                }
                                 db.SaveChanges();
 
                                 BindRecord edit = spdb.BindRecord.FirstOrDefault(m => m.Id == Bind.Id);
@@ -258,11 +262,7 @@ namespace MySystem
 
                                 if(Bind.Field5 == "已激活")
                                 {
-                                    bool PrizeFlag = pos.Detail != "1";
-                                    if(pos.IsPurchase == 1)
-                                    {
-                                        PrizeFlag = false;
-                                    }
+                                    bool PrizeFlag = pos.CardType > 1;
                                     SycnSpTradeService.Instance.ActPos(db, pos, 0, 30, PrizeFlag, Bind.SeoKeyword);
                                 }
                                 db.SaveChanges();

+ 26 - 0
PxcModels/HelpProfitUserTradeSummay.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class HelpProfitUserTradeSummay
+    {
+        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 UserId { get; set; }
+    }
+}

+ 3 - 0
PxcModels/PosMachinesTwo.cs

@@ -62,5 +62,8 @@ namespace MySystem.PxcModels
         public string OutBatchNo { get; set; }
         public int WithholdFlag { get; set; }
         public int LastMerchantId { get; set; }
+        public int IsSupplement { get; set; }
+        public int IsOpAct { get; set; }
+        public int CardType { get; set; }
     }
 }

+ 2 - 0
PxcModels/PosMerchantInfoBak.cs

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

+ 27 - 0
PxcModels/SimCardDaySummary.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class SimCardDaySummary
+    {
+        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 NotHelpTradeAmount { get; set; }
+        public decimal HelpTradeAmount { get; set; }
+        public decimal TradeAmount { get; set; }
+        public string TradeMonth { get; set; }
+        public string TradeDay { get; set; }
+        public int UserId { get; set; }
+    }
+}

+ 45 - 0
PxcModels/TradeRecordTmp.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class TradeRecordTmp
+    {
+        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 MerUserId { get; set; }
+        public int TopUserId { get; set; }
+        public string Remark { get; set; }
+        public int BrandId { get; set; }
+        public ulong DirectFlag { get; set; }
+        public int CapFlag { get; set; }
+        public int QrPayFlag { get; set; }
+        public int BankCardType { get; set; }
+        public decimal TradeAmount { get; set; }
+        public string TradeSerialNo { get; set; }
+        public DateTime? ClearDate { get; set; }
+        public DateTime? TradeDate { get; set; }
+        public string SnNo { get; set; }
+        public int MerBuddyType { get; set; }
+        public int HelpMonthCount { get; set; }
+        public ulong MerHelpFlag { get; set; }
+        public string MerNo { get; set; }
+        public int MerchantId { get; set; }
+        public int UserId { get; set; }
+        public string RecordNo { get; set; }
+        public string ParentNav { get; set; }
+        public int PayType { get; set; }
+        public int VipFlag { get; set; }
+        public int ActStatus { get; set; }
+    }
+}

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 115 - 181
PxcModels/WebCMSEntities.cs


برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است