1店铺登录逻辑优化 2备货单查询显示
This commit is contained in:
1 parent
89eb9ce9d4
commit
862ad088f5
216 files changed
+3481
-1543
No files matched your search
@@ -2,8 +2,8 @@
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.Param.OrderManage;
|
||||
using AllBase.Model.Result;
|
||||
using LittleRabbit.Extension;
|
||||
using LittleRabbit.LittleRabbitForms.BaseForms;
|
||||
using TemuKJD.Extension;
|
||||
using TemuKJD.KJDForms.BaseForms;
|
||||
using NaiBa.Util.Extension;
|
||||
using NaiBa.Util.Helper;
|
||||
using Newtonsoft.Json.Linq;
|
||||
@@ -20,7 +20,7 @@ using System.Windows.Forms;
|
||||
using Work;
|
||||
using Work.DouyinApiClass;
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.ShopForms
|
||||
namespace TemuKJD.KJDForms.ShopForms
|
||||
{
|
||||
public partial class FreightTemplateForm : Form
|
||||
{
|
||||
@@ -84,14 +84,14 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms
|
||||
=> row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList();
|
||||
// 获取被删除的店铺
|
||||
List<DataGridViewRow> dgvRowList = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
|
||||
=> !GlobalConfig.DouShopLoginList.Any(s => s.ShopAccountId == row.Cells["colShopId"]?.Value?.ToString())).ToList();
|
||||
=> !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList();
|
||||
// 更新被删除的店铺列表
|
||||
foreach (var row in dgvRowList)
|
||||
{
|
||||
dgvShop.Rows.Remove(row);
|
||||
}
|
||||
// 绑定其他店铺(含新导入的店铺)
|
||||
foreach (DouShopLoginInfo shopEntity in GlobalConfig.DouShopLoginList)
|
||||
foreach (DouShopLoginInfo shopEntity in GlobalConfig.ShopLoginList)
|
||||
{
|
||||
BindShop(shopEntity, selectIds);
|
||||
}
|
||||
@@ -104,12 +104,12 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms
|
||||
selectShopId = new List<string>();
|
||||
|
||||
bool canUse = shopEntity.BuyApiAuth.ApiAuthStatus == "授权成功" && shopEntity.LoginStatus == "登录成功";
|
||||
var row = dgvShop.Rows.Cast<DataGridViewRow>().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopAccountId);
|
||||
var row = dgvShop.Rows.Cast<DataGridViewRow>().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopId);
|
||||
if (row == null)
|
||||
{
|
||||
this.dgvShop.Rows.Add(
|
||||
selectShopId.Contains(shopEntity.ShopAccountId) && canUse,
|
||||
shopEntity.ShopAccountId,
|
||||
selectShopId.Contains(shopEntity.ShopId) && canUse,
|
||||
shopEntity.ShopId,
|
||||
shopEntity.ShopAccount,
|
||||
shopEntity.BuyApiAuth.ApiAuthStatus,
|
||||
shopEntity.LoginStatus,
|
||||
@@ -119,7 +119,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms
|
||||
}
|
||||
else
|
||||
{
|
||||
row.Cells["colSelect"].Value = selectShopId.Contains(shopEntity.ShopAccountId) && canUse;
|
||||
row.Cells["colSelect"].Value = selectShopId.Contains(shopEntity.ShopId) && canUse;
|
||||
row.Cells["colShopName"].Value = shopEntity.ShopAccount;
|
||||
row.Cells["colBuyAuthStatus"].Value = shopEntity.BuyApiAuth.ApiAuthStatus;
|
||||
row.Cells["colLoginStatus"].Value = shopEntity.LoginStatus;
|
||||
@@ -139,7 +139,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms
|
||||
}
|
||||
else
|
||||
{
|
||||
var list = GlobalConfig.DouShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && s.LoginStatus == "登录成功").Select(ss => ss.ShopAccountId);
|
||||
var list = GlobalConfig.ShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && s.LoginStatus == "登录成功").Select(ss => ss.ShopId);
|
||||
foreach (DataGridViewRow row in dgvShop.Rows)
|
||||
{
|
||||
if (list.Any(l => l == row.Cells["colShopId"]?.Value?.ToString()))
|
||||
@@ -156,7 +156,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms
|
||||
string columnName = dgvShop.Columns[e.ColumnIndex].Name;
|
||||
long shopId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToLong();
|
||||
string shopName = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ToString();
|
||||
var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId.ToString());
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString());
|
||||
var row = dgvShop.Rows[e.RowIndex];
|
||||
switch (columnName)
|
||||
{
|
||||
@@ -201,7 +201,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms
|
||||
if (cancellationTokenSource.IsCancellationRequested)
|
||||
break;
|
||||
|
||||
var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId);
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId);
|
||||
if (shop == null)
|
||||
continue;
|
||||
|
||||
@@ -212,7 +212,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms
|
||||
{
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
var row = this.dgvShop.Rows.Cast<DataGridViewRow>().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId);
|
||||
var row = this.dgvShop.Rows.Cast<DataGridViewRow>().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId);
|
||||
if (row != null)
|
||||
{
|
||||
row.Cells["colLoginStatus"].Value = "未登录";
|
||||
@@ -225,11 +225,11 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms
|
||||
FreightTemplateListForm templateListForm = null;
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
var tab = this.ucTabControl1.TabPages.Cast<TabPage>().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopAccountId);
|
||||
var tab = this.ucTabControl1.TabPages.Cast<TabPage>().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopId);
|
||||
if (tab == null)
|
||||
{
|
||||
tab = new TabPage();
|
||||
tab.Name = "tab" + shop.ShopAccountId;
|
||||
tab.Name = "tab" + shop.ShopId;
|
||||
tab.Text = shop.ShopAccount;
|
||||
this.ucTabControl1.TabPages.Add(tab);
|
||||
|
||||
@@ -281,7 +281,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms
|
||||
if (addr != null && (addr.sub_districts != null || addr.level == "Town"))
|
||||
return addr;
|
||||
|
||||
var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.BuyApiAuth.ApiAuthStatus == "授权成功");
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.BuyApiAuth.ApiAuthStatus == "授权成功");
|
||||
if (shop == null)
|
||||
{
|
||||
BaseMsgForm.ShowError("请确保有店铺拍单授权成功!");
|
||||
@@ -593,7 +593,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms
|
||||
if (cancellationTokenSource.IsCancellationRequested)
|
||||
break;
|
||||
|
||||
var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId);
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId);
|
||||
if (shop == null)
|
||||
continue;
|
||||
|
||||
@@ -604,7 +604,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms
|
||||
{
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
var row = this.dgvShop.Rows.Cast<DataGridViewRow>().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId);
|
||||
var row = this.dgvShop.Rows.Cast<DataGridViewRow>().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId);
|
||||
if (row != null)
|
||||
{
|
||||
row.Cells["colLoginStatus"].Value = "未登录";
|
||||
@@ -617,11 +617,11 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms
|
||||
FreightTemplateListForm templateListForm = null;
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
var tab = this.ucTabControl1.TabPages.Cast<TabPage>().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopAccountId);
|
||||
var tab = this.ucTabControl1.TabPages.Cast<TabPage>().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopId);
|
||||
if (tab == null)
|
||||
{
|
||||
tab = new TabPage();
|
||||
tab.Name = "tab" + shop.ShopAccountId;
|
||||
tab.Name = "tab" + shop.ShopId;
|
||||
tab.Text = shop.ShopAccount;
|
||||
this.ucTabControl1.TabPages.Add(tab);
|
||||
|
||||
|
||||
Reference in new issue
Block a user