1.界面优化调整 2.618取消活动 3.清理无流量新 4.用户商品库1688及拼多多外部商品入库逻辑优化 5.带百分号的属性微信上货优化 6.数据库产品在不同用户间迁移 7.删除店铺功能开放给充值用户防止店铺导入错误无法删除

This commit is contained in:
wule committed 2026-06-11 11:38:08 +08:00
1 parent 2759ff0f6d
commit 0a9980335f
59 files changed
+3078 -652

No files matched your search

@@ -13,6 +13,7 @@ using System.Threading.Tasks;
using System.Windows.Forms;
using TemuKJD.BaseForms;
using TemuKJD.BLL;
using TemuKJD.Extension;
using Work;
namespace TemuKJD.WXForms.AdminForms
@@ -20,7 +21,7 @@ namespace TemuKJD.WXForms.AdminForms
public partial class WXAdminAccountForm
: BaseForm
{
public static List<ShopSubAccountInfo> AllUsers { get; set; } = new List<ShopSubAccountInfo>();
public static List<UserSubAccountInfo> AllUsers { get; set; } = new List<UserSubAccountInfo>();
public MainForm Mf { get; set; } = null;
public string Uid { get; set; } = "";
@@ -150,7 +151,7 @@ namespace TemuKJD.WXForms.AdminForms
foreach (Newtonsoft.Json.Linq.JObject obj in userObj["data"])
{
string oStr = JsonHelper.SerializeObject(obj);
ShopSubAccountInfo user = new ShopSubAccountInfo();
UserSubAccountInfo user = new UserSubAccountInfo();
user.id = BaseRegex.GetIntJson(ref oStr, "id");
user.user_name = BaseRegex.GetStringJson(ref oStr, "user_name");
user.nick_name = BaseRegex.GetStringJson(ref oStr, "nick_name");
@@ -162,6 +163,7 @@ namespace TemuKJD.WXForms.AdminForms
user.authority = BaseRegex.GetStringJson(ref oStr, "authority");
user.group_id = BaseRegex.GetStringJson(ref oStr, "group_id");
user.points = BaseRegex.GetIntJson(ref oStr, "points");
user.shop_points_per_month = BaseRegex.GetIntJson(ref oStr, "shop_points_per_month");
var parent_user_name = BaseRegex.GetStringJson(ref oStr, "parent_user_name");
AllUsers.Add(user);
@@ -177,8 +179,10 @@ namespace TemuKJD.WXForms.AdminForms
user.sa_level,
user.sa_level_name /*+ (user.group_id == "4" ? "(客服)" : "")*/,
user.authority,
user.group_id == "3" ? user.points.ToString() : "",
"+",
(user.authority.Contains("充值用户") && user.group_id == "3") ? (int?)user.shop_points_per_month : null,
(user.authority.Contains("充值用户") && user.group_id == "3") ? "改" : null,
(user.authority.Contains("充值用户") && user.group_id == "3") ? (int?)user.points : null,
(user.authority.Contains("充值用户") && user.group_id == "3") ? "+" : null,
user.group_id == "3" ? "添加店铺" : "",
"编辑",
"删除");
@@ -231,6 +235,7 @@ namespace TemuKJD.WXForms.AdminForms
string company = dgvUser.Rows[e.RowIndex].Cells["colCompany"].Value.ToString();
string saLevelName = dgvUser.Rows[e.RowIndex].Cells["colSaLevelName"].Value.ToString();
string authority = dgvUser.Rows[e.RowIndex].Cells["colAuthority"].Value.ParseToString();
int shopPointsPerMonth = dgvUser.Rows[e.RowIndex].Cells["colShopPointsPerMonth"].Value.ParseToInt();
var row = dgvUser.Rows[e.RowIndex];
if (columname == "编辑")
{
@@ -276,6 +281,14 @@ namespace TemuKJD.WXForms.AdminForms
this.pnlTopUp.Tag = row;
this.pnlTopUp.Visible = true;
}
if (columname == "改")
{
this.lblShopPointsPerMonthUserInfo.Text = mobile + " - " + nickName;
this.numShopPointsPerMonth.Value = shopPointsPerMonth;
this.pnlShopPointsPerMonth.Tag = row;
this.pnlShopPointsPerMonth.Visible = true;
this.lblShopPointsPerMonthUserId.Text = uid;
}
}
public void Delete(string uid)
@@ -312,6 +325,8 @@ namespace TemuKJD.WXForms.AdminForms
private void MainAccountForm_Load(object sender, EventArgs e)
{
pnlShopPointsPerMonth.Location = new Point(pnlTopUp.Location.X, pnlTopUp.Location.Y);
this.cmbGroup.Items.Clear();
this.cmbGroup.Items.Add("主账户");
this.cmbGroup.Items.Add("客服");
@@ -323,6 +338,11 @@ namespace TemuKJD.WXForms.AdminForms
this.txtSearch.GotFocus += TxtSearch_GotFocus;
this.txtSearch.LostFocus += TxtSearch_LostFocus;
this.dgvUser.AddMergeColumn(new List<string> { "colShopPointsPerMonth", "colChangePointsPerMonth" });
this.dgvUser.AddMergeColumnHeader(new List<string> { "colShopPointsPerMonth", "colChangePointsPerMonth" }, "月费耗点");
this.dgvUser.AddMergeColumn(new List<string> { "colPoints", "colPlus" });
this.dgvUser.AddMergeColumnHeader(new List<string> { "colPoints", "colPlus" }, "积分点数");
}
private void TxtSearch_LostFocus(object sender, EventArgs e)
@@ -405,5 +425,33 @@ namespace TemuKJD.WXForms.AdminForms
row.Visible = false;
}
}
private void btnShopPointsPerMonthCancel_Click(object sender, EventArgs e)
{
pnlShopPointsPerMonth.Visible = false;
}
private void btnShopPointsPerMonth_Click(object sender, EventArgs e)
{
string url = BaseClass.BuildObjString("user/update_user");
string data = UserLogin.GetSignaturex();
data += "&id=" + lblShopPointsPerMonthUserId.Text;
data += "&shop_points_per_month=" + numShopPointsPerMonth.Value;
string html = GetHtml.PostUtf8(url, data.ToString()).Trim();
if (!html.Contains("\"code\":200"))
{
var msg = BaseRegex.GetStringJsonByRegs(ref html, html, "msg");
BaseMsgForm.ShowError(msg);
return;
}
var row = pnlShopPointsPerMonth.Tag as DataGridViewRow;
if (row != null)
{
row.Cells["colShopPointsPerMonth"].Value = numShopPointsPerMonth.Value;
}
pnlShopPointsPerMonth.Visible = false;
BaseMsgForm.ShowInfo("修改充值用户店铺月费金额成功");
}
}
}