1店铺登录逻辑优化 2备货单查询显示

This commit is contained in:
wule committed 2025-07-01 18:58:51 +08:00
1 parent 89eb9ce9d4
commit 862ad088f5
216 files changed
+3481 -1543

No files matched your search

+61 -81
View File
@@ -3,9 +3,9 @@ using AllBase.Helper;
using AllBase.Model.Result;
using CefSharp;
using CefSharp.WinForms;
using LittleRabbit.DashBoardForms;
using LittleRabbit.Helper;
using LittleRabbit.LittleRabbitForms.BaseForms;
using TemuKJD.DashBoardForms;
using TemuKJD.Helper;
using TemuKJD.KJDForms.BaseForms;
using Microsoft.Win32;
using NaiBa.CefHelper;
using NaiBa.CefHelper.Handler;
@@ -25,7 +25,7 @@ using System.Windows.Forms;
using Work;
using Work.BLL.Tools;
namespace LittleRabbit.LittleRabbitForms.ShopForms
namespace TemuKJD.KJDForms.ShopForms
{
public enum EnumOpenType
{
@@ -61,8 +61,8 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms
if (openType == EnumOpenType.login)
{
this.shop.ShopAccountId = "";
this.shop.ShopAccount = "";
//this.shop.ShopId = "";
//this.shop.ShopAccount = "";
}
if (isMultiLogin && shop != null)
@@ -113,92 +113,72 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms
if (!lstShopCompany.Any(c => c.LoginName == shop.LoginName))
continue;
string cookies = "";
List<Cookie> cookieList = CEFBrowser.GetCookieList(shopCookieHead, cefWebBrowser.RequestContext.GetCookieManager(null));
if (cookieList != null && cookieList.Count > 0)
{
string cookies = "";
List<Cookie> cookieList = CEFBrowser.GetCookieList(shopCookieHead, cefWebBrowser.RequestContext.GetCookieManager(null));
if (cookieList != null && cookieList.Count > 0)
foreach (var cookie in cookieList)
{
foreach (var cookie in cookieList)
{
//if (cookies.Contains(cookie.Name + "=" + cookie.Value))
// continue;
cookies += cookie.Name + "=" + cookie.Value + "; ";
}
cookies = cookies.Trim().TrimEnd(';');
//if (cookies.Contains(cookie.Name + "=" + cookie.Value))
// continue;
cookies += cookie.Name + "=" + cookie.Value + "; ";
}
cookies = cookies.Trim().TrimEnd(';');
}
if (!string.IsNullOrEmpty(cookies)
&& lstShopCompany.Any(c => c.LoginName == shop.LoginName))
if (!string.IsNullOrEmpty(cookies)
&& lstShopCompany.Any(c => c.LoginName == shop.LoginName))
{
shop.Cookies = cookies;
var lstShopCompanyCopy = lstShopCompany.ToList();
lstShopCompanyCopy = lstShopCompanyCopy.Where(l => l.LoginName == shop.LoginName).ToList();
foreach (ShopCompany sc in lstShopCompanyCopy)
{
var lstShopCompanyCopy = lstShopCompany.ToList();
//var shopCompany = lstShopCompany.FirstOrDefault(c=>c.LoginName==shop.LoginName);
//if (shopCompany == null)
// shopCompany = new ShopCompany();
//shop.LoginStatus = "登录成功";
//shop.ShopAccountId = shopCompany.AccountId;
//shop.ShopAccount = shopCompany.AccountName;
//shop.Cookies = cookies;
//shop.LastRefreshDate = DateTime.Now.ToString("yyyyMMdd");
//var shopInfo = GlobalConfig.DouShopLoginList.FirstOrDefault(v => v.ShopAccountId == shop.ShopAccountId);
//if (shopInfo != null)
//{
// shopInfo.Cookies = shop.Cookies;
// shopInfo.Password = shop.Password;
// shopInfo.ShopAccountId = shop.ShopAccountId;
// shopInfo.ShopAccount = shop.ShopAccount;
//}
//else
// GlobalConfig.DouShopLoginList.Add(shop);
//StartUp.SaveLocalShopLoginInfo();
////ShopListForm.AddServerDouShop(shop); // 店铺写入到服务端
//ShopListForm.UpdateServerShopCookies(shop, shop.Cookies); // cookie写入到服务端
foreach (ShopCompany sc in lstShopCompanyCopy)
DouShopLoginInfo newShop = new DouShopLoginInfo()
{
DouShopLoginInfo newShop = new DouShopLoginInfo()
{
LoginName = shop.LoginName,
Password = shop.Password,
Group = shop.Group,
LoginStatus = "登录成功",
ShopAccount = sc.AccountName,
ShopAccountId = sc.AccountId,
Cookies = cookies,
};
LoginName = shop.LoginName,
Password = shop.Password,
Group = shop.Group,
ShopAccount = sc.AccountName,
ShopId = sc.AccountId,
};
var oldShop = GlobalConfig.DouShopLoginList.FirstOrDefault(l =>
l.LoginName == newShop.LoginName && l.ShopAccountId == newShop.ShopAccountId);
if (oldShop == null)
{
GlobalConfig.DouShopLoginList.Add(newShop);
ShopListForm.AddServerDouShop(newShop); // 店铺写入到服务端
}
else
{
oldShop.LoginName = shop.LoginName;
oldShop.Password = shop.Password;
oldShop.Group = shop.Group;
oldShop.LoginStatus = "登录成功";
oldShop.ShopAccount = sc.AccountName;
oldShop.ShopAccountId = sc.AccountId;
oldShop.Cookies = cookies;
}
StartUp.SaveLocalShopLoginInfo();
ShopListForm.UpdateServerShopCookies(newShop, newShop.Cookies);
}
OnSaveComplete(shop);
if (this.Created && this.chkCloseAfterLogin.Checked)
var oldShop = GlobalConfig.ShopLoginList.FirstOrDefault(l =>
l.LoginName == newShop.LoginName && l.ShopId == newShop.ShopId);
if (oldShop == null)
{
Invoke(new Action(() => { this.Close(); }));
newShop.LoginStatus = "登录成功";
newShop.LastRefreshDate = DateTime.Now.ToString("yyyyMMdd");
GlobalConfig.ShopLoginList.Add(newShop);
ShopListForm.AddServerDouShop(newShop); // 店铺写入到服务端
}
else
break;
{
oldShop.LoginStatus = "登录成功";
oldShop.LastRefreshDate = DateTime.Now.ToString("yyyyMMdd");
oldShop.LoginName = newShop.LoginName;
oldShop.Password = newShop.Password;
oldShop.Group = newShop.Group;
oldShop.ShopAccount = newShop.ShopAccount;
oldShop.ShopId = newShop.ShopId;
}
}
var lstShop = GlobalConfig.ShopLoginList.Where(l => l.LoginName == shop.LoginName).ToList();
foreach(var s in lstShop)
{
s.Cookies = shop.Cookies;
}
StartUp.SaveLocalShopLoginInfo(); // 店铺保存到本地
ShopListForm.UpdateServerShopCookies(shop, shop.Cookies); // 店铺cookie写入服务端,多店共用一个登录账号一组cookie
OnSaveComplete(shop);
if (this.Created && this.chkCloseAfterLogin.Checked)
{
Invoke(new Action(() => { this.Close(); }));
}
else
break;
}
}
}