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

@@ -741,7 +741,7 @@ namespace TemuKJD.PDDForms.ShopForms
//if (result?.Contains("\"code\":200") == true)
//{
// var jObj = JObject.Parse(result);
// List<DouShopSubAccountInfo> shopSubAccountList = JsonHelper.DeserializeJsonToList<DouShopSubAccountInfo>(jObj["data"].ToString());
// List<UserSubAccountInfo> shopSubAccountList = JsonHelper.DeserializeJsonToList<UserSubAccountInfo>(jObj["data"].ToString());
// foreach (var shop in GlobalConfig.DouShopLoginList)
// {
// shop.ShopSubAccountList.Clear();
@@ -758,7 +758,7 @@ namespace TemuKJD.PDDForms.ShopForms
shop.ShopSubAccountList.Clear();
if (!string.IsNullOrWhiteSpace(shop.SubUserName))
{
ShopSubAccountInfo subAccount = new ShopSubAccountInfo();
UserSubAccountInfo subAccount = new UserSubAccountInfo();
subAccount.sub_user_name = shop.SubUserName;
subAccount.user_name = shop.SubUserName;
subAccount.shop_login_name = shop.LoginName;
@@ -16,7 +16,7 @@ namespace TemuKJD.PDDForms.ShopForms
{
public partial class PDDSubAccountListForm : 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; } = "";
public PDDSubAccountListForm()
@@ -120,7 +120,7 @@ namespace TemuKJD.PDDForms.ShopForms
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");
@@ -17,9 +17,9 @@ namespace TemuKJD.PDDForms.ShopForms
public partial class PDDSubAccountShopEditForm : BaseGeneralForm
{
ShopLoginInfo shop = null;
public List<ShopSubAccountInfo> AllSubAccountList { get; set; } = new List<ShopSubAccountInfo>();
public List<ShopSubAccountInfo> ShopSubAccountList { get; set; } = new List<ShopSubAccountInfo>();
public List<ShopSubAccountInfo> NotShopSubAccountList { get; set; } = new List<ShopSubAccountInfo>();
public List<UserSubAccountInfo> AllSubAccountList { get; set; } = new List<UserSubAccountInfo>();
public List<UserSubAccountInfo> ShopSubAccountList { get; set; } = new List<UserSubAccountInfo>();
public List<UserSubAccountInfo> NotShopSubAccountList { get; set; } = new List<UserSubAccountInfo>();
public PDDSubAccountShopEditForm(ShopLoginInfo _shop)
{
InitializeComponent();
@@ -51,7 +51,7 @@ namespace TemuKJD.PDDForms.ShopForms
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.nick_name = BaseRegex.GetStringJson(ref oStr, "nick_name");
user.user_name = BaseRegex.GetStringJson(ref oStr, "user_name");
@@ -134,8 +134,8 @@ namespace TemuKJD.PDDForms.ShopForms
private void btnOk_Click(object sender, EventArgs e)
{
List<ShopSubAccountInfo> AddUsers = new List<ShopSubAccountInfo>();
List<ShopSubAccountInfo> DeleteUsers = new List<ShopSubAccountInfo>();
List<UserSubAccountInfo> AddUsers = new List<UserSubAccountInfo>();
List<UserSubAccountInfo> DeleteUsers = new List<UserSubAccountInfo>();
foreach (Control c in this.flpNotSubAccount.Controls)
{
var co = c as UcSubAccount;
+2 -2
View File
@@ -13,14 +13,14 @@ namespace TemuKJD.PDDForms.ShopForms
{
public partial class UcSubAccount : UserControl
{
public ShopSubAccountInfo subAccount = null;
public UserSubAccountInfo subAccount = null;
public delegate void SubAcountDelegate(object obj);
public event SubAcountDelegate AddSubAcountEvent;
public event SubAcountDelegate RemoveSubAcountEvent;
public UcSubAccount(ShopSubAccountInfo _subAccount, bool isNotShopSubAccount = true)
public UcSubAccount(UserSubAccountInfo _subAccount, bool isNotShopSubAccount = true)
{
InitializeComponent();
subAccount = _subAccount;