From eb07d0be014b11568d4263b470d46b5cd427fe9b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 17 七月 2025 08:49:45 +0800
Subject: [PATCH] 送货费用
---
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 52 +++++++++++++++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.designer.cs | 9 ++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx | 1
CY_ECommercePlatform/CY.Model/EC/EC_AwbInfo.cs | 5 ++
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs | 11 +++++
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 6 +++
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs | 2 +
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.cs | 5 +-
CY_ECommercePlatform/CY.Model/EC/EC_AwbInfoExtend.cs | 6 +++
9 files changed, 94 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_AwbInfo.cs b/CY_ECommercePlatform/CY.Model/EC/EC_AwbInfo.cs
index 9c7aeb5..20f9191 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_AwbInfo.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_AwbInfo.cs
@@ -101,6 +101,11 @@
/// 鍙栬揣鐢佃瘽
/// </summary>
public string FetchPhoneNum { get; set; }
+
+ /// <summary>
+ /// 鏀惰揣鑱旂郴浜�
+ /// </summary>
+ public decimal? SonghuoJine { get; set; }
#endregion Model
}
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_AwbInfoExtend.cs b/CY_ECommercePlatform/CY.Model/EC/EC_AwbInfoExtend.cs
index 9394caf..a2abb2a 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_AwbInfoExtend.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_AwbInfoExtend.cs
@@ -113,6 +113,12 @@
this.FetchPhoneNum = isChange ? MyConvert.ConvertToString(value) : FetchPhoneNum;
theValue = this.FetchPhoneNum;
}
+ else if ("SonghuoJine".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 10)
+ {
+ this.SonghuoJine = isChange ? MyConvert.ConvertToDecimal(value) : SonghuoJine;
+ theValue = this.SonghuoJine;
+ }
+
return theValue;
}
#endregion
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
index bc331d9..13d9ce5 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
@@ -652,6 +652,11 @@
/// </summary>
public string Shejicountneiyename { get; set; }
+ /// <summary>
+ /// 閫佽揣閲戦
+ /// </summary>
+ public decimal? SonghuoJine { get; set; }
+
#endregion
#region Visiter
@@ -1190,6 +1195,12 @@
this.Shejicountneiye = isChange ? MyConvert.ConvertToInt32(value) : this.Shejicountneiye;
theValue = this.Shejicountneiye;
}
+ else if ("SonghuoJine".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 122)
+ {
+ this.SonghuoJine = isChange ? MyConvert.ConvertToDecimal(value) : this.SonghuoJine;
+ theValue = this.SonghuoJine;
+ }
+
#endregion
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index ad4b9c5..7ce51d2 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -1761,6 +1761,44 @@
}
}
+
+
+
+ /// <summary>
+ /// 淇敼璁㈠崟閫佽揣閲戦
+ /// </summary>
+ /// <param name="orderOperate">璁㈠崟鎿嶄綔</param>
+ /// <returns></returns>
+ internal bool UpdateOrderSonghuoJine(int OrderId,decimal? SonghuoJine)
+ {
+
+
+ _eC_OrderOperateDAL = null == _eC_OrderOperateDAL ? new EC_OrderOperateDAL(_dataBase) : _eC_OrderOperateDAL;
+ try
+ {
+
+ bool isWin = false;
+
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@orderId",OrderId),
+ new SqlParameter("@SonghuoJine",SonghuoJine.HasValue?SonghuoJine.Value:0),
+
+ };
+ string sql = "Update [EC_OrderExtend] Set [SonghuoJine]=@SonghuoJine where [Keyid] =@orderId ";
+
+
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+
+ return true;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
/// <summary>
/// 鏍规嵁鏂板璁㈠崟鎿嶄綔锛屽苟淇敼璁㈠崟鐘舵��
/// </summary>
@@ -2626,7 +2664,8 @@
new SqlParameter(){ParameterName="@AppointCourierCompany",Value=awbInfo.AppointCourierCompany,SqlDbType=SqlDbType.VarChar,Size=50},
new SqlParameter(){ParameterName="@FetchAddress",Value=awbInfo.FetchAddress,SqlDbType=SqlDbType.VarChar,Size=200},
new SqlParameter(){ParameterName="@FetchContacts",Value=awbInfo.FetchContacts,SqlDbType=SqlDbType.VarChar,Size=50},
- new SqlParameter(){ParameterName="@FetchPhoneNum",Value=awbInfo.FetchPhoneNum,SqlDbType=SqlDbType.VarChar,Size=20}
+ new SqlParameter(){ParameterName="@FetchPhoneNum",Value=awbInfo.FetchPhoneNum,SqlDbType=SqlDbType.VarChar,Size=20},
+ new SqlParameter(){ParameterName="@SonghuoJine",Value=awbInfo.SonghuoJine.HasValue?awbInfo.SonghuoJine.Value:0,SqlDbType=SqlDbType.Money}
};
_dataBase.Query("sp_EC_AwbInfo_DeliverPresswork", CommandType.StoredProcedure, sqlParms.ToArray<SqlParameter>());
isWin = 1.Equals(sqlParms[0].Value);
@@ -2647,6 +2686,17 @@
return false;
else
;
+
+ if(awbInfo.Operate.OperateType == 5)
+ isWin = this.UpdateOrderSonghuoJine(awbInfo.Keyid.Value, awbInfo.SonghuoJine);//淇敼璁㈠崟鐘舵��
+ else
+ {
+ isWin = this.UpdateOrderSonghuoJine(awbInfo.Keyid.Value, 0);//淇敼璁㈠崟鐘舵��
+ }
+ if (!isWin)
+ return false;
+ else
+ ;
}
else
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx
index 86a05fe..5f370eb 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx
@@ -53,6 +53,7 @@
<tr><td class="ali03">璐ц繍鍗曞彿锛�</td><td colspan="3"><asp:TextBox ID="txtTheAwb" runat="server"></asp:TextBox></td></tr>
<tr><td class="ali03">閫佽揣浜猴細</td><td colspan="3"><asp:TextBox ID="txtDeliverPerson" runat="server"></asp:TextBox></td></tr>
<tr><td class="ali03">閫佽揣鏃堕棿锛�</td><td colspan="3"><asp:TextBox ID="txtDeliverTime" runat="server" CssClass="date req"></asp:TextBox></td></tr>
+ <tr><td class="ali03">閫佽揣璐圭敤锛�</td><td colspan="3"> <input id='txtSonghuoJine' runat="server" maxlength='9' class='float' /></td></tr>
<tr><td class="ali03">鏀惰揣鏂瑰紡锛�</td><td colspan="3"><asp:DropDownList ID="ddlAcceptType" runat="server" keepdefaultstyle='true' ></asp:DropDownList></td></tr>
<tr class="show1"><td class="ali03">璐ц繍鍏徃锛�</td><td><asp:TextBox ID="txtAppointCourierCompany" runat="server" Width="257px"></asp:TextBox></td><td class="ali03">鑱旂郴浜猴細</td><td><asp:TextBox ID="txtFetchContacts" runat="server"></asp:TextBox></td></tr>
<tr class="show1"><td class="ali03">鍙栬揣鍦板潃锛�</td><td><asp:TextBox ID="txtFetchAddress" runat="server" Width="257px"></asp:TextBox></td><td class="ali03">鑱旂郴浜虹數璇濓細</td><td><asp:TextBox ID="txtFetchPhoneNum" runat="server"></asp:TextBox></td></tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.cs
index 6a4daa9..818a63a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.cs
@@ -63,7 +63,8 @@
this.txtDeliverPerson.Text = model.DeliverPerson;
if (model.DeliverTime.HasValue)
this.txtDeliverTime.Text = model.DeliverTime.Value.ToShortDateString();
- this.txtRemark.Text = model.Remark;
+ this.txtSonghuoJine.Value = model.SonghuoJine.HasValue? model.SonghuoJine.Value.ToString("0.0000"):"0";
+ this.txtRemark.Text = model.Remark;
this.ddlAcceptType.SelectedValue = model.AcceptTypeId.ToString();
switch (model.AcceptTypeId)
{
@@ -141,7 +142,7 @@
eC_AwbInfo.DeliverPerson = this.txtDeliverPerson.Text;
if (this.txtDeliverTime.Text != string.Empty)
eC_AwbInfo.DeliverTime = this.txtDeliverTime.Text.ToDateTime2();
-
+ eC_AwbInfo.SonghuoJine = this.txtSonghuoJine.Value.ToDecimal2();
eC_AwbInfo.AcceptTypeId = ddlAcceptType.SelectedValue.ToString().ToInt32().Value;
switch (eC_AwbInfo.AcceptTypeId)
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.designer.cs
index 4c2aa90..3a6af7d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWork.aspx.designer.cs
@@ -78,6 +78,15 @@
protected global::System.Web.UI.WebControls.TextBox txtDeliverTime;
/// <summary>
+ /// txtSonghuoJine 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtSonghuoJine;
+
+ /// <summary>
/// ddlAcceptType 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index f9b26da..683e688 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -491,6 +491,9 @@
<th width="26" menu_member_case_id="case_DeliverWork" menu_member_case_name="閫佽揣">
閫佽揣
</th>
+ <th width="26">
+ 閫佽揣璐圭敤
+ </th>
<th width="26" menu_member_case_id="case_ShowDoDelay" menu_member_case_name="鎾ゅ崟">
鎾ゅ崟
</th>
@@ -626,6 +629,9 @@
<span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"閫佽揣")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "閫佽揣")?"title='宸查�佽揣'":"title='閫佽揣'"%> style='display: ' onclick='DeliverWork(<%#Eval("Keyid")%>,"<%#Eval("SellerOrderId")%>","<%#Eval("OrderState")%>")'>
<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "閫佽揣") ? "鈭�" : Eval("Shifoubiaohongsonghuo")%></span>
</td>
+ <td>
+ <%#Eval("SonghuoJine","{0:F}")%>
+ </td>
<td class="td_hide" menu_member_case_id="case_ShowDoDelay" menu_member_case_name="鎾ゅ崟">
<span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"鎾ゅ崟")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鎾ゅ崟")?"title='宸叉挙鍗�'":"title='鎾ゅ崟'"%> style='display: ' onclick="ShowDoDelay({dtypeId:4,defaultarget:'<%#Eval("TradingSingle.PayedMoney", "{0:F}")%>',orderid:<%#Eval("Keyid")%>,orderShowId:'<%#Eval("SellerOrderId")%>',receiver:'<%#Eval("BuyerId")%>',orderState:'<%#Eval("OrderState")%>',orderType:'<%#Eval("OrderTypeId")%>',title:'鎾ゅ崟绠＄悊' })">
<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鎾ゅ崟") ? "鈭�" : "鎾ゅ崟"%></span>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
index cd6a5bc..f9bdb9c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
@@ -882,6 +882,7 @@
headerRow.CreateCell(12).SetCellValue("閲戦");
headerRow.CreateCell(13).SetCellValue("宸叉敹娆�");
headerRow.CreateCell(14).SetCellValue("鏈粯娆�");
+ headerRow.CreateCell(15).SetCellValue("閫佽揣閲戦");
// 娣诲姞鏁版嵁
int rowIndex = 1;
@@ -903,6 +904,7 @@
row.CreateCell(12).SetCellValue(order.SumPrice.HasValue? order.SumPrice.Value.ToDouble2().Value:0);
row.CreateCell(13).SetCellValue(order.TradingSingle.PayedMoney.HasValue ? order.TradingSingle.PayedMoney.Value.ToDouble2().Value : 0);
row.CreateCell(14).SetCellValue(order.UnPayedMoney.ToDouble2().Value);
+ row.CreateCell(15).SetCellValue(order.SonghuoJine.HasValue ? order.SonghuoJine.Value.ToDouble2().Value : 0);
}
--
Gitblit v1.9.1