From a980cd04341d71216e0f59bd4b7327fe9fc50032 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 21 五月 2025 11:41:46 +0800
Subject: [PATCH] 提交
---
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 509 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 497 insertions(+), 12 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 83404d4..690d966 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -37,6 +37,8 @@
using CY.Model;
using CY.Infrastructure.Query;
using System.Transactions;
+using CY.Model.Inquiry;
+using CY.Infrastructure.Common;
namespace CY.SQLDAL
{
@@ -122,6 +124,15 @@
{
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},
@@ -129,7 +140,7 @@
new SqlParameter("@OrderTypeId",trueModel.OrderTypeId),
new SqlParameter("@PrintTypeId",trueModel.PrintTypeId),
new SqlParameter("@DocumentName",trueModel.DocumentName),
- new SqlParameter("@DeliveryTime",trueModel.DeliveryTime),
+ 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},
@@ -176,6 +187,16 @@
{
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>()
{
@@ -185,8 +206,8 @@
new SqlParameter("@SellerId",trueModel.SellerId),
new SqlParameter("@SellerName",trueModel.SellerName),
new SqlParameter("@DocumentName",trueModel.DocumentName),
- new SqlParameter("@DeliveryTime",trueModel.DeliveryTime),
- unitPricePar,
+ DeliveryTime,//new SqlParameter("@DeliveryTime",trueModel.DeliveryTime),
+ unitPricePar,
new SqlParameter("@SumPrice",trueModel.SumPrice),
new SqlParameter("@PayState",trueModel.PayState),
new SqlParameter("@Operator",trueModel.Operator),
@@ -270,6 +291,31 @@
}
return true;
}
+
+ /// <summary>
+ /// 鍒犻櫎澶栧崗璁㈠崟
+ /// </summary>
+ /// <param name="OrderId"></param>
+ /// <returns></returns>
+ public bool UpdateOldOrderSurplusPrintNum(int OrderId)
+ {
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@Keyid",OrderId)
+ };
+ string sql = " Update [EC_OrderExtend] Set [SurplusPrintNum]=[PrintNum] where [Keyid] = (select [OrderId] from [OA_OrderWorkListRelation] where [RelationTargetId] = @Keyid and [RelationTypeId]=4 ) ;Update [EC_OrderBasic] Set [OrderState]=2 where [Keyid] = (select [OrderId] from [OA_OrderWorkListRelation] where [RelationTargetId] = @Keyid and [RelationTypeId]=4 ) ";
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
/// <summary>
/// 鍒嗛〉鏌ヨ
@@ -505,6 +551,136 @@
else
{
}
+ StringBuilder ssss = new StringBuilder();
+ if (int.Parse(searchParam[18].ToString()) > 0)
+ {
+ var oA_Staffs = _dataBase.SelectModel<OA_Staff>(" * ", " [OA_Staff] ", "[Keyid]='" + searchParam[20] + "'").FirstOrDefault();
+
+
+ if (!string.IsNullOrEmpty(oA_Staffs.ManageCountry))
+ {
+ var sys_CitySites = _dataBase.SelectModel<Sys_CitySite>(" * ", " [Sys_CitySite] ").ToList();
+
+
+
+ var ManageCity = oA_Staffs.ManageCity.Split(',').Where(x => x != "").ToArray();
+
+
+ var ManageCountry = (oA_Staffs.ManageCountry + "," + oA_Staffs.ManageCountry1).Split(',').Where(x => x != "").ToArray();
+
+ int[] intManageCity = new int[ManageCity.Length];
+ for (int i = 0; i < ManageCity.Length; i++)
+ {
+ intManageCity[i] = int.Parse(ManageCity[i]);
+ }
+
+ int[] intManageCountry = new int[ManageCountry.Length];
+ for (int i = 0; i < ManageCountry.Length; i++)
+ {
+ intManageCountry[i] = int.Parse(ManageCountry[i]);
+ }
+ var city = sys_CitySites.Where(x => intManageCity.Contains(x.Keyid)).ToList();
+ var country = sys_CitySites.Where(x => intManageCountry.Contains(x.Keyid)).ToList();
+
+ StringBuilder citystring = new StringBuilder();
+ for (int i = 0; i < city.Count; i++)
+ {
+ if (i == city.Count - 1)
+ {
+ citystring.Append("'" + city[i].Name.ToString() + "'");
+ }
+ else
+ {
+ citystring.Append("'" + city[i].Name.ToString() + "',");
+ }
+
+ }
+
+ StringBuilder countrystring = new StringBuilder();
+ for (int i = 0; i < country.Count; i++)
+ {
+ if (i == country.Count - 1)
+ {
+ countrystring.Append("'" + country[i].Name.ToString() + "'");
+ }
+ else
+ {
+ countrystring.Append("'" + country[i].Name.ToString() + "',");
+ }
+
+ }
+
+
+
+ var resultsss = _dataBase.SelectModel<OA_CorporateClients>(" axz.* ", " [OA_CorporateClients] axz join [OA_CustomerCommunications] bxz on axz.Keyid=bxz.Keyid ", " axz.FirmId ='" + searchParam[1] + "'and ( ( bxz.City in ( " + citystring.ToString() + ") and bxz.County in ( " + countrystring.ToString() + " ) )or axz.AccountManagerId='" + searchParam[20] + "' or axz.BusinessManagerId='" + searchParam[20] + "')").Select(x => x.Keyid).ToList();
+ //return null == result || result.Count < 1 ? null : result[0];
+
+
+
+ for (int i = 0; i < resultsss.Count; i++)
+ {
+ if (i == resultsss.Count - 1)
+ {
+ ssss.Append("'" + resultsss[i].ToString() + "'");
+ }
+ else
+ {
+ ssss.Append("'" + resultsss[i].ToString() + "',");
+ }
+
+ }
+ }
+ else
+ {
+ var resultsss = _dataBase.SelectModel<OA_CorporateClients>(" axz.* ", " [OA_CorporateClients] axz join [OA_CustomerCommunications] bxz on axz.Keyid=bxz.Keyid ", " axz.FirmId ='" + searchParam[1] + "'and ( axz.AccountManagerId='" + searchParam[20] + "' or axz.BusinessManagerId='" + searchParam[20] + "')").Select(x => x.Keyid).ToList();
+ //return null == result || result.Count < 1 ? null : result[0];
+
+
+
+ for (int i = 0; i < resultsss.Count; i++)
+ {
+ if (i == resultsss.Count - 1)
+ {
+ ssss.Append("'" + resultsss[i].ToString() + "'");
+ }
+ else
+ {
+ ssss.Append("'" + resultsss[i].ToString() + "',");
+ }
+
+ }
+ }
+
+ if (string.IsNullOrEmpty(ssss.ToString()))
+ {
+ ssss.Append("'4354654657568345429890'");
+ }
+
+
+ }
+ else
+ {
+ var resultsss = _dataBase.SelectModel<OA_CorporateClients>(" axz.* ", " [OA_CorporateClients] axz ", " axz.FirmId ='" + searchParam[1] + "' ").Select(x => x.Keyid).ToList();
+ //return null == result || result.Count < 1 ? null : result[0];
+
+
+
+ for (int i = 0; i < resultsss.Count; i++)
+ {
+ if (i == resultsss.Count - 1)
+ {
+ ssss.Append("'" + resultsss[i].ToString() + "'");
+ }
+ else
+ {
+ ssss.Append("'" + resultsss[i].ToString() + "',");
+ }
+
+ }
+ }
+
+
+
IList<SqlParameter> sqlParms = new List<SqlParameter>()
{
@@ -536,6 +712,11 @@
new SqlParameter("@Kehuqianshou",DBNull.Value){SqlDbType=SqlDbType.Int},
new SqlParameter("@KaipiaoshenqingId",DBNull.Value){SqlDbType=SqlDbType.UniqueIdentifier},
new SqlParameter("@buyerId",DBNull.Value){SqlDbType=SqlDbType.UniqueIdentifier},
+ new SqlParameter("@DocumentName",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=50},
+ new SqlParameter("@Orderids",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=500},
+ new SqlParameter("@WorkStates",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=500},
+ new SqlParameter("@DeleverStates",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=500},
+
};
/*
@@ -580,26 +761,48 @@
Direction = ParameterDirection.Output
});
+ sqlParms.Add(new SqlParameter()
+ {
+ ParameterName = "@CorporateClientsId",
+ SqlDbType = SqlDbType.VarChar,
+ Size=int.MaxValue,
+ Value = ssss.ToString()
+ });
+
IList<EC_OrderBasic> result = null;
//鎵ц鍒嗛〉瀛樺偍
- using (IDataReader reader = _dataBase.QueryDataReader("sp_EC_OrderBasic_Search_Seller", CommandType.StoredProcedure, sqlParms.ToArray()))
+ using (IDataReader reader = _dataBase.QueryDataReader("sp_EC_OrderBasic_Search_Seller_Ceshi", CommandType.StoredProcedure, sqlParms.ToArray()))
{
result = _dataBase.ReadDataToModel<EC_OrderBasic>(reader);
}
if (result != null && result.Count > 0)
{
+ _eC_OrderPrintParameterDAL = new EC_OrderPrintParameterDAL(_dataBase);
foreach (EC_OrderBasic ob in result)
{
if (IsComplainant(ob.Keyid.Value))
{
ob.IsComplainant = true;
}
+
+ EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterDAL.GetModel(ob.Keyid.Value);
+ InquiryCommonModel _inquiryCommonModel = null;
+ if (null == _eC_OrderPrintParameter)
+ {
+ _inquiryCommonModel = new InquiryCommonModel();
+ }
+ else
+ {
+ _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+ }
+
+ ob.PrintSizeName = _inquiryCommonModel.PrintSizeName;
}
}
/*鑾峰彇椤垫暟涓庤繑鍥炴暟鎹潯鏁�*/
- int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[30].Value);
+ int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[34].Value);
pagination.PageCount = resultValue.HasValue ? resultValue.Value : 0;
- resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[31].Value);
+ resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[35].Value);
pagination.RecordCount = resultValue.HasValue ? resultValue.Value : 0;
return result;
@@ -852,7 +1055,9 @@
new SqlParameter("@businessManager",DBNull.Value){SqlDbType=SqlDbType.Int},
new SqlParameter("@payType",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20},
new SqlParameter("@returnvisit",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20},
- new SqlParameter("@appraise",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20}
+ new SqlParameter("@appraise",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20},
+ new SqlParameter("@Orderids",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=500}
+
};
/*
@@ -919,9 +1124,9 @@
}
}
/*鑾峰彇椤垫暟涓庤繑鍥炴暟鎹潯鏁�*/
- int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[19].Value);
+ int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[20].Value);
pagination.PageCount = resultValue.HasValue ? resultValue.Value : 0;
- resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[20].Value);
+ resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[21].Value);
pagination.RecordCount = resultValue.HasValue ? resultValue.Value : 0;
return result;
@@ -1127,6 +1332,57 @@
}
+
+
+ /// <summary>
+ /// 浣滀笟鏈�佽揣鍒嗛〉鏌ヨ
+ /// </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)
+ {
+ try
+ {
+ string condition = " ob.PrintTypeId = 37 ";
+
+ if (_MemberID != Guid.Empty)
+ condition += " and ob.SellerId = '" + _MemberID + "'";
+
+ if (!string.IsNullOrEmpty(txtBeginDate))
+ condition += string.Format(" and CAST(ob.CreateTime AS DATE) >='{0}'", txtBeginDate);
+
+ if (!string.IsNullOrEmpty(txtEndDate))
+ {
+ var EndDate = txtEndDate.ToDateTime2().Value.AddDays(1).ToShortDateString();
+ condition += string.Format(" and CAST(ob.CreateTime AS DATE) <='{0}'", EndDate);
+ }
+
+
+ if (!string.IsNullOrEmpty(txtOrderId))
+ condition += " and ob.SellerOrderId like '%" + txtOrderId + "%'";
+
+ if (!string.IsNullOrEmpty(txtSearchyjname))
+ condition += " and ob.DocumentName like '%" + txtSearchyjname + "%'";
+
+ if (!string.IsNullOrEmpty(selCustormerManager))
+ condition += " and oe.CustomerManagerId = '" + selCustormerManager + "'";
+
+ if (!string.IsNullOrEmpty(selBusinessManager))
+ condition += " and oe.BusinessManagerId = '" + selBusinessManager + "'";
+
+ if (!string.IsNullOrEmpty(selOrderStates))
+ condition += " and ob.OrderState = '" + selOrderStates + "'";
+
+
+
+ return _dataBase.SelectModelPage<EC_OrderBasic>(pagination, " ob.*,oe.shifouDelivery,oe.DeliveryOrderId,oe.KaipiaoshenqingCreater,oe.KaipiaoshenqingTime,oe.KaipiaoquerenCreater,oe.KaipiaoquerenTime,oe.Kehuqianshou,oe.KehuqianshouCreater,oe.KehuqianshouTime ,oe.Quchudingdan,oe.QuchudingdanCreater,oe.QuchudingdanTime,oe.PrintPackDeliveryRequir,oe.PrintNum,oe.ExigencyCaseId,opy.Name as yssldw ", " EC_OrderBasic as ob Inner Join EC_OrderExtend as oe On(ob.Keyid=oe.Keyid) Left Join Sys_Dictionary as opy On (opy.DicType='鍗板埛鍗曚綅' And opy.MeanValue = oe.printunit ) ", " ob.Keyid DESC ", " Keyid DESC ", condition);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
/// <summary>
/// 鍗曚釜鏌ヨ
/// </summary>
@@ -1205,6 +1461,53 @@
throw ex;
}
+ }
+
+
+
+ /// <summary>
+ /// 閿佸崟璁㈠崟
+ /// </summary>
+ /// <param name="orderId">璁㈠崟缂栧彿</param>
+ /// <param name="operater">鎿嶄綔浜�</param>
+ /// <returns></returns>
+ public bool SuodingOrder(int orderId, string operater)
+ {
+ if (0 >= orderId || 0 >= orderId)
+ {
+ return false;
+ }
+ else
+ {
+ }
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+
+ new SqlParameter("@SuodanState",true),
+ new SqlParameter("@SuodanTime",DateTime.Now),
+ new SqlParameter("@SuodanOperator",operater),
+ new SqlParameter("@Keyid",orderId),
+ };
+ IList<SqlParameter> sqlParms1 = new List<SqlParameter>()
+ {
+ new SqlParameter("@Keyid",orderId),
+ };
+ try
+ {
+ string sql = "Update EC_OrderBasic Set [SuodanState]=@SuodanState,[SuodanTime]=@SuodanTime,[SuodanOperator]=@SuodanOperator where [Keyid] =@Keyid ";
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+
+ string sql1 = "Update CoreCmsPlanOrder Set [status]=2 where [orderkeyid] =@Keyid ";
+ _dataBase.ExecuteSql(sql1, sqlParms1.ToArray<SqlParameter>());
+
+
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
}
/// <summary>
@@ -1320,6 +1623,19 @@
}
return null == result || result.Count == 0 ? null : result[0];
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁璁㈠崟缂栧彿鑾峰彇璁㈠崟
+ /// </summary>
+ /// <param name="orderIds">璁㈠崟缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<EC_OrderBasic> GetOrderByIds(string orderIds)
+ {
+ //return _eC_OrderBasicDAL.SelectModelById(orderId);
+ IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>(" ob.*,ts.OnlineMoney,ts.LineMoney,ts.UsedCredit,ts.PayedMoney ", "EC_OrderBasic as ob Inner Join Pay_TradingSingle as ts On ( ob.Keyid = ts.OrderId ) ", string.Format(" ob.Keyid in ({0})", orderIds));
+ return null == result || result.Count < 1 ? null : result;
}
/// <summary>
@@ -1634,6 +1950,59 @@
}
+
+
+ /// <summary>
+ /// 鏀舵(绾夸笅杞处銆佺幇閲�)
+ /// </summary>
+ /// <param name="orderId">璁㈠崟缂栧彿</param>
+ /// <param name="firmAccountRecord">鎿嶄綔璁板綍</param>
+ /// <returns></returns>
+ public bool ReceiveMoneyToQueren(int orderId, OA_FirmAccountRecord firmAccountRecord)
+ {
+ bool isWin = false;
+ if (0 >= orderId || !firmAccountRecord.Money.HasValue)
+ return false;
+ else
+ ;
+ if ( 0 > firmAccountRecord.Money.Value)
+ return false;
+ else
+ ;
+ try
+ {
+ OA_FirmAccountRecordDAL oA_FirmAccountRecordDAL = new OA_FirmAccountRecordDAL(_dataBase);
+ using (TransactionScope tran = new TransactionScope())
+ {
+
+
+ //鏇存柊璁㈠崟鏀粯閲戦
+ isWin = this.UpdateOrderPayedMoney(orderId, -1, firmAccountRecord.Money.Value);
+ if (!isWin)
+ {
+ return isWin;
+ }
+ else
+ ;
+ //鏇存柊璁㈠崟鐘舵��
+ isWin = this.UpdateOrderPayState(orderId);
+ if (!isWin)
+ {
+ return isWin;
+ }
+ else
+ ;
+ tran.Complete();
+ }
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return isWin;
+
+ }
+
/// <summary>
/// 鏀舵(澶栧崗棰勪粯娆俱�佸鎴烽浠樻)
/// </summary>
@@ -1708,7 +2077,7 @@
if (string.IsNullOrEmpty(Keyids))
return null;//閿欒鏁版嵁杩斾細绌�
- IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>("*", "EC_OrderBasic", string.Format(" Keyid in ({0}) and SellerId ='{1}' order by SellerOrderId DESC ", Keyids, FirmId)) as IList<EC_OrderBasic>;//鎵ц鏌ヨ
+ IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>("*", "EC_OrderBasic", string.Format(" Keyid in ({0}) order by SellerOrderId DESC ", Keyids)) as IList<EC_OrderBasic>;//鎵ц鏌ヨ and SellerId ='{1}' , FirmId
return result;//杩斿洖缁撴灉
}
@@ -2459,6 +2828,48 @@
}
}
+
+ /// <summary>
+ /// 淇敼鎵撳嵃鐘舵��
+ /// </summary>
+ /// <param name="orderId"></param>
+ public bool Updatejinedanjia(int orderId, decimal SumPrice, decimal UnitPrice,int num)
+ {
+ try
+ {
+ string sqlStr = string.Empty;
+ sqlStr = "UPDATE EC_OrderBasic SET SumPrice="+ SumPrice + " ,UnitPrice="+ UnitPrice + " WHERE Keyid=@orderId;UPDATE [EC_OrderExtend] SET [PrintNum]=" + num + " WHERE Keyid="+ orderId ;
+ SqlParameter par = new SqlParameter("@orderId", orderId);
+ _dataBase.ExecuteSql(sqlStr, par);
+ }
+ catch
+ {
+
+ }
+
+ return true;
+ }
+
+ /// <summary>
+ /// 淇敼鎵撳嵃鐘舵��
+ /// </summary>
+ /// <param name="orderId"></param>
+ public void UpdatePrintfengqianState(int orderId)
+ {
+ try
+ {
+ string sqlStr = string.Empty;
+ sqlStr = "UPDATE EC_OrderExtend SET IsPrintfengqian='true' WHERE Keyid=@orderId";
+ SqlParameter par = new SqlParameter("@orderId", orderId);
+ _dataBase.ExecuteSql(sqlStr, par);
+ }
+ catch
+ {
+
+ }
+ }
+
+
/// <summary>
/// 淇敼鎵撳嵃鐘舵��
/// </summary>
@@ -2492,8 +2903,9 @@
/// <param name="WorkStates"></param>
/// <param name="OutOrderId"></param>
/// <param name="RelationType"></param>
+ /// <param name="PayState"></param>
/// <returns></returns>
- public IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType)
+ public IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType, string PayState = null)
{
try
{
@@ -2504,6 +2916,9 @@
if (RelationType > 0)
condition += " and b.RelationTypeId = '" + RelationType + "' ";
+ if (!string.IsNullOrEmpty(PayState))
+ condition += " and a.PayState = " + PayState + " ";
+
if (StartCreatTime != null)
condition += " and a.CreateTime >= '" + StartCreatTime.Value + "' ";
@@ -2772,7 +3187,7 @@
if (deliverorderId==null || deliverorderId.Equals(Guid.Empty))
return null;//閿欒鏁版嵁杩斾細绌�
- IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>(" ob.*,oe.shifouDelivery,oe.DeliveryOrderId,oe.Kaipiaoshenqing,oe.KaipiaoshenqingCreater,oe.KaipiaoshenqingTime,oe.KaipiaoquerenCreater,oe.KaipiaoquerenTime,oe.Kehuqianshou,oe.KehuqianshouCreater,oe.KehuqianshouTime ,oe.Quchudingdan,oe.QuchudingdanCreater,oe.QuchudingdanTime,oe.PrintPackDeliveryRequir,oe.PrintNum,oe.ExigencyCaseId,pt.PrintName as PrintTypeName ", "EC_OrderBasic ob Inner Join EC_OrderExtend as oe On ob.Keyid=oe.Keyid Left Join SysInquiry_PrintingType as pt On(ob.PrintTypeId=pt.Keyid) ", string.Format(" oe.DeliveryOrderId = '{0}' and ob.SellerId ='{1}' order by SellerOrderId DESC ", deliverorderId, FirmId)) as IList<EC_OrderBasic>;//鎵ц鏌ヨ
+ IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>(" ob.*,oe.printunit,oe.shifouDelivery,oe.DeliveryOrderId,oe.Kaipiaoshenqing,oe.KaipiaoshenqingCreater,oe.KaipiaoshenqingTime,oe.KaipiaoquerenCreater,oe.KaipiaoquerenTime,oe.Kehuqianshou,oe.KehuqianshouCreater,oe.KehuqianshouTime ,oe.Quchudingdan,oe.QuchudingdanCreater,oe.QuchudingdanTime,oe.PrintPackDeliveryRequir,oe.PrintNum,oe.ExigencyCaseId,pt.PrintName as PrintTypeName ", "EC_OrderBasic ob Inner Join EC_OrderExtend as oe On ob.Keyid=oe.Keyid Left Join SysInquiry_PrintingType as pt On(ob.PrintTypeId=pt.Keyid) ", string.Format(" oe.DeliveryOrderId = '{0}' and ob.SellerId ='{1}' order by SellerOrderId DESC ", deliverorderId, FirmId)) as IList<EC_OrderBasic>;//鎵ц鏌ヨ
return result;//杩斿洖缁撴灉
}
@@ -2782,5 +3197,75 @@
}
}
+
+
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="pagination"></param>
+ /// <param name="MemberId"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.EC_OrderBasic> SelectModelPageSheji(Infrastructure.Query.Pagination pagination, Guid MemberId, string BeginCreateTime, string EndCreateTime, string SellerOrderId, string PrintTypeId, string BusinessManagerId, string Shejirenyuan, string BuyerName, string DocumentName, string ShejiStatus)
+ {
+ try
+ {
+ string condition = " 1=1 ";
+ if (MemberId != Guid.Empty)
+ {
+ var originalGuid = MemberId;
+ Guid reversedGuid = new Guid(originalGuid.ToByteArray().Reverse().ToArray());
+ condition += " and ob.SellerId = '" + reversedGuid + "'";
+ }
+
+
+
+ if (!string.IsNullOrEmpty(BeginCreateTime))
+ condition += string.Format(" and CAST(ob.CreateTime AS DATE) >='{0}'", BeginCreateTime);
+
+ if (!string.IsNullOrEmpty(EndCreateTime))
+ condition += string.Format(" and CAST(ob.CreateTime AS DATE) <='{0}'", EndCreateTime);
+
+ if (!string.IsNullOrEmpty(SellerOrderId))
+ condition += " and ob.SellerOrderId like '%" + SellerOrderId + "%'";
+
+ if (!string.IsNullOrEmpty(PrintTypeId))
+ {
+ condition += " and ob.PrintTypeId = " + PrintTypeId + "";
+ }
+ if (!string.IsNullOrEmpty(BusinessManagerId))
+ {
+ condition += " and oe.BusinessManagerId = " + BusinessManagerId + "";
+ }
+ if (!string.IsNullOrEmpty(Shejirenyuan))
+ {
+ condition += " and ( oe.Shejirenyuan = " + Shejirenyuan + " or oe.Shejirenyuanneiye = " + Shejirenyuan + " )";
+ }
+ if (!string.IsNullOrEmpty(BuyerName))
+ condition += " and ob.BuyerName like '%" + BuyerName + "%'";
+
+ if (!string.IsNullOrEmpty(DocumentName))
+ condition += " and ob.DocumentName like '%" + DocumentName + "%'";
+
+ if (!string.IsNullOrEmpty(ShejiStatus))
+ {
+ if(ShejiStatus == "1")
+ {
+ condition += " and oe.ShejiStatus = " + ShejiStatus + "";
+ }
+ else
+ {
+ condition += " and oe.ShejiStatus != 1 ";
+ }
+ }
+
+ return _dataBase.SelectModelPage<Model.EC_OrderBasic>(pagination, " ob.*,oe.BusinessManagerId,oe.shifouDelivery,oe.IsPrintfengqian,oe.DeliveryOrderId,oe.KaipiaoshenqingCreater,oe.KaipiaoshenqingTime,oe.KaipiaoquerenCreater,oe.KaipiaoquerenTime,oe.Kehuqianshou,oe.KehuqianshouCreater,oe.KehuqianshouTime ,oe.Quchudingdan,oe.QuchudingdanCreater,oe.QuchudingdanTime,oe.PrintPackDeliveryRequir,oe.PrintNum,oe.ExigencyCaseId,oe.Duiyinghetongbianhao,oe.[Shejirenyuan],oe.[Shejileixing] ,oe.[Danshuangmian],oe.[Shejirenyuanneiye],oe.[Shejileixingneiye],oe.[Danshuangmianneiye],oe.[Shejiyaoqiu],oe.[Shejiyaoqiuneiye],oe.[ShejirenyuanName],oe.[ShejirenyuanNameneiye],oe.[ShejiStatus],oe.[ShejileixingName],oe.[ShejileixingNameneiye],oe.[ShejiUnitPrice] ,oe.[ShejiSumPrice],oe.[ShejiUnitPriceneiye],oe.[ShejiSumPriceneiye] ,oe.[Shejicount],oe.[Shejicountneiye] ,pt.PrintName as PrintTypeName ", " EC_OrderBasic as ob Inner Join [EC_OrderExtend] as oe On ob.Keyid=oe.Keyid Left Join SysInquiry_PrintingType as pt On(ob.PrintTypeId=pt.Keyid) ", " ob.CreateTime desc", " CreateTime desc ", condition);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
}
}
--
Gitblit v1.9.1