chfei/KJD_WebService
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

快递拍单更改每单oem费用

Browse Source
This commit is contained in:
wule committed 2026-08-14 16:02:53 +08:00
1 parent f80e99cf57
commit 191ecbb57f
16 files changed
+761 -276
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AllBase/BaseClass.cs
+2 -1
View File
@@ -31,7 +31,7 @@ namespace AllBase
/// <summary>
/// 版本ID
/// </summary>
public static int VersionCount = 1285;
public static int VersionCount = 1286;
public static string MainPath = "29wx";
//public static string MainPath = "29wx";
//public static string MainPath = "29pdd";
@@ -115,6 +115,7 @@ namespace AllBase
public static decimal Balance { get; set; } = 0;
public static decimal PostagePerOrder { get; set; } = 2.2m;
public static decimal RefundPostagePerOrder { get; set; } = 2.5m;
public static decimal GiftOemAmountPerOrder { get; set; } = 0m;
/// <summary>
/// 采集最低销量
/// </summary>
AllBase/Model/Result/ShopLoginInfo.cs
+3 -3
View File
@@ -316,11 +316,11 @@ namespace AllBase.Model.Result
/// <summary>
/// 每一单中转退货快递费用
/// </summary>
public decimal refund_postage_per_order { get; set; } = 2.2m;
public decimal refund_postage_per_order { get; set; } = 2.5m;
/// <summary>
/// 每一单退货费用
/// 每一单礼物额外收取费用
/// </summary>
//public decimal refund_postage_per_order { get; set; } = 2.5m;
public decimal gift_oem_amount_per_order { get; set; } = 0m;
/// <summary>
/// 子账号禁止访问的页面
/// </summary>
KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs
+19 -6
View File
@@ -97,8 +97,8 @@ namespace KJD_Web.BLL.WXXD
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
MysqlUtils mySql = new MysqlUtils(conn);
string sql = "select u.*,uu.authority as main_authority,uu.oem_id as main_oem_id,uu.postage_per_order as main_postage_per_order" +
",uu.refund_postage_per_order as main_refund_postage_per_order " +
string sql = "select u.*,uu.authority as main_authority,uu.oem_id as main_oem_id,uu.postage_per_order as main_postage_per_order," +
"uu.refund_postage_per_order as main_refund_postage_per_order,uu.gift_oem_amount_per_order as main_gift_oem_amount_per_order " +
"FROM wxxd.user u LEFT JOIN wxxd.user uu ON uu.user_name=u.parent_user_name where u.user_name='"
+ mobile + "' and u.password='" + password + "'";
@@ -136,11 +136,13 @@ namespace KJD_Web.BLL.WXXD
recharge_amount_total = row.Table.Columns.Contains("recharge_amount_total") ? row["recharge_amount_total"].ParseToDecimal() : 0,
postage_per_order = row.Table.Columns.Contains("postage_per_order") ? row["postage_per_order"].ParseToNullableDecimal() : null,
refund_postage_per_order = row.Table.Columns.Contains("refund_postage_per_order") ? row["refund_postage_per_order"].ParseToNullableDecimal() : null,
gift_oem_amount_per_order = row.Table.Columns.Contains("gift_oem_amount_per_order") ? row["gift_oem_amount_per_order"].ParseToNullableDecimal() : null,
};
var main_authority = row.Table.Columns.Contains("main_authority") ? row["main_authority"].ParseToString() : "";
var main_oem_id = row.Table.Columns.Contains("main_oem_id") ? row["main_oem_id"].ParseToString() : "";
var main_postage_per_order = row.Table.Columns.Contains("main_postage_per_order") ? row["main_postage_per_order"].ParseToDecimal() : 0m;
var main_refund_postage_per_order = row.Table.Columns.Contains("main_refund_postage_per_order") ? row["main_refund_postage_per_order"].ParseToDecimal() : 0m;
var main_gift_oem_amount_per_order = row.Table.Columns.Contains("main_gift_oem_amount_per_order") ? row["main_gift_oem_amount_per_order"].ParseToDecimal() : 0m;
// 填写子账号的父账号权限
if (user.group_id != "3")
@@ -164,7 +166,8 @@ namespace KJD_Web.BLL.WXXD
// 子账号每单扣费金额跟随主账号
user.postage_per_order = Math.Max(2.2m, main_postage_per_order);
user.refund_postage_per_order = Math.Max(2.2m, main_refund_postage_per_order);
user.refund_postage_per_order = Math.Max(2.5m, main_refund_postage_per_order);
user.gift_oem_amount_per_order = Math.Max(0m, main_gift_oem_amount_per_order);
}
if (string.IsNullOrEmpty(user.company_name))
{
@@ -491,7 +494,8 @@ namespace KJD_Web.BLL.WXXD
sql = "select u.*,uu.authority as main_authority,uu.oem_id as main_oem_id," +
" uu.postage_per_order as main_postage_per_order," +
" uu.refund_postage_per_order as main_refund_postage_per_order,o.oem_name " +
" uu.refund_postage_per_order as main_refund_postage_per_order," +
" uu.gift_oem_amount_per_order as main_gift_oem_amount_per_order,o.oem_name " +
" FROM wxxd.user u " +
" LEFT JOIN wxxd.user uu ON uu.user_name=u.parent_user_name " +
" LEFT JOIN wxxd.oem o ON uu.oem_id=o.oem_id or u.oem_id=o.oem_id " +
@@ -537,11 +541,13 @@ namespace KJD_Web.BLL.WXXD
recharge_amount_total = row.Table.Columns.Contains("recharge_amount_total") ? row["recharge_amount_total"].ParseToDecimal() : 0,
postage_per_order = row.Table.Columns.Contains("postage_per_order") ? row["postage_per_order"].ParseToNullableDecimal() : null,
refund_postage_per_order = row.Table.Columns.Contains("refund_postage_per_order") ? row["refund_postage_per_order"].ParseToNullableDecimal() : null,
gift_oem_amount_per_order = row.Table.Columns.Contains("gift_oem_amount_per_order") ? row["gift_oem_amount_per_order"].ParseToNullableDecimal() : null,
};
var main_authority = row.Table.Columns.Contains("main_authority") ? row["main_authority"].ParseToString() : "";
var main_oem_id = row.Table.Columns.Contains("main_oem_id") ? row["main_oem_id"].ParseToString() : "";
var main_postage_per_order = row.Table.Columns.Contains("main_postage_per_order") ? row["main_postage_per_order"].ParseToDecimal() : 0m;
var main_refund_postage_per_order = row.Table.Columns.Contains("main_refund_postage_per_order") ? row["main_refund_postage_per_order"].ParseToDecimal() : 0m;
var main_gift_oem_amount_per_order = row.Table.Columns.Contains("main_gift_oem_amount_per_order") ? row["main_gift_oem_amount_per_order"].ParseToDecimal() : 0m;
if (user.group_id != "3")
{
@@ -563,6 +569,7 @@ namespace KJD_Web.BLL.WXXD
// 子账号每单扣费金额跟随主账号
user.postage_per_order = Math.Max(2.2m, main_postage_per_order);
user.refund_postage_per_order = Math.Max(2.5m, main_refund_postage_per_order);
user.gift_oem_amount_per_order = Math.Max(0m, main_gift_oem_amount_per_order);
}
if (string.IsNullOrEmpty(user.mobile))
{
@@ -606,6 +613,9 @@ namespace KJD_Web.BLL.WXXD
var refund_postage_per_order = RegexUtils.GetStringQuery(ref inputData, "refund_postage_per_order")?.Replace("'", "\\'");
if (refund_postage_per_order.ParseToDecimal() <= 2.5m) // 每单费用
refund_postage_per_order = "2.5";
var gift_oem_amount_per_order = RegexUtils.GetStringQuery(ref inputData, "gift_oem_amount_per_order")?.Replace("'", "\\'");
if (gift_oem_amount_per_order.ParseToDecimal() < 0m) // 每单费用
gift_oem_amount_per_order = "0";
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
MysqlUtils mySql = new MysqlUtils(conn);
@@ -619,10 +629,10 @@ namespace KJD_Web.BLL.WXXD
}
sql = "insert into wxxd.user (nick_name,user_name,mobile,password,card_id,group_id,company_name,notes,sa_level,authority," +
"forbidden_page,shop_points_per_month,postage_per_order,refund_postage_per_order,oem_id,add_time,mdy_time) " +
"forbidden_page,shop_points_per_month,postage_per_order,refund_postage_per_order,gift_oem_amount_per_order,oem_id,add_time,mdy_time) " +
"values ('" + nick_name + "','" + user_name + "','" + mobile + "','" + password + "','" + card_id + "','" +
group_id + "','" + company_name + "','" + notes + "'," + sa_level + ",'" + authority + "','" + forbidden_page + "'," +
shop_points_per_month + ",'" + postage_per_order + "','" + refund_postage_per_order + "',@oem_id,'" +
shop_points_per_month + "," + postage_per_order + "," + refund_postage_per_order + "," + gift_oem_amount_per_order + ",@oem_id,'" +
DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','" +
DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "');";
@@ -661,6 +671,7 @@ namespace KJD_Web.BLL.WXXD
var shop_points_per_month = RegexUtils.GetStringQuery(ref inputData, "shop_points_per_month")?.Replace("'", "\\'");
var postage_per_order = RegexUtils.GetStringQuery(ref inputData, "postage_per_order")?.Replace("'", "\\'");
var refund_postage_per_order = RegexUtils.GetStringQuery(ref inputData, "refund_postage_per_order")?.Replace("'", "\\'");
var gift_oem_amount_per_order = RegexUtils.GetStringQuery(ref inputData, "gift_oem_amount_per_order")?.Replace("'", "\\'");
var oem_id = RegexUtils.GetStringQuery(ref inputData, "oem_id")?.Replace("'", "\\'");
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
@@ -697,6 +708,8 @@ namespace KJD_Web.BLL.WXXD
sql += " postage_per_order=" + postage_per_order + ",";
if (refund_postage_per_order != null)
sql += " refund_postage_per_order=" + refund_postage_per_order + ",";
if (gift_oem_amount_per_order != null)
sql += " gift_oem_amount_per_order=" + gift_oem_amount_per_order + ",";
if (oem_id != null)
sql += " oem_id='" + oem_id + "',";
sql = sql.TrimEnd(',');
KJDService/KJD_WebService/KJD_WebService.csproj
+1
View File
@@ -289,6 +289,7 @@
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="Properties\PublishProfiles\IISProfile.pubxml" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
KJDService/KJD_WebService/Model/UserLoginResultParam.cs
+4
View File
@@ -101,5 +101,9 @@ namespace KJD_Web.Model
/// 每单退货运费金额
/// </summary>
public decimal? refund_postage_per_order { get; set; }
/// <summary>
/// 每一单礼物额外收取费用
/// </summary>
public decimal? gift_oem_amount_per_order { get; set; }
}
}
TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.cs
+6 -6
View File
@@ -461,12 +461,12 @@ namespace TemuKJD.KJDForms.AdminForms
if (cefWebBrowser == null)
{
//cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser("about:blank", false);
var setting = new CefSettings();
if (Cef.IsInitialized != true)
{
var rst = Cef.InitializeAsync(setting);
rst.Wait();
}
//var setting = new CefSettings();
//if (Cef.IsInitialized != true)
//{
// var rst = Cef.InitializeAsync(setting);
// rst.Wait();
//}
if (!string.IsNullOrEmpty(InitUrl))
cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser(InitUrl, true);
TEMUKJD/PDDForms/AdminForms/PDDAdminShopLoginForm.cs
+6 -6
View File
@@ -290,12 +290,12 @@ namespace TemuKJD.PDDForms.AdminForms
if (cefWebBrowser == null)
{
//cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser("about:blank", false);
var setting = new CefSettings();
if (Cef.IsInitialized != true)
{
var rst = Cef.InitializeAsync(setting);
rst.Wait();
}
//var setting = new CefSettings();
//if (Cef.IsInitialized != true)
//{
// var rst = Cef.InitializeAsync(setting);
// rst.Wait();
//}
if (!string.IsNullOrEmpty(InitUrl))
cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser(InitUrl, true);
TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs
+3
View File
@@ -240,6 +240,7 @@ namespace TemuKJD.WXForms.AdminForms
user.shop_points_per_month = BaseRegex.GetIntJson(ref oStr, "shop_points_per_month");
user.postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "postage_per_order");
user.refund_postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "refund_postage_per_order");
user.gift_oem_amount_per_order = BaseRegex.GetDecimalJson(ref oStr, "gift_oem_amount_per_order");
user.oem_id = BaseRegex.GetStringJson(ref oStr, "oem_id");
user.oem_name = BaseRegex.GetStringJson(ref oStr, "oem_name");
var parent_user_name = BaseRegex.GetStringJson(ref oStr, "parent_user_name");
@@ -271,6 +272,8 @@ namespace TemuKJD.WXForms.AdminForms
(user.group_id == "3") ? "改" : null,
Math.Max(2.5m, user.refund_postage_per_order.ParseToDecimal()),
(user.group_id == "3") ? "改" : null,
Math.Max(2.5m, user.gift_oem_amount_per_order.ParseToDecimal()),
(user.group_id == "3") ? "改" : null,
user.group_id == "3" ? "添加店铺" : "",
"编辑",
"删除");
TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs
Generated
+389 -229
View File
File diff suppressed because it is too large. Load diff
TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs
+62
View File
@@ -173,6 +173,7 @@ namespace TemuKJD.WXForms.AdminForms
user.shop_points_per_month = BaseRegex.GetIntJson(ref oStr, "shop_points_per_month");
user.postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "postage_per_order");
user.refund_postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "refund_postage_per_order");
user.gift_oem_amount_per_order = BaseRegex.GetDecimalJson(ref oStr, "gift_oem_amount_per_order");
user.oem_id = BaseRegex.GetStringJson(ref oStr, "oem_id");
user.oem_name = BaseRegex.GetStringJson(ref oStr, "oem_name");
var parent_user_name = BaseRegex.GetStringJson(ref oStr, "parent_user_name");
@@ -203,6 +204,8 @@ namespace TemuKJD.WXForms.AdminForms
(user.group_id == "3") ? "改" : null,
Math.Max(2.5m, user.refund_postage_per_order.ParseToDecimal()),
(user.group_id == "3") ? "改" : null,
Math.Max(0m, user.gift_oem_amount_per_order.ParseToDecimal()),
(user.group_id == "3") ? "改" : null,
user.group_id == "3" ? "添加店铺" : "",
"编辑",
"删除");
@@ -263,6 +266,7 @@ namespace TemuKJD.WXForms.AdminForms
int shopPointsPerMonth = dgvUser.Rows[e.RowIndex].Cells["colShopPointsPerMonth"].Value.ParseToInt();
decimal postagePerOrder = dgvUser.Rows[e.RowIndex].Cells["colPostagePerOrder"].Value.ParseToDecimal();
decimal refundPostagePerOrder = dgvUser.Rows[e.RowIndex].Cells["colRefundPostagePerOrder"].Value.ParseToDecimal();
decimal giftOemAmountPerOrder = dgvUser.Rows[e.RowIndex].Cells["colGiftOemAmountPerOrder"].Value.ParseToDecimal();
string oemId = dgvUser.Rows[e.RowIndex].Cells["colOemId"].Value.ParseToString();
var row = dgvUser.Rows[e.RowIndex];
if (columText == "编辑")
@@ -329,6 +333,15 @@ namespace TemuKJD.WXForms.AdminForms
this.pnlBalance.Visible = true;
this.pnlBalance.BringToFront();
}
if (columName == "colChangeGiftOemAmountPerOrder")
{
this.lblGiftOemAmountPerOrderUserInfo.Text = mobile + " - " + nickName;
this.numGiftOemAmountPerOrder.Value = giftOemAmountPerOrder;
this.pnlGiftOemAmountPerOrder.Tag = row;
this.pnlGiftOemAmountPerOrder.Visible = true;
this.pnlGiftOemAmountPerOrder.BringToFront();
this.lblGiftOemAmountPerOrderUserId.Text = uid;
}
}
if (columText == "改")
{
@@ -359,6 +372,15 @@ namespace TemuKJD.WXForms.AdminForms
this.pnlRefundPostagePerOrder.BringToFront();
this.lblRefundPostagePerOrderUserId.Text = uid;
}
if (columName == "colChangeGiftOemAmountPerOrder")
{
this.lblGiftOemAmountPerOrderUserInfo.Text = mobile + " - " + nickName;
this.numGiftOemAmountPerOrder.Value = giftOemAmountPerOrder;
this.pnlGiftOemAmountPerOrder.Tag = row;
this.pnlGiftOemAmountPerOrder.Visible = true;
this.pnlGiftOemAmountPerOrder.BringToFront();
this.lblGiftOemAmountPerOrderUserId.Text = uid;
}
}
}
@@ -402,6 +424,7 @@ namespace TemuKJD.WXForms.AdminForms
pnlBalance.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y);
pnlPostagePerOrder.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y);
pnlRefundPostagePerOrder.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y);
pnlGiftOemAmountPerOrder.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y);
this.cmbGroup.Items.Clear();
this.cmbGroup.Items.Add("主账户");
@@ -656,5 +679,44 @@ namespace TemuKJD.WXForms.AdminForms
{
pnlRefundPostagePerOrder.Visible = false;
}
private void btnGiftOemAmountPerOrder_Click(object sender, EventArgs e)
{
if (updateGiftOemAmountPerOrder(lblGiftOemAmountPerOrderUserId.Text))
{
pnlGiftOemAmountPerOrder.Visible = false;
BaseMsgForm.ShowInfo("修改充值用户店铺月费金额成功");
}
}
public bool updateGiftOemAmountPerOrder(string userDbId, bool showFailBox = true)
{
string url = BaseClass.BuildObjString("user/update_user");
string data = UserLogin.GetSignaturex();
data += "&id=" + userDbId;
data += "&gift_oem_amount_per_order=" + numGiftOemAmountPerOrder.Value;
string html = GetHtml.PostUtf8(url, data.ToString()).Trim();
if (!html.Contains("\"code\":200"))
{
var msg = BaseRegex.GetStringJsonByRegs(ref html, html, "msg");
if (showFailBox)
{
Invoke(new Action(() => { BaseMsgForm.ShowError(msg); }));
}
return false;
}
var row = dgvUser.Rows.Cast<DataGridViewRow>().FirstOrDefault(r => r.Cells["UserIdColumn"].Value.ParseToString() == userDbId);
if (row != null)
{
Invoke(new Action(() => { row.Cells["colGiftOemAmountPerOrder"].Value = numGiftOemAmountPerOrder.Value; }));
}
return true;
}
private void btnGiftOemAmountPerOrderCancel_Click(object sender, EventArgs e)
{
pnlGiftOemAmountPerOrder.Visible = false;
}
}
}
TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.resx
+6
View File
@@ -189,6 +189,12 @@
<metadata name="colChangeRefundPostagePerOrder.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colGiftOemAmountPerOrder.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colChangeGiftOemAmountPerOrder.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colAddShop.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.cs
+3
View File
@@ -276,6 +276,7 @@ namespace Work._29Tools.Forms.UserForms
user.shop_points_per_month = BaseRegex.GetIntJson(ref oStr, "shop_points_per_month");
user.postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "postage_per_order");
user.refund_postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "refund_postage_per_order");
user.gift_oem_amount_per_order = BaseRegex.GetDecimalJson(ref oStr, "gift_oem_amount_per_order");
user.oem_id = BaseRegex.GetStringJson(ref oStr, "oem_id");
user.oem_name = BaseRegex.GetStringJson(ref oStr, "oem_name");
var parent_user_name = BaseRegex.GetStringJson(ref oStr, "parent_user_name");
@@ -306,6 +307,8 @@ namespace Work._29Tools.Forms.UserForms
(user.group_id == "3") ? "改" : null,
Math.Max(2.5m, user.refund_postage_per_order.ParseToDecimal()),
(user.group_id == "3") ? "改" : null,
Math.Max(2.5m, user.gift_oem_amount_per_order.ParseToDecimal()),
(user.group_id == "3") ? "改" : null,
user.group_id == "3" ? "添加店铺" : "",
"编辑",
"删除");
TEMUKJD/WXForms/ShopForms/WXOemAccountForm.Designer.cs
Generated
+192 -24
View File
@@ -29,12 +29,14 @@ namespace TemuKJD.WXForms.ShopForms
/// </summary>
private void InitializeComponent()
{
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer5 = new System.Windows.Forms.SplitContainer();
this.pnlSuperManage = new System.Windows.Forms.Panel();
this.label10 = new System.Windows.Forms.Label();
@@ -64,6 +66,14 @@ namespace TemuKJD.WXForms.ShopForms
this.label4 = new System.Windows.Forms.Label();
this.txtSearch = new System.Windows.Forms.TextBox();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.pnlGiftOemAmountPerOrder = new System.Windows.Forms.Panel();
this.lblGiftOemAmountPerOrderUserId = new System.Windows.Forms.Label();
this.lblGiftOemAmountPerOrderUserInfo = new System.Windows.Forms.Label();
this.panel7 = new System.Windows.Forms.Panel();
this.numGiftOemAmountPerOrder = new System.Windows.Forms.NumericUpDown();
this.label7 = new System.Windows.Forms.Label();
this.btnGiftOemAmountPerOrderCancel = new DevComponents.DotNetBar.PanelEx();
this.btnGiftOemAmountPerOrder = new DevComponents.DotNetBar.PanelEx();
this.pnlRefundPostagePerOrder = new System.Windows.Forms.Panel();
this.lblRefundPostagePerOrderUserId = new System.Windows.Forms.Label();
this.lblRefundPostagePerOrderUserInfo = new System.Windows.Forms.Label();
@@ -129,6 +139,8 @@ namespace TemuKJD.WXForms.ShopForms
this.colChangePostagePerOrder = new System.Windows.Forms.DataGridViewLinkColumn();
this.colRefundPostagePerOrder = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colChangeRefundPostagePerOrder = new System.Windows.Forms.DataGridViewLinkColumn();
this.colGiftOemAmountPerOrder = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colChangeGiftOemAmountPerOrder = new System.Windows.Forms.DataGridViewLinkColumn();
this.editColumn = new System.Windows.Forms.DataGridViewLinkColumn();
this.deleteColumn = new System.Windows.Forms.DataGridViewLinkColumn();
this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx();
@@ -141,6 +153,9 @@ namespace TemuKJD.WXForms.ShopForms
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
this.pnlGiftOemAmountPerOrder.SuspendLayout();
this.panel7.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numGiftOemAmountPerOrder)).BeginInit();
this.pnlRefundPostagePerOrder.SuspendLayout();
this.panel6.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numRefundPostagePerOrder)).BeginInit();
@@ -497,6 +512,7 @@ namespace TemuKJD.WXForms.ShopForms
//
// splitContainer1.Panel1
//
this.splitContainer1.Panel1.Controls.Add(this.pnlGiftOemAmountPerOrder);
this.splitContainer1.Panel1.Controls.Add(this.pnlRefundPostagePerOrder);
this.splitContainer1.Panel1.Controls.Add(this.pnlPostagePerOrder);
this.splitContainer1.Panel1.Controls.Add(this.pnlBalance);
@@ -511,6 +527,121 @@ namespace TemuKJD.WXForms.ShopForms
this.splitContainer1.SplitterDistance = 620;
this.splitContainer1.TabIndex = 2;
//
// pnlGiftOemAmountPerOrder
//
this.pnlGiftOemAmountPerOrder.Anchor = System.Windows.Forms.AnchorStyles.None;
this.pnlGiftOemAmountPerOrder.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pnlGiftOemAmountPerOrder.Controls.Add(this.lblGiftOemAmountPerOrderUserId);
this.pnlGiftOemAmountPerOrder.Controls.Add(this.lblGiftOemAmountPerOrderUserInfo);
this.pnlGiftOemAmountPerOrder.Controls.Add(this.panel7);
this.pnlGiftOemAmountPerOrder.Location = new System.Drawing.Point(23, 237);
this.pnlGiftOemAmountPerOrder.Name = "pnlGiftOemAmountPerOrder";
this.pnlGiftOemAmountPerOrder.Size = new System.Drawing.Size(360, 146);
this.pnlGiftOemAmountPerOrder.TabIndex = 14;
this.pnlGiftOemAmountPerOrder.Visible = false;
//
// lblGiftOemAmountPerOrderUserId
//
this.lblGiftOemAmountPerOrderUserId.AutoSize = true;
this.lblGiftOemAmountPerOrderUserId.Location = new System.Drawing.Point(256, 19);
this.lblGiftOemAmountPerOrderUserId.Name = "lblGiftOemAmountPerOrderUserId";
this.lblGiftOemAmountPerOrderUserId.Size = new System.Drawing.Size(47, 17);
this.lblGiftOemAmountPerOrderUserId.TabIndex = 457;
this.lblGiftOemAmountPerOrderUserId.Text = "UserId";
this.lblGiftOemAmountPerOrderUserId.Visible = false;
//
// lblGiftOemAmountPerOrderUserInfo
//
this.lblGiftOemAmountPerOrderUserInfo.AutoSize = true;
this.lblGiftOemAmountPerOrderUserInfo.Location = new System.Drawing.Point(20, 19);
this.lblGiftOemAmountPerOrderUserInfo.Name = "lblGiftOemAmountPerOrderUserInfo";
this.lblGiftOemAmountPerOrderUserInfo.Size = new System.Drawing.Size(58, 17);
this.lblGiftOemAmountPerOrderUserInfo.TabIndex = 455;
this.lblGiftOemAmountPerOrderUserInfo.Text = "UserInfo";
//
// panel7
//
this.panel7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panel7.Controls.Add(this.numGiftOemAmountPerOrder);
this.panel7.Controls.Add(this.label7);
this.panel7.Controls.Add(this.btnGiftOemAmountPerOrderCancel);
this.panel7.Controls.Add(this.btnGiftOemAmountPerOrder);
this.panel7.Location = new System.Drawing.Point(23, 52);
this.panel7.Name = "panel7";
this.panel7.Size = new System.Drawing.Size(310, 57);
this.panel7.TabIndex = 454;
//
// numGiftOemAmountPerOrder
//
this.numGiftOemAmountPerOrder.DecimalPlaces = 2;
this.numGiftOemAmountPerOrder.Location = new System.Drawing.Point(125, 16);
this.numGiftOemAmountPerOrder.Maximum = new decimal(new int[] {
100000,
0,
0,
0});
this.numGiftOemAmountPerOrder.Name = "numGiftOemAmountPerOrder";
this.numGiftOemAmountPerOrder.Size = new System.Drawing.Size(56, 23);
this.numGiftOemAmountPerOrder.TabIndex = 1;
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(7, 19);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(128, 17);
this.label7.TabIndex = 456;
this.label7.Text = "礼物单每单额外收取：";
//
// btnGiftOemAmountPerOrderCancel
//
this.btnGiftOemAmountPerOrderCancel.CanvasColor = System.Drawing.SystemColors.Control;
this.btnGiftOemAmountPerOrderCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnGiftOemAmountPerOrderCancel.DisabledBackColor = System.Drawing.Color.Empty;
this.btnGiftOemAmountPerOrderCancel.Location = new System.Drawing.Point(244, 16);
this.btnGiftOemAmountPerOrderCancel.Name = "btnGiftOemAmountPerOrderCancel";
this.btnGiftOemAmountPerOrderCancel.Size = new System.Drawing.Size(56, 23);
this.btnGiftOemAmountPerOrderCancel.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnGiftOemAmountPerOrderCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnGiftOemAmountPerOrderCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnGiftOemAmountPerOrderCancel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.btnGiftOemAmountPerOrderCancel.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnGiftOemAmountPerOrderCancel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.btnGiftOemAmountPerOrderCancel.Style.GradientAngle = 90;
this.btnGiftOemAmountPerOrderCancel.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
this.btnGiftOemAmountPerOrderCancel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btnGiftOemAmountPerOrderCancel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnGiftOemAmountPerOrderCancel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnGiftOemAmountPerOrderCancel.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnGiftOemAmountPerOrderCancel.TabIndex = 458;
this.btnGiftOemAmountPerOrderCancel.Text = "取消";
this.btnGiftOemAmountPerOrderCancel.Click += new System.EventHandler(this.btnGiftOemAmountPerOrderCancel_Click);
//
// btnGiftOemAmountPerOrder
//
this.btnGiftOemAmountPerOrder.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnGiftOemAmountPerOrder.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnGiftOemAmountPerOrder.DisabledBackColor = System.Drawing.Color.Empty;
this.btnGiftOemAmountPerOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnGiftOemAmountPerOrder.Location = new System.Drawing.Point(185, 16);
this.btnGiftOemAmountPerOrder.Name = "btnGiftOemAmountPerOrder";
this.btnGiftOemAmountPerOrder.Size = new System.Drawing.Size(56, 23);
this.btnGiftOemAmountPerOrder.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnGiftOemAmountPerOrder.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnGiftOemAmountPerOrder.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnGiftOemAmountPerOrder.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.btnGiftOemAmountPerOrder.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
this.btnGiftOemAmountPerOrder.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
this.btnGiftOemAmountPerOrder.Style.ForeColor.Color = System.Drawing.Color.White;
this.btnGiftOemAmountPerOrder.Style.GradientAngle = 90;
this.btnGiftOemAmountPerOrder.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btnGiftOemAmountPerOrder.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnGiftOemAmountPerOrder.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnGiftOemAmountPerOrder.TabIndex = 453;
this.btnGiftOemAmountPerOrder.Text = "确定";
this.btnGiftOemAmountPerOrder.Click += new System.EventHandler(this.btnGiftOemAmountPerOrder_Click);
//
// pnlRefundPostagePerOrder
//
this.pnlRefundPostagePerOrder.Anchor = System.Windows.Forms.AnchorStyles.None;
@@ -1118,20 +1249,20 @@ namespace TemuKJD.WXForms.ShopForms
//
this.dgvUser.AllowUserToAddRows = false;
this.dgvUser.AllowUserToDeleteRows = false;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9;
this.dgvUser.AutoRowNumber = true;
this.dgvUser.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgvUser.BackgroundColor = System.Drawing.Color.White;
this.dgvUser.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10;
this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheck,
@@ -1158,6 +1289,8 @@ namespace TemuKJD.WXForms.ShopForms
this.colChangePostagePerOrder,
this.colRefundPostagePerOrder,
this.colChangeRefundPostagePerOrder,
this.colGiftOemAmountPerOrder,
this.colChangeGiftOemAmountPerOrder,
this.editColumn,
this.deleteColumn});
this.dgvUser.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1284,8 +1417,8 @@ namespace TemuKJD.WXForms.ShopForms
//
// colPlus
//
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
this.colPlus.DefaultCellStyle = dataGridViewCellStyle3;
dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
this.colPlus.DefaultCellStyle = dataGridViewCellStyle11;
this.colPlus.FillWeight = 22F;
this.colPlus.HeaderText = "+";
this.colPlus.Name = "colPlus";
@@ -1300,8 +1433,8 @@ namespace TemuKJD.WXForms.ShopForms
//
// colChangePointsPerMonth
//
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
this.colChangePointsPerMonth.DefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
this.colChangePointsPerMonth.DefaultCellStyle = dataGridViewCellStyle12;
this.colChangePointsPerMonth.FillWeight = 25F;
this.colChangePointsPerMonth.HeaderText = "改";
this.colChangePointsPerMonth.Name = "colChangePointsPerMonth";
@@ -1317,8 +1450,8 @@ namespace TemuKJD.WXForms.ShopForms
//
// colBalancePlus
//
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
this.colBalancePlus.DefaultCellStyle = dataGridViewCellStyle5;
dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
this.colBalancePlus.DefaultCellStyle = dataGridViewCellStyle13;
this.colBalancePlus.FillWeight = 22F;
this.colBalancePlus.HeaderText = "+";
this.colBalancePlus.Name = "colBalancePlus";
@@ -1334,8 +1467,8 @@ namespace TemuKJD.WXForms.ShopForms
//
// colChangePostagePerOrder
//
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
this.colChangePostagePerOrder.DefaultCellStyle = dataGridViewCellStyle6;
dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
this.colChangePostagePerOrder.DefaultCellStyle = dataGridViewCellStyle14;
this.colChangePostagePerOrder.FillWeight = 25F;
this.colChangePostagePerOrder.HeaderText = "改";
this.colChangePostagePerOrder.Name = "colChangePostagePerOrder";
@@ -1350,6 +1483,8 @@ namespace TemuKJD.WXForms.ShopForms
//
// colChangeRefundPostagePerOrder
//
dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
this.colChangeRefundPostagePerOrder.DefaultCellStyle = dataGridViewCellStyle15;
this.colChangeRefundPostagePerOrder.FillWeight = 25F;
this.colChangeRefundPostagePerOrder.HeaderText = "改";
this.colChangeRefundPostagePerOrder.Name = "colChangeRefundPostagePerOrder";
@@ -1357,6 +1492,24 @@ namespace TemuKJD.WXForms.ShopForms
this.colChangeRefundPostagePerOrder.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colChangeRefundPostagePerOrder.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
//
// colGiftOemAmountPerOrder
//
this.colGiftOemAmountPerOrder.FillWeight = 60F;
this.colGiftOemAmountPerOrder.HeaderText = "每单礼物额外收取";
this.colGiftOemAmountPerOrder.Name = "colGiftOemAmountPerOrder";
this.colGiftOemAmountPerOrder.ReadOnly = true;
//
// colChangeGiftOemAmountPerOrder
//
dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
this.colChangeGiftOemAmountPerOrder.DefaultCellStyle = dataGridViewCellStyle16;
this.colChangeGiftOemAmountPerOrder.FillWeight = 25F;
this.colChangeGiftOemAmountPerOrder.HeaderText = "改";
this.colChangeGiftOemAmountPerOrder.Name = "colChangeGiftOemAmountPerOrder";
this.colChangeGiftOemAmountPerOrder.ReadOnly = true;
this.colChangeGiftOemAmountPerOrder.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colChangeGiftOemAmountPerOrder.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
//
// editColumn
//
this.editColumn.FillWeight = 40F;
@@ -1422,6 +1575,11 @@ namespace TemuKJD.WXForms.ShopForms
this.splitContainer1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.pnlGiftOemAmountPerOrder.ResumeLayout(false);
this.pnlGiftOemAmountPerOrder.PerformLayout();
this.panel7.ResumeLayout(false);
this.panel7.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numGiftOemAmountPerOrder)).EndInit();
this.pnlRefundPostagePerOrder.ResumeLayout(false);
this.pnlRefundPostagePerOrder.PerformLayout();
this.panel6.ResumeLayout(false);
@@ -1525,6 +1683,14 @@ namespace TemuKJD.WXForms.ShopForms
private System.Windows.Forms.Label label18;
private DevComponents.DotNetBar.PanelEx btnRefundPostagePerOrderCancel;
private DevComponents.DotNetBar.PanelEx btnRefundPostagePerOrder;
private System.Windows.Forms.Panel pnlGiftOemAmountPerOrder;
private System.Windows.Forms.Label lblGiftOemAmountPerOrderUserId;
private System.Windows.Forms.Label lblGiftOemAmountPerOrderUserInfo;
private System.Windows.Forms.Panel panel7;
private System.Windows.Forms.NumericUpDown numGiftOemAmountPerOrder;
private System.Windows.Forms.Label label7;
private DevComponents.DotNetBar.PanelEx btnGiftOemAmountPerOrderCancel;
private DevComponents.DotNetBar.PanelEx btnGiftOemAmountPerOrder;
private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
private System.Windows.Forms.DataGridViewTextBoxColumn UserIdColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn UserNickNameColumn;
@@ -1549,6 +1715,8 @@ namespace TemuKJD.WXForms.ShopForms
private System.Windows.Forms.DataGridViewLinkColumn colChangePostagePerOrder;
private System.Windows.Forms.DataGridViewTextBoxColumn colRefundPostagePerOrder;
private System.Windows.Forms.DataGridViewLinkColumn colChangeRefundPostagePerOrder;
private System.Windows.Forms.DataGridViewTextBoxColumn colGiftOemAmountPerOrder;
private System.Windows.Forms.DataGridViewLinkColumn colChangeGiftOemAmountPerOrder;
private System.Windows.Forms.DataGridViewLinkColumn editColumn;
private System.Windows.Forms.DataGridViewLinkColumn deleteColumn;
}
TEMUKJD/WXForms/ShopForms/WXOemAccountForm.cs
+58 -1
View File
@@ -127,6 +127,7 @@ namespace TemuKJD.WXForms.ShopForms
user.shop_points_per_month = BaseRegex.GetIntJson(ref oStr, "shop_points_per_month");
user.postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "postage_per_order");
user.refund_postage_per_order = BaseRegex.GetDecimalJson(ref oStr, "refund_postage_per_order");
user.gift_oem_amount_per_order = BaseRegex.GetDecimalJson(ref oStr, "gift_oem_amount_per_order");
user.oem_id = BaseRegex.GetStringJson(ref oStr, "oem_id");
user.oem_name = BaseRegex.GetStringJson(ref oStr, "oem_name");
var parent_user_name = BaseRegex.GetStringJson(ref oStr, "parent_user_name");
@@ -157,6 +158,8 @@ namespace TemuKJD.WXForms.ShopForms
(user.group_id == "3") ? "改" : null,
Math.Max(2.5m, user.refund_postage_per_order.ParseToDecimal()),
(user.group_id == "3") ? "改" : null,
Math.Max(0m, user.gift_oem_amount_per_order.ParseToDecimal()),
(user.group_id == "3") ? "改" : null,
user.group_id == "3" ? "添加店铺" : "",
"编辑",
"删除");
@@ -202,6 +205,7 @@ namespace TemuKJD.WXForms.ShopForms
int shopPointsPerMonth = dgvUser.Rows[e.RowIndex].Cells["colShopPointsPerMonth"].Value.ParseToInt();
decimal postagePerOrder = dgvUser.Rows[e.RowIndex].Cells["colPostagePerOrder"].Value.ParseToDecimal();
decimal refundPostagePerOrder = dgvUser.Rows[e.RowIndex].Cells["colRefundPostagePerOrder"].Value.ParseToDecimal();
decimal giftOemAmountPerOrder = dgvUser.Rows[e.RowIndex].Cells["colGiftOemAmountPerOrder"].Value.ParseToDecimal();
var row = dgvUser.Rows[e.RowIndex];
if (columText == "编辑")
{
@@ -269,9 +273,18 @@ namespace TemuKJD.WXForms.ShopForms
this.pnlRefundPostagePerOrder.BringToFront();
this.lblRefundPostagePerOrderUserId.Text = uid;
}
if (columName == "colChangeGiftOemAmountPerOrder")
{
this.lblGiftOemAmountPerOrderUserInfo.Text = mobile + " - " + nickName;
this.numGiftOemAmountPerOrder.Value = giftOemAmountPerOrder;
this.pnlGiftOemAmountPerOrder.Tag = row;
this.pnlGiftOemAmountPerOrder.Visible = true;
this.pnlGiftOemAmountPerOrder.BringToFront();
this.lblGiftOemAmountPerOrderUserId.Text = uid;
}
}
if (columText == "")
row.Cells["colSelect"].Value = !row.Cells["colSelect"].Value.ParseToBool();
row.Cells["colCheck"].Value = !row.Cells["colCheck"].Value.ParseToBool();
}
public void Delete(string uid)
@@ -314,6 +327,7 @@ namespace TemuKJD.WXForms.ShopForms
pnlBalance.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y);
pnlPostagePerOrder.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y);
pnlRefundPostagePerOrder.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y);
pnlGiftOemAmountPerOrder.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y);
this.txtSearch.GotFocus += TxtSearch_GotFocus;
this.txtSearch.LostFocus += TxtSearch_LostFocus;
@@ -326,6 +340,10 @@ namespace TemuKJD.WXForms.ShopForms
this.dgvUser.AddMergeColumnHeader(new List<string> { "colBalance", "colBalancePlus" }, "快递余额");
this.dgvUser.AddMergeColumn(new List<string> { "colPostagePerOrder", "colChangePostagePerOrder" });
this.dgvUser.AddMergeColumnHeader(new List<string> { "colPostagePerOrder", "colChangePostagePerOrder" }, "每单快递费");
this.dgvUser.AddMergeColumn(new List<string> { "colRefundPostagePerOrder", "colChangeRefundPostagePerOrder" });
this.dgvUser.AddMergeColumnHeader(new List<string> { "colRefundPostagePerOrder", "colChangeRefundPostagePerOrder" }, "每单退货快递费");
this.dgvUser.AddMergeColumn(new List<string> { "colGiftOemAmountPerOrder", "colChangeRefundPostagePerOrder" });
this.dgvUser.AddMergeColumnHeader(new List<string> { "colGiftOemAmountPerOrder", "colChangeGiftOemAmountPerOrder" }, "每单礼物额外收取");
}
private void TxtSearch_LostFocus(object sender, EventArgs e)
@@ -557,5 +575,44 @@ namespace TemuKJD.WXForms.ShopForms
{
pnlRefundPostagePerOrder.Visible = false;
}
private void btnGiftOemAmountPerOrder_Click(object sender, EventArgs e)
{
if (updateGiftOemAmountPerOrder(lblGiftOemAmountPerOrderUserId.Text))
{
pnlGiftOemAmountPerOrder.Visible = false;
BaseMsgForm.ShowInfo("修改充值用户店铺月费金额成功");
}
}
public bool updateGiftOemAmountPerOrder(string userDbId, bool showFailBox = true)
{
string url = BaseClass.BuildObjString("user/update_user");
string data = UserLogin.GetSignaturex();
data += "&id=" + userDbId;
data += "&gift_oem_amount_per_order=" + numGiftOemAmountPerOrder.Value;
string html = GetHtml.PostUtf8(url, data.ToString()).Trim();
if (!html.Contains("\"code\":200"))
{
var msg = BaseRegex.GetStringJsonByRegs(ref html, html, "msg");
if (showFailBox)
{
Invoke(new Action(() => { BaseMsgForm.ShowError(msg); }));
}
return false;
}
var row = dgvUser.Rows.Cast<DataGridViewRow>().FirstOrDefault(r => r.Cells["UserIdColumn"].Value.ParseToString() == userDbId);
if (row != null)
{
Invoke(new Action(() => { row.Cells["colGiftOemAmountPerOrder"].Value = numGiftOemAmountPerOrder.Value; }));
}
return true;
}
private void btnGiftOemAmountPerOrderCancel_Click(object sender, EventArgs e)
{
pnlGiftOemAmountPerOrder.Visible = false;
}
}
}
TEMUKJD/WXForms/ShopForms/WXOemAccountForm.resx
+6
View File
@@ -189,6 +189,12 @@
<metadata name="colChangeRefundPostagePerOrder.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colGiftOemAmountPerOrder.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colChangeGiftOemAmountPerOrder.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="editColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
Work/UserLogin.cs
+1
View File
@@ -94,6 +94,7 @@ namespace Work
BaseClass.Balance = BaseRegex.GetDecimalJson(ref html, "balance");
BaseClass.PostagePerOrder = Math.Max(2.2m, BaseRegex.GetDecimalJson(ref html, "postage_per_order"));
BaseClass.RefundPostagePerOrder = Math.Max(2.5m, BaseRegex.GetDecimalJson(ref html, "refund_postage_per_order"));
BaseClass.GiftOemAmountPerOrder = Math.Max(0m, BaseRegex.GetDecimalJson(ref html, "gift_oem_amount_per_order"));
BaseClass.OemId = BaseRegex.GetStringJson(ref html, "oem_id");
BaseClass.OemName = BaseRegex.GetStringJson(ref html, "oem_name");
BaseClass.IsOemOwner = BaseRegex.GetBoolJson(ref html, "is_oem_owner");