jit推单功能除统计外完成
This commit is contained in:
1 parent
b05de6797e
commit
bbbc12148b
25 files changed
+3130
-1142
No files matched your search
@@ -30,7 +30,7 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
public bool IsClientJit { get; set; } = false;
|
||||
CheckBox chkSelectAll;
|
||||
PriceCheckConfig priceCheckConfig = null;
|
||||
List<PriceCheckFilterConfig> lstPriceCheckFilterConfig = new List<PriceCheckFilterConfig>();
|
||||
ConcurrentList<PriceCheckFilterConfig> lstPriceCheckFilterConfig = new ConcurrentList<PriceCheckFilterConfig>();
|
||||
public CancellationTokenSource cancellationTokenSource { get; set; } = null;
|
||||
public ConcurrentList<ShopLoginInfo> lstAdminShopInfo { get; set; } = new ConcurrentList<ShopLoginInfo>();
|
||||
public ConcurrentList<TemuForChainProductInfo> lstCheckPriceInfo = new ConcurrentList<TemuForChainProductInfo>();
|
||||
@@ -43,9 +43,9 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
|
||||
private void AdminProductPriceCheckForm_Load(object sender, EventArgs e)
|
||||
{
|
||||
lstPriceCheckFilterConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig<List<PriceCheckFilterConfig>>("price_check_filter_config");
|
||||
lstPriceCheckFilterConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig<ConcurrentList<PriceCheckFilterConfig>>("price_check_filter_config");
|
||||
if (lstPriceCheckFilterConfig == null)
|
||||
lstPriceCheckFilterConfig = new List<PriceCheckFilterConfig>();
|
||||
lstPriceCheckFilterConfig = new ConcurrentList<PriceCheckFilterConfig>();
|
||||
|
||||
//this.dgvShop.AddSelectorColumn("colSelect");
|
||||
chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false, null, true);
|
||||
@@ -93,6 +93,8 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
this.numWeight2.Value = 200;
|
||||
|
||||
btnSearchPrice3.Visible = false;
|
||||
btnStop.Location = btnSearchPrice3.Location;
|
||||
btnStop.Size = btnSearchPrice3.Size;
|
||||
}
|
||||
|
||||
if (IsClientJit)
|
||||
@@ -127,7 +129,7 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
{
|
||||
var list = lstAdminShopInfo.Where(s => s.LoginStatus2 == "国际版在线").ToList();
|
||||
if (IsClientJit)
|
||||
list = list.Where(s => s.LoginStatus2 == "国际版在线" && s.jit_expire_time >= DateTime.Now.Date).ToList();
|
||||
list = GlobalConfig.ShopLoginList.Where(s => s.LoginStatus2 == "国际版在线" && s.jit_expire_time >= DateTime.Now.Date).ToList();
|
||||
foreach (DataGridViewRow row in dgvShop.Rows)
|
||||
{
|
||||
if (list.Any(l => l.ShopId == row.Cells["colShopId"]?.Value?.ToString()))
|
||||
@@ -2171,7 +2173,12 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
//长宽高超50且重量大于1000克认为是有意改大了参数需要还原
|
||||
//if (skc.skuList.Any(s => (s.len >= 45 * 10 || s.width >= 45 * 10 || s.height >= 45 * 10) && s.weight >= 1000 * 1000))
|
||||
// return true;
|
||||
if (skc.skuList.Any(s => (s.len >= numJudgeLen.Value * 10 || s.width >= numJudgeLen.Value * 10 || s.height >= numJudgeLen.Value * 10) && s.weight >= numJudgeWeight.Value * 1000))
|
||||
|
||||
bool isRevers = false;
|
||||
Invoke(new Action(() => { isRevers = chkLessThan.Checked; }));
|
||||
if (!isRevers && skc.skuList.Any(s => (s.len >= numJudgeLen.Value * 10 || s.width >= numJudgeLen.Value * 10 || s.height >= numJudgeLen.Value * 10) && s.weight >= numJudgeWeight.Value * 1000))
|
||||
return true;
|
||||
else if (isRevers && skc.skuList.Any(s => (s.len < numJudgeLen.Value * 10 || s.width < numJudgeLen.Value * 10 || s.height < numJudgeLen.Value * 10) && s.weight < numJudgeWeight.Value * 1000))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
@@ -2449,6 +2456,22 @@ namespace TemuKJD.KJDForms.AdminForms
|
||||
{
|
||||
chkFilterSize.Checked = !chkFilterSize.Checked;
|
||||
}
|
||||
|
||||
private void chkLessThan_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
if(chkLessThan.Checked)
|
||||
{
|
||||
lblJudgeLen.Text = "长<";
|
||||
lblJudgeWeight.Text = "且重<";
|
||||
lblJudgeLen.ForeColor = lblJudgeWeight.ForeColor = Color.Red;
|
||||
}
|
||||
else
|
||||
{
|
||||
lblJudgeLen.Text = "长≥";
|
||||
lblJudgeWeight.Text = "且重≥";
|
||||
lblJudgeLen.ForeColor = lblJudgeWeight.ForeColor = Color.Black;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class PriceCheckConfig
|
||||
|
||||
Reference in new issue
Block a user