暂存

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

@@ -41,22 +41,22 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             var orderId = int.Parse(OrderId);
             var order = ConsumerOrdersService.Query(orderId);
             var Status = 0;
-            // if (order.IsAct == 0 && order.DivideFlag == 0)
-            // {
-            //     Status = -1;
-            // }
-            // if (order.IsAct == 1 && order.DivideFlag == 0)
-            // {
-            //     Status = 0;
-            // }
-            // if (order.IsAct == 1 && order.DivideFlag == 1)
-            // {
-            //     Status = 2;
-            // }
-            // if (order.IsAct == 1 && order.DivideFlag == 2)
-            // {
-            //     Status = 1;
-            // }
+            if (order.IsAct == 0 && order.DivideFlag == 0)
+            {
+                Status = -1;
+            }
+            if (order.IsAct == 1 && order.DivideFlag == 0)
+            {
+                Status = 0;
+            }
+            if (order.IsAct == 1 && order.DivideFlag == 1)
+            {
+                Status = 2;
+            }
+            if (order.IsAct == 1 && order.DivideFlag == 2)
+            {
+                Status = 1;
+            }
             List<RelationData> relationData = new List<RelationData>();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
             List<Dictionary<string, object>> source = ConsumerProfitService.List(relationData, " and OrderId=" + orderId + "", pageNum, pageSize);

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

@@ -23,16 +23,16 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
         }
 
 
-        #region 交易查询-直连商户订单分账记录
+        #region 交易查询-银联商户订单分账记录
         [Authorize]
-        public JsonResult DirectOrderProfitList(string value)
+        public JsonResult UnionPayOrderProfitList(string value)
         {
             value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
-            List<Dictionary<string, object>> dataList = DirectOrderProfitListDo(value);
+            List<Dictionary<string, object>> dataList = UnionPayOrderProfitListDo(value);
             return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
         }
-        private List<Dictionary<string, object>> DirectOrderProfitListDo(string value)
+        private List<Dictionary<string, object>> UnionPayOrderProfitListDo(string value)
         {
             JsonData data = JsonMapper.ToObject(value);
             string OrderId = data["OrderId"].ToString(); //订单Id