From ba73ec7987459b7bc5710798e8b4989cfe0e13a2 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期四, 30 六月 2022 13:04:34 +0800
Subject: [PATCH] 删除日志文件版本控制
---
web/web/GwOrder.ashx | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/web/web/GwOrder.ashx b/web/web/GwOrder.ashx
index 434b392..a5f34f1 100644
--- a/web/web/GwOrder.ashx
+++ b/web/web/GwOrder.ashx
@@ -80,7 +80,7 @@
string permissionsSQL = new GwClientDao().GetClientPermissions(_userId, _userType, "GWC");
- List<GwOrder> list = _Dao.LoadInfoList(spId, clientId, compay, flag, startDate, endDate, pageSize, pageIndex, permissionsSQL, out recordCount);
+ List<GwOrder> list = _Dao.LoadInfoList(spId, clientId, compay, flag, startDate, endDate.AddDays(1.0), pageSize, pageIndex, permissionsSQL, out recordCount);
string str1 = "";
if (list != null && list.Count > 0)
@@ -142,7 +142,7 @@
string permissionsSQL = new GwClientDao().GetClientPermissions(_userId, _userType, "GWC");
- List<GwOrder> list = _Dao.LoadInfoList(spId, clientId, company, flag, startDate, endDate, pageSize, pageIndex, permissionsSQL, out recordCount);
+ List<GwOrder> list = _Dao.LoadInfoList(spId, clientId, company, flag, startDate, endDate.AddDays(1.0), pageSize, pageIndex, permissionsSQL, out recordCount);
string str1 = "";
if (list != null && list.Count > 0)
@@ -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