From 3bf021ed05b7ae7a50b4287b2831588495bb06e6 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期四, 30 六月 2022 12:35:39 +0800
Subject: [PATCH] 优化金额或条数的长度处理。
---
web/web/Bin/Dao.dll | 0
web/Dao/GwOrderDao.cs | 2
web/web/Bin/App_Code.dll | 0
web/web/Bin/UMCLib.pdb | 0
web/web/Bin/Common.pdb | 0
web/Lib/Common.dll | 0
web/Lib/Model.pdb | 0
web/Dao/GwClientDao.cs | 2
web/Lib/Dao.dll | 0
web/Dao/GwSpDao.cs | 2
web/Lib/Common.pdb | 0
web/web/Bin/Common.dll | 0
web/web/Bin/Model.pdb | 0
web/.vs/Web/v16/.suo | 0
web/Lib/Model.dll | 0
web/web/Bin/App_Code.pdb | 0
web/web/GwOrder.ashx | 48 ++++++++++++------------
web/Model/Model/GwOrder.cs | 12 +++---
web/web/Bin/Model.dll | 0
web/Lib/Dao.pdb | 0
web/web/Bin/Dao.pdb | 0
21 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/web/.vs/Web/v16/.suo b/web/.vs/Web/v16/.suo
index aea8cd4..4c2bcdb 100644
--- a/web/.vs/Web/v16/.suo
+++ b/web/.vs/Web/v16/.suo
Binary files differ
diff --git a/web/Dao/GwClientDao.cs b/web/Dao/GwClientDao.cs
index 6d27537..fe7bc15 100644
--- a/web/Dao/GwClientDao.cs
+++ b/web/Dao/GwClientDao.cs
@@ -303,7 +303,7 @@
* clientId锛氬鎴稩D
*
*/
- public bool UpdateClientAmount(int AddBalance, int payAmount, string clientId )
+ public bool UpdateClientAmount(Int64 AddBalance, Int64 payAmount, string clientId )
{
return OracleHelper.ExecuteSql("UPDATE GW_CLIENT SET BALANCE=(BALANCE + :BALANCE), TOP_UP_AMOUNT_TOTAL=(TOP_UP_AMOUNT_TOTAL + :TOP_UP_AMOUNT_TOTAL) WHERE CLIENT_ID=:CLIENT_ID", OracleHelper.Connection, new OracleParameter(":BALANCE", (object)AddBalance), new OracleParameter(":TOP_UP_AMOUNT_TOTAL", (object)payAmount), new OracleParameter(":CLIENT_ID", (object)clientId)) > 0;
}
diff --git a/web/Dao/GwOrderDao.cs b/web/Dao/GwOrderDao.cs
index d2df31a..479ec49 100644
--- a/web/Dao/GwOrderDao.cs
+++ b/web/Dao/GwOrderDao.cs
@@ -224,7 +224,7 @@
}
//鏇存柊璁㈠崟淇敼鍓嶄綑棰�
- public bool UpdateBalanceAndStatus(int basicNum, int givingNum, int orderNumTotal, int orderAmountTotal, int payAmount , int beforeGivingNum, int orderStatus, string orderId )
+ public bool UpdateBalanceAndStatus(Int64 basicNum, Int64 givingNum, Int64 orderNumTotal, Int64 orderAmountTotal, Int64 payAmount , Int64 beforeGivingNum, int orderStatus, string orderId )
{
if (string.IsNullOrEmpty(orderId))
return false;
diff --git a/web/Dao/GwSpDao.cs b/web/Dao/GwSpDao.cs
index aa296c8..a738fa7 100644
--- a/web/Dao/GwSpDao.cs
+++ b/web/Dao/GwSpDao.cs
@@ -467,7 +467,7 @@
* spid锛氳处鍙�
*
*/
- public bool UpdateBalanceByOrder(int AddBalance,int AddBasicNum, int AddGivingNum, string spid)
+ public bool UpdateBalanceByOrder(Int64 AddBalance,Int64 AddBasicNum, Int64 AddGivingNum, string spid)
{
return OracleHelper.ExecuteSql("UPDATE GW_SP SET BALANCE=(BALANCE + :BALANCE), BASIC_NUM=(BASIC_NUM + :BASIC_NUM锛�, GIVING_NUM= (GIVING_NUM + :GIVING_NUM) WHERE SP_ID=:SP_ID", OracleHelper.Connection
, new OracleParameter(":BALANCE", (object)AddBalance)
diff --git a/web/Lib/Common.dll b/web/Lib/Common.dll
index 81f812b..05e666c 100644
--- a/web/Lib/Common.dll
+++ b/web/Lib/Common.dll
Binary files differ
diff --git a/web/Lib/Common.pdb b/web/Lib/Common.pdb
index 64958ca..7272b90 100644
--- a/web/Lib/Common.pdb
+++ b/web/Lib/Common.pdb
Binary files differ
diff --git a/web/Lib/Dao.dll b/web/Lib/Dao.dll
index a549682..5abb9ce 100644
--- a/web/Lib/Dao.dll
+++ b/web/Lib/Dao.dll
Binary files differ
diff --git a/web/Lib/Dao.pdb b/web/Lib/Dao.pdb
index b9c9849..2d404e7 100644
--- a/web/Lib/Dao.pdb
+++ b/web/Lib/Dao.pdb
Binary files differ
diff --git a/web/Lib/Model.dll b/web/Lib/Model.dll
index 809b332..4a02c80 100644
--- a/web/Lib/Model.dll
+++ b/web/Lib/Model.dll
Binary files differ
diff --git a/web/Lib/Model.pdb b/web/Lib/Model.pdb
index 022af82..32b82ec 100644
--- a/web/Lib/Model.pdb
+++ b/web/Lib/Model.pdb
Binary files differ
diff --git a/web/Model/Model/GwOrder.cs b/web/Model/Model/GwOrder.cs
index b9497dd..240e9f3 100644
--- a/web/Model/Model/GwOrder.cs
+++ b/web/Model/Model/GwOrder.cs
@@ -23,19 +23,19 @@
public string ComboId { get; set; }
- public int BasicNum { get; set; }
+ public Int64 BasicNum { get; set; }
- public int GivingNum { get; set; }
+ public Int64 GivingNum { get; set; }
public int Price { get; set; }
- public int OrderNumTotal { get; set; }
+ public Int64 OrderNumTotal { get; set; }
- public int OrderAmountTotal { get; set; }
+ public Int64 OrderAmountTotal { get; set; }
- public int PayAmount { get; set; }
+ public Int64 PayAmount { get; set; }
- public int BeforeBalanceNum { get; set; }
+ public Int64 BeforeBalanceNum { get; set; }
public string Creator { get; set; }
diff --git a/web/web/Bin/App_Code.dll b/web/web/Bin/App_Code.dll
index 31377bf..3a98e52 100644
--- a/web/web/Bin/App_Code.dll
+++ b/web/web/Bin/App_Code.dll
Binary files differ
diff --git a/web/web/Bin/App_Code.pdb b/web/web/Bin/App_Code.pdb
index c315af5..bde19c4 100644
--- a/web/web/Bin/App_Code.pdb
+++ b/web/web/Bin/App_Code.pdb
Binary files differ
diff --git a/web/web/Bin/Common.dll b/web/web/Bin/Common.dll
index 81f812b..05e666c 100644
--- a/web/web/Bin/Common.dll
+++ b/web/web/Bin/Common.dll
Binary files differ
diff --git a/web/web/Bin/Common.pdb b/web/web/Bin/Common.pdb
index 64958ca..7272b90 100644
--- a/web/web/Bin/Common.pdb
+++ b/web/web/Bin/Common.pdb
Binary files differ
diff --git a/web/web/Bin/Dao.dll b/web/web/Bin/Dao.dll
index a549682..5abb9ce 100644
--- a/web/web/Bin/Dao.dll
+++ b/web/web/Bin/Dao.dll
Binary files differ
diff --git a/web/web/Bin/Dao.pdb b/web/web/Bin/Dao.pdb
index b9c9849..2d404e7 100644
--- a/web/web/Bin/Dao.pdb
+++ b/web/web/Bin/Dao.pdb
Binary files differ
diff --git a/web/web/Bin/Model.dll b/web/web/Bin/Model.dll
index 809b332..4a02c80 100644
--- a/web/web/Bin/Model.dll
+++ b/web/web/Bin/Model.dll
Binary files differ
diff --git a/web/web/Bin/Model.pdb b/web/web/Bin/Model.pdb
index 022af82..32b82ec 100644
--- a/web/web/Bin/Model.pdb
+++ b/web/web/Bin/Model.pdb
Binary files differ
diff --git a/web/web/Bin/UMCLib.pdb b/web/web/Bin/UMCLib.pdb
index 48cc582..9b51360 100644
--- a/web/web/Bin/UMCLib.pdb
+++ b/web/web/Bin/UMCLib.pdb
Binary files differ
diff --git a/web/web/GwOrder.ashx b/web/web/GwOrder.ashx
index 434b392..8004557 100644
--- a/web/web/GwOrder.ashx
+++ b/web/web/GwOrder.ashx
@@ -313,11 +313,11 @@
{
string spId = context.GetString("spId");
string orderId = context.GetString("orderId");
- int basicNum = context.GetInt("basicNum");
- int givingNum = context.GetInt("givingNum");
+ Int64 basicNum = context.GetInt64("basicNum");
+ Int64 givingNum = context.GetInt64("givingNum");
string clientId = "";
- int payAmount = 0;
- int tmpPayAmount = Math.Max((int) (context.GetDecimal("payAmount", new Decimal(4, 0, 0, false, (byte) 2)) * new Decimal(1000)), 0);
+ Int64 payAmount = 0;
+ Int64 tmpPayAmount = Math.Max((int) (context.GetDecimal("payAmount", new Decimal(4, 0, 0, false, (byte) 2)) * new Decimal(1000)), 0);
payAmount = tmpPayAmount;
//double price = context.GetDecimal(price);
int num = Math.Max((int) (context.GetDecimal("price", new Decimal(4, 0, 0, false, (byte) 2)) * new Decimal(1000)), 0);
@@ -455,10 +455,10 @@
}
else if(status==1)
{
- int beforeBasicNum = 0;
- int beforeGivingNum = 0;
- int balance = 0;
- int topUpAmountTotal = 0;
+ Int64 beforeBasicNum = 0;
+ Int64 beforeGivingNum = 0;
+ Int64 balance = 0;
+ Int64 topUpAmountTotal = 0;
if (string.IsNullOrEmpty(nextFlowCode))
{
orderStatus = 2;
@@ -472,8 +472,8 @@
//鑾峰彇瀹㈡埛淇℃伅
GwClient gwClient = _GwClientDao.Get(gwSp.ClientID);
- balance = int.Parse(gwClient.Balance.ToString() );
- topUpAmountTotal = int.Parse(gwClient.Top_up_Amount_Total.ToString() );
+ balance = Int64.Parse(gwClient.Balance.ToString() );
+ topUpAmountTotal = Int64.Parse(gwClient.Top_up_Amount_Total.ToString() );
//涓�1-棰勪粯璐�
//if (gwSp.ChargeType==1 && (balance + payAmount) < num * basicNum)
@@ -544,21 +544,21 @@
string clientId = context.GetString("clientId");
string productId = context.GetString("productId");
//string comboId = context.GetString("comboId");
- int basicNum = context.GetInt("basicNum", 0);
- int givingNum = context.GetInt("givingNum", 0);
+ Int64 basicNum = context.GetInt("basicNum", 0);
+ Int64 givingNum = context.GetInt("givingNum", 0);
int price = 0;
- int orderNumTotal = context.GetInt("orderNumTotal", 0);
- int orderAmountTotal = context.GetInt("orderAmountTotal", 0);
- int payAmount = 0;
- int beforeBalanceNum = context.GetInt("beforeBalanceNum", 0);
+ Int64 orderNumTotal = context.GetInt("orderNumTotal", 0);
+ Int64 orderAmountTotal = context.GetInt("orderAmountTotal", 0);
+ Int64 payAmount = 0;
+ Int64 beforeBalanceNum = context.GetInt("beforeBalanceNum", 0);
//瀹㈡湇浜哄憳鎻愪氦璁㈠崟鏃剁殑鐘舵�佷负1-瀹℃牳涓��
int status = 1; //0-寰呭鏍革紙宸叉彁浜わ級锛�1-瀹℃牳涓紱2-瀹℃牳閫氳繃锛�3-瀹℃牳涓嶉�氳繃锛�4-鍙栨秷锛涚敵璇疯鍗曞湪鏈鏍告儏鍐典笅鍙互鍙栨秷銆�
string remark = context.GetString("remark");
DateTime createTime = DateTime.Now;
string creator = context.OperatorID;
- int tmpPayAmount = Math.Max((int) (context.GetDecimal("payAmount", new Decimal(4, 0, 0, false, (byte) 2)) * new Decimal(1000)), 0);
+ Int64 tmpPayAmount = Math.Max((Int64) (context.GetDecimal("payAmount", new Decimal(4, 0, 0, false, (byte) 2)) * new Decimal(1000)), 0);
payAmount = tmpPayAmount;
int num = Math.Max((int) (context.GetDecimal("price", new Decimal(4, 0, 0, false, (byte) 2)) * new Decimal(1000)), 0);
price = num;
@@ -727,20 +727,20 @@
string clientId = context.GetString("clientId");
string productId = context.GetString("productId");
string comboId = context.GetString("clientId");
- int basicNum = context.GetInt("basicNum", 0);
- int givingNum = context.GetInt("givingNum", 0);
+ Int64 basicNum = context.GetInt("basicNum", 0);
+ Int64 givingNum = context.GetInt("givingNum", 0);
int price = 0;
- int orderNumTotal = context.GetInt("orderNumTotal", 0);
- int orderAmountTotal = context.GetInt("orderAmountTotal", 0);
- int payAmount = 0;
- int beforeBalanceNum = context.GetInt("beforeBalanceNum", 0);
+ Int64 orderNumTotal = context.GetInt("orderNumTotal", 0);
+ Int64 orderAmountTotal = context.GetInt("orderAmountTotal", 0);
+ Int64 payAmount = 0;
+ Int64 beforeBalanceNum = context.GetInt("beforeBalanceNum", 0);
int status = 0;
string remark = context.GetString("remark");
DateTime createTime = DateTime.Now;
string creator = context.OperatorID;
- int tmpPayAmount = Math.Max((int) (context.GetDecimal("payAmount", new Decimal(4, 0, 0, false, (byte) 2)) * new Decimal(1000)), 0);
+ Int64 tmpPayAmount = Math.Max((Int64) (context.GetDecimal("payAmount", new Decimal(4, 0, 0, false, (byte) 2)) * new Decimal(1000)), 0);
payAmount = tmpPayAmount;
int num = Math.Max((int) (context.GetDecimal("price", new Decimal(4, 0, 0, false, (byte) 2)) * new Decimal(1000)), 0);
--
Gitblit v1.9.1