diff --git a/AllBase/AllBase.csproj b/AllBase/AllBase.csproj
index 7dd276b..00adec7 100644
--- a/AllBase/AllBase.csproj
+++ b/AllBase/AllBase.csproj
@@ -218,8 +218,11 @@
+
+
+
@@ -289,6 +292,7 @@
+
diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index b19bc64..6eccd85 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -27,7 +27,7 @@ namespace AllBase
///
/// 版本ID
///
- public static int VersionCount = 1075;
+ public static int VersionCount = 1086;
//public static int VersionCount = 613;
///
diff --git a/AllBase/Model/Config/WxShopMainStatistics.cs b/AllBase/Model/Config/WxShopMainStatistics.cs
index c4641fc..d1b2fb5 100644
--- a/AllBase/Model/Config/WxShopMainStatistics.cs
+++ b/AllBase/Model/Config/WxShopMainStatistics.cs
@@ -1,4 +1,5 @@
-using System;
+using AllBase.Model.Result.WXResult;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -75,6 +76,7 @@ namespace AllBase.Model.Config
public int? ProdCount { get; set; }
public decimal? curScoreValue {get;set;}
+ public DSRShopScoreRetInfo scoreRetInfo { get; set; } = new DSRShopScoreRetInfo();
public DateTime lastRefreshDate { get; set; } = DateTime.MinValue;
///
diff --git a/AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs b/AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs
index 75ee3bf..2e026ba 100644
--- a/AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs
+++ b/AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs
@@ -38,6 +38,7 @@ namespace AllBase.Model.Result.PDDResult
if (expressCompanyName.Contains("京东快递")) return "JD";
if (expressCompanyName.Contains("京东快运")) return "JDKY";
if (expressCompanyName.Contains("京东大件物流")) return "JD";
+ if (expressCompanyName.Contains("其他快递")) return "OTHER";
return "";
}
diff --git a/AllBase/Model/Result/WXResult/DSRShopScoreInfo.cs b/AllBase/Model/Result/WXResult/DSRShopScoreInfo.cs
new file mode 100644
index 0000000..eb818d9
--- /dev/null
+++ b/AllBase/Model/Result/WXResult/DSRShopScoreInfo.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.Result.WXResult
+{
+ public class DSRShopScoreRetInfo
+ {
+ public int? code { get; set; } // 0
+ public DSRShopScoreInfo dsrScore { get; set; }
+ public extInfo ext { get; set; }
+ }
+
+ public class extInfo
+ {
+ public int? version { get; set; } // 1
+
+ }
+
+ public class DSRShopScoreInfo
+ {
+ public decimal? curValue { get; set; } // 4.87, // 综合得分
+ public decimal? rankRatio { get; set; } // 0.9107, //优于91.07%同行
+ public int? level { get; set; } // 3, // 3好 2中 1差
+ public List valueList { get; set; }
+ public string curDate { get; set; } // "20260518"
+ }
+
+ public class ScoreValueInfo
+ {
+ public string date { get; set; } // "20260518",
+ public decimal? value { get; set; } // 4.87,
+ public decimal? grossAvgValue { get; set; } // 4.633553482240027,
+ public decimal? scoreMedian { get; set; } // 0.0472,
+ public int? level { get; set; } // 3
+
+ }
+}
diff --git a/AllBase/Model/Result/WXResult/WxActivityData.cs b/AllBase/Model/Result/WXResult/WxActivityData.cs
new file mode 100644
index 0000000..60a44bf
--- /dev/null
+++ b/AllBase/Model/Result/WXResult/WxActivityData.cs
@@ -0,0 +1,61 @@
+using AllBase.Model.Param.WXParam;
+using NaiBa.Util;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.Result.WXResult
+{
+ public class WxActivityData
+ {
+ public requestProductInfoList requestProductInfoList { get; set; } = new requestProductInfoList();
+ public ConcurrentList productList { get; set; } = new ConcurrentList();
+ //public int? totalNum { get; set; } // "1648"
+ //public int? totalPage { get; set; } // "165"
+ }
+
+ public class requestProductInfoList
+ {
+ public int? code { get; set; } // 0
+ public ConcurrentList resultList { get; set; } = new ConcurrentList();
+ }
+
+ public class requestProductInfoResult
+ {
+ public string shopId { get; set; }
+
+
+ public requestProductInfo product { get; set; }
+
+ ///
+ /// 是否已报名活动
+ ///
+ public bool? isAdded { get; set; } // true
+ public int? activityStockNum { get; set; } // 0
+ public int? activityPrice { get; set; } // 557
+ public int? dailyStock { get; set; } // 0,
+ public int? stockMode { get; set; } // 1,
+
+ public string invalidString { get; set; } // "",
+ public string invalidStringPrecheck { get; set; } // "",
+ public int? canSetLowestPrice { get; set; } // 0,
+ public int? minActivityPrice { get; set; } // 567,
+ public int? minStockNum { get; set; } // 0,
+ public int? defaultStockMode { get; set; } // 1,
+ public string maxPlatform_618Discount { get; set; } // "28",
+ public string maxPlatform_618DiscountMerchant { get; set; } // "42",
+ public string maxPlatformSubsidy { get; set; } // "28",
+ public string maxMerchantSubsidy { get; set; } // "42",
+ public string validPrice { get; set; } // "567",
+ public string salePrice { get; set; } // "567"
+ }
+
+ public class requestProductInfo
+ {
+ public string productId { get; set; } // "10000848702293",
+ public string skuId { get; set; } // "14973867421"
+
+ }
+}
diff --git a/AllBase/Model/Result/WXResult/WxConsignmentOrderInfo.cs b/AllBase/Model/Result/WXResult/WxConsignmentOrderInfo.cs
new file mode 100644
index 0000000..0195b46
--- /dev/null
+++ b/AllBase/Model/Result/WXResult/WxConsignmentOrderInfo.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.Result.WXResult
+{
+ public class WxConsignmentOrderInfo
+ {
+ public WxConsignmentOrderCommonInfo commonInfo { get; set; }
+ public List productsList { get; set; }
+ public WxConsignmentOrderEditAddrInfo editAddrInfo { get; set; }
+ public WxConsignmentOrderBuyerInfo buyerInfo { get; set; }
+ public WxConsignmentOrderNotesInfo notesInfo { get; set; }
+ public WxConsignmentOrderPresentInfo presentInfo { get; set; }
+ public object expressData { get; set; }
+ public WxConsignmentOrderInspectInfo inspectInfo { get; set; }
+ public WxConsignmentOrderCustomInfo customInfo { get; set; }
+ public WxConsignmentOrderBackUpInfo backUpInfo { get; set; }
+ }
+
+ public class WxConsignmentOrderBackUpInfo
+ {
+ public int? type { get; set; } // 0,
+ public string title { get; set; } // "",
+ public string taskId { get; set; } // "",
+ public object delayDeliveryInfo { get; set; } // { }
+ }
+
+ public class WxConsignmentOrderCustomInfo
+ {
+ public string content { get; set; } // "",
+ public int? type { get; set; } // 0,
+ public string previewImgUrl { get; set; } // ""
+ }
+
+ public class WxConsignmentOrderInspectInfo
+ {
+ public string inspectOrgName { get; set; } // "",
+ public string warehouseName { get; set; } // ""
+
+ }
+
+ public class WxConsignmentOrderPresentInfo
+ {
+ public string presentOrderId { get; set; } // "",
+ public string greetingMessage { get; set; } // ""
+
+ }
+
+ public class WxConsignmentOrderNotesInfo
+ {
+ public bool? hasNotes { get; set; } // true,
+ public string customerNotes { get; set; } // "",
+ public string merchantNotes { get; set; } // "260517-004110435981905",
+ public string presentNotes { get; set; } // ""
+ }
+
+ public class WxConsignmentOrderBuyerInfo
+ {
+ public string nickName { get; set; } // ""
+ }
+
+ public class WxConsignmentOrderEditAddrInfo
+ {
+ public int? applyEditAddrStatus { get; set; } // 0,
+ public string applyEditAddrAuditStaff { get; set; } // "",
+ public string applyEditAddrAuditTimeText { get; set; } // ""
+
+ }
+
+ public class WxConsignmentOrderProductInfo
+ {
+ public string productId { get; set; } // "10000845960754",
+ public string thumbImg { get; set; } // "https://wst.wxapp.tc.qq.com/161/20304/snscosdownload/SH/reserved/69de113c00028665206560e2d33f0315000000a100004f50",
+ public string title { get; set; } // "应急灯家用超长续航充电停电太阳能户外备用照明手提马灯露营挂灯",
+ public string skuId { get; set; } // "14913157803",
+ public List saleParam { get; set; } // [ "一拉既亮【金黄色】充手机+一灯四用", "尊享版-太阳能O电费【900N】超长续航36" ],
+ public int? productCnt { get; set; } // 1,
+ public string deliveryTimeStr { get; set; } // "",
+ public List