调整

Areas/Api/Controllers/v1/MainServer/MerchantAddInfoController.cs

@@ -89,6 +89,11 @@ namespace MySystem.Areas.Api.Controllers.v1
             int Finish = int.Parse(function.CheckInt(data["Finish"].ToString()));
             int UserId = int.Parse(function.CheckInt(data["UserId"].ToString()));
             int MerchantAddInfoId = int.Parse(function.CheckInt(data["Id"].ToString()));
+            var check = maindb.UserSwapWhite.FirstOrDefault(m => m.UserId == UserId) ?? new UserSwapWhite();
+            if (check.Id > 0)
+            {
+                return new AppResultJson() { Status = "-1", Info = "参数错误" };
+            }
             string BankBranchId = "";
             if (Finish == 1)
             {
@@ -101,8 +106,8 @@ namespace MySystem.Areas.Api.Controllers.v1
             }
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             MerchantAddInfo query = maindb.MerchantAddInfo.FirstOrDefault(m => m.CertMerchantName == CertMerchantName);
-            if(query == null)
-            {                
+            if (query == null)
+            {
                 query = maindb.MerchantAddInfo.Add(new MerchantAddInfo()
                 {
                     CreateDate = DateTime.Now,
@@ -150,7 +155,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             query.CreateMan = AlipayAccount;
             query.UpdateMan = AlipayMccCode;
             MerchantInfo merchant = maindb.MerchantInfo.FirstOrDefault(m => m.Id == query.Id);
-            if(merchant == null)
+            if (merchant == null)
             {
                 merchant = maindb.MerchantInfo.Add(new MerchantInfo()
                 {
@@ -207,7 +212,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 Obj.Add("SubjectTypeName", Subjects[function.CheckNull(query.SubjectType)]);
             }
             else
-            { 
+            {
                 Obj.Add("SubjectTypeName", "");
             }
             Obj.Add("LicenseCopy", query.LicenseCopy); //营业执照照片
@@ -267,7 +272,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 Obj.Add("QualificationTypeName", item.ptext + "," + item.text);
             }
             else
-            { 
+            {
                 Obj.Add("QualificationTypeName", "");
             }
             Obj.Add("Qualifications", query.Qualifications); //特殊资质图片
@@ -279,7 +284,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 Obj.Add("BankAccountTypeName", AccountTypes[function.CheckNull(query.BankAccountType)]);
             }
             else
-            { 
+            {
                 Obj.Add("BankAccountTypeName", "");
             }
             Obj.Add("AccountName", query.AccountName); //开户名称
@@ -326,12 +331,12 @@ namespace MySystem.Areas.Api.Controllers.v1
             int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
             if (Kind == "2")
-            { 
+            {
                 dataList = GetPersonSettles();
             }
             else if (Kind == "21")
-            { 
-                dataList = GetBusinessSettles();                
+            {
+                dataList = GetBusinessSettles();
             }
             else
             {
@@ -377,7 +382,7 @@ namespace MySystem.Areas.Api.Controllers.v1
         }
 
         public List<SettleData> GetPersonSettleItems()
-        { 
+        {
             List<SettleData> dic = new List<SettleData>();
             dic.Add(new SettleData() { ptext = "食品生鲜", text = "肉、禽、蛋及水产品等", value = "719", code = "A0002_B0202" });
             dic.Add(new SettleData() { ptext = "健身运动服务", text = "健身房", value = "719", code = "A0004_B0064" });
@@ -445,7 +450,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 bigDic.Add("value", i.ToString());
                 bigDic.Add("text", sub);
                 List<Dictionary<string, object>> children = new List<Dictionary<string, object>>();
-                foreach (SettleData ssub in dic.Where(m=>m.ptext == sub).ToList())
+                foreach (SettleData ssub in dic.Where(m => m.ptext == sub).ToList())
                 {
                     Dictionary<string, object> smallDic = new Dictionary<string, object>();
                     smallDic.Add("value", ssub.value + "_" + ssub.code);
@@ -462,25 +467,25 @@ namespace MySystem.Areas.Api.Controllers.v1
         public List<SettleData> GetBusinessSettleItems()
         {
             List<SettleData> dic = new List<SettleData>();
-            dic.Add(new SettleData() { ptext = "餐饮", text = "餐饮", value="716", code="A0001_B0001"});
-            dic.Add(new SettleData() { ptext = "食品生鲜", text = "肉、禽、蛋及水产品等", value="716", code="A0002_B0202"});
-            dic.Add(new SettleData() { ptext = "健身运动服务", text = "健身房", value="716", code="A0004_B0064"});
-            dic.Add(new SettleData() { ptext = "健身运动服务", text = "体育场馆", value="716", code="A0004_B0068"});
-            dic.Add(new SettleData() { ptext = "城市公共交通", text = "公共交通", value="716", code="A0006_B0088"});
-            dic.Add(new SettleData() { ptext = "景区/酒店", text = "旅行住宿", value="716", code="A0010_B0157"});
-            dic.Add(new SettleData() { ptext = "居民生活服务", text = "生活服务", value="716", code="A0003_B0116"});
-            dic.Add(new SettleData() { ptext = "零售", text = "百货商城", value="716", code="A0002_B0017"});
-            dic.Add(new SettleData() { ptext = "服饰鞋包", text = "服饰鞋包", value="716", code="A0002_B0026"});
-            dic.Add(new SettleData() { ptext = "零售", text = "家居家纺建材", value="716", code="A0002_B0216"});
-            dic.Add(new SettleData() { ptext = "零售", text = "母婴玩具", value="716", code="A0002_B0032"});
-            dic.Add(new SettleData() { ptext = "零售", text = "数码家电", value="716", code="A0003_B0051"});
-            dic.Add(new SettleData() { ptext = "零售", text = "图书音像", value="716", code="A0002_B0031"});
-            dic.Add(new SettleData() { ptext = "居民生活服务", text = "文化玩乐宠物", value="716", code="A0004_B0070"});
-            dic.Add(new SettleData() { ptext = "咨询/娱乐票务", text = "娱乐票务", value="716", code="A0004_B0065"});
-            dic.Add(new SettleData() { ptext = "零售", text = "办公用品", value="716", code="A0002_B0203"});
-            dic.Add(new SettleData() { ptext = "零售", text = "工业产品", value="716", code="A0002_B0042"});
-            dic.Add(new SettleData() { ptext = "婚介平台/就业信息平台/其他信息服务平台", text = "婚介服务", value="720", code="A0003_B0053"});
-            dic.Add(new SettleData() { ptext = "零售", text = "其它类别", value="716", code="A0002_B0043"});
+            dic.Add(new SettleData() { ptext = "餐饮", text = "餐饮", value = "716", code = "A0001_B0001" });
+            dic.Add(new SettleData() { ptext = "食品生鲜", text = "肉、禽、蛋及水产品等", value = "716", code = "A0002_B0202" });
+            dic.Add(new SettleData() { ptext = "健身运动服务", text = "健身房", value = "716", code = "A0004_B0064" });
+            dic.Add(new SettleData() { ptext = "健身运动服务", text = "体育场馆", value = "716", code = "A0004_B0068" });
+            dic.Add(new SettleData() { ptext = "城市公共交通", text = "公共交通", value = "716", code = "A0006_B0088" });
+            dic.Add(new SettleData() { ptext = "景区/酒店", text = "旅行住宿", value = "716", code = "A0010_B0157" });
+            dic.Add(new SettleData() { ptext = "居民生活服务", text = "生活服务", value = "716", code = "A0003_B0116" });
+            dic.Add(new SettleData() { ptext = "零售", text = "百货商城", value = "716", code = "A0002_B0017" });
+            dic.Add(new SettleData() { ptext = "服饰鞋包", text = "服饰鞋包", value = "716", code = "A0002_B0026" });
+            dic.Add(new SettleData() { ptext = "零售", text = "家居家纺建材", value = "716", code = "A0002_B0216" });
+            dic.Add(new SettleData() { ptext = "零售", text = "母婴玩具", value = "716", code = "A0002_B0032" });
+            dic.Add(new SettleData() { ptext = "零售", text = "数码家电", value = "716", code = "A0003_B0051" });
+            dic.Add(new SettleData() { ptext = "零售", text = "图书音像", value = "716", code = "A0002_B0031" });
+            dic.Add(new SettleData() { ptext = "居民生活服务", text = "文化玩乐宠物", value = "716", code = "A0004_B0070" });
+            dic.Add(new SettleData() { ptext = "咨询/娱乐票务", text = "娱乐票务", value = "716", code = "A0004_B0065" });
+            dic.Add(new SettleData() { ptext = "零售", text = "办公用品", value = "716", code = "A0002_B0203" });
+            dic.Add(new SettleData() { ptext = "零售", text = "工业产品", value = "716", code = "A0002_B0042" });
+            dic.Add(new SettleData() { ptext = "婚介平台/就业信息平台/其他信息服务平台", text = "婚介服务", value = "720", code = "A0003_B0053" });
+            dic.Add(new SettleData() { ptext = "零售", text = "其它类别", value = "716", code = "A0002_B0043" });
 
 
             // dic.Add(new SettleData() { ptext = "餐饮", text = "餐饮", code = "C_C05_5814", value = "716", special = 0});
@@ -532,7 +537,7 @@ namespace MySystem.Areas.Api.Controllers.v1
         }
         public List<Dictionary<string, object>> GetBusinessSettles()
         {
-            List<SettleData> dic = GetBusinessSettleItems();            
+            List<SettleData> dic = GetBusinessSettleItems();
 
             int i = 0;
             List<Dictionary<string, object>> list = new List<Dictionary<string, object>>();
@@ -543,7 +548,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 bigDic.Add("value", i.ToString());
                 bigDic.Add("text", sub);
                 List<Dictionary<string, object>> children = new List<Dictionary<string, object>>();
-                foreach (SettleData ssub in dic.Where(m=>m.ptext == sub).ToList())
+                foreach (SettleData ssub in dic.Where(m => m.ptext == sub).ToList())
                 {
                     Dictionary<string, object> smallDic = new Dictionary<string, object>();
                     smallDic.Add("value", ssub.value + "_" + ssub.code);

Areas/Api/Controllers/v1/MainServer/MerchantParamSetController.cs

@@ -131,26 +131,6 @@ namespace MySystem.Areas.Api.Controllers.v1
                 }).Entity;
                 maindb.SaveChanges();
             }
-            query.UpdateDate = DateTime.Now; //修改时间
-            query.IsAll = IsAll; //是否收全额
-            query.MinPayMoney = MinPayMoney; //订单参与门槛
-            query.GetPercent = GetPercent; //商家实收比例
-            query.ProfitDays = ProfitDays; //分红期限（天）
-            query.DiviPercent = DiviPercent; //最大分红比例
-            query.DiviPersons = DiviPersons; //单笔订单分红人数
-            // var status = 0;
-            // if (query.IsAll == IsAll && IsAll == 0 && (query.MinPayMoney != MinPayMoney || query.GetPercent != GetPercent || query.ProfitDays != ProfitDays || query.DiviPersons != DiviPersons || query.DiviPercent != DiviPercent))
-            // {
-            //     status = 1;
-            // }
-            // if (query.IsAll != IsAll && IsAll == 1 && query.MinPayMoney == MinPayMoney && query.GetPercent == GetPercent && query.ProfitDays == ProfitDays && query.DiviPersons == DiviPersons && query.DiviPercent == DiviPercent)
-            // {
-            //     status = 0;
-            // }
-            // if (query.IsAll != IsAll && IsAll == 0 && query.MinPayMoney == MinPayMoney && query.GetPercent == GetPercent && query.ProfitDays == ProfitDays && query.DiviPersons == DiviPersons && query.DiviPercent == DiviPercent)
-            // {
-            //     status = 0;
-            // }
             var merchantParamSetRecord = maindb.MerchantParamSetRecord.Add(new MerchantParamSetRecord()
             {
                 // Status = status, //活动状态(1 使用中 -1 已失效 0 已关闭)
@@ -169,6 +149,13 @@ namespace MySystem.Areas.Api.Controllers.v1
                 AfterMinPayMoney = MinPayMoney,
                 AfterIsAll = IsAll,
             }).Entity;
+            query.UpdateDate = DateTime.Now; //修改时间
+            query.IsAll = IsAll; //是否收全额
+            query.MinPayMoney = MinPayMoney; //订单参与门槛
+            query.GetPercent = GetPercent; //商家实收比例
+            query.ProfitDays = ProfitDays; //分红期限（天）
+            query.DiviPercent = DiviPercent; //最大分红比例
+            query.DiviPersons = DiviPersons; //单笔订单分红人数
             query.Version = merchantParamSetRecord.Id;
             maindb.SaveChanges();
             Obj.Add("UpdateDate", query.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //更新时间