修复bug若干

代码/System.Common/IRepositories/IRepository.cs

@@ -34,7 +34,7 @@ namespace System.Common
         Task<PageData<T>> GetListByPage(Expression<Func<T, bool>> whereExpression, MyPageModel pagemodel, string orderby);
 
         Task<T> GetSingle(Expression<Func<T, bool>> whereExpression);
-
+        Task<T> GetFirst(Expression<Func<T, bool>> whereExpression);
         /// <summary>
         /// 添加
         /// </summary>

代码/System.Common/Repositories/BaseRepository.cs

@@ -95,9 +95,16 @@ namespace System.Common
 
         public async Task<T> GetSingle(Expression<Func<T, bool>> whereExpression)
         {
-
+            //FirstAsync替换SingleAsync 保证正常运行，但是可能结果会不一样。
             return await Db.Queryable<T>().With(SqlWith.NoLock).Where(whereExpression).SingleAsync();
             //return CurrentCurrentDB.GetSingle(whereExpression);
+        }
+
+        public async Task<T> GetFirst(Expression<Func<T, bool>> whereExpression)
+        {
+            //FirstAsync替换SingleAsync 保证正常运行，但是可能结果会不一样。
+            return await Db.Queryable<T>().With(SqlWith.NoLock).Where(whereExpression).FirstAsync();
+            //return CurrentCurrentDB.GetSingle(whereExpression);
 
         }
 

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

@@ -1358,7 +1358,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             if (string.IsNullOrEmpty(orderid))
                 return Error("请输入订单号");
 
-            List<T_Bus_OrderDetail> detaillist = await bus_OrderDetailRepository.GetListALL(q => q.F_OrderId == orderid && q.F_State == 0, o => o.F_Sort, OrderByType.Asc);
+            List<T_Bus_OrderDetail> detaillist = await bus_OrderDetailRepository.GetListALL(q => q.F_OrderId == orderid, o => o.F_Sort, OrderByType.Asc);
 
             return Success("成功", detaillist);
         }

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

@@ -228,10 +228,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             #region 条件筛选
 
 
-            conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThan, FieldValue = "0" });
+            conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThan, FieldValue = "-2" });
 
             //状态
-            if (input.F_State > -1)
+            if (input.F_State > -2)
             {
                 conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = input.F_State.ToString() });
             }
@@ -615,7 +615,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                     await bus_OrderRepository.UpdateListToColumns(new List<T_Bus_Order>() { modelOrder }, s => new { s.F_PayState, s.F_RealPrice });
                 }
 
-                if (await busOrderMoneyRepository.AddReturnCount(modelOrderMoeny))
+                if (await busOrderMoneyRepository.Update(modelOrderMoeny))
                     return Success("成功！");
                 return Error("失败！");
             }
@@ -780,5 +780,33 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
 
 
 
+        /// <summary>
+        /// 根据订单获取相应支付记录
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("getordermoney")]
+        public async Task<IActionResult> GetOrderMoneyList(OrderMoneyInput input)
+        {
+            if (string.IsNullOrEmpty(input.F_OrderId))
+            {
+                return Error("请输入订单号");
+            }
+
+            #region  拼接条件
+
+            Expression<Func<T_Bus_OrderMoney, bool>> eq = a => a.F_OrderId== input.F_OrderId;
+
+
+            #endregion
+
+            List<T_Bus_OrderMoney> list = await busOrderMoneyRepository.GetListALL(eq,o=>o.F_AddTime,OrderByType.Asc);
+
+            return Success("成功", list);
+
+        }
+
+
+
     }
 }

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

@@ -175,7 +175,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                     { return Error("请选择订购商品"); }
                         if (string.IsNullOrEmpty(input.F_Stock))
                     {
-                        return Error("请选择货仓");
+                        return Error("请选择出库货仓");
                     }
                     if (string.IsNullOrEmpty(modelOrder.F_Express))
                     {
@@ -295,11 +295,13 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                         modelDetail.F_AddUserName = modelOrder.F_AddUserName;
                         modelDetail.F_TotlePrice = modelDetail.F_DealPrice * modelDetail.F_Count;
                         modelDetail.F_Activity = 0;
-                        if (modelProduct.F_Tag.IndexOf(".") > -1)
+                        if (modelProduct.F_Tag.IndexOf(".") > -1&& !string.IsNullOrEmpty(UseActivity))
                         {
                             string[] tagarry = modelProduct.F_Tag.Split(',');
+                            string[] actlist = UseActivity.Split(',');
                             string tag = tagarry.First(a => a.StartsWith(".")).ToString();
-                            T_Sys_Marketing modelactive = await bus_MarketingRepository.GetSingle(b => ("," + b.F_Commodity + ",").Contains("," + tag + ",")&&b.F_IsDelete==0);
+                            T_Sys_Marketing modelactive = await bus_MarketingRepository.GetFirst(b => actlist.Contains(b.F_ID.ToString())&& b.F_EndTime >= DateTime.Now && b.F_StartTime <= DateTime.Now && b.F_IsDelete == 0 && ("," + b.F_Commodity + ",").Contains(("," + tag + ",")));
+
 
                             //此商品参加活动
                             if (modelactive != null)
@@ -307,6 +309,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                                 modelDetail.F_Activity = modelactive.F_ID;
                             }
                         }
+                        else { modelDetail.F_Activity = 0; }
 
                         totle += modelDetail.F_TotlePrice;
                         modelDetailList.Add(modelDetail);
@@ -602,11 +605,12 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                     modelDetail.F_AddUserName = modelOrder.F_AddUserName;
                     modelDetail.F_TotlePrice = modelDetail.F_DealPrice * modelDetail.F_Count;
                     modelDetail.F_Activity = 0;
-                    if (modelProduct.F_Tag.IndexOf(".") > -1)
+                    if (modelProduct.F_Tag.IndexOf(".") > -1 && !string.IsNullOrEmpty(UseActivity))
                     {
                         string[] tagarry = modelProduct.F_Tag.Split(',');
+                        string[] actlist = UseActivity.Split(',');
                         string tag = tagarry.First(a => a.StartsWith(".")).ToString();
-                        T_Sys_Marketing modelactive = await bus_MarketingRepository.GetSingle(b => ("," + b.F_Commodity + ",").Contains(("," + tag + ",")));
+                        T_Sys_Marketing modelactive = await bus_MarketingRepository.GetFirst(b => actlist.Contains(b.F_ID.ToString()) && b.F_EndTime >= DateTime.Now && b.F_StartTime<=DateTime.Now && b.F_IsDelete==0&&("," + b.F_Commodity + ",").Contains(("," + tag + ",")));
 
                         //此商品参加活动
                         if (modelactive != null)
@@ -648,7 +652,23 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             {
                 if (string.IsNullOrEmpty(input.F_Stock))
                 {
-                    return Error("请选择货仓");
+                    return Error("请选择出库货仓");
+                }
+                if (string.IsNullOrEmpty(modelOrder.F_Express))
+                {
+                    return Error("快递不能为空");
+                }
+                if (string.IsNullOrEmpty(modelOrder.F_AddPhone))
+                {
+                    return Error("收件人电话不能为空");
+                }
+                if (string.IsNullOrEmpty(modelOrder.F_AddTown))
+                {
+                    return Error("收件人地址不能为空");
+                }
+                if (string.IsNullOrEmpty(modelOrder.F_Address))
+                {
+                    return Error("收件人详细地址不能为空");
                 }
                 modelOrder.F_FlowNum =UserLogin.UserCode+"T"+DateTime.Now.ToString("yyMMddhhmmss") +new Random().Next(9);
 
@@ -709,7 +729,12 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                         else
                             return Error("订单操作失败,请重试1！");
                     }
-                    else { return Error("订单操作失败,请重试2！"); }
+                    else {
+                        if (await bus_OrderDetailRepository.AddMany(modelDetailList))
+                            return Success("订单生成成功2");
+                        else
+                            return Error("订单操作失败,请重试2！");
+                       }
                 }
                 else { return Success("成功"); }
             }

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

@@ -80,7 +80,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                     if (string.IsNullOrEmpty(input.F_Gift))
                         input.F_Gift = "";
                     if (input.F_Money <= 0)
-                        return Error("请数据金额");
+                        return Error("请输入有效金额");
                 }
                 //F_Remark、F_CheckRemak
                 #endregion

代码/TVShoppingCallCenter_ZLJ/Controllers/Product/ProductController.cs

@@ -756,7 +756,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
             //标签
             if (!string.IsNullOrEmpty(input.Tag))
             {
-                conModels.Add(new ConditionalModel() { FieldName = "F_Tag", ConditionalType = ConditionalType.Equal, FieldValue = input.Tag });
+                conModels.Add(new ConditionalModel() { FieldName = "F_Tag", ConditionalType = ConditionalType.Like, FieldValue = input.Tag });
             }
             if (input.IsSale > -1)
             {