Merge branch 'feat-广电卡交易' of http://47.109.31.237:13000/kxs-end/admin-server into feature-dgy-后台测试

暂存

AppStart/Helper/SycnProfitServiceV3.cs

@@ -108,7 +108,7 @@ namespace MySystem
             WebCMSEntities db = new WebCMSEntities();
             string conn = Library.ConfigurationManager.AppSettings["SqlConnStr"].ToString();
 
-            CustomerSqlConn.op("insert into UserAccountRecord (CreateDate,UpdateDate,UserId,ProductType,ChangeType,ChangeAmount,BeforeTotalAmount,AfterTotalAmount,BeforeFreezeAmount,AfterFreezeAmount,BeforeBalanceAmount,AfterBalanceAmount,Remark) select tb.CreateDate,tb.UpdateDate,tb.UserId,ProductType,ChangeType,ProfitAmount,a.TotalAmount BeforeTotalAmount,a.TotalAmount+ProfitAmount AfterTotalAmount,a.FreezeAmount BeforeFreezeAmount,a.FreezeAmount AfterFreezeAmount,a.BalanceAmount BeforeBalanceAmount,a.BalanceAmount+ProfitAmount AfterBalanceAmount,Remark from (select now() CreateDate,now() UpdateDate,UserId," + BrandId + " ProductType,1 ChangeType,ProfitAmount,(case when DirectFlag=1 then '直拓商户分润' else '品牌推广服务费' end) Remark from ProfitRecord where BrandId=" + BrandId + " and SeoTitle='" + date + "' and Version=0 and UserId>0 order by Id) tb left join UserAccount a on tb.UserId=a.Id", conn);
+            CustomerSqlConn.op("insert into UserAccountRecord (CreateDate,UpdateDate,UserId,ProductType,ChangeType,ChangeAmount,BeforeTotalAmount,AfterTotalAmount,BeforeFreezeAmount,AfterFreezeAmount,BeforeBalanceAmount,AfterBalanceAmount,Remark) select tb.CreateDate,tb.UpdateDate,tb.UserId,ProductType,ChangeType,ProfitAmount,a.TotalAmount BeforeTotalAmount,a.TotalAmount+ProfitAmount AfterTotalAmount,a.FreezeAmount BeforeFreezeAmount,a.FreezeAmount AfterFreezeAmount,a.BalanceAmount BeforeBalanceAmount,a.BalanceAmount+ProfitAmount AfterBalanceAmount,Remark from (select now() CreateDate,now() UpdateDate,UserId," + BrandId + " ProductType,1 ChangeType,ProfitAmount,CONCAT((case when DirectFlag=1 then '直拓商户分润' else '品牌推广服务费' end),'-',SeoDescription) Remark from ProfitRecord where BrandId=" + BrandId + " and SeoTitle='" + date + "' and Version=0 and UserId>0 order by Id) tb left join UserAccount a on tb.UserId=a.Id", conn);
 
             CustomerSqlConn.op("update ProfitRecord set Version=1 where BrandId=" + BrandId + " and SeoTitle='" + date + "' and Version=0 and UserId>0", conn);
             db.Dispose();

Areas/Admin/Controllers/MainServer/TradeRecordController.cs

@@ -423,61 +423,61 @@ namespace MySystem.Areas.Admin.Controllers
                 // PosMerchantInfo checkMer = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == PhoneNumber && m.Field5 == ActStatus);
                 // if (checkMer == null)
                 // {
-                    string json = "{";
-                    json += "\"OrderNo\":\"" + OrderNo + "\",";
-                    json += "\"CreateDate\":\"" + CreateDate + "\",";
-                    json += "\"PhoneNumber\":\"" + PhoneNumber + "\",";
-                    json += "\"HasFirstCharge\":\"" + HasFirstCharge + "\",";
-                    json += "\"FirstChargeAmount\":\"" + FirstChargeAmount + "\",";
-                    json += "\"Province\":\"" + Province + "\",";
-                    json += "\"City\":\"" + City + "\",";
-                    json += "\"ProductName\":\"" + ProductName + "\",";
-                    json += "\"ActiveName\":\"" + ActiveName + "\",";
-                    json += "\"ProductType\":\"" + ProductType + "\",";
-                    json += "\"ActualAmount\":\"" + ActualAmount + "\",";
-                    json += "\"OrderStatus\":\"" + OrderStatus + "\",";
-                    json += "\"ActStatus\":\"" + ActStatus + "\",";
-                    json += "\"ActDate\":\"" + ActDate + "\",";
-                    json += "\"WorkNo\":\"" + WorkNo + "\",";
-                    json += "\"AccountName\":\"" + AccountName + "\",";
-                    json += "\"SimNo\":\"" + SimNo + "\"";
-                    json += "}";
-
-                    spdb.BindRecord.Add(new SpModels.BindRecord()
-                    {
-                        CreateDate = DateTime.Parse(CreateDate),
-                        UpdateTime = DateTime.Parse(CreateDate), //机具绑定、解绑时间
-                        CreateTime = DateTime.Parse(CreateDate), //商户操作时间
-                        MerNewSnNo = PhoneNumber, //商户手机号
-                        MerSnNo = SimNo, //序列号
-                        MerName = AccountName, //商户名称
-                        MerNo = PhoneNumber, //商户编号
-                        Remark = ProductType,
-                        Field1 = Province,
-                        Field2 = ActiveName,
-                        Field3 = ProductName,
-                        Field4 = WorkNo,
-                        Field5 = ActStatus,
-                        SeoTitle = ActualAmount,
-                        SeoKeyword = ActDate,
-                        SeoDescription = json,
-                        ProductType = "14",
-                        Status = 1,
-                    });
+                string json = "{";
+                json += "\"OrderNo\":\"" + OrderNo + "\",";
+                json += "\"CreateDate\":\"" + CreateDate + "\",";
+                json += "\"PhoneNumber\":\"" + PhoneNumber + "\",";
+                json += "\"HasFirstCharge\":\"" + HasFirstCharge + "\",";
+                json += "\"FirstChargeAmount\":\"" + FirstChargeAmount + "\",";
+                json += "\"Province\":\"" + Province + "\",";
+                json += "\"City\":\"" + City + "\",";
+                json += "\"ProductName\":\"" + ProductName + "\",";
+                json += "\"ActiveName\":\"" + ActiveName + "\",";
+                json += "\"ProductType\":\"" + ProductType + "\",";
+                json += "\"ActualAmount\":\"" + ActualAmount + "\",";
+                json += "\"OrderStatus\":\"" + OrderStatus + "\",";
+                json += "\"ActStatus\":\"" + ActStatus + "\",";
+                json += "\"ActDate\":\"" + ActDate + "\",";
+                json += "\"WorkNo\":\"" + WorkNo + "\",";
+                json += "\"AccountName\":\"" + AccountName + "\",";
+                json += "\"SimNo\":\"" + SimNo + "\"";
+                json += "}";
 
-                    spdb.Merchants.Add(new SpModels.Merchants()
-                    {
-                        SnNo = SimNo,
-                        CreateTime = DateTime.Parse(CreateDate),
-                        UpdateTime = DateTime.Parse(CreateDate),
-                        AgentName = AccountName,
-                        MerRealName = AccountName,
-                        MerMobile = PhoneNumber,
-                        MerNo = PhoneNumber,
-                        MerName = AccountName,
-                        ProductType = "14",
-                        Status = 1,
-                    });
+                spdb.BindRecord.Add(new SpModels.BindRecord()
+                {
+                    CreateDate = DateTime.Parse(CreateDate),
+                    UpdateTime = DateTime.Parse(CreateDate), //机具绑定、解绑时间
+                    CreateTime = DateTime.Parse(CreateDate), //商户操作时间
+                    MerNewSnNo = PhoneNumber, //商户手机号
+                    MerSnNo = SimNo, //序列号
+                    MerName = AccountName, //商户名称
+                    MerNo = PhoneNumber, //商户编号
+                    Remark = ProductType,
+                    Field1 = Province,
+                    Field2 = ActiveName,
+                    Field3 = ProductName,
+                    Field4 = WorkNo,
+                    Field5 = ActStatus,
+                    SeoTitle = ActualAmount,
+                    SeoKeyword = ActDate,
+                    SeoDescription = json,
+                    ProductType = "14",
+                    Status = 1,
+                });
+
+                spdb.Merchants.Add(new SpModels.Merchants()
+                {
+                    SnNo = SimNo,
+                    CreateTime = DateTime.Parse(CreateDate),
+                    UpdateTime = DateTime.Parse(CreateDate),
+                    AgentName = AccountName,
+                    MerRealName = AccountName,
+                    MerMobile = PhoneNumber,
+                    MerNo = PhoneNumber,
+                    MerName = AccountName,
+                    ProductType = "14",
+                    Status = 1,
+                });
                 // }
 
                 // spdb.TradeRecord.Add(new SpModels.TradeRecord()
@@ -586,64 +586,74 @@ namespace MySystem.Areas.Admin.Controllers
                 json += "\"OrgDivi\":\"" + OrgDivi + "\"";
                 json += "}";
 
-                bool op = true;                
+                bool op = true;
                 string OrderNo = DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
                 decimal TotalAmountNum = decimal.Parse(function.CheckNum(numberString: TotalAmount));
                 DateTime CreateDate = DateTime.Parse(OrderCreateTime);
                 string CheckDate = DateTime.Now.AddMonths(-3).ToString("yyyyMM");
-                if(int.Parse(CreateMonth) >= int.Parse(CheckDate)) op = false;
-                if(OrderStatus == "待激活") op = false;
-                if(UserStatus == "已注销" || UserStatus.Contains("欠费"))
+                if (int.Parse(CreateMonth) >= int.Parse(CheckDate)) op = false;
+                if (OrderStatus == "待激活") op = false;
+                if (UserStatus.Contains("注销") || UserStatus.Contains("欠费"))
                 {
                     op = false;
                     SimposMerchantInfo checkSimMer = db.SimposMerchantInfo.FirstOrDefault(m => m.KqMerNo == Mobile && m.KqSnNo == SimNo);
-                    if(checkSimMer != null)
+                    if (checkSimMer != null)
                     {
                         checkSimMer.Status = -1;
-                        if(UserStatus.Contains("欠费"))
+                        if (UserStatus.Contains("欠费") && checkSimMer.Status != -1)
                         {
                             checkSimMer.Status = -2;
                         }
                         db.SaveChanges();
                     }
                     PosMerchantInfo checkMer = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == Mobile && m.KqSnNo == SimNo);
-                    if(checkMer != null)
+                    if (checkMer != null)
                     {
                         checkMer.Status = -1;
-                        if(UserStatus.Contains("欠费"))
+                        if (UserStatus.Contains("欠费") && checkMer.Status != -1)
                         {
                             checkMer.Status = -2;
                         }
                         db.SaveChanges();
                     }
                     PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == SimNo);
-                    if(pos != null)
+                    if (pos != null)
                     {
                         pos.Status = -1;
-                        if(UserStatus.Contains("欠费"))
+                        if (UserStatus.Contains("欠费") && pos.Status != -1)
                         {
                             pos.Status = -2;
                         }
                         db.SaveChanges();
                     }
                 }
-                if(UserStatus == "正常")
+                if (UserStatus.Contains("正常"))
                 {
                     SimposMerchantInfo checkSimMer = db.SimposMerchantInfo.FirstOrDefault(m => m.KqMerNo == Mobile && m.KqSnNo == SimNo);
-                    if(checkSimMer != null)
+                    if (checkSimMer != null)
                     {
-                        checkSimMer.Status = 0;
+                        if (checkSimMer.Status == -2) checkSimMer.Status = 0;
                         db.SaveChanges();
                     }
                     PosMerchantInfo checkMer = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == Mobile && m.KqSnNo == SimNo);
-                    if(checkMer != null)
+                    if (checkMer != null)
                     {
-                        checkMer.Status = 1;
+                        if (checkMer.Status == -2) checkMer.Status = 1;
+                        db.SaveChanges();
+                    }
+
+                    PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == SimNo);
+                    if (pos != null && pos.Status < 0)
+                    {
+                        if (pos.Status == -2)
+                        {
+                            pos.Status = 0;
+                        }
                         db.SaveChanges();
                     }
                 }
-                
-                if(TotalAmountNum > 0 && op)
+
+                if (TotalAmountNum > 0 && op)
                 {
                     spdb.TradeRecord.Add(new SpModels.TradeRecord()
                     {