1店铺登录逻辑优化 2备货单查询显示
This commit is contained in:
1 parent
89eb9ce9d4
commit
862ad088f5
216 files changed
+3481
-1543
No files matched your search
+13
-13
@@ -1,4 +1,4 @@
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
partial class CouponForm
|
||||
{
|
||||
@@ -34,7 +34,7 @@
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.splitContainer5 = new System.Windows.Forms.SplitContainer();
|
||||
this.ucGroupBoxEx3 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.pbPaste2 = new System.Windows.Forms.PictureBox();
|
||||
this.pbPaste1 = new System.Windows.Forms.PictureBox();
|
||||
this.txtFilter = new DevComponents.DotNetBar.Controls.TextBoxX();
|
||||
@@ -53,7 +53,7 @@
|
||||
this.btnStopGetProduct = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnGetProduct = new DevComponents.DotNetBar.PanelEx();
|
||||
this.rbOffSale = new System.Windows.Forms.RadioButton();
|
||||
this.ucGroupBoxEx2 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
|
||||
this.nudThresHold = new System.Windows.Forms.NumericUpDown();
|
||||
this.lblThresHold = new System.Windows.Forms.Label();
|
||||
@@ -94,11 +94,11 @@
|
||||
this.btnStopOperate = new DevComponents.DotNetBar.PanelEx();
|
||||
this.nudDays = new System.Windows.Forms.NumericUpDown();
|
||||
this.label7 = new System.Windows.Forms.Label();
|
||||
this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.btnRefreshShop = new LittleRabbit.UserControls.ButtonEx();
|
||||
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.btnRefreshShop = new TemuKJD.UserControls.ButtonEx();
|
||||
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
|
||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||
this.dgvShop = new LittleRabbit.UserComponent.DataGridViewEx();
|
||||
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
@@ -107,11 +107,11 @@
|
||||
this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
|
||||
this.ucTabControl1 = new LittleRabbit.UserComponent.UcTabControl();
|
||||
this.ucTabControl1 = new TemuKJD.UserComponent.UcTabControl();
|
||||
this.tabPageCheckResult = new System.Windows.Forms.TabPage();
|
||||
this.tabPageViolateFileList = new System.Windows.Forms.TabPage();
|
||||
this.splitContainer4 = new System.Windows.Forms.SplitContainer();
|
||||
this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl();
|
||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||
this.btnClear = new DevComponents.DotNetBar.PanelEx();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
||||
this.splitContainer1.Panel1.SuspendLayout();
|
||||
@@ -197,7 +197,7 @@
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.ucGroupBoxEx3.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx3.Controls.Add(this.pbPaste2);
|
||||
this.ucGroupBoxEx3.Controls.Add(this.pbPaste1);
|
||||
this.ucGroupBoxEx3.Controls.Add(this.txtFilter);
|
||||
@@ -227,7 +227,7 @@
|
||||
//
|
||||
this.pbPaste2.BackColor = System.Drawing.Color.White;
|
||||
this.pbPaste2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.pbPaste2.Image = global::LittleRabbit.Properties.Resources.FullPaste;
|
||||
this.pbPaste2.Image = global::TemuKJD.Properties.Resources.FullPaste;
|
||||
this.pbPaste2.Location = new System.Drawing.Point(277, 81);
|
||||
this.pbPaste2.Name = "pbPaste2";
|
||||
this.pbPaste2.Size = new System.Drawing.Size(23, 23);
|
||||
@@ -240,7 +240,7 @@
|
||||
//
|
||||
this.pbPaste1.BackColor = System.Drawing.Color.White;
|
||||
this.pbPaste1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.pbPaste1.Image = global::LittleRabbit.Properties.Resources.FullPaste;
|
||||
this.pbPaste1.Image = global::TemuKJD.Properties.Resources.FullPaste;
|
||||
this.pbPaste1.Location = new System.Drawing.Point(277, 52);
|
||||
this.pbPaste1.Name = "pbPaste1";
|
||||
this.pbPaste1.Size = new System.Drawing.Size(23, 23);
|
||||
@@ -444,7 +444,7 @@
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.ucGroupBoxEx2.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx2.Controls.Add(this.flowLayoutPanel1);
|
||||
this.ucGroupBoxEx2.Controls.Add(this.pnlTimePeriod);
|
||||
this.ucGroupBoxEx2.Controls.Add(this.panel3);
|
||||
@@ -927,7 +927,7 @@
|
||||
this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||
| System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop);
|
||||
this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2);
|
||||
this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
|
||||
|
||||
@@ -3,9 +3,9 @@ using AllBase.Helper;
|
||||
using AllBase.Model.Result;
|
||||
using CefSharp;
|
||||
using CefSharp.WinForms;
|
||||
using LittleRabbit.Extension;
|
||||
using LittleRabbit.Helper;
|
||||
using LittleRabbit.LittleRabbitForms.BaseForms;
|
||||
using TemuKJD.Extension;
|
||||
using TemuKJD.Helper;
|
||||
using TemuKJD.KJDForms.BaseForms;
|
||||
using NaiBa.CefHelper;
|
||||
using NaiBa.CefHelper.Handler;
|
||||
using NaiBa.Util.Extension;
|
||||
@@ -21,7 +21,7 @@ using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
public partial class CouponForm : Form
|
||||
{
|
||||
@@ -65,7 +65,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
else
|
||||
{
|
||||
lstShopId.Clear();
|
||||
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);
|
||||
lstShopId.AddRange(list);
|
||||
foreach (DataGridViewRow row in dgvShop.Rows)
|
||||
{
|
||||
@@ -89,17 +89,17 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
private void RefreshShop()
|
||||
{
|
||||
// 更新选中的上货店铺Id
|
||||
lstShopId = lstShopId.Where(id => GlobalConfig.DouShopLoginList.Any(s => s.ShopAccountId == id && s.LoginStatus == "已授权")).ToList();
|
||||
lstShopId = lstShopId.Where(id => GlobalConfig.ShopLoginList.Any(s => s.ShopId == id && s.LoginStatus == "已授权")).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);
|
||||
}
|
||||
@@ -111,12 +111,12 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
return;
|
||||
|
||||
bool canUse = shopEntity.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(
|
||||
lstShopId.Contains(shopEntity.ShopAccountId) && canUse,
|
||||
shopEntity.ShopAccountId,
|
||||
lstShopId.Contains(shopEntity.ShopId) && canUse,
|
||||
shopEntity.ShopId,
|
||||
shopEntity.ShopAccount,
|
||||
shopEntity.ApiAuthStatus,
|
||||
shopEntity.LoginStatus,
|
||||
@@ -126,7 +126,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
}
|
||||
else
|
||||
{
|
||||
row.Cells["colSelect"].Value = lstShopId.Contains(shopEntity.ShopAccountId) && canUse;
|
||||
row.Cells["colSelect"].Value = lstShopId.Contains(shopEntity.ShopId) && canUse;
|
||||
row.Cells["colShopName"].Value = shopEntity.ShopAccount;
|
||||
row.Cells["colAuthStatus"].Value = shopEntity.ApiAuthStatus;
|
||||
row.Cells["colLoginStatus"].Value = shopEntity.LoginStatus;
|
||||
@@ -142,7 +142,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
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)
|
||||
{
|
||||
@@ -191,18 +191,18 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
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;
|
||||
|
||||
CouponShopForm couponShopForm = 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);
|
||||
|
||||
@@ -341,7 +341,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
if (webBrowser.Tag != null)
|
||||
{
|
||||
var shop = webBrowser.Tag as DouShopLoginInfo;
|
||||
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);
|
||||
var clearForm = tab.Controls[0] as CouponShopForm;
|
||||
|
||||
Task.Run(() =>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
partial class CouponMulitAddForm
|
||||
{
|
||||
@@ -49,7 +49,7 @@
|
||||
this.label6 = new System.Windows.Forms.Label();
|
||||
this.panel3 = new System.Windows.Forms.Panel();
|
||||
this.lblAdd = new System.Windows.Forms.LinkLabel();
|
||||
this.ucCouponAddParam = new LittleRabbit.LittleRabbitForms.SalesCenterForms.UcCouponAddParam();
|
||||
this.ucCouponAddParam = new TemuKJD.KJDForms.SalesCenterForms.UcCouponAddParam();
|
||||
this.panel2.SuspendLayout();
|
||||
this.panel4.SuspendLayout();
|
||||
this.panel3.SuspendLayout();
|
||||
@@ -285,7 +285,7 @@
|
||||
this.ucCouponAddParam.Name = "ucCouponAddParam";
|
||||
this.ucCouponAddParam.Size = new System.Drawing.Size(1180, 40);
|
||||
this.ucCouponAddParam.TabIndex = 0;
|
||||
this.ucCouponAddParam.OnClose += new LittleRabbit.LittleRabbitForms.SalesCenterForms.UcCouponAddParam.CloseCouponAdd(this.couponAddParamControl1_OnClose);
|
||||
this.ucCouponAddParam.OnClose += new TemuKJD.KJDForms.SalesCenterForms.UcCouponAddParam.CloseCouponAdd(this.couponAddParamControl1_OnClose);
|
||||
//
|
||||
// CouponMulitAddForm
|
||||
//
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using AllBase;
|
||||
using LittleRabbit.LittleRabbitForms.BaseForms;
|
||||
using TemuKJD.KJDForms.BaseForms;
|
||||
using NaiBa.Util.Extension;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
@@ -12,7 +12,7 @@ using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
public partial class CouponMulitAddForm : LRBaseForm
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
partial class CouponShopForm
|
||||
{
|
||||
@@ -33,11 +33,11 @@
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||
this.dgvProduct = new LittleRabbit.UserComponent.DataGridViewEx();
|
||||
this.dgvProduct = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
|
||||
this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl();
|
||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colProductId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colProductName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
using AllBase.Extension;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.Result;
|
||||
using LittleRabbit.Extension;
|
||||
using LittleRabbit.LittleRabbitForms.BaseForms;
|
||||
using TemuKJD.Extension;
|
||||
using TemuKJD.KJDForms.BaseForms;
|
||||
using NaiBa.Util.Extension;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
@@ -18,7 +18,7 @@ using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using Work.BLL.Product;
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
public partial class CouponShopForm : Form
|
||||
{
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
partial class DouProductProPromotionListSkuInfoForm
|
||||
{
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
using AllBase;
|
||||
using AllBase.Model.Result;
|
||||
using LittleRabbit.LittleRabbitForms.BaseForms;
|
||||
using TemuKJD.KJDForms.BaseForms;
|
||||
using NaiBa.Util.Extension;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
public partial class DouProductProPromotionListSkuInfoForm : Form
|
||||
{
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
partial class DouProductPromotionListSkuInfoEditForm
|
||||
{
|
||||
@@ -47,7 +47,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
this.label2 = new System.Windows.Forms.Label();
|
||||
this.btnDelete = new DevComponents.DotNetBar.PanelEx();
|
||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||
this.dgvActiveSku = new LittleRabbit.UserComponent.DataGridViewEx();
|
||||
this.dgvActiveSku = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colSkuId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colSku = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
using LittleRabbit.LittleRabbitForms.BaseForms;
|
||||
using TemuKJD.KJDForms.BaseForms;
|
||||
using NaiBa.Util.Extension;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
public partial class DouProductPromotionListSkuInfoEditForm : Form
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
partial class FullMinusActiveForm
|
||||
{
|
||||
@@ -46,7 +46,7 @@
|
||||
this.lblActivity = new System.Windows.Forms.Label();
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||
this.dgvActive = new LittleRabbit.UserComponent.DataGridViewEx();
|
||||
this.dgvActive = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colActiveId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colActiveName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
@@ -57,7 +57,7 @@
|
||||
this.colActiveState = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl();
|
||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||
this.panel1.SuspendLayout();
|
||||
this.panel4.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
using AllBase;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.Result;
|
||||
using LittleRabbit.LittleRabbitForms.BaseForms;
|
||||
using TemuKJD.KJDForms.BaseForms;
|
||||
using NaiBa.Util.Extension;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
@@ -11,7 +11,7 @@ using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
public partial class FullMinusActiveForm : Form
|
||||
{
|
||||
|
||||
+13
-13
@@ -1,5 +1,5 @@
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
partial class FullMinusForm
|
||||
{
|
||||
@@ -34,8 +34,8 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.ucGroupBoxEx2 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.ucGroupBoxEx4 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.panel12 = new System.Windows.Forms.Panel();
|
||||
this.panel15 = new System.Windows.Forms.Panel();
|
||||
this.btnRemove9 = new DevComponents.DotNetBar.PanelEx();
|
||||
@@ -85,7 +85,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
this.panel9 = new System.Windows.Forms.Panel();
|
||||
this.rdoReduction = new System.Windows.Forms.RadioButton();
|
||||
this.rdoDiscount = new System.Windows.Forms.RadioButton();
|
||||
this.ucGroupBoxEx3 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.btnAdd1 = new DevComponents.DotNetBar.PanelEx();
|
||||
this.panel7 = new System.Windows.Forms.Panel();
|
||||
this.btnRemove5 = new DevComponents.DotNetBar.PanelEx();
|
||||
@@ -142,11 +142,11 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
this.btnSubAct = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnGetProduct = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnStopGetProduct = new DevComponents.DotNetBar.PanelEx();
|
||||
this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.btnRefreshShop = new LittleRabbit.UserControls.ButtonEx();
|
||||
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.btnRefreshShop = new TemuKJD.UserControls.ButtonEx();
|
||||
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
|
||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||
this.dgvShop = new LittleRabbit.UserComponent.DataGridViewEx();
|
||||
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
@@ -155,10 +155,10 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
|
||||
this.ucTabControl1 = new LittleRabbit.UserComponent.UcTabControl();
|
||||
this.ucTabControl1 = new TemuKJD.UserComponent.UcTabControl();
|
||||
this.tabPageCheckResult = new System.Windows.Forms.TabPage();
|
||||
this.splitContainer4 = new System.Windows.Forms.SplitContainer();
|
||||
this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl();
|
||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||
this.btnClear = new DevComponents.DotNetBar.PanelEx();
|
||||
this.tabPageViolateFileList = new System.Windows.Forms.TabPage();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
||||
@@ -229,7 +229,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.ucGroupBoxEx2.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx2.Controls.Add(this.ucGroupBoxEx4);
|
||||
this.ucGroupBoxEx2.Controls.Add(this.ucGroupBoxEx3);
|
||||
this.ucGroupBoxEx2.Controls.Add(this.label2);
|
||||
@@ -260,7 +260,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.ucGroupBoxEx4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.ucGroupBoxEx4.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx4.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx4.Controls.Add(this.panel12);
|
||||
this.ucGroupBoxEx4.Controls.Add(this.panel16);
|
||||
this.ucGroupBoxEx4.Controls.Add(this.panel9);
|
||||
@@ -855,7 +855,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.ucGroupBoxEx3.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx3.Controls.Add(this.btnAdd1);
|
||||
this.ucGroupBoxEx3.Controls.Add(this.panel7);
|
||||
this.ucGroupBoxEx3.Controls.Add(this.panel6);
|
||||
@@ -1544,7 +1544,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||
| System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop);
|
||||
this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2);
|
||||
this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.Result;
|
||||
using CefSharp.WinForms;
|
||||
using LittleRabbit.Extension;
|
||||
using LittleRabbit.Helper;
|
||||
using LittleRabbit.LittleRabbitForms.BaseForms;
|
||||
using LittleRabbit.LittleRabbitForms.ShopForms;
|
||||
using TemuKJD.Extension;
|
||||
using TemuKJD.Helper;
|
||||
using TemuKJD.KJDForms.BaseForms;
|
||||
using TemuKJD.KJDForms.ShopForms;
|
||||
using NaiBa.CefHelper;
|
||||
using NaiBa.CefHelper.Handler;
|
||||
using NaiBa.Util.Extension;
|
||||
@@ -18,7 +18,7 @@ using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
public partial class FullMinusForm : Form
|
||||
{
|
||||
@@ -58,7 +58,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
else
|
||||
{
|
||||
lstShopId.Clear();
|
||||
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);
|
||||
lstShopId.AddRange(list);
|
||||
foreach (DataGridViewRow row in dgvShop.Rows)
|
||||
{
|
||||
@@ -76,17 +76,17 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
private void RefreshShop()
|
||||
{
|
||||
// 更新选中的上货店铺Id
|
||||
lstShopId = lstShopId.Where(id => GlobalConfig.DouShopLoginList.Any(s => s.ShopAccountId == id && s.LoginStatus == "已授权")).ToList();
|
||||
lstShopId = lstShopId.Where(id => GlobalConfig.ShopLoginList.Any(s => s.ShopId == id && s.LoginStatus == "已授权")).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);
|
||||
}
|
||||
@@ -97,12 +97,12 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
return;
|
||||
|
||||
bool canUse = shopEntity.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(
|
||||
lstShopId.Contains(shopEntity.ShopAccountId) && canUse,
|
||||
shopEntity.ShopAccountId,
|
||||
lstShopId.Contains(shopEntity.ShopId) && canUse,
|
||||
shopEntity.ShopId,
|
||||
shopEntity.ShopAccount,
|
||||
shopEntity.ApiAuthStatus,
|
||||
shopEntity.LoginStatus,
|
||||
@@ -112,7 +112,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
}
|
||||
else
|
||||
{
|
||||
row.Cells["colSelect"].Value = lstShopId.Contains(shopEntity.ShopAccountId) && canUse;
|
||||
row.Cells["colSelect"].Value = lstShopId.Contains(shopEntity.ShopId) && canUse;
|
||||
if (!row.Cells["colSelect"].Value.ParseToBool())
|
||||
chkSelectAll.Checked = false;
|
||||
row.Cells["colShopName"].Value = shopEntity.ShopAccount;
|
||||
@@ -130,7 +130,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
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)
|
||||
{
|
||||
@@ -548,7 +548,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
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;
|
||||
|
||||
@@ -559,7 +559,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
{
|
||||
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 = "未登录";
|
||||
@@ -572,11 +572,11 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
FullMinusShopForm fullMinusShopForm = 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;
|
||||
ucTabControl1.TabPages.Add(tab);
|
||||
|
||||
@@ -672,7 +672,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
}
|
||||
|
||||
var shop = webBrowser.Tag as DouShopLoginInfo;
|
||||
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 && this.btnManagerAct.Enabled == false)
|
||||
{
|
||||
var minusShopForm = tab.Controls[0] as FullMinusShopForm;
|
||||
@@ -688,7 +688,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
}
|
||||
else
|
||||
{
|
||||
tab = this.ucTabControl1.TabPages.Cast<TabPage>().FirstOrDefault(t => t.Text == shop.ShopAccount + "活动管理" && t.Name == "tab" + shop.ShopAccountId + "Active");
|
||||
tab = this.ucTabControl1.TabPages.Cast<TabPage>().FirstOrDefault(t => t.Text == shop.ShopAccount + "活动管理" && t.Name == "tab" + shop.ShopId + "Active");
|
||||
if (tab != null)
|
||||
{
|
||||
var activeForm = tab.Controls[0] as FullMinusActiveForm;
|
||||
@@ -743,7 +743,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
{
|
||||
foreach (var shopId in lstShopId)
|
||||
{
|
||||
var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId);
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId);
|
||||
if (shop == null)
|
||||
continue;
|
||||
|
||||
@@ -918,7 +918,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
if (dptStartTime.Value <= DateTime.Now && dptEndTime.Value > DateTime.Now)
|
||||
minusForm.RefreshdgvProduct(strList);
|
||||
|
||||
var tab1 = this.ucTabControl1.TabPages.Cast<TabPage>().FirstOrDefault(t => t.Text == shop.ShopAccount + "活动管理" && t.Name == "tab" + shop.ShopAccountId + "Active");
|
||||
var tab1 = this.ucTabControl1.TabPages.Cast<TabPage>().FirstOrDefault(t => t.Text == shop.ShopAccount + "活动管理" && t.Name == "tab" + shop.ShopId + "Active");
|
||||
if (tab1 != null)
|
||||
{
|
||||
FullMinusActiveForm actForm = tab1.Controls[0] as FullMinusActiveForm;
|
||||
@@ -963,7 +963,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
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;
|
||||
|
||||
@@ -974,7 +974,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
{
|
||||
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 = "未登录";
|
||||
@@ -987,11 +987,11 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
FullMinusActiveForm actForm = null;
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
var tab = this.ucTabControl1.TabPages.Cast<TabPage>().FirstOrDefault(t => t.Text == shop.ShopAccount + "活动管理" && t.Name == "tab" + shop.ShopAccountId + "Active");
|
||||
var tab = this.ucTabControl1.TabPages.Cast<TabPage>().FirstOrDefault(t => t.Text == shop.ShopAccount + "活动管理" && t.Name == "tab" + shop.ShopId + "Active");
|
||||
if (tab == null)
|
||||
{
|
||||
tab = new TabPage();
|
||||
tab.Name = "tab" + shop.ShopAccountId + "Active";
|
||||
tab.Name = "tab" + shop.ShopId + "Active";
|
||||
tab.Text = shop.ShopAccount + "活动管理";
|
||||
this.ucTabControl1.TabPages.Add(tab);
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
partial class FullMinusShopForm
|
||||
{
|
||||
@@ -33,9 +33,9 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||
this.dgvProduct = new LittleRabbit.UserComponent.DataGridViewEx();
|
||||
this.dgvProduct = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl();
|
||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colProductId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colProductName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
using AllBase;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.Result;
|
||||
using LittleRabbit.Extension;
|
||||
using TemuKJD.Extension;
|
||||
using NaiBa.Util.Extension;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
@@ -11,7 +11,7 @@ using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
public partial class FullMinusShopForm : Form
|
||||
{
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
partial class GroupBuyCustomActivityNameForm
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using LittleRabbit.LittleRabbitForms.BaseForms;
|
||||
using TemuKJD.KJDForms.BaseForms;
|
||||
using NaiBa.Util;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
@@ -10,7 +10,7 @@ using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
public partial class GroupBuyCustomActivityNameForm : LRBaseForm
|
||||
{
|
||||
|
||||
+13
-13
@@ -1,4 +1,4 @@
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
partial class GroupBuyForm
|
||||
{
|
||||
@@ -34,7 +34,7 @@
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.splitContainer5 = new System.Windows.Forms.SplitContainer();
|
||||
this.ucGroupBoxEx3 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.label15 = new System.Windows.Forms.Label();
|
||||
this.txtGetPage = new System.Windows.Forms.TextBox();
|
||||
this.pbPaste2 = new System.Windows.Forms.PictureBox();
|
||||
@@ -55,7 +55,7 @@
|
||||
this.btnStopGetProduct = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnGetProduct = new DevComponents.DotNetBar.PanelEx();
|
||||
this.rbOffSale = new System.Windows.Forms.RadioButton();
|
||||
this.ucGroupBoxEx2 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.cmbSkuOptionType = new DevComponents.DotNetBar.Controls.ComboBoxEx();
|
||||
this.第一个 = new DevComponents.Editors.ComboItem();
|
||||
this.最后一个 = new DevComponents.Editors.ComboItem();
|
||||
@@ -105,11 +105,11 @@
|
||||
this.label4 = new System.Windows.Forms.Label();
|
||||
this.btnSetActivity = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnStopOperate = new DevComponents.DotNetBar.PanelEx();
|
||||
this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.btnRefreshShop = new LittleRabbit.UserControls.ButtonEx();
|
||||
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.btnRefreshShop = new TemuKJD.UserControls.ButtonEx();
|
||||
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
|
||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||
this.dgvShop = new LittleRabbit.UserComponent.DataGridViewEx();
|
||||
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
@@ -118,11 +118,11 @@
|
||||
this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
|
||||
this.ucTabControl1 = new LittleRabbit.UserComponent.UcTabControl();
|
||||
this.ucTabControl1 = new TemuKJD.UserComponent.UcTabControl();
|
||||
this.tabPage1 = new System.Windows.Forms.TabPage();
|
||||
this.tabPage2 = new System.Windows.Forms.TabPage();
|
||||
this.splitContainer4 = new System.Windows.Forms.SplitContainer();
|
||||
this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl();
|
||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||
this.btnClear = new DevComponents.DotNetBar.PanelEx();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
||||
this.splitContainer1.Panel1.SuspendLayout();
|
||||
@@ -204,7 +204,7 @@
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.ucGroupBoxEx3.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx3.Controls.Add(this.label15);
|
||||
this.ucGroupBoxEx3.Controls.Add(this.txtGetPage);
|
||||
this.ucGroupBoxEx3.Controls.Add(this.pbPaste2);
|
||||
@@ -254,7 +254,7 @@
|
||||
this.pbPaste2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.pbPaste2.BackColor = System.Drawing.Color.White;
|
||||
this.pbPaste2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.pbPaste2.Image = global::LittleRabbit.Properties.Resources.FullPaste;
|
||||
this.pbPaste2.Image = global::TemuKJD.Properties.Resources.FullPaste;
|
||||
this.pbPaste2.Location = new System.Drawing.Point(231, 113);
|
||||
this.pbPaste2.Name = "pbPaste2";
|
||||
this.pbPaste2.Size = new System.Drawing.Size(23, 23);
|
||||
@@ -268,7 +268,7 @@
|
||||
this.pbPaste1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.pbPaste1.BackColor = System.Drawing.Color.White;
|
||||
this.pbPaste1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.pbPaste1.Image = global::LittleRabbit.Properties.Resources.FullPaste;
|
||||
this.pbPaste1.Image = global::TemuKJD.Properties.Resources.FullPaste;
|
||||
this.pbPaste1.Location = new System.Drawing.Point(231, 84);
|
||||
this.pbPaste1.Name = "pbPaste1";
|
||||
this.pbPaste1.Size = new System.Drawing.Size(23, 23);
|
||||
@@ -476,7 +476,7 @@
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.ucGroupBoxEx2.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx2.Controls.Add(this.cmbSkuOptionType);
|
||||
this.ucGroupBoxEx2.Controls.Add(this.chkSetSkuOption);
|
||||
this.ucGroupBoxEx2.Controls.Add(this.label13);
|
||||
@@ -1028,7 +1028,7 @@
|
||||
this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||
| System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop);
|
||||
this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2);
|
||||
this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
|
||||
|
||||
@@ -3,10 +3,10 @@ using AllBase.Helper;
|
||||
using AllBase.Model.Result;
|
||||
using CefSharp;
|
||||
using CefSharp.WinForms;
|
||||
using LittleRabbit.Extension;
|
||||
using LittleRabbit.Helper;
|
||||
using LittleRabbit.LittleRabbitForms.BaseForms;
|
||||
using LittleRabbit.LittleRabbitForms.ShopForms;
|
||||
using TemuKJD.Extension;
|
||||
using TemuKJD.Helper;
|
||||
using TemuKJD.KJDForms.BaseForms;
|
||||
using TemuKJD.KJDForms.ShopForms;
|
||||
using NaiBa.CefHelper;
|
||||
using NaiBa.CefHelper.Handler;
|
||||
using NaiBa.Util;
|
||||
@@ -23,7 +23,7 @@ using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
public partial class GroupBuyForm : Form
|
||||
{
|
||||
@@ -89,7 +89,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
else
|
||||
{
|
||||
lstShopId.Clear();
|
||||
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);
|
||||
lstShopId.AddRange(list);
|
||||
foreach (DataGridViewRow row in dgvShop.Rows)
|
||||
{
|
||||
@@ -123,17 +123,17 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
private void RefreshShop()
|
||||
{
|
||||
// 更新选中的上货店铺Id
|
||||
lstShopId = lstShopId.Where(id => GlobalConfig.DouShopLoginList.Any(s => s.ShopAccountId == id && s.LoginStatus == "已授权")).ToList();
|
||||
lstShopId = lstShopId.Where(id => GlobalConfig.ShopLoginList.Any(s => s.ShopId == id && s.LoginStatus == "已授权")).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);
|
||||
}
|
||||
@@ -145,12 +145,12 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
return;
|
||||
|
||||
bool canUse = shopEntity.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(
|
||||
lstShopId.Contains(shopEntity.ShopAccountId) && canUse,
|
||||
shopEntity.ShopAccountId,
|
||||
lstShopId.Contains(shopEntity.ShopId) && canUse,
|
||||
shopEntity.ShopId,
|
||||
shopEntity.ShopAccount,
|
||||
shopEntity.ApiAuthStatus,
|
||||
shopEntity.LoginStatus,
|
||||
@@ -160,7 +160,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
}
|
||||
else
|
||||
{
|
||||
row.Cells["colSelect"].Value = lstShopId.Contains(shopEntity.ShopAccountId) && canUse;
|
||||
row.Cells["colSelect"].Value = lstShopId.Contains(shopEntity.ShopId) && canUse;
|
||||
row.Cells["colShopName"].Value = shopEntity.ShopAccount;
|
||||
row.Cells["colAuthStatus"].Value = shopEntity.ApiAuthStatus;
|
||||
row.Cells["colLoginStatus"].Value = shopEntity.LoginStatus;
|
||||
@@ -262,7 +262,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
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;
|
||||
|
||||
@@ -273,7 +273,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
{
|
||||
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 = "未登录";
|
||||
@@ -286,11 +286,11 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
GroupBuyShopForm groupBuyShopForm = 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);
|
||||
|
||||
@@ -488,7 +488,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
var shop = webBrowser.Tag as DouShopLoginInfo;
|
||||
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);
|
||||
salesForm = tab.Controls[0] as GroupBuyShopForm;
|
||||
}));
|
||||
|
||||
@@ -542,7 +542,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
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)
|
||||
{
|
||||
@@ -619,7 +619,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
{
|
||||
foreach (var shopId in lstShopId)
|
||||
{
|
||||
var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId);
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId);
|
||||
if (shop == null)
|
||||
continue;
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
partial class GroupBuyMonitorForm
|
||||
{
|
||||
@@ -34,7 +34,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.ucGroupBoxEx2 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.panelEx2 = new DevComponents.DotNetBar.PanelEx();
|
||||
this.label2 = new System.Windows.Forms.Label();
|
||||
this.numericUpDown2 = new System.Windows.Forms.NumericUpDown();
|
||||
@@ -71,14 +71,14 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
this.label11 = new System.Windows.Forms.Label();
|
||||
this.btnSetActivity = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnStopOperate = new DevComponents.DotNetBar.PanelEx();
|
||||
this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.btnRefreshShop = new LittleRabbit.UserControls.ButtonEx();
|
||||
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.btnRefreshShop = new TemuKJD.UserControls.ButtonEx();
|
||||
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
|
||||
this.splitContainer4 = new System.Windows.Forms.SplitContainer();
|
||||
this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl();
|
||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||
this.btnClear = new DevComponents.DotNetBar.PanelEx();
|
||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||
this.dgvShop = new LittleRabbit.UserComponent.DataGridViewEx();
|
||||
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
@@ -138,7 +138,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.ucGroupBoxEx2.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx2.Controls.Add(this.panelEx2);
|
||||
this.ucGroupBoxEx2.Controls.Add(this.label2);
|
||||
this.ucGroupBoxEx2.Controls.Add(this.numericUpDown2);
|
||||
@@ -599,7 +599,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||
| System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop);
|
||||
this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2);
|
||||
this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
|
||||
|
||||
@@ -9,7 +9,7 @@ using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
public partial class GroupBuyMonitorForm : Form
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
partial class GroupBuyShopForm
|
||||
{
|
||||
@@ -32,7 +32,7 @@
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||
this.dgvProduct = new LittleRabbit.UserComponent.DataGridViewEx();
|
||||
this.dgvProduct = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colProductId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colProductName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
@@ -42,7 +42,7 @@
|
||||
this.colCreateTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl();
|
||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
|
||||
this.splitContainer2.Panel1.SuspendLayout();
|
||||
this.splitContainer2.Panel2.SuspendLayout();
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
using AllBase.Extension;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.Result;
|
||||
using LittleRabbit.Extension;
|
||||
using LittleRabbit.LittleRabbitForms.BaseForms;
|
||||
using TemuKJD.Extension;
|
||||
using TemuKJD.KJDForms.BaseForms;
|
||||
using NaiBa.Util.Extension;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
@@ -18,7 +18,7 @@ using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using Work.BLL.Product;
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
public partial class GroupBuyShopForm : Form
|
||||
{
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
partial class LimitedSalesActivityNameForm
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using LittleRabbit.LittleRabbitForms.BaseForms;
|
||||
using TemuKJD.KJDForms.BaseForms;
|
||||
using NaiBa.Util;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
@@ -10,7 +10,7 @@ using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
public partial class LimitedSalesActivityNameForm : LRBaseForm
|
||||
{
|
||||
|
||||
+3
-3
@@ -1,5 +1,5 @@
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
partial class LimitedSalesManagerActiveForm
|
||||
{
|
||||
@@ -33,7 +33,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||
this.dgvActive = new LittleRabbit.UserComponent.DataGridViewEx();
|
||||
this.dgvActive = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colActivityId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colActivityName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
@@ -44,7 +44,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
this.colActiveState = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl();
|
||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.txtProID = new System.Windows.Forms.TextBox();
|
||||
this.cmbType = new DevComponents.DotNetBar.Controls.ComboBoxEx();
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
using AllBase;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.Result;
|
||||
using LittleRabbit.Extension;
|
||||
using LittleRabbit.LittleRabbitForms.BaseForms;
|
||||
using TemuKJD.Extension;
|
||||
using TemuKJD.KJDForms.BaseForms;
|
||||
using NaiBa.Util.Extension;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
@@ -12,7 +12,7 @@ using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
public partial class LimitedSalesManagerActiveForm : Form
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
partial class SalesCenterForm
|
||||
{
|
||||
@@ -40,7 +40,7 @@
|
||||
treeNode4,
|
||||
treeNode5});
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.tv = new LittleRabbit.UserComponent.UcTreeView();
|
||||
this.tv = new TemuKJD.UserComponent.UcTreeView();
|
||||
this.panel1 = new System.Windows.Forms.Panel();
|
||||
this.panel3 = new System.Windows.Forms.Panel();
|
||||
this.panel2 = new System.Windows.Forms.Panel();
|
||||
|
||||
@@ -9,7 +9,7 @@ using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
public partial class SalesCenterForm : Form
|
||||
{
|
||||
|
||||
+9
-9
@@ -1,4 +1,4 @@
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
partial class SeckillingAndLimitedSalesForm
|
||||
{
|
||||
@@ -34,7 +34,7 @@
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
|
||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||
this.dgvShop = new LittleRabbit.UserComponent.DataGridViewEx();
|
||||
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
@@ -43,17 +43,17 @@
|
||||
this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
|
||||
this.ucTabControl1 = new LittleRabbit.UserComponent.UcTabControl();
|
||||
this.ucTabControl1 = new TemuKJD.UserComponent.UcTabControl();
|
||||
this.tabPageCheckResult = new System.Windows.Forms.TabPage();
|
||||
this.lblProductName = new System.Windows.Forms.Label();
|
||||
this.txtProductName = new System.Windows.Forms.TextBox();
|
||||
this.chkSkipHasSale = new System.Windows.Forms.CheckBox();
|
||||
this.tabPageViolateFileList = new System.Windows.Forms.TabPage();
|
||||
this.splitContainer4 = new System.Windows.Forms.SplitContainer();
|
||||
this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl();
|
||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||
this.btnClear = new DevComponents.DotNetBar.PanelEx();
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.ucGroupBoxEx3 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.btnMdyAct = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnStopMdyAct = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnCancelGet = new DevComponents.DotNetBar.PanelEx();
|
||||
@@ -145,8 +145,8 @@
|
||||
this.rbTimePeriod = new System.Windows.Forms.RadioButton();
|
||||
this.lblTime = new System.Windows.Forms.Label();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.btnRefreshShop = new LittleRabbit.UserControls.ButtonEx();
|
||||
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.btnRefreshShop = new TemuKJD.UserControls.ButtonEx();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
|
||||
this.splitContainer3.Panel1.SuspendLayout();
|
||||
this.splitContainer3.Panel2.SuspendLayout();
|
||||
@@ -483,7 +483,7 @@
|
||||
| System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.ucGroupBoxEx3.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx3.Controls.Add(this.btnMdyAct);
|
||||
this.ucGroupBoxEx3.Controls.Add(this.btnStopMdyAct);
|
||||
this.ucGroupBoxEx3.Controls.Add(this.btnCancelGet);
|
||||
@@ -1491,7 +1491,7 @@
|
||||
this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||
| System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
|
||||
this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop);
|
||||
this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2);
|
||||
this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.Result;
|
||||
using CefSharp.WinForms;
|
||||
using LittleRabbit.Extension;
|
||||
using LittleRabbit.Helper;
|
||||
using LittleRabbit.LittleRabbitForms.BaseForms;
|
||||
using LittleRabbit.LittleRabbitForms.ShopForms;
|
||||
using TemuKJD.Extension;
|
||||
using TemuKJD.Helper;
|
||||
using TemuKJD.KJDForms.BaseForms;
|
||||
using TemuKJD.KJDForms.ShopForms;
|
||||
using NaiBa.CefHelper;
|
||||
using NaiBa.CefHelper.Handler;
|
||||
using NaiBa.Util.Extension;
|
||||
@@ -21,7 +21,7 @@ using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
public partial class SeckillingAndLimitedSalesForm : Form
|
||||
{
|
||||
@@ -182,7 +182,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
else
|
||||
{
|
||||
lstShopId.Clear();
|
||||
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);
|
||||
lstShopId.AddRange(list);
|
||||
foreach (DataGridViewRow row in dgvShop.Rows)
|
||||
{
|
||||
@@ -235,17 +235,17 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
private void RefreshShop()
|
||||
{
|
||||
// 更新选中的上货店铺Id
|
||||
lstShopId = lstShopId.Where(id => GlobalConfig.DouShopLoginList.Any(s => s.ShopAccountId == id && s.LoginStatus == "已授权")).ToList();
|
||||
lstShopId = lstShopId.Where(id => GlobalConfig.ShopLoginList.Any(s => s.ShopId == id && s.LoginStatus == "已授权")).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);
|
||||
}
|
||||
@@ -257,12 +257,12 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
return;
|
||||
|
||||
bool canUse = shopEntity.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(
|
||||
lstShopId.Contains(shopEntity.ShopAccountId) && canUse,
|
||||
shopEntity.ShopAccountId,
|
||||
lstShopId.Contains(shopEntity.ShopId) && canUse,
|
||||
shopEntity.ShopId,
|
||||
shopEntity.ShopAccount,
|
||||
shopEntity.ApiAuthStatus,
|
||||
shopEntity.LoginStatus,
|
||||
@@ -272,7 +272,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
}
|
||||
else
|
||||
{
|
||||
row.Cells["colSelect"].Value = lstShopId.Contains(shopEntity.ShopAccountId) && canUse;
|
||||
row.Cells["colSelect"].Value = lstShopId.Contains(shopEntity.ShopId) && canUse;
|
||||
row.Cells["colShopName"].Value = shopEntity.ShopAccount;
|
||||
row.Cells["colAuthStatus"].Value = shopEntity.ApiAuthStatus;
|
||||
row.Cells["colLoginStatus"].Value = shopEntity.LoginStatus;
|
||||
@@ -288,7 +288,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
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)
|
||||
{
|
||||
@@ -349,7 +349,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
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;
|
||||
|
||||
@@ -360,7 +360,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
{
|
||||
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 = "未登录";
|
||||
@@ -373,11 +373,11 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
SeckillingAndLimitedSalesShopForm salesShopForm = 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);
|
||||
|
||||
@@ -481,7 +481,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
}
|
||||
|
||||
var shop = webBrowser.Tag as DouShopLoginInfo;
|
||||
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);
|
||||
var salesForm = tab.Controls[0] as SeckillingAndLimitedSalesShopForm;
|
||||
|
||||
Task.Run(() =>
|
||||
@@ -511,7 +511,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
}
|
||||
|
||||
var shop = webBrowser.Tag as DouShopLoginInfo;
|
||||
var tab = this.ucTabControl1.TabPages.Cast<TabPage>().FirstOrDefault(t => t.Text == shop.ShopAccount + "活动管理" && t.Name == "tab" + shop.ShopAccountId + "Active");
|
||||
var tab = this.ucTabControl1.TabPages.Cast<TabPage>().FirstOrDefault(t => t.Text == shop.ShopAccount + "活动管理" && t.Name == "tab" + shop.ShopId + "Active");
|
||||
var managerActiveForm = tab.Controls[0] as LimitedSalesManagerActiveForm;
|
||||
|
||||
Task.Run(() =>
|
||||
@@ -570,7 +570,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
|
||||
foreach (var shopId in lstShopIdTemp)
|
||||
{
|
||||
var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId);
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId);
|
||||
if (shop == null)
|
||||
continue;
|
||||
|
||||
@@ -1259,7 +1259,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
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;
|
||||
|
||||
@@ -1270,7 +1270,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
{
|
||||
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 = "未登录";
|
||||
@@ -1283,11 +1283,11 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
LimitedSalesManagerActiveForm managerActiveForm = null;
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
var tab = this.ucTabControl1.TabPages.Cast<TabPage>().FirstOrDefault(t => t.Text == shop.ShopAccount + "活动管理" && t.Name == "tab" + shop.ShopAccountId + "Active");
|
||||
var tab = this.ucTabControl1.TabPages.Cast<TabPage>().FirstOrDefault(t => t.Text == shop.ShopAccount + "活动管理" && t.Name == "tab" + shop.ShopId + "Active");
|
||||
if (tab == null)
|
||||
{
|
||||
tab = new TabPage();
|
||||
tab.Name = "tab" + shop.ShopAccountId + "Active";
|
||||
tab.Name = "tab" + shop.ShopId + "Active";
|
||||
tab.Text = shop.ShopAccount + "活动管理";
|
||||
this.ucTabControl1.TabPages.Add(tab);
|
||||
|
||||
@@ -1476,7 +1476,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
|
||||
foreach (var shopId in lstShopIdTemp)
|
||||
{
|
||||
var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId);
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId);
|
||||
if (shop == null)
|
||||
continue;
|
||||
|
||||
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
partial class SeckillingAndLimitedSalesShopForm
|
||||
{
|
||||
@@ -32,9 +32,9 @@
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||
this.dgvProduct = new LittleRabbit.UserComponent.DataGridViewEx();
|
||||
this.dgvProduct = new TemuKJD.UserComponent.DataGridViewEx();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl();
|
||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colProductId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colProductName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
using AllBase.Extension;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.Result;
|
||||
using LittleRabbit.Extension;
|
||||
using LittleRabbit.LittleRabbitForms.BaseForms;
|
||||
using TemuKJD.Extension;
|
||||
using TemuKJD.KJDForms.BaseForms;
|
||||
using NaiBa.Util.Extension;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
@@ -20,7 +20,7 @@ using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using Work.BLL.Product;
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
public partial class SeckillingAndLimitedSalesShopForm : Form
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
partial class UcCouponAddParam
|
||||
{
|
||||
|
||||
@@ -8,7 +8,7 @@ using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace LittleRabbit.LittleRabbitForms.SalesCenterForms
|
||||
namespace TemuKJD.KJDForms.SalesCenterForms
|
||||
{
|
||||
public partial class UcCouponAddParam : UserControl
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user