jit制造商报错问题修复 temu已报名直通车商品查询优化 jit数据库商品查询全部商品bug修复 jit订单数据库逻辑优化 拼多多上传加入直通车等待时间延长 其他部分优化

This commit is contained in:
wule committed 2025-12-08 17:35:51 +08:00
1 parent 85d0c2d86a
commit 4dde0936ed
24 files changed
+1905 -585

No files matched your search

+480 -194
View File
@@ -20,6 +20,7 @@ using TemuKJD.Extension;
using TemuKJD.KJDForms.AdminForms;
using TemuKJD.KJDForms.ProductForms;
using TemuKJD.KJDForms.ShopForms;
using TemuKJD.KJDForms.ShopForms.Statistics;
using TemuKJD.ToolForms;
using Work;
@@ -60,18 +61,24 @@ namespace TemuKJD.KJDForms.JITForms
if (!IsClientJit)
{
ucSplitPage1.Visible = true;
btnGetDbOrder.Visible = true;
//btnGetDbOrder.Visible = true;
btnGetDbOrder.Text = "拉取已上传订单";
pnlGetNewOrder.Visible = false;
pnlStatistics.Visible = false;
colJitStatus.Visible = false;
dgvShop.Columns["colOrderToday"].Visible = false;
dgvShop.Columns["colOrder7days"].Visible = false;
splitContainer2.SplitterDistance = 320;
}
else
{
ucSplitPage1.Visible = false;
btnGetDbOrder.Visible = false;
//btnGetDbOrder.Visible = false;
btnGetDbOrder.Text = "刷新已读取订单";
pnlGetNewOrder.Visible = true;
pnlStatistics.Visible = true;
}
splitContainer4.SplitterDistance = splitContainer2.SplitterDistance - 4;
lblNextGetTime.Text = "";
@@ -110,10 +117,10 @@ namespace TemuKJD.KJDForms.JITForms
this.txtExtCode.TextChanged += Txt_TextChanged;
this.chkSearchTime.CheckedChanged += Txt_TextChanged;
lblAuthorizedAmount.Text = "剩余授权金:" + BaseClass.AuthorizedAmount;
lblAuthorizedAmount.Text = "" + BaseClass.AuthorizedAmount.ParseToDecimal().ToString("0.0");
if (IsClientJit)
loadServerDbOrder();
btnGetDbOrder_Click(null, null);
}
private void chkSelectAll_CheckedChanged(object sender, EventArgs e)
{
@@ -218,6 +225,8 @@ namespace TemuKJD.KJDForms.JITForms
shop.Notes,
canUse ? "在线" : "掉线",
canUse,
string.Empty,
string.Empty,
string.Empty
);
displayShopStatus(shop);
@@ -516,6 +525,9 @@ namespace TemuKJD.KJDForms.JITForms
row.Cells["colMessage"].Value = "";
}
txtErr.Text = "状态正常";
txtErr.ForeColor = Color.Black;
cancellationTokenSource = new CancellationTokenSource();
Task.Run(() =>
{
@@ -532,15 +544,18 @@ namespace TemuKJD.KJDForms.JITForms
{
Task.Run(() =>
{
Task.Run(() => { GetMainStatics(lstShopId, cancellationTokenSource); });
lstOrderForSupplierInfo.Clear();
GetNewOrder(lstShopId, cancellationTokenSource);
statisticsListOrder();
});
nextReadTime = DateTime.Now.AddMinutes(30);
}
Thread.Sleep(1000);
Invoke(new Action(() => {
var ticks = nextReadTime - DateTime.Now;
lblNextGetTime.Text = "距离下次读取剩余:" + ticks.Minutes + "分" + ticks.Seconds + "秒";
lblNextGetTime.Text = "下次读取:" + nextReadTime.ToString("HH:mm") + ",剩余:" + ticks.Minutes + "分" + ticks.Seconds + "秒";
}));
if (cancellationTokenSource?.IsCancellationRequested == true)
{
@@ -554,9 +569,76 @@ namespace TemuKJD.KJDForms.JITForms
}
}
void GetMainStatics(List<string> lstShopId, CancellationTokenSource _cancellationTokenSource)
{
var lstShopIdTemp = new ConcurrentList<string>();
lstShopIdTemp.AddRange(lstShopId);
foreach (var shopId in lstShopIdTemp)
{
if (_cancellationTokenSource.IsCancellationRequested)
break;
bool rst = true;
ShopLoginInfo shop = GetAndCheckShopLogin(shopId, ref rst);
if (!rst)
{
continue;
}
ShopOrderStatisticsInfo statistics = new ShopOrderStatisticsInfo();
string html = ShopOrderStatisticsForm.GetMainStatistics(shop);
if (!html.Contains("\"success\":true"))
html = ShopOrderStatisticsForm.GetMainStatistics(shop);
if (html.Contains("\"success\":true"))
{
statistics.aboutToSellOutNumber = BaseRegex.GetNullableIntJson(ref html, "aboutToSellOutNumber");
statistics.adjustPrice = BaseRegex.GetNullableIntJson(ref html, "adjustPrice");
statistics.advicePrepareSkcNumber = BaseRegex.GetNullableIntJson(ref html, "advicePrepareSkcNumber");
statistics.alreadySoldOutNumber = BaseRegex.GetNullableIntJson(ref html, "alreadySoldOutNumber");
statistics.havePublishProduct = BaseRegex.GetNullableBoolJson(ref html, "havePublishProduct");
statistics.highPriceLimitNumber = BaseRegex.GetNullableIntJson(ref html, "highPriceLimitNumber");
statistics.lackSkcNumber = BaseRegex.GetNullableIntJson(ref html, "lackSkcNumber");
statistics.onSaleProductNumber = BaseRegex.GetNullableIntJson(ref html, "onSaleProductNumber");
statistics.qualityAfterSaleRatio90d = BaseRegex.GetNullableIntJson(ref html, "qualityAfterSaleRatio90d");
statistics.reviewAdjustPrice = BaseRegex.GetNullableIntJson(ref html, "reviewAdjustPrice");
statistics.saleVolume = BaseRegex.GetNullableIntJson(ref html, "saleVolume");
statistics.sevenDaysSaleVolume = BaseRegex.GetNullableIntJson(ref html, "sevenDaysSaleVolume");
statistics.thirtyDaysSaleVolume = BaseRegex.GetNullableIntJson(ref html, "thirtyDaysSaleVolume");
statistics.waitProductNumber = BaseRegex.GetNullableIntJson(ref html, "waitProductNumber");
statistics.is_search_1 = true;
Invoke(new Action(() =>
{
var rows = this.dgvShop.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId);
foreach (var row in rows)
{
row.Cells["colOrderToday"].Value = statistics.saleVolume;
row.Cells["colOrder7Days"].Value = statistics.sevenDaysSaleVolume;
}
}));
}
else
{
string errStr = BaseRegex.GetStringJson(ref html, "errorMsg");
if (string.IsNullOrEmpty(errStr))
errStr = BaseRegex.GetStringJson(ref html, "error_msg");
if (string.IsNullOrEmpty(errStr))
errStr = html;
if (errStr.Contains("Invalid Login State"))
{
ShopListForm.Instance.CheckShopLogin(new string[] { shop.LoginName }, false);
}
Thread.Sleep(Randomx.GetId(100, 200));
statistics.err_msg = errStr;
continue;
}
}
}
void GetNewOrder(List<string> lstShopId, CancellationTokenSource _cancellationTokenSource)
{
var lstShopIdTemp = new List<string>();
var lstShopIdTemp = new ConcurrentList<string>();
lstShopIdTemp.AddRange(lstShopId);
int i = 0;
foreach (var shopId in lstShopIdTemp)
@@ -569,49 +651,15 @@ namespace TemuKJD.KJDForms.JITForms
i++;
}));
if (cancellationTokenSource.IsCancellationRequested)
if (_cancellationTokenSource.IsCancellationRequested)
break;
ShopLoginInfo shop = null;
if (!IsClientJit)
{
shop = this.lstAdminShopInfo.FirstOrDefault(s => s.ShopId == shopId);
}
else
{
shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId);
}
if (shop == null)
continue;
#region 检测登录
if (shop.LoginStatus2 != "国际版在线")
bool rst = true;
ShopLoginInfo shop = GetAndCheckShopLogin(shopId, ref rst);
if (!rst)
{
continue;
}
if (!IsClientJit)
{
AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
}
else
{
ShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
}
if (shop.LoginStatus2 != "国际版在线")
{
Invoke(new Action(() =>
{
var rows = this.dgvShop.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colLoginName"].Value.ToString() == shop.LoginName);
foreach (var row in rows)
{
row.Cells["colMessage"].Value = "店铺掉线";
row.Cells["colLoginStatus"].Value = "未登录";
row.Cells["colCanUse"].Value = false;
}
}));
continue;
}
#endregion
Invoke(new Action(() =>
{
@@ -629,7 +677,7 @@ namespace TemuKJD.KJDForms.JITForms
string errorMsg = "";
while (page <= totalPage)
{
if (cancellationTokenSource.IsCancellationRequested)
if (_cancellationTokenSource.IsCancellationRequested)
break;
Thread.Sleep(100 + Randomx.GetId(200));
@@ -651,6 +699,9 @@ namespace TemuKJD.KJDForms.JITForms
ConcurrentList<subOrderForSupplier> subOrderInfoLst = new ConcurrentList<subOrderForSupplier>();
if (jsonStr.Contains("\"success\":true"))
{
int total = BaseRegex.GetStringJson(ref jsonStr, "total").ParseToInt();
totalPage = Math.Ceiling(1.0m * total / pageSize).ParseToInt();
var jArr = new JArray();
try
{
@@ -740,46 +791,43 @@ namespace TemuKJD.KJDForms.JITForms
var url = BaseClass.BuildObjString("order/add_order");
var data = UserLogin.GetSignaturex() +
//"&page=" + page +
//"&page_size=" + pageSize +
"&shop_id=" + dbOrderInfo.supplierId +
"&order_data=" + HttpUtility.UrlEncode(JsonHelper.SerializeObject(dbOrderInfo), Encoding.UTF8);
//if (BaseClass.SaLevel > 1 && !chkSearchAllShop.Checked)
// data += "&operate_sub_sa_name=" + BaseClass.UserName;
var html = GetHtml.PostUtf8(url, data);
//if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
// html = GetHtml.PostUtf8(url, data);
//if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
// html = GetHtml.PostUtf8(url, data);
if (!string.IsNullOrEmpty(html) && html.Contains("\"code\":200"))
#if RELEASE
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
#endif
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
var errMsg = BaseRegex.GetStringJson(ref html, "msg");
Invoke(new Action(() =>
{
txtErr.Text = "订单入库失败,请检查网络" + errMsg;
txtErr.ForeColor = Color.Red;
}));
}
Invoke(new Action(() =>
{
int rowId = 0;
var rows = this.dgvStock.Rows.Cast<DataGridViewRow>();
foreach (var r in rows)
var rw = this.dgvStock.Rows.Cast<DataGridViewRow>().LastOrDefault(r =>
r.Cells["colSupplierId"].Value.ParseToString() == shop.ShopId &&
r.Cells["colCreateTimeTick"].Value.ParseToLong() > dbOrderInfo.purchaseTime
);
if (rw != null)
{
if (r.Cells["colSupplierId"].Value.ParseToString() == shop.ShopId && r.Cells["colCreateTime"].Value.ParseToLong() <= dbOrderInfo.purchaseTime)
{
rowId = r.Index;
break;
}
rowId = rw.Index + 1;
}
InsertRow(rowId, dbOrderInfo);
if (dbOrderInfo.costPrice > 0)
InsertRow(rowId, dbOrderInfo);
}));
}
int total = BaseRegex.GetStringJson(ref jsonStr, "total").ParseToInt();
totalPage = Math.Ceiling(1.0m * total / pageSize).ParseToInt();
}
page++;
}
InsertRowEnd(); // 处理合并单元格恰在好最后一行的情况
Invoke(new Action(() =>
{
@@ -804,7 +852,7 @@ namespace TemuKJD.KJDForms.JITForms
Invoke(new Action(() =>
{
string sRst = "查询结束!";
if (cancellationTokenSource.IsCancellationRequested)
if (_cancellationTokenSource.IsCancellationRequested)
sRst = "已取消查询!";
//BaseMsgForm.ShowInfo(sRst);
@@ -812,6 +860,8 @@ namespace TemuKJD.KJDForms.JITForms
}));
}
Dictionary<string, ConcurrentList<DataGridViewCell>> dicMergeInfoCells = new Dictionary<string, ConcurrentList<DataGridViewCell>>();
Dictionary<string, ConcurrentList<DataGridViewCell>> dicMergeImgCells = new Dictionary<string, ConcurrentList<DataGridViewCell>>();
ConcurrentList<DataGridViewCell> MergeInfoCells = new ConcurrentList<DataGridViewCell>();
ConcurrentList<DataGridViewCell> MergeImgCells = new ConcurrentList<DataGridViewCell>();
void InsertRow(int rowId, TemuDBOrderInfo dbOrderInfo)
@@ -851,6 +901,7 @@ namespace TemuKJD.KJDForms.JITForms
dbOrderInfo.supplierPrice / 100m,
dbOrderInfo.purchaseQuantity, // 备货件数
dbOrderInfo.purchaseTime,
BaseClass.StampToDateTime((dbOrderInfo.purchaseTime / 1000).ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"), // 备货单创建时间
"",
""
@@ -868,13 +919,13 @@ namespace TemuKJD.KJDForms.JITForms
if (MergeInfoCells.Count > 1)
{
ConcurrentList<DataGridViewCell> cells = new ConcurrentList<DataGridViewCell>();
cells.AddRange(MergeInfoCells);
cells.AddRange(MergeInfoCells.OrderBy(c => c.RowIndex));
dgvStock.AddVerticalMergeCell(cells);
}
if (MergeImgCells.Count > 1)
{
ConcurrentList<DataGridViewCell> cells = new ConcurrentList<DataGridViewCell>();
cells.AddRange(MergeImgCells);
cells.AddRange(MergeImgCells.OrderBy(c => c.RowIndex));
dgvStock.AddVerticalMergeCell(cells);
}
MergeInfoCells.Clear();
@@ -886,12 +937,15 @@ namespace TemuKJD.KJDForms.JITForms
{
MergeInfoCells.Insert(0, dgvStock.Rows[rowId].Cells["colProdInfo"]);
MergeImgCells.Insert(0, dgvStock.Rows[rowId].Cells["colProductSkcPic"]);
if (dgvStock.Rows.Count > rowId + 1)
{
//dgvStock.Rows[rowId + 1].Cells["colProdInfo"].Value = "";
dgvStock.Rows[rowId + 1].Cells["colProductSkcPic"].Value = this.defaultBitmap;
}
}
//if (!dicMergeInfoCells.ContainsKey(dbOrderInfo.originalPurchaseOrderSn))
// dicMergeInfoCells.Add(dbOrderInfo.originalPurchaseOrderSn, new ConcurrentList<DataGridViewCell>());
//dicMergeInfoCells["dbOrderInfo.originalPurchaseOrderSn"].Add(dgvStock.Rows[rowId].Cells["colProdInfo"]);
//if (!dicMergeImgCells.ContainsKey(dbOrderInfo.originalPurchaseOrderSn))
// dicMergeImgCells.Add(dbOrderInfo.originalPurchaseOrderSn, new ConcurrentList<DataGridViewCell>());
//dicMergeImgCells["dbOrderInfo.originalPurchaseOrderSn"].Add(dgvStock.Rows[rowId].Cells["colProductSkcPic"]);
if (indexId % 2 == 1)
row.DefaultCellStyle.BackColor = Color.White;
else
@@ -900,10 +954,28 @@ namespace TemuKJD.KJDForms.JITForms
FilterRow(row);
}
void InsertRowEnd()
{
if (MergeInfoCells.Count > 1)
{
ConcurrentList<DataGridViewCell> cells = new ConcurrentList<DataGridViewCell>();
cells.AddRange(MergeInfoCells.OrderBy(c => c.RowIndex));
dgvStock.AddVerticalMergeCell(cells);
}
if (MergeImgCells.Count > 1)
{
ConcurrentList<DataGridViewCell> cells = new ConcurrentList<DataGridViewCell>();
cells.AddRange(MergeImgCells.OrderBy(c => c.RowIndex));
dgvStock.AddVerticalMergeCell(cells);
}
MergeInfoCells.Clear();
MergeImgCells.Clear();
}
void SetRowLinkCellText(TemuDBOrderInfo dbOrderInfo, DataGridViewRow row)
{
string upLoadCodeText = "";
//if (dbOrderInfo.upLoadStatus < 2)
if(IsClientJit)
{
upLoadCodeText = "上传";
if (!string.IsNullOrWhiteSpace(dbOrderInfo.jiaTongCode) && !string.IsNullOrWhiteSpace(dbOrderInfo.barCodeMd5) &&
@@ -912,102 +984,125 @@ namespace TemuKJD.KJDForms.JITForms
upLoadCodeText = "修改上传";
}
}
if (!IsClientJit)
else
{
upLoadCodeText = "查看";
}
string upLoadOrderText = "";
if (dbOrderInfo.upLoadStatus < 2 && upLoadCodeText == "修改上传")
if (IsClientJit)
{
upLoadOrderText = "上传订单";
if (dbOrderInfo.upLoadStatus < 2)
{
if (!string.IsNullOrWhiteSpace(dbOrderInfo.jiaTongCode) && !string.IsNullOrWhiteSpace(dbOrderInfo.barCodeMd5) &&
!string.IsNullOrWhiteSpace(dbOrderInfo.shippingMarkMd5))
{
upLoadOrderText = "上传订单";
}
}
if (dbOrderInfo.upLoadStatus == 2)
{
upLoadOrderText = "已上传";
}
if (dbOrderInfo.upLoadStatus == 3)
{
upLoadOrderText = "已打单";
}
if (dbOrderInfo.upLoadStatus == 4)
{
upLoadOrderText = "已发货";
}
}
if (dbOrderInfo.upLoadStatus >= 2)
else
{
upLoadOrderText = "已上传";
if (dbOrderInfo.upLoadStatus == 2)
{
upLoadOrderText = "已上传 点击打单";
}
if (dbOrderInfo.upLoadStatus == 3)
{
upLoadOrderText = "已打单 点击发货";
}
if (dbOrderInfo.upLoadStatus == 4)
{
upLoadOrderText = "已发货";
}
}
row.Cells["colUploadCode"].Value = upLoadCodeText;
row.Cells["colUploadOrder"].Value = upLoadOrderText;
}
void loadServerDbOrder()
void clientLoadServerDbOrder()
{
Task.Run(() =>
var shops = GlobalConfig.ShopLoginList;
for (int i = shops.Count - 1; i >= 0; i--)
{
var shops = GlobalConfig.ShopLoginList;
if (!IsClientJit)
var shop = shops[i];
if (shop.jit_expire_time >= DateTime.Now.Date)
{
var lstShopId = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
=> row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList();
if (lstShopId.Count == 0)
loadServerDbOrder(shop);
}
}
statisticsListOrder();
}
void loadServerDbOrder(ShopLoginInfo shop)
{
int page = 0;
int totalPage = 1;
int pageSize = 200;
while (page < totalPage)
{
page++;
var url = BaseClass.BuildObjString("order/get_order_list");
var data = UserLogin.GetSignaturex() +
"&page_size=" + pageSize +
"&page=" + page;
if (shop != null)
data += "&shop_id=" + shop.ShopId;
if (!IsClientJit)
data += "&upload_order_status=2";
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
Thread.Sleep(50);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
var errMsg = BaseRegex.GetStringJson(ref html, "msg");
Invoke(new Action(() =>
{
txtErr.Text = "拉取入库订单失败,请检查网络" + errMsg;
txtErr.ForeColor = Color.Red;
}));
}
else
{
int total = BaseRegex.GetStringJson(ref html, "count").ParseToInt();
totalPage = Math.Ceiling(1.0m * total / pageSize).ParseToInt();
var jObj = JObject.Parse(html);
var list = JsonHelper.DeserializeJsonToList<TemuDBOrderInfo>(jObj["data"].ToString());
list = list.Where(s => !lstTemuDBOrderInfo.Any(o => o.subPurchaseOrderSn == s.subPurchaseOrderSn)).ToList();
lstTemuDBOrderInfo.AddRange(list);
foreach (var dbOrderInfo in list)
{
Invoke(new Action(() =>
{
BaseMsgForm.ShowInfo("请选择店铺!");
}));
return;
}
lstTemuDBOrderInfo.Clear();
Invoke(new Action(() =>
{
dgvStock.Rows.Clear();
}));
shops.Clear();
foreach (var shopId in lstShopId)
{
shops.Add(this.lstAdminShopInfo.FirstOrDefault(s => s.ShopId == shopId));
}
}
for (int i = shops.Count - 1; i >= 0; i--)
{
var shop = shops[i];
if (shop.jit_expire_time >= DateTime.Now.Date)
{
int page = 0;
int totalPage = 1;
int pageSize = 50;
while (page < totalPage)
{
page++;
var url = BaseClass.BuildObjString("order/get_order_list");
var data = UserLogin.GetSignaturex() +
//"&page=" + page +
//"&page_size=" + pageSize +
"&shop_id=" + shop.ShopId +
"&page=" + page;
if (!IsClientJit)
data += "&upload_order_status=2";
//if (BaseClass.SaLevel > 1 && !chkSearchAllShop.Checked)
// data += "&operate_sub_sa_name=" + BaseClass.UserName;
var html = GetHtml.PostUtf8(url, data);
//if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
// html = GetHtml.PostUtf8(url, data);
//if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
// html = GetHtml.PostUtf8(url, data);
if (!string.IsNullOrEmpty(html) && html.Contains("\"code\":200"))
int rowId = 0;
var rw = this.dgvStock.Rows.Cast<DataGridViewRow>().LastOrDefault(r =>
r.Cells["colSupplierId"].Value.ParseToString() == shop.ShopId &&
r.Cells["colCreateTimeTick"].Value.ParseToLong() > dbOrderInfo.purchaseTime
);
if (rw != null)
{
//lstTemuDBOrderInfo.AddRange()
var jObj = JObject.Parse(html);
var list = JsonHelper.DeserializeJsonToList<TemuDBOrderInfo>(jObj["data"].ToString());
list = list.Where(s => !lstTemuDBOrderInfo.Any(o => o.subPurchaseOrderSn == s.subPurchaseOrderSn)).ToList();
lstTemuDBOrderInfo.AddRange(list);
foreach (var dbOrderInfo in list)
{
Invoke(new Action(() =>
{
int rowId = 0;
InsertRow(rowId, dbOrderInfo);
}));
}
int total = BaseRegex.GetStringJson(ref html, "count").ParseToInt();
totalPage = Math.Ceiling(1.0m * total / pageSize).ParseToInt();
rowId = rw.Index + 1;
}
}
if(dbOrderInfo.costPrice > 0)
InsertRow(rowId, dbOrderInfo);
}));
}
}
});
}
InsertRowEnd(); // 处理合并单元格恰在好最后一行的情况
}
string getLength2312Str(string text, int length = 30)
@@ -1083,17 +1178,18 @@ namespace TemuKJD.KJDForms.JITForms
{
if (!checkNeedRestoreSizeAndNumber(priceInfo))
{
// todo 更改不用再修商品并改参数提交到数据库;
//不用再修尺寸的商品提交到数据库更新所有同id商品,已废弃;
var url = BaseClass.BuildObjString("order/update_order_status1");
var data = UserLogin.GetSignaturex() +
"&shop_id=" + shop.ShopId +
"&product_id=" + priceInfo.productId;
var html = GetHtml.PostUtf8(url, data);
//if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
// html = GetHtml.PostUtf8(url, data);
//if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
// html = GetHtml.PostUtf8(url, data);
if (!string.IsNullOrEmpty(html) && html.Contains("\"code\":200"))
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
}
else
{
foreach(var o in lstTemuDBOrderInfo)
{
@@ -1285,7 +1381,10 @@ namespace TemuKJD.KJDForms.JITForms
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (!string.IsNullOrEmpty(html) && html.Contains("\"code\":200"))
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
}
else
{
try
{
@@ -1294,7 +1393,9 @@ namespace TemuKJD.KJDForms.JITForms
if (cateSizeWeightConfig != null)
lstCateSizeWeightConfig.Add(cateSizeWeightConfig);
}
catch { }
catch
{
}
}
}
@@ -1551,12 +1652,88 @@ namespace TemuKJD.KJDForms.JITForms
else
ShopListForm.Instance.CheckShopLogin(shops, isShowProgress);
}
ShopLoginInfo GetAndCheckShopLogin(string shopId, ref bool chkRst)
{
ShopLoginInfo shop = null;
if (!IsClientJit)
{
shop = this.lstAdminShopInfo.FirstOrDefault(s => s.ShopId == shopId);
}
else
{
shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId);
}
if (shop == null)
{
chkRst = false;
return shop;
}
#region 检测登录
if (shop.LoginStatus2 != "国际版在线")
{
chkRst = false;
return shop;
}
this.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
if (shop.LoginStatus2 != "国际版在线")
{
Invoke(new Action(() =>
{
var rows = this.dgvShop.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colLoginName"].Value.ToString() == shop.LoginName);
foreach (var row in rows)
{
row.Cells["colMessage"].Value = "店铺掉线";
row.Cells["colLoginStatus"].Value = "未登录";
row.Cells["colCanUse"].Value = false;
}
}));
chkRst = false;
return shop;
}
#endregion
chkRst = true;
return shop;
}
public static int sleepTime = 300;
void commonSleep()
{
Thread.Sleep(sleepTime);
}
private void dgvStock_CellClick(object sender, DataGridViewCellEventArgs e)
{
if (e.ColumnIndex < 0 || e.RowIndex < 0)
return;
string headerText = dgvStock.Columns[e.ColumnIndex].HeaderText;
string shopId = dgvStock.Rows[e.RowIndex].Cells["colSupplierId"].Value.ParseToString();
string prodId = dgvStock.Rows[e.RowIndex].Cells["colProductId"].Value.ParseToString();
string subOrderId = dgvStock.Rows[e.RowIndex].Cells["colSubOrderSn"].Value.ParseToString(); // 备货单号
switch (headerText)
{
case "Skc图":
case "SKC图":
{
string url = dgvStock.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString().Replace("img.kwcdn.com", "img.cdnfe.com").Split('?').FirstOrDefault();
url = url.IndexOf("?") < 0 ? url : url.Substring(0, url.IndexOf("?"));
ShowImgForm imgFrom = new ShowImgForm(url);
imgFrom.ShowDialog();
}
break;
case "SKU图":
{
string url = dgvStock.Rows[e.RowIndex].Cells["colSkuImgUrl"].Value.ParseToString().Replace("img.kwcdn.com", "img.cdnfe.com").Split('?').FirstOrDefault();
url = url.IndexOf("?") < 0 ? url : url.Substring(0, url.IndexOf("?"));
ShowImgForm imgFrom = new ShowImgForm(url);
imgFrom.ShowDialog();
}
break;
}
}
private void dgvStock_CellContentClick(object sender, DataGridViewCellEventArgs e)
{
if (e.ColumnIndex < 0 || e.RowIndex < 0)
@@ -1568,14 +1745,6 @@ namespace TemuKJD.KJDForms.JITForms
switch (headerText)
{
case "Skc图片111":
{
string url = dgvStock.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString().Replace("img.kwcdn.com", "img.cdnfe.com").Split('?').FirstOrDefault();
url = url.IndexOf("?") < 0 ? url : url.Substring(0, url.IndexOf("?"));
ShowImgForm imgFrom = new ShowImgForm(url);
imgFrom.ShowDialog();
}
break;
case "上传条码/箱唛":
{
var dbOrder = this.lstTemuDBOrderInfo.FirstOrDefault(o => o.subPurchaseOrderSn == subOrderId);
@@ -1585,6 +1754,13 @@ namespace TemuKJD.KJDForms.JITForms
BaseMsgForm.ShowError("订单不存在!");
return;
}
decimal fee = (dbOrder.costPrice.ParseToDecimal() * 0.01m + dbOrder.deliveryFee.ParseToDecimal() * 0.01m +
dbOrder.markFee.ParseToDecimal() * 0.01m) * dbOrder.purchaseQuantity;
if (fee <= 0)
{
BaseMsgForm.ShowError("该订单类型不支持操作!");
return;
}
JitOrderUploadFileForm uploadFileForm = new JitOrderUploadFileForm(dbOrder);
uploadFileForm.isClientJit = this.IsClientJit;
uploadFileForm.ShowDialog();
@@ -1595,25 +1771,44 @@ namespace TemuKJD.KJDForms.JITForms
{
var dbOrder = this.lstTemuDBOrderInfo.FirstOrDefault(o => o.subPurchaseOrderSn == subOrderId);
var row = dgvStock.Rows[e.RowIndex];
if (row.Cells["colUploadOrder"].Value.ParseToString() != "上传订单")
if (IsClientJit)
{
//BaseMsgForm.ShowError("订单状态不可上传!");
return;
}
if (BaseMsgForm.ShowConfirm("确定上传?将扣除授权金!").DialogResult == DialogResult.OK)
{
decimal fee = (dbOrder.deliveryFee.ParseToDecimal() * 0.01m + dbOrder.markFee.ParseToDecimal() * 0.01m) * dbOrder.purchaseQuantity;
var url = BaseClass.BuildObjString("order/upload_order");
var data = UserLogin.GetSignaturex();
data += "&shop_id=" + dbOrder.supplierId;
data += "&subPurchaseOrderSn=" + dbOrder.subPurchaseOrderSn;
data += "&fee=" + fee;
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (!string.IsNullOrEmpty(html) && html.Contains("\"code\":200"))
if (row.Cells["colUploadOrder"].Value.ParseToString() != "上传订单")
{
try
//BaseMsgForm.ShowError("订单状态不可上传!");
return;
}
if (BaseMsgForm.ShowConfirm("确定上传?将扣除授权金!").DialogResult == DialogResult.OK)
{
decimal fee = (dbOrder.costPrice.ParseToDecimal() * 0.01m + dbOrder.deliveryFee.ParseToDecimal() * 0.01m +
dbOrder.markFee.ParseToDecimal() * 0.01m) * dbOrder.purchaseQuantity;
if (fee < 0)
{
BaseMsgForm.ShowError("该订单类型不支持操作!");
return;
}
if (fee > BaseClass.AuthorizedAmount)
{
BaseMsgForm.ShowError("剩余授权金不足,请联系管理员!");
return;
}
var url = BaseClass.BuildObjString("order/upload_order");
var data = UserLogin.GetSignaturex();
data += "&shop_id=" + dbOrder.supplierId;
data += "&subPurchaseOrderSn=" + dbOrder.subPurchaseOrderSn;
data += "&purchaseTime=" + dbOrder.purchaseTime;
data += "&fee=" + fee;
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
var errMsg = BaseRegex.GetStringJson(ref html, "msg");
BaseMsgForm.ShowError(errMsg);
return;
}
else
{
BaseClass.AuthorizedAmount -= fee;
this.lblAuthorizedAmount.Text = "剩余授权金:" + BaseClass.AuthorizedAmount;
@@ -1621,12 +1816,65 @@ namespace TemuKJD.KJDForms.JITForms
dbOrder.upLoadStatus = 2;
SetRowLinkCellText(dbOrder, row);
}
catch { }
}
else
}
else
{
if (row.Cells["colUploadOrder"].Value.ParseToString() == "已上传 点击打单")
{
var errMsg = BaseRegex.GetStringJson(ref html, "msg");
BaseMsgForm.ShowError(errMsg);
if (BaseMsgForm.ShowConfirm("确定更改状态为发货?").DialogResult == DialogResult.OK)
{
decimal fee = (dbOrder.deliveryFee.ParseToDecimal() * 0.01m + dbOrder.markFee.ParseToDecimal() * 0.01m) * dbOrder.purchaseQuantity;
var url = BaseClass.BuildObjString("order/update_order_status");
var data = UserLogin.GetSignaturex();
data += "&shop_id=" + dbOrder.supplierId;
data += "&subPurchaseOrderSn=" + dbOrder.subPurchaseOrderSn;
data += "&purchaseTime=" + dbOrder.purchaseTime;
data += "&new_status=3";
data += "&old_status=2";
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
var errMsg = BaseRegex.GetStringJson(ref html, "msg");
BaseMsgForm.ShowError(errMsg);
return;
}
else
{
dbOrder.upLoadStatus = 3;
SetRowLinkCellText(dbOrder, row);
}
}
}
else if (row.Cells["colUploadOrder"].Value.ParseToString() == "已打单 点击发货")
{
if (BaseMsgForm.ShowConfirm("确定更改状态为发货?").DialogResult == DialogResult.OK)
{
decimal fee = (dbOrder.deliveryFee.ParseToDecimal() * 0.01m + dbOrder.markFee.ParseToDecimal() * 0.01m) * dbOrder.purchaseQuantity;
var url = BaseClass.BuildObjString("order/update_order_status");
var data = UserLogin.GetSignaturex();
data += "&shop_id=" + dbOrder.supplierId;
data += "&subPurchaseOrderSn=" + dbOrder.subPurchaseOrderSn;
data += "&purchaseTime=" + dbOrder.purchaseTime;
data += "&new_status=4";
data += "&old_status=3";
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
var errMsg = BaseRegex.GetStringJson(ref html, "msg");
BaseMsgForm.ShowError(errMsg);
return;
}
else
{
dbOrder.upLoadStatus = 4;
SetRowLinkCellText(dbOrder, row);
}
}
}
}
}
@@ -1667,11 +1915,6 @@ namespace TemuKJD.KJDForms.JITForms
}
}
private void ucGroupBoxEx1_Enter(object sender, EventArgs e)
{
}
private void btnRestore_Click(object sender, EventArgs e)
{
txtSubOrderSn.Text = txtProductSn.Text = txtProductId.Text = "";
@@ -1679,7 +1922,18 @@ namespace TemuKJD.KJDForms.JITForms
private void btnGetDbOrder_Click(object sender, EventArgs e)
{
loadServerDbOrder();
lstTemuDBOrderInfo.Clear();
dgvStock.Rows.Clear();
this.pbLoading.Visible = true;
Task.Run(() =>
{
if(IsClientJit)
clientLoadServerDbOrder();
else
loadServerDbOrder(null);
Invoke(new Action(() => { this.pbLoading.Visible = false; }));
});
}
private void ucSplitPage1_PageChange(object obj)
@@ -1689,5 +1943,37 @@ namespace TemuKJD.KJDForms.JITForms
SearchShop(this.ucSplitPage1.CurrentPage);
}
}
private void lblRefreshAmount_Click(object sender, EventArgs e)
{
var url = BaseClass.BuildObjString("user/get_user_amount");
var data = UserLogin.GetSignaturex();
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
var errMsg = BaseRegex.GetStringJson(ref html, "msg");
BaseMsgForm.ShowError(errMsg);
return;
}
else
{
BaseClass.AuthorizedAmount = BaseRegex.GetStringJson(ref html, "data").ParseToDecimal();
this.lblAuthorizedAmount.Text = "" + BaseClass.AuthorizedAmount.ParseToDecimal().ToString("0.0");
}
}
void statisticsListOrder()
{
Invoke(new Action(() =>
{
lblOriginalOrderNumber.Text = this.dgvStock.Rows.Cast<DataGridViewRow>().Select(r => r.Cells["colParentStockId"].Value.ParseToString()).Distinct().Count().ToString();
lblOrderNumber.Text = this.dgvStock.Rows.Cast<DataGridViewRow>().Select(r => r.Cells["colSubOrderSn"].Value.ParseToString()).Distinct().Count().ToString();
lblOrderTotalPrice.Text = lstTemuDBOrderInfo.Where(o => o.costPrice > 0).Sum(o => o.supplierPrice * o.purchaseQuantity * 0.01).ToString("0.00");
lblOrderTotalCost.Text = lstTemuDBOrderInfo.Where(o => o.costPrice > 0).Sum(o => (o.costPrice + o.deliveryFee + o.markFee) * o.purchaseQuantity * 0.01).ParseToDecimal().ToString("0.00");
lblOrderTotalProfit.Text = (lblOrderTotalPrice.Text.ParseToDecimal() - lblOrderTotalCost.Text.ParseToDecimal()).ToString("0.00");
}));
}
}
}