1店铺登录逻辑优化 2备货单查询显示
This commit is contained in:
1 parent
89eb9ce9d4
commit
862ad088f5
216 files changed
+3481
-1543
No files matched your search
@@ -17,24 +17,24 @@ using System.Text;
|
||||
using AllBase.Helper;
|
||||
using NaiBa.Util.Extension;
|
||||
using Work.CollectClass;
|
||||
using LittleRabbit.LittleRabbitForms.BaseForms;
|
||||
using TemuKJD.KJDForms.BaseForms;
|
||||
using AllBase.Model.Param.FissionManage;
|
||||
using Work;
|
||||
using Work.Api;
|
||||
using System.Threading;
|
||||
using LittleRabbit.LittleRabbitForms.ToolForms;
|
||||
using LittleRabbit.LittleRabbitForms.ToolForms.JDVerify;
|
||||
using TemuKJD.KJDForms.ToolForms;
|
||||
using TemuKJD.KJDForms.ToolForms.JDVerify;
|
||||
using NaiBa.Util;
|
||||
using Work.DouyinApiClass;
|
||||
using Work.BLL.Upload;
|
||||
using NaiBa.CefHelper;
|
||||
using AllBase.Model.Param.ProductManage;
|
||||
using LittleRabbit.LittleRabbitForms.UploadForms.FissionUserControl;
|
||||
using TemuKJD.KJDForms.UploadForms.FissionUserControl;
|
||||
using AllBase.Model.Result;
|
||||
using NaiBa.CefHelper.Handler;
|
||||
using LittleRabbit.LittleRabbitForms.ToolForms.KeywordsForms;
|
||||
using TemuKJD.KJDForms.ToolForms.KeywordsForms;
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.UploadForms
|
||||
namespace TemuKJD.KJDForms.UploadForms
|
||||
{
|
||||
public partial class Fission : LRBaseForm
|
||||
{
|
||||
@@ -664,7 +664,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms
|
||||
var item = this.cmbGetCatShop.SelectedItem as ComboBoxItem;
|
||||
if (item != null && item.Name != "随机选择")
|
||||
{
|
||||
dyShop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == item.Name);
|
||||
dyShop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == item.Name);
|
||||
if (dyShop != null)
|
||||
{
|
||||
catid = (int)UploadProductBLL.GetCat(data.name, out errMsg, out fullCatStrings, dyShop);
|
||||
@@ -679,7 +679,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms
|
||||
}
|
||||
else
|
||||
{
|
||||
dyShop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.LoginStatus == "登录成功");
|
||||
dyShop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.LoginStatus == "登录成功");
|
||||
if (dyShop == null)
|
||||
lblCategory.Text = "请登录店铺!";
|
||||
while (dyShop != null && catid == 0)
|
||||
@@ -690,7 +690,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms
|
||||
if (dyShop.LoginStatus == "未登录")
|
||||
{
|
||||
StartUp.SaveLocalShopLoginInfo();
|
||||
dyShop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.LoginStatus == "登录成功");
|
||||
dyShop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.LoginStatus == "登录成功");
|
||||
Thread.Sleep(100);
|
||||
}
|
||||
}
|
||||
@@ -1767,7 +1767,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms
|
||||
{
|
||||
cboxShop.Items.Clear();
|
||||
|
||||
foreach (var shop in GlobalConfig.DouShopLoginList)
|
||||
foreach (var shop in GlobalConfig.ShopLoginList)
|
||||
{
|
||||
cboxShop.Items.Add(shop.ShopAccount);
|
||||
}
|
||||
@@ -1782,7 +1782,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms
|
||||
cboxCat3.Items.Clear();//有的店铺没有一级、二级、三级类目,所以,更改店铺前要把一二三级类目全部清空 by ttzhao 2020.10.13
|
||||
dicNameCate.Clear();
|
||||
string shopname = cboxShop.Text;
|
||||
var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(x => x.ShopAccount == shopname);
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(x => x.ShopAccount == shopname);
|
||||
if (shop == null || shop.LstShopCategory == null)
|
||||
{
|
||||
return;
|
||||
@@ -2060,10 +2060,10 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms
|
||||
List<GoodsCategoryModel> list = NaiBa.Util.Helper.ConfigHelper.LoadConfig<List<GoodsCategoryModel>>("cat_dy");
|
||||
if (list == null)
|
||||
list = new List<GoodsCategoryModel>();
|
||||
if (list.Count == 0 || GlobalConfig.DouShopLoginList.Any(s => s.ApiAuthStatus == "授权成功" && (s.LstShopCategory == null || s.LstShopCategory.Count == 0)))
|
||||
if (list.Count == 0 || GlobalConfig.ShopLoginList.Any(s => s.ApiAuthStatus == "授权成功" && (s.LstShopCategory == null || s.LstShopCategory.Count == 0)))
|
||||
{
|
||||
//list.Clear();
|
||||
foreach (var shop in GlobalConfig.DouShopLoginList)
|
||||
foreach (var shop in GlobalConfig.ShopLoginList)
|
||||
{
|
||||
if (shop.ApiAuthStatus == "授权成功")
|
||||
{
|
||||
@@ -2562,7 +2562,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms
|
||||
if (!foodCate1Names.Any(f => categoryText.StartsWith(f)))
|
||||
return;
|
||||
|
||||
var dyShop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ApiAuthStatus == "授权成功");
|
||||
var dyShop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ApiAuthStatus == "授权成功");
|
||||
if (dyShop == null)
|
||||
{
|
||||
BaseMsgForm.ShowError("请确保至少有一个店铺授权成功!");
|
||||
@@ -2577,7 +2577,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms
|
||||
{
|
||||
dyShop.ApiAuthStatus = "未授权";
|
||||
StartUp.SaveLocalShopLoginInfo();
|
||||
dyShop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ApiAuthStatus == "授权成功");
|
||||
dyShop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ApiAuthStatus == "授权成功");
|
||||
if (dyShop == null)
|
||||
{
|
||||
BaseMsgForm.ShowError("请确保至少有一个店铺授权成功!");
|
||||
@@ -2729,7 +2729,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms
|
||||
var textQuery = "";
|
||||
while (result == "" || result.Contains("已过期"))
|
||||
{
|
||||
var dyShop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ApiAuthStatus == "授权成功");
|
||||
var dyShop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ApiAuthStatus == "授权成功");
|
||||
if (dyShop == null)
|
||||
{
|
||||
BaseMsgForm.ShowError("请确保至少有一个店铺授权成功!");
|
||||
@@ -2923,9 +2923,9 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms
|
||||
this.cmbGetCatShop.Items.Clear();
|
||||
|
||||
this.cmbGetCatShop.Items.Add(new ComboBoxItem() { Name = "随机选择", Text = "随机选择" });
|
||||
foreach (var shop in GlobalConfig.DouShopLoginList)
|
||||
foreach (var shop in GlobalConfig.ShopLoginList)
|
||||
{
|
||||
cmbGetCatShop.Items.Add(new ComboBoxItem() { Name = shop.ShopAccountId, Text = shop.ShopAccount + (shop.LoginStatus == "登录成功" ? "" : " 未登录") });
|
||||
cmbGetCatShop.Items.Add(new ComboBoxItem() { Name = shop.ShopId, Text = shop.ShopAccount + (shop.LoginStatus == "登录成功" ? "" : " 未登录") });
|
||||
}
|
||||
this.cmbGetCatShop.SelectedIndex = 0;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user