添加分账限制

Areas/Api/Controllers/v1/Main1/ConsumerOrdersController.cs

@@ -188,33 +188,41 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         {
             JsonData data = JsonMapper.ToObject(value);
             int Id = int.Parse(function.CheckInt(data["Id"].ToString())); //订单Id
-            var check = ConsumerProfitService.Query(" and OrderId=" + Id + "");
-            if (check.Id > 0)
+            var order = ConsumerOrdersService.Query(Id);
+            if (order.Id > 0 && order.DivideFlag == 2)
             {
-                return new AppResultJson() { Status = "-1", Info = "操作失败，该订单已存在返现记录" };
-            }
-            else
-            {
-                var query = ConsumerOrdersService.Query(Id);
-                List<ConsumerOrders> suborders = RedisDbconn.Instance.GetList<ConsumerOrders>("ConsumerOrders:Divi:" + query.PayMode + ":" + query.MerchantId);
-                if (suborders.Count > 0)
+                var check = ConsumerProfitService.Query(" and OrderId=" + Id + "");
+                if (check.Id > 0)
+                {
+                    return new AppResultJson() { Status = "-1", Info = "操作失败，该订单已存在返现记录" };
+                }
+                else
                 {
-                    var suborder = suborders.FirstOrDefault(m => m.Id == Id);
-                    if (suborder == null)
+                    var query = ConsumerOrdersService.Query(Id);
+                    List<ConsumerOrders> suborders = RedisDbconn.Instance.GetList<ConsumerOrders>("ConsumerOrders:Divi:" + query.PayMode + ":" + query.MerchantId);
+                    if (suborders.Count > 0)
                     {
-                        RedisDbconn.Instance.AddList("ConsumerOrders:Divi:" + query.PayMode + ":List", Id);
-                        return new AppResultJson() { Status = "1", Info = "成功" };
+                        var suborder = suborders.FirstOrDefault(m => m.Id == Id);
+                        if (suborder == null)
+                        {
+                            RedisDbconn.Instance.AddList("ConsumerOrders:Divi:" + query.PayMode + ":List", Id);
+                            return new AppResultJson() { Status = "1", Info = "成功" };
+                        }
+                        else
+                        {
+                            return new AppResultJson() { Status = "-1", Info = "操作失败，该订单已存在返现队列中" };
+                        }
                     }
                     else
                     {
-                        return new AppResultJson() { Status = "-1", Info = "操作失败，该订单已存在返现队列中" };
+                        RedisDbconn.Instance.AddList("ConsumerOrders:Divi:" + query.PayMode + ":List", Id);
+                        return new AppResultJson() { Status = "1", Info = "成功" };
                     }
                 }
-                else
-                {
-                    RedisDbconn.Instance.AddList("ConsumerOrders:Divi:" + query.PayMode + ":List", Id);
-                    return new AppResultJson() { Status = "1", Info = "成功" };
-                }
+            }
+            else
+            {
+                return new AppResultJson() { Status = "-1", Info = "操作失败，该订单未分账" };
             }
         }
         #endregion

Areas/Api/Controllers/v1/Main2/ConsumerOrdersController.cs

@@ -185,33 +185,41 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
         {
             JsonData data = JsonMapper.ToObject(value);
             int Id = int.Parse(function.CheckInt(data["Id"].ToString())); //订单Id
-            var check = ConsumerProfitService.Query(" and OrderId=" + Id + "");
-            if (check.Id > 0)
+            var order = ConsumerOrdersService.Query(Id);
+            if (order.Id > 0 && order.DivideFlag >= 1)
             {
-                return new AppResultJson() { Status = "-1", Info = "操作失败，该订单已存在返现记录" };
-            }
-            else
-            {
-                var query = ConsumerOrdersService.Query(Id);
-                List<ConsumerOrders> suborders = RedisDbconn.Instance.GetList<ConsumerOrders>("ConsumerOrdersHd:Divi:" + query.PayMode + ":" + query.MerchantId);
-                if (suborders.Count > 0)
+                var check = ConsumerProfitService.Query(" and OrderId=" + Id + "");
+                if (check.Id > 0)
+                {
+                    return new AppResultJson() { Status = "-1", Info = "操作失败，该订单已存在返现记录" };
+                }
+                else
                 {
-                    var suborder = suborders.FirstOrDefault(m => m.Id == Id);
-                    if (suborder == null)
+                    var query = ConsumerOrdersService.Query(Id);
+                    List<ConsumerOrders> suborders = RedisDbconn.Instance.GetList<ConsumerOrders>("ConsumerOrdersHd:Divi:" + query.PayMode + ":" + query.MerchantId);
+                    if (suborders.Count > 0)
                     {
-                        RedisDbconn.Instance.AddList("ConsumerOrdersHd:Divi:" + query.PayMode + ":List", Id);
-                        return new AppResultJson() { Status = "1", Info = "成功" };
+                        var suborder = suborders.FirstOrDefault(m => m.Id == Id);
+                        if (suborder == null)
+                        {
+                            RedisDbconn.Instance.AddList("ConsumerOrdersHd:Divi:" + query.PayMode + ":List", Id);
+                            return new AppResultJson() { Status = "1", Info = "成功" };
+                        }
+                        else
+                        {
+                            return new AppResultJson() { Status = "-1", Info = "操作失败，该订单已存在返现队列中" };
+                        }
                     }
                     else
                     {
-                        return new AppResultJson() { Status = "-1", Info = "操作失败，该订单已存在返现队列中" };
+                        RedisDbconn.Instance.AddList("ConsumerOrdersHd:Divi:" + query.PayMode + ":List", Id);
+                        return new AppResultJson() { Status = "1", Info = "成功" };
                     }
                 }
-                else
-                {
-                    RedisDbconn.Instance.AddList("ConsumerOrdersHd:Divi:" + query.PayMode + ":List", Id);
-                    return new AppResultJson() { Status = "1", Info = "成功" };
-                }
+            }
+            else
+            {
+                return new AppResultJson() { Status = "-1", Info = "操作失败，该订单未分账" };
             }
         }
         #endregion