diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs index 93043d7..8807bed 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs @@ -4212,13 +4212,6 @@ namespace TemuKJD.WXForms.ProductForms } Thread.Sleep(Randomx.GetId(100, 300)); - var maxSkuSpecCnt = prodInfo.detail.sku.Max(x => x.spec?.Count).ParseToInt(); - foreach(var skuTmp in prodInfo.detail.sku.ToList()) - { - if (skuTmp.spec?.Count != maxSkuSpecCnt) - prodInfo.detail.sku.Remove(skuTmp); - } - upProdParam.product.info.productSaleAttrs = new List(); if (prodInfo.detail.sku == null) prodInfo.detail.sku = new List(); @@ -4231,6 +4224,13 @@ namespace TemuKJD.WXForms.ProductForms if (prodInfo.detail.sku.FirstOrDefault().thumb_url.IsNullOrEmpty()) prodInfo.detail.sku.FirstOrDefault().thumb_url = prodInfo.detail.galleries.FirstOrDefault(g => g.type == 1)?.url; + var maxSkuSpecCnt = prodInfo.detail.sku.Max(x => x.spec?.Count).ParseToInt(); + foreach (var skuTmp in prodInfo.detail.sku.ToList()) + { + if (skuTmp.spec?.Count != maxSkuSpecCnt) + prodInfo.detail.sku.Remove(skuTmp); + } + // 处理系统指定的规格名称 //if ((upProdParam.product.info.category.FirstOrDefault()?.name == "食品饮料" || prodInfo.detail.cats.FirstOrDefault() == "食品饮料") && // (selectProd.cat_name == "坚果炒货" || selectProd.cat_name == "果干")) diff --git a/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.cs b/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.cs index 57b159a..e1a86d2 100644 --- a/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.cs @@ -327,7 +327,7 @@ namespace TemuKJD.WXForms.ShopForms statistics.WxShopAmount.totalAmount * 0.01m, // 货款金额 statistics.WxShopAmount.availableAmount * 0.01m, // 可提现余额 statistics.WxShopAmount.pendingAmount * 0.01m, // 待结算金额 - statistics.WxShopAmount.DepositBalance * 0.01m // 抱枕金 + statistics.WxShopAmount.DepositBalance * 0.01m // 保证金 ); row = dgvShop.Rows[rowId]; (row.Cells["colLoginStatus"] as DataGridViewLinkCell).Style.ForeColor = canUse ? Color.Green : Color.Red; @@ -795,6 +795,7 @@ namespace TemuKJD.WXForms.ShopForms statistics.WxShopSaleInfo1Day.LastRefreshDate = DateTime.MinValue; statistics.WxShopSaleInfo7Day.LastRefreshDate = DateTime.MinValue; statistics.WxShopSaleInfo30Day.LastRefreshDate = DateTime.MinValue; + statistics.WxShopAmount.LastRefreshDate = DateTime.MinValue; statistics.lastRefreshDate = DateTime.MinValue; } //this.lstSubOrderInfo.RemoveAll(o => o.supplierId.ParseToString() == shop.ShopId);