From 60e3e84cb3d2bac6bf81c10ae97a80b3fa4892da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=88=E6=A3=AE=E5=90=B4?= <8402134@qq.com>
Date: Wed, 28 Dec 2022 17:13:05 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8A=96=E9=9F=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 类库/Api.Framework/Api.Framework.csproj |  2 ++
 类库/Api.Framework/Cps/DouyinApi.cs     |  2 +-
 类库/Api.Framework/Cps/DouyinApiV2.cs   | 12 ------------
 类库/Api.Framework/Tools/DYHelper.cs    |  2 +-
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/类库/Api.Framework/Api.Framework.csproj b/类库/Api.Framework/Api.Framework.csproj
index a350996..22bc937 100644
--- a/类库/Api.Framework/Api.Framework.csproj
+++ b/类库/Api.Framework/Api.Framework.csproj
@@ -304,6 +304,7 @@
     <Compile Include="Config\OtherConfig.cs" />
     <Compile Include="Config\ServerConfig.cs" />
     <Compile Include="Config\SystemConfig.cs" />
+    <Compile Include="Cps\DouyinApi.cs" />
     <Compile Include="Cps\DouyinApiV2.cs" />
     <Compile Include="Cps\douyin_form_login.cs">
       <SubType>Form</SubType>
@@ -556,6 +557,7 @@
     <Compile Include="Tools\CloudApiHelper.cs" />
     <Compile Include="Tools\CloudBlack.cs" />
     <Compile Include="Tools\DouyinGoodsInfo.cs" />
+    <Compile Include="Tools\DYHelper.cs" />
     <Compile Include="Tools\DYHelperV2.cs" />
     <Compile Include="Tools\KSHelper.cs" />
     <Compile Include="Tools\PointManageConfig.cs" />
diff --git a/类库/Api.Framework/Cps/DouyinApi.cs b/类库/Api.Framework/Cps/DouyinApi.cs
index bbe5c3a..a2897d7 100644
--- a/类库/Api.Framework/Cps/DouyinApi.cs
+++ b/类库/Api.Framework/Cps/DouyinApi.cs
@@ -254,7 +254,7 @@ promotion_id = {promotion_id}");
                                 groupid = promotion_id_tmp;
                                 var cps = CpsClient.Members.FirstOrDefault(f => f.online && f.cpstype == CpsType.抖音联盟);
                                 if (cps == null) return string.Empty;
-                                string goodid = new DouyinApiV2(cps).GetPromotionId(groupid, out promotion_id);
+                                string goodid = new DouyinApi(cps).GetPromotionId(groupid, out promotion_id);
                                 if (!string.IsNullOrWhiteSpace(goodid))
                                 {
                                     return goodid;
diff --git a/类库/Api.Framework/Cps/DouyinApiV2.cs b/类库/Api.Framework/Cps/DouyinApiV2.cs
index b759c46..f2c0d59 100644
--- a/类库/Api.Framework/Cps/DouyinApiV2.cs
+++ b/类库/Api.Framework/Cps/DouyinApiV2.cs
@@ -20,18 +20,6 @@ using System.Web;
 
 namespace Api.Framework.Cps
 {
-    /// <summary>
-    /// 抖音订单状态
-    /// </summary>
-    public enum DouyinOrderStatus : int
-    {
-        全部订单 = 1,
-        SETTLE = 2,//结算
-        PAY_SUCC = 3,//订单付款
-        REFUND = 5,//退款/失效
-        订单维权中 = 6,
-        CONFIRM = 7,//确定收货
-    }
     public class DouyinApiV2 : BaseCpsApi
     {
         internal DouyinApiV2(fl_cps_member member) : base(member) { }
diff --git a/类库/Api.Framework/Tools/DYHelper.cs b/类库/Api.Framework/Tools/DYHelper.cs
index 58decf4..1f6e150 100644
--- a/类库/Api.Framework/Tools/DYHelper.cs
+++ b/类库/Api.Framework/Tools/DYHelper.cs
@@ -158,7 +158,7 @@ Regex.IsMatch(mess, @"\[语音=(.+?)\]")
                 var reg = Regex.Match(mess, "([︽#]{2}[A-Za-z0-9]{11,14}[︽#]{2})");
                 if (reg.Success)
                 {
-                    return DouyinApiV2.(reg.Groups[1].Value, out promotion_id, out title);
+                    return DouyinApi.AnalysisCmdToGoodsUrl(reg.Groups[1].Value, out promotion_id, out title);
                 }
             }
             return string.Empty;