This commit is contained in:
chfei committed 2026-08-27 14:50:44 +08:00
commit ff3ee89383
8 files changed
+56 -24

No files matched your search

+1 -1
View File
@@ -12,7 +12,7 @@
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<PlatformTarget>x64</PlatformTarget>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
+15 -1
View File
@@ -10,12 +10,26 @@
<ErrorReportUrlHistory />
<FallbackCulture>zh-CN</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
<ActiveDebugProfile>Development</ActiveDebugProfile>
<ActiveDebugProfile>Production</ActiveDebugProfile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
</PropertyGroup>
<!-- ========== 补充 SubType 元数据,让 SDK 风格项目中的窗体/用户控件/组件恢复设计器支持 ========== -->
<ItemGroup>
<Compile Update="BaseForms\BaseTalkForm.cs">
@@ -938,7 +938,6 @@ namespace TemuKJD.ToolForms
this.ClientSize = new System.Drawing.Size(1404, 478);
this.Controls.Add(this.splitContainer1);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.KeyPreview = true;
this.Name = "WXSaleAssistantForm";
this.Text = "微信带货助手";
@@ -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<productSaleAttrParam>();
if (prodInfo.detail.sku == null)
prodInfo.detail.sku = new List<sku_item>();
@@ -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 == "果干"))
@@ -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);