1 bxx相关逻辑 2 店铺活动相关逻辑

This commit is contained in:
wule committed 2025-09-09 19:07:29 +08:00
1 parent fc017993df
commit b44fa2a6c3
35 files changed
+460 -3861

No files matched your search

+4 -3
View File
@@ -21,6 +21,7 @@ using Work;
using NaiBa.Util;
using System.Globalization;
using TemuKJD.KJDForms.AdminForms;
using TemuKJD.BLL;
namespace TemuKJD.KJDForms.ShopForms
{
@@ -171,7 +172,7 @@ namespace TemuKJD.KJDForms.ShopForms
if (jArr.Count() == 0)
break;
list.AddRange(AdminForms.AdminShopListForm.DeserializationShop(html));
list.AddRange(ShopBLL.DeserializationShop(html));
}
return list;
}
@@ -619,7 +620,7 @@ namespace TemuKJD.KJDForms.ShopForms
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(v => v.LoginName == shopNames[i]);
// 先从服务端取最新cookie
var serverCampanys = AdminShopListForm.AdminGetServerShopLstByIds(campanys.Select(c => c.ShopId).ToList());
var serverCampanys = ShopBLL.AdminGetServerShopLstByIds(campanys.Select(c => c.ShopId).ToList());
var sss = string.Join(",", serverCampanys.Select(s => s.UserName + s.ShopAccount));
var serverShop = serverCampanys.FirstOrDefault();
if (shop != null && serverShop != null)
@@ -760,7 +761,7 @@ namespace TemuKJD.KJDForms.ShopForms
shop.ShopSubAccountList.Clear();
if (!string.IsNullOrWhiteSpace(shop.SubUserName))
{
DouShopSubAccountInfo subAccount = new DouShopSubAccountInfo();
ShopSubAccountInfo subAccount = new ShopSubAccountInfo();
subAccount.sub_user_name = shop.SubUserName;
subAccount.user_name = shop.SubUserName;
subAccount.shop_login_name = shop.LoginName;
@@ -15,6 +15,7 @@ using NaiBa.Util.Extension;
using Newtonsoft.Json.Linq;
using Work;
using TemuKJD.KJDForms.AdminForms;
using TemuKJD.BLL;
namespace TemuKJD.KJDForms.ShopForms
{
@@ -156,7 +157,7 @@ namespace TemuKJD.KJDForms.ShopForms
}
List<ShopLoginInfo> serverShopLst = new List<ShopLoginInfo>();
var rst = AdminShopListForm.AdminGetServerShopLstForSetCookie(shopLoginInfo, serverShopLst);
var rst = ShopBLL.AdminGetServerShopLstForSetCookie(shopLoginInfo, serverShopLst);
if (rst != "success")
{
@@ -233,7 +234,7 @@ namespace TemuKJD.KJDForms.ShopForms
}
List<ShopLoginInfo> serverShopLst = new List<ShopLoginInfo>();
var rst = AdminShopListForm.AdminGetServerShopLstForSetCookie(shopLoginInfo, serverShopLst);
var rst = ShopBLL.AdminGetServerShopLstForSetCookie(shopLoginInfo, serverShopLst);
if (rst != "success")
{
@@ -310,7 +311,7 @@ namespace TemuKJD.KJDForms.ShopForms
if (oldServerShop == null)
{
if (updateFrom != SetCookieFromEnum.normal_user)
AdminShopListForm.AdminAddServerShop(newShop); // 店铺写入到服务端
ShopBLL.AdminAddServerShop(newShop); // 店铺写入到服务端
else
ShopListForm.AddServerDouShop(newShop); // 店铺写入到服务端
}
@@ -16,7 +16,7 @@ namespace TemuKJD.KJDForms.ShopForms
{
public partial class SubAccountListForm : BaseForm
{
public static List<DouShopSubAccountInfo> AllUsers { get; set; } = new List<DouShopSubAccountInfo>();
public static List<ShopSubAccountInfo> AllUsers { get; set; } = new List<ShopSubAccountInfo>();
public MainForm Mf { get; set; } = null;
public string Uid { get; set; } = "";
public SubAccountListForm()
@@ -120,7 +120,7 @@ namespace TemuKJD.KJDForms.ShopForms
foreach (Newtonsoft.Json.Linq.JObject obj in userObj["data"])
{
string oStr = JsonHelper.SerializeObject(obj);
DouShopSubAccountInfo user = new DouShopSubAccountInfo();
ShopSubAccountInfo user = new ShopSubAccountInfo();
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.KJDForms.ShopForms
public partial class SubAccountShopEditForm : LRBaseForm
{
ShopLoginInfo shop = null;
public List<DouShopSubAccountInfo> AllSubAccountList { get; set; } = new List<DouShopSubAccountInfo>();
public List<DouShopSubAccountInfo> ShopSubAccountList { get; set; } = new List<DouShopSubAccountInfo>();
public List<DouShopSubAccountInfo> NotShopSubAccountList { get; set; } = new List<DouShopSubAccountInfo>();
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 SubAccountShopEditForm(ShopLoginInfo _shop)
{
InitializeComponent();
@@ -51,7 +51,7 @@ namespace TemuKJD.KJDForms.ShopForms
foreach (Newtonsoft.Json.Linq.JObject obj in userObj["data"])
{
string oStr = JsonHelper.SerializeObject(obj);
DouShopSubAccountInfo user = new DouShopSubAccountInfo();
ShopSubAccountInfo user = new ShopSubAccountInfo();
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.KJDForms.ShopForms
private void btnOk_Click(object sender, EventArgs e)
{
List<DouShopSubAccountInfo> AddUsers = new List<DouShopSubAccountInfo>();
List<DouShopSubAccountInfo> DeleteUsers = new List<DouShopSubAccountInfo>();
List<ShopSubAccountInfo> AddUsers = new List<ShopSubAccountInfo>();
List<ShopSubAccountInfo> DeleteUsers = new List<ShopSubAccountInfo>();
foreach (Control c in this.flpNotSubAccount.Controls)
{
var co = c as UcSubAccount;
+2 -2
View File
@@ -13,14 +13,14 @@ namespace TemuKJD.KJDForms.ShopForms
{
public partial class UcSubAccount : UserControl
{
public DouShopSubAccountInfo subAccount = null;
public ShopSubAccountInfo subAccount = null;
public delegate void SubAcountDelegate(object obj);
public event SubAcountDelegate AddSubAcountEvent;
public event SubAcountDelegate RemoveSubAcountEvent;
public UcSubAccount(DouShopSubAccountInfo _subAccount, bool isNotShopSubAccount = true)
public UcSubAccount(ShopSubAccountInfo _subAccount, bool isNotShopSubAccount = true)
{
InitializeComponent();
subAccount = _subAccount;