From 22a7922be8d234c04bdf894b48d9f57fe97c857f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 15 十月 2024 15:55:30 +0800
Subject: [PATCH] 作业本显示修改
---
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 220 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 214 insertions(+), 6 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 83404d4..4795903 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),
@@ -505,6 +526,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 +687,8 @@
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},
+
};
/*
@@ -580,26 +733,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[31].Value);
pagination.PageCount = resultValue.HasValue ? resultValue.Value : 0;
- resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[31].Value);
+ resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[32].Value);
pagination.RecordCount = resultValue.HasValue ? resultValue.Value : 0;
return result;
@@ -1320,6 +1495,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>
@@ -2463,6 +2651,26 @@
/// 淇敼鎵撳嵃鐘舵��
/// </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>
+ /// <param name="orderId"></param>
public void UpdatePrintBiaoqianState(int orderId)
{
try
--
Gitblit v1.9.1