From 1032e7e409dff2134a4a1086fda34a55f025dcbc Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 31 十月 2025 11:46:43 +0800
Subject: [PATCH] 提交

---
 CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs |   87 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 82 insertions(+), 5 deletions(-)

diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 1eb2893..ab8f49b 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -165,6 +165,70 @@
             }
         }
 
+
+        /// <summary>
+        /// 鏂板
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool InserModelsheji(Infrastructure.Domain.IAggregateRoot model)
+        {
+            Model.EC_OrderBasic trueModel = model as Model.EC_OrderBasic;
+            if (trueModel == null)
+            {
+                return false;
+            }
+            SqlParameter unitPricePar = null;
+            if (trueModel.UnitPrice.HasValue)
+            {
+                unitPricePar = new SqlParameter("@UnitPrice", trueModel.UnitPrice);
+            }
+            else
+            {
+                unitPricePar = new SqlParameter("@UnitPrice", DBNull.Value);
+            }
+            SqlParameter DeliveryTime = null;
+            if (trueModel.DeliveryTime.HasValue)
+            {
+                DeliveryTime = new SqlParameter("@DeliveryTime", trueModel.DeliveryTime);
+            }
+            else
+            {
+                DeliveryTime = new SqlParameter("@DeliveryTime", DBNull.Value);
+            }
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+                    new SqlParameter(){ ParameterName ="@Keyid", SqlDbType=System.Data.SqlDbType.Int, DbType=System.Data.DbType.Int32, Direction=ParameterDirection.Output},
+                    new SqlParameter(){ ParameterName="@SellerOrderId",SqlDbType=System.Data.SqlDbType.VarChar,Size=25,DbType=System.Data.DbType.String, Direction=ParameterDirection.Output},
+                    new SqlParameter("@OrderTypeId",trueModel.OrderTypeId),
+                    new SqlParameter("@PrintTypeId",trueModel.PrintTypeId),
+                    new SqlParameter("@DocumentName",trueModel.DocumentName),
+                    DeliveryTime,//new SqlParameter("@DeliveryTime",trueModel.DeliveryTime),
+					new SqlParameter("@SellerId",trueModel.SellerId),
+                    new SqlParameter("@BuyerId",trueModel.BuyerId),
+                    new SqlParameter("@SellerName",trueModel.SellerName){SqlDbType=SqlDbType.VarChar,Size=200},
+                    new SqlParameter("@BuyerName",trueModel.BuyerName){SqlDbType=SqlDbType.VarChar,Size=200},
+                    unitPricePar,
+                    new SqlParameter("@SumPrice",trueModel.SumPrice),
+                    new SqlParameter("@Creater",trueModel.Creater),
+                    new SqlParameter("@Operator",trueModel.Operator),
+                    new SqlParameter("@Remark",trueModel.Remark??"") ,
+                    new SqlParameter("@OutId",(trueModel.OutId==null ? "0":trueModel.OutId.ToString()))
+            };
+            try
+            {
+                _dataBase.Query("sp_EC_OrderBasic_Insertsheji", CommandType.StoredProcedure, sqlParms.ToArray<SqlParameter>());
+                trueModel.Keyid = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[0].Value);
+                trueModel.SellerOrderId = CY.Infrastructure.Common.MyConvert.ConvertToString(sqlParms[1].Value);
+                return trueModel.Keyid.HasValue;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+
         /// <summary>
         /// 淇敼
         /// </summary>
@@ -1176,7 +1240,7 @@
                 new SqlParameter("@createTimeEnd",DBNull.Value){SqlDbType=SqlDbType.Date},
                 new SqlParameter("@printType",DBNull.Value){SqlDbType=SqlDbType.Int},
                 new SqlParameter("@orderType",DBNull.Value){SqlDbType=SqlDbType.Int},
-                new SqlParameter("@orderState",DBNull.Value){SqlDbType=SqlDbType.Int},
+                new SqlParameter("@orderState",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20},
                 new SqlParameter("@orderPayState",DBNull.Value){SqlDbType=SqlDbType.Int},
                 new SqlParameter("@creater",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20},
                 new SqlParameter("@customerLevel",DBNull.Value){SqlDbType=SqlDbType.Int},
@@ -1339,7 +1403,7 @@
         /// </summary>
         /// <param name="pagination"></param>
         /// <returns></returns>
-        public IEnumerable<EC_OrderBasic> SelectModelPageWorkBook(Infrastructure.Query.Pagination pagination, Guid _MemberID, string txtBeginDate, string txtEndDate, string txtOrderId, string txtSearchyjname, string selCustormerManager, string selBusinessManager, string selOrderStates)
+        public IEnumerable<EC_OrderBasic> SelectModelPageWorkBook(Infrastructure.Query.Pagination pagination, Guid _MemberID, string txtBeginDate, string txtEndDate, string txtOrderId, string txtSearchyjname, string selCustormerManager, string selBusinessManager, string selOrderStates, string BuyerName)
         {
             try
             {
@@ -1364,6 +1428,9 @@
                 if (!string.IsNullOrEmpty(txtSearchyjname))
                     condition += " and ob.DocumentName like '%" + txtSearchyjname + "%'";
 
+                if (!string.IsNullOrEmpty(BuyerName))
+                    condition += " and ob.BuyerName like '%" + BuyerName + "%'";
+
                 if (!string.IsNullOrEmpty(selCustormerManager))
                     condition += " and oe.CustomerManagerId = '" + selCustormerManager + "'";
 
@@ -1371,7 +1438,17 @@
                     condition += " and oe.BusinessManagerId = '" + selBusinessManager + "'";
 
                 if (!string.IsNullOrEmpty(selOrderStates))
-                    condition += " and ob.OrderState = '" + selOrderStates + "'";
+                {
+                    if(selOrderStates == "0")
+                    {
+                        condition += " and ob.OrderState  in (1,2,3,4)";
+                    }
+                    else if (selOrderStates == "1")
+                    {
+                        condition += " and ob.OrderState in ( 5,6,-1)";
+                    }
+                }
+                   
 
  
 
@@ -1415,11 +1492,11 @@
         /// </summary>
         /// <param name="BuyerId">鍗栧ID</param>
         /// <returns></returns>
-        public IList<EC_OrderBasic> GetOrderById(Guid BuyerId, int PayState)
+        public IList<EC_OrderBasic> GetOrderById(Guid BuyerId, int PayState, Guid SellerId)
         {
             IList<EC_OrderBasic> result = new List<EC_OrderBasic>();
          
-             result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" BuyerId = '{0}' and PayState!={1}", BuyerId,PayState));
+             result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" BuyerId = '{0}' and PayState!={1} and  SellerId = '{2}'", BuyerId,PayState, SellerId));
             return result;
         }
         /// <summary>

--
Gitblit v1.9.1