暂存

Areas/Api/Controllers/Main/MerchantParamSetController.cs

@@ -140,13 +140,17 @@ namespace MySystem.Areas.Api.Controllers.v1
             query.DiviPercent = DiviPercent; //最大分红比例
             query.DiviPersons = DiviPersons; //单笔订单分红人数
             // var status = 0;
-            // if (query.IsAll != IsAll && (query.MinPayMoney != MinPayMoney || query.GetPercent != GetPercent || query.ProfitDays != ProfitDays || query.DiviPersons != DiviPersons || query.DiviPercent != DiviPercent))
+            // 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 && query.MinPayMoney == MinPayMoney && query.GetPercent == GetPercent && query.ProfitDays == ProfitDays && query.DiviPersons == DiviPersons && query.DiviPercent == DiviPercent)
+            // 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()
             {
@@ -166,6 +170,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 AfterMinPayMoney = MinPayMoney,
                 AfterIsAll = IsAll,
             }).Entity;
+            query.Version = merchantParamSetRecord.Id;
             maindb.SaveChanges();
             Obj.Add("UpdateDate", query.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //更新时间
             return new AppResultJson() { Status = "1", Info = "", Data = Obj };