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 | 68 ++++++++++++++++
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs | 19 ++++
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs | 18 ++++
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/common/PayAbout.aspx.cs | 2
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs | 106 ++++++++++++++++++++++++++
6 files changed, 211 insertions(+), 4 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs
index a0485a5..c8cf2d5 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs
@@ -68,6 +68,25 @@
}
/// <summary>
+ /// 鏂板缓璁㈠崟(鍏�,鍚鏉�)
+ /// </summary>
+ /// <param name="orderBasic">璁㈠崟鍩虹淇℃伅</param>
+ /// <param name="orderExtend">璁㈠崟鎵╁睍淇℃伅</param>
+ /// <param name="tradingSingle">浜ゆ槗鍗�</param>
+ /// <param name="acceptWayByOrder">璁㈠崟鏀惰揣鏂瑰紡</param>
+ /// <param name="payRequest">鏀粯璇锋眰(鍙┖)</param>
+ /// <param name="commission">璁㈠崟鍙楃悊浣ｉ噾(浼犲叆鍊煎ぇ浜�0鏃舵渶鍚庝細璋冪敤鍙楃悊璁㈠崟杩涜鍙楃悊)</param>
+ /// <param name="seckillId">绉掓潃涓氬姟缂栧彿(浼犲叆鍊煎ぇ浜�0鏃朵細鍑忓皯绉掓潃鏁伴噺1)</param>
+ /// <param name="orderPrintParameter">璁㈠崟鍗板埛鍙傛暟(閫夊～)</param>
+ /// <returns></returns>
+ public bool NewOrdersheji(EC_OrderBasic orderBasic, EC_OrderExtend orderExtend, Pay_TradingSingle tradingSingle, EC_AcceptWayByOrder acceptWayByOrder, Pay_Request payRequest = null, double commission = 0, int seckillId = 0, EC_OrderPrintParameter orderPrintParameter = null)
+ {
+ return _iEC_OrderDAL.NewOrdersheji(orderBasic, orderExtend, tradingSingle, acceptWayByOrder, payRequest, commission, seckillId, orderPrintParameter);
+ }
+
+
+
+ /// <summary>
/// 鏂板缓璁㈠崟(鍏�,鍚鏉�)鎵归噺
/// </summary>
/// <param name="orderBasic">璁㈠崟鍩虹淇℃伅</param>
diff --git a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs
index 6ce9eb4..d80a8e5 100644
--- a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs
@@ -49,6 +49,24 @@
bool NewOrder(EC_OrderBasic orderBasic, EC_OrderExtend orderExtend, Pay_TradingSingle tradingSingle, EC_AcceptWayByOrder acceptWayByOrder, Pay_Request payRequest = null, double commission = 0, int seckillId = 0, EC_OrderPrintParameter orderPrintParameter = null);
+
+ /// <summary>
+ /// 鏂板缓璁㈠崟(鍏紝鍚鏉�)
+ /// </summary>
+ /// <param name="orderBasic">璁㈠崟鍩虹淇℃伅</param>
+ /// <param name="orderExtend">璁㈠崟鎵╁睍淇℃伅</param>
+ /// <param name="tradingSingle">浜ゆ槗鍗�</param>
+ /// <param name="acceptWayByOrder">璁㈠崟鏀惰揣鏂瑰紡</param>
+ /// <param name="payRequest">鏀粯璇锋眰(鍙┖)</param>
+ /// <param name="commission">璁㈠崟鍙楃悊浣ｉ噾(浼犲叆鍊煎ぇ浜�0鏃朵細璋冪敤鍙楃悊璁㈠崟杩涜鍙楃悊)</param>
+ /// <param name="seckillId">绉掓潃涓氬姟缂栧彿(浼犲叆鍊煎ぇ浜�0鏃朵細鍑忓皯绉掓潃鏁伴噺1)</param>
+ /// <param name="orderPrintParameter">鍗板埛鍙傛暟瀵硅薄(绉掓潃璁㈠崟涓嶄紶鍏�)</param>
+ /// <returns></returns>
+ bool NewOrdersheji(EC_OrderBasic orderBasic, EC_OrderExtend orderExtend, Pay_TradingSingle tradingSingle, EC_AcceptWayByOrder acceptWayByOrder, Pay_Request payRequest = null, double commission = 0, int seckillId = 0, EC_OrderPrintParameter orderPrintParameter = null);
+
+
+
+
/// <summary>
/// 鏂板缓璁㈠崟(鍏紝鍚鏉�)鎵归噺
/// </summary>
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 62d4cd8..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>
@@ -1428,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>
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
index 08855cc..7399928 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
@@ -157,6 +157,112 @@
}
+
+ /// <summary>
+ /// 鏂板缓璁㈠崟(鍏紝鍚鏉�)
+ /// </summary>
+ /// <param name="orderBasic">璁㈠崟鍩虹淇℃伅</param>
+ /// <param name="orderExtend">璁㈠崟鎵╁睍淇℃伅</param>
+ /// <param name="tradingSingle">浜ゆ槗鍗�</param>
+ /// <param name="acceptWayByOrder">璁㈠崟鏀惰揣鏂瑰紡</param>
+ /// <param name="payRequest">鏀粯璇锋眰(鍙┖)</param>
+ /// <param name="commission">璁㈠崟鍙楃悊浣ｉ噾(浼犲叆鍊煎ぇ浜�0鏃朵細璋冪敤鍙楃悊璁㈠崟杩涜鍙楃悊)</param>
+ /// <param name="seckillId">绉掓潃涓氬姟缂栧彿(浼犲叆鍊煎ぇ浜�0鏃朵細鍑忓皯绉掓潃鏁伴噺1)</param>
+ /// <param name="orderPrintParameter">鍗板埛鍙傛暟瀵硅薄(绉掓潃璁㈠崟涓嶄紶鍏�)</param>
+ /// <returns></returns>
+ public bool NewOrdersheji(EC_OrderBasic orderBasic, EC_OrderExtend orderExtend, Pay_TradingSingle tradingSingle, EC_AcceptWayByOrder acceptWayByOrder, Pay_Request payRequest = null, double commission = 0, int seckillId = 0, EC_OrderPrintParameter orderPrintParameter = null)
+ {
+ try
+ {
+ _eC_OrderExtendDAL = new EC_OrderExtendDAL(_dataBase);
+ _pay_TradingSingleDAL = new Pay_TradingSingleDAL(_dataBase);
+ _eC_AcceptWayByOrderDAL = new EC_AcceptWayByOrderDAL(_dataBase);
+ _eC_OrderOperateDAL = new EC_OrderOperateDAL(_dataBase);
+ _eC_MemberBasicDAL = new EC_MemberBasicDAL(_dataBase);
+ _oA_CorporateClientsDAL = new OA_CorporateClientsDAL(_dataBase);
+ using (System.Transactions.TransactionScope tran = new System.Transactions.TransactionScope())
+ {
+ bool isWin = false;
+ isWin = _eC_OrderBasicDAL.InserModelsheji(orderBasic);
+ if (!isWin)
+ {
+ return false;
+ }
+ acceptWayByOrder.TargetId = tradingSingle.OrderId = orderExtend.Keyid = orderBasic.Keyid;//鑾峰彇杩斿洖鐨勮鍗曞敮涓�缂栧彿
+ isWin = _eC_OrderExtendDAL.InserModel(orderExtend);
+ if (!isWin)
+ {
+ return false;
+ }
+
+ isWin = _eC_AcceptWayByOrderDAL.InserModel(acceptWayByOrder);
+ if (!isWin)
+ {
+ return false;
+ }
+ isWin = _pay_TradingSingleDAL.InserModel(tradingSingle);
+ if (!isWin)
+ {
+ return false;
+ }
+
+ //澧炲姞涓嬪崟鎿嶄綔璁板綍
+ isWin = _eC_OrderOperateDAL.InserModel(new EC_OrderOperate()
+ {
+ OperateType = 1,
+ Operator = orderBasic.Operator,
+ OrderId = orderBasic.Keyid,
+ Remark = string.Empty
+ });
+ if (!isWin)
+ {
+ return false;
+ }
+
+ if (null != payRequest)//鏈夋敮浠樿姹傚垯璋冪敤鏀粯璁㈠崟鏂规硶
+ {
+ //浼犲叆鐨刾ayRequest.Subject蹇呴』涓烘牸寮忓寲鍣� 鏍煎紡渚嬪:{0},{1},{2}
+ //0:Keyid,1:SellerOrderId,2:DocumentName
+ payRequest.Subject = string.Format(payRequest.Subject, orderBasic.Keyid, orderBasic.SellerOrderId, orderBasic.DocumentName);
+ isWin = _eC_OrderBasicDAL.PayOrder(orderBasic.Keyid.Value, payRequest, commission, 0);
+ }
+
+ if (0 < seckillId)
+ {
+ _eC_SeckillBusinessDAL = new EC_SeckillBusinessDAL(_dataBase);
+ //鑻ユ湁绉掓潃涓氬姟缂栧彿鍒欐墸闄ゅ叾绉掓潃鏁伴噺1
+ isWin = _eC_SeckillBusinessDAL.DecreaseSeckillNum(seckillId, 1, orderBasic.BuyerId);
+ }
+ if (!isWin)
+ {
+ return false;
+ }
+ if (null != orderPrintParameter)
+ {
+ _eC_OrderPrintParameterDAL = new EC_OrderPrintParameterDAL(_dataBase);
+ orderPrintParameter.OrderId = orderBasic.Keyid.Value;
+ isWin = _eC_OrderPrintParameterDAL.InserModel(orderPrintParameter);
+ }
+
+ if (!isWin)
+ {
+ return false;
+ }
+ else
+ tran.Complete();
+ }
+
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+
+
+
/// <summary>
/// 鏂板缓璁㈠崟(鍏紝鍚鏉�)鎵归噺
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.cs
index cef76c4..a5672fb 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.cs
@@ -155,7 +155,7 @@
{
item.LessOrderMoneyProperty = item.Contractmoney-item.OrderMoney;
- item.NoOverOderCount = bll_eC_OrderBasicDAL.GetOrderById(item.Keyid, -1).Count;
+ item.NoOverOderCount = bll_eC_OrderBasicDAL.GetOrderById(item.Keyid, -1, CurrentUser.MemberId).Count;
Database DC = new Database();
try
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/PayAbout.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/common/PayAbout.aspx.cs
index 95b562f..1708d33 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/common/PayAbout.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/common/PayAbout.aspx.cs
@@ -793,7 +793,7 @@
return null;//涔板涓嶈兘鏄崠瀹�
EC_OrderBLL eC_OrderBLL = new EC_OrderBLL();//瀹炰緥鍖栬鍗曚笟鍔℃搷浣滃璞�
- bool isWin = eC_OrderBLL.NewOrder(orderBasic, orderBasic.OrderExtend, orderBasic.TradingSingle, eC_AcceptWayByOrder, pay_Request, commission.Value, seckillId, orderPrintParameter);
+ bool isWin = eC_OrderBLL.NewOrdersheji(orderBasic, orderBasic.OrderExtend, orderBasic.TradingSingle, eC_AcceptWayByOrder, pay_Request, commission.Value, seckillId, orderPrintParameter);
return isWin ? orderBasic : null;
}
--
Gitblit v1.9.1