From 7dad3e5ef9896edc58a04c7b52e2978c33396d7a Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 31 十二月 2024 09:53:34 +0800
Subject: [PATCH] 提交
---
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 72 ++++++++++++++++++++++++++++++++----
1 files changed, 64 insertions(+), 8 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 46278c9..8cc520c 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -688,7 +688,8 @@
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},
+
};
/*
@@ -772,9 +773,9 @@
}
}
/*鑾峰彇椤垫暟涓庤繑鍥炴暟鎹潯鏁�*/
- int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[31].Value);
+ int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[32].Value);
pagination.PageCount = resultValue.HasValue ? resultValue.Value : 0;
- resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[32].Value);
+ resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[33].Value);
pagination.RecordCount = resultValue.HasValue ? resultValue.Value : 0;
return result;
@@ -1027,7 +1028,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}
+
};
/*
@@ -1094,9 +1097,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;
@@ -1892,6 +1895,59 @@
else
;
}
+
+ //鏇存柊璁㈠崟鏀粯閲戦
+ 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>
+ /// <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);
@@ -2750,12 +2806,12 @@
/// 淇敼鎵撳嵃鐘舵��
/// </summary>
/// <param name="orderId"></param>
- public bool Updatejinedanjia(int orderId, decimal SumPrice, decimal UnitPrice)
+ 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";
+ 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);
}
--
Gitblit v1.9.1