This commit is contained in:
chfei committed 2026-09-15 16:08:14 +08:00
1 parent 085f275620
commit 256a0c24f9
11 files changed
+198 -147

No files matched your search

+4 -3
View File
@@ -1,4 +1,5 @@
using Store.Framework.Models;
using Store.Framework.Inerterfaces;
using Store.Framework.Models;
using Store.Product.Models.Product;
using Store.Product.Models.PublishParameters;
using Store.Product.Models.PublishParameters.Wx;
@@ -19,7 +20,7 @@ public class PublishContextBase
/// <summary>
/// 商铺
/// </summary>
public Shop Shop { get; set; }
public IShop Shop { get; set; }
/// <summary>
/// 商铺名称
/// </summary>
@@ -31,7 +32,7 @@ public class PublishContextBase
{
return "";
}
return Shop.Name;
return Shop.ShopName;
}
}
@@ -7,6 +7,7 @@ using Newtonsoft.Json.Linq;
using Store.Product.Models.PublishParameters;
using Store.Product.Models.PublishParameters.Wx;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -227,7 +228,7 @@ public class WXPublishParameters: PublishParameters
/// <summary>
/// 待裂变标题文本,使用换行分隔。
/// </summary>
public string FissionTitles { get; set; } = "";
public Queue<string> FissionTitles { get; set; } = new Queue<string>();
/// <summary>
/// 是否删除标题开头的特殊字符。
/// </summary>
@@ -38,17 +38,13 @@ public sealed class FissionTitleStep : WxProductPublishStepBase
}
protected override Task ExecuteProvider(WXPublishContext context, CancellationToken cancellationToken)
{
var titles = context.Parameters.FissionTitles.Split(new string[] { "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries).ToList();
if (titles.Count == 0)
if (context.Parameters.FissionTitles.Count == 0)
{
throw new Exception("裂变标题数量不足,将暂停上传");
}
context.Product.Title = titles[0];
context.Product.Title = context.Parameters.FissionTitles.Dequeue();
context.Parameters.IsFissionTitle = true;
titles.RemoveAt(0);
context.Parameters.FissionTitles = string.Join("\r\n", titles);
context.Progress.Report("标题裂变成功,更改为:" + context.Product.Title);
return Task.CompletedTask;
}
}
@@ -25,8 +25,7 @@ using Work;
namespace Store.Product.Publish.Steps.Wx;
/// <summary>
/// 由 WXDBProdUploadForm.UploadProduct 的“初始化上传参数与店铺登录校验”区段迁移。
/// TODO(迁移): 原区段中的 TEMUKJD/WXUpload/窗体服务引用需按 Store.Product 运行时适配逐项核对。
/// 初始化上传参数与店铺登录校验
/// </summary>
public sealed class InitializeUploadProductStep : WxProductPublishStepBase
{
@@ -34,7 +33,7 @@ public sealed class InitializeUploadProductStep : WxProductPublishStepBase
protected override Task ExecuteProvider(WXPublishContext context, CancellationToken cancellationToken)
{
if (context.Parameters.Shop == null || string.IsNullOrEmpty(context.Parameters.Shop.ShopId) || context.Parameters.Shop.LoginStatus != "登录成功")
if (context.ShopName == null || string.IsNullOrEmpty(context.Shop.ShopId) || context.Shop.IsLoggedIn == false)
{
throw new Exception("店铺为空或未登录!");
}