订单修改

代码/TVShoppingCallCenter_ZLJ/Controllers/Customer/VIPInfoController.cs

@@ -51,7 +51,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
         /// <param name="pagesize"></param>
         /// <returns></returns>
         [HttpGet("getlistbypage")]
-        public async Task<IActionResult> GetListsByPageAsync(string keyword,string name,string phone,string type, string province,string city,string area,string town,string address,string birthday,string recommender,string saleperson,int pageindex = 1, int pagesize = 20)
+        public async Task<IActionResult> GetListsByPageAsync(string keyword,string label, string name,string phone,string type, string province,string city,string area,string town,string address,string birthday,string recommender,string saleperson,int pageindex = 1, int pagesize = 20)
         {
             List<IConditionalModel> conModels = new List<IConditionalModel>();
             #region 条件筛选
@@ -68,6 +68,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
                        
                     }
                 });
+            if (!string.IsNullOrEmpty(label))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Label", ConditionalType = ConditionalType.Like, FieldValue = label });
+            }
             if (!string.IsNullOrEmpty(name))
             {
                 conModels.Add(new ConditionalModel() { FieldName = "F_Name", ConditionalType = ConditionalType.Like, FieldValue = name });

代码/TVShoppingCallCenter_ZLJ/Controllers/Order/KFOrderController.cs

@@ -221,7 +221,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost("/api/order/getorderlistbykfpage")]
-        public async Task<IActionResult> GetOrderListByKFPage(OrderInput input,int PayState=0)
+        public async Task<IActionResult> GetOrderListByKFPage(OrderInput input,int PayState=0,int state=-1)
         {
 
             List<IConditionalModel> conModels = new List<IConditionalModel>();
@@ -229,12 +229,19 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
 
 
            // conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThan, FieldValue = "0" });
-
+          
             //状态
             if (input.F_State > -2)
             {
                 conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = input.F_State.ToString() });
             }
+            else
+            {
+                if (state > -1)
+                {
+                    conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThanOrEqual , FieldValue ="3" });
+                }
+            }
             //根据角色展示列表
             if (UserLogin.RoleCode == "XS")
             {

代码/TVShoppingCallCenter_ZLJ/Controllers/Order/OrderController.cs

@@ -490,6 +490,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             modelOrder.F_RealPrice = input.F_RealPrice;
             modelOrder.F_UseScore = input.F_UseScore;
             //选填 关联属性
+            
             modelOrder.F_VipId = input.F_VipId;
 
 
@@ -684,7 +685,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 {  //订单完成后也不计算积分
                     modelOrder.F_Score = 0.00M;
                 }
-                if (modelscore.F_StartDebit == 1)
+                if (modelscore.F_StartDebit == 0)
                 {
                     modelOrder.F_UseScore = 0;
                 }

代码/TVShoppingCallCenter_ZLJ/Controllers/Order/OrderMergeController.cs

@@ -257,10 +257,14 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             {
                 eq = eq.And(a => a.F_Id == input.F_Id);
             }
-            if (input.F_State >-2)
+            if (input.F_State > -2)
             {
                 eq = eq.And(a => a.F_State == input.F_State);
             }
+            if (UserLogin.RoleCode == "KF")
+            {
+                eq = eq.And(a => a.F_State > 0);
+            }
 
             #endregion
             RefAsync<int> count = 0;