This commit is contained in:
chfei authored and chfei committed 2026-09-14 09:16:59 +08:00
1 parent 0a3e5af6a9
commit c2dcedd238
59 files changed
+2053 -1274

No files matched your search

@@ -1,5 +1,6 @@
using AllBase;
using AllBase.Extension;
using NaiBa.Util.Extension;
using AllBase.Helper;
using AllBase.Model.Config;
using AllBase.Model.DBModel;
@@ -9,7 +10,6 @@ using AllBase.Model.Result.PDDResult;
using AllBase.Model.Result.WXResult;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Store.Framework.Extensions;
using Store.Product.Models.PublishParameters.Wx;
using Store.Product.Publish;
using System;
@@ -21,7 +21,6 @@ using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using Work;
namespace Store.Product.Publish.Steps.Wx;
@@ -35,22 +34,22 @@ public sealed class CalculateShippingTemplateStep : WxProductPublishStepBase
protected override Task ExecuteProvider(WXPublishContext context, CancellationToken cancellationToken)
{
if (cell != null)
if (context.Progress != null)
{
Invoke(new Action(() =>
{
cell.Value = "正在选取运费模板";
context.Progress.Report("正在选取运费模板");
}));
}
shippingTemplateJson = "";
shipPrice = 0;
context.Parameters.ShippingTemplateJson = "";
context.Parameters.ShipPrice = 0;
if (dbProd.product_get_type_text == "厂商直采")
if (context.Product.ProductGetTypeText == "厂商直采")
{
var urlShipping = BaseClass.BuildObjString("product/wx_get_shipping_template");
var dataShipping = Work.UserLogin.GetSignaturex() +
"&coid=" + dbProd.skc_id;
"&coid=" + context.Product.SkcId;
var htmlShipping = GetHtml.PostUtf8(urlShipping, dataShipping);
if (string.IsNullOrEmpty(htmlShipping) || !htmlShipping.Contains("\"code\":200"))
htmlShipping = GetHtml.PostUtf8(urlShipping, dataShipping);
@@ -66,7 +65,7 @@ public sealed class CalculateShippingTemplateStep : WxProductPublishStepBase
{
try
{
shippingTemplateJson = JsonHelper.SerializeObject(JsonHelper.JObjectParse(htmlShipping)["data"]);
context.Parameters.ShippingTemplateJson = JsonHelper.SerializeObject(JsonHelper.JObjectParse(htmlShipping)["data"]);
}
catch
{
@@ -75,11 +74,11 @@ public sealed class CalculateShippingTemplateStep : WxProductPublishStepBase
}
}
if (string.IsNullOrEmpty(shippingTemplateJson))
if (string.IsNullOrEmpty(context.Parameters.ShippingTemplateJson))
{
// 获取运费模板
var urlShip = BaseClass.BuildObjString("product/e57_get_freight_template");
var dataShip = Work.UserLogin.GetSignaturex() + "&coid=" + dbProd.skc_id;
var dataShip = Work.UserLogin.GetSignaturex() + "&coid=" + context.Product.SkcId;
var shipRst = GetHtml.PostUtf8(urlShip, dataShip);
if (string.IsNullOrEmpty(shipRst) || !shipRst.Contains("\"code\":0"))
shipRst = GetHtml.PostUtf8(urlShipping, dataShipping);
@@ -93,13 +92,13 @@ public sealed class CalculateShippingTemplateStep : WxProductPublishStepBase
try
{
//[{"id":"204","warehouseNum":"15016108","freightType":0,"provinces":"香港特别行政区,台湾省,澳门特别行政区","freightPrice":9999900,"createBy":"vmslin","createTime":"2026-01-30T16:45:03+08:00","updateBy":"vmslin","updateTime":"2026-01-30T16:45:03+08:00"},{"id":"205","warehouseNum":"15016108","freightType":3,"provinces":"海南省,新疆维吾尔自治区,西藏自治区,内蒙古自治区","freightPrice":1530,"createBy":"vmslin","createTime":"2026-01-30T16:45:51+08:00","updateBy":"vmslin","updateTime":"2026-01-30T16:45:51+08:00"},{"id":"206","warehouseNum":"15016108","freightType":1,"provinces":"北京市,上海市","freightPrice":410,"createBy":"vmslin","createTime":"2026-01-30T16:46:04+08:00","updateBy":"vmslin","updateTime":"2026-01-30T16:46:04+08:00"},{"id":"207","warehouseNum":"15016108","freightType":1,"provinces":"安徽省,重庆市,福建省,广东省,甘肃省,广西壮族自治区,贵州省,河北省,湖北省,黑龙江省,河南省,湖南省,吉林省,江苏省,江西省,辽宁省,宁夏回族自治区,青海省,四川省,山东省,山西省,陕西省,天津市,云南省,浙江省","freightPrice":310,"createBy":"vmslin","createTime":"2026-01-30T16:46:17+08:00","updateBy":"vmslin","updateTime":"2026-01-30T16:46:17+08:00"}]
shippingTemplateJson = JsonHelper.SerializeObject(JsonHelper.JObjectParse(shipRst)["data"]);
if (shipRst.Contains("\"code\":0") && !string.IsNullOrEmpty(shippingTemplateJson))
context.Parameters.ShippingTemplateJson = JsonHelper.SerializeObject(JsonHelper.JObjectParse(shipRst)["data"]);
if (shipRst.Contains("\"code\":0") && !string.IsNullOrEmpty(context.Parameters.ShippingTemplateJson))
{
urlShipping = BaseClass.BuildObjString("product/wx_add_mdy_shipping_template");
dataShipping = Work.UserLogin.GetSignaturex() +
"&coid=" + dbProd.skc_id +
"&shipping_template_json=" + shippingTemplateJson;
"&coid=" + context.Product.SkcId +
"&shipping_template_json=" + context.Parameters.ShippingTemplateJson;
htmlShipping = GetHtml.PostUtf8(urlShipping, dataShipping);
if (string.IsNullOrEmpty(htmlShipping) || !htmlShipping.Contains("\"code\":200"))
htmlShipping = GetHtml.PostUtf8(urlShipping, dataShipping);
@@ -111,19 +110,19 @@ public sealed class CalculateShippingTemplateStep : WxProductPublishStepBase
}
}
if (!string.IsNullOrEmpty(shippingTemplateJson))
if (!string.IsNullOrEmpty(context.Parameters.ShippingTemplateJson))
{
try
{
int count = 0;
var shipObjs = JArray.Parse(shippingTemplateJson);
var shipObjs = JArray.Parse(context.Parameters.ShippingTemplateJson);
foreach (var shipObj in shipObjs)
{
var provincesStr = shipObj["provinces"].ParseToString();
if (provincesStr.Split(',').Length > count)
{
count = provincesStr.Split(',').Length;
shipPrice = shipObj["freightPrice"].ParseToInt();
context.Parameters.ShipPrice = shipObj["freightPrice"].ParseToInt();
}
}
}
@@ -132,10 +131,11 @@ public sealed class CalculateShippingTemplateStep : WxProductPublishStepBase
throw new Exception("运费模板获取失败 " + ex.Message);
}
}
if (shipPrice <= 0)
if (context.Parameters.ShipPrice <= 0)
{
throw new Exception("运费模板获取失败 未获取到");
}
}
return Task.CompletedTask;
}
}