1店铺登录逻辑优化 2备货单查询显示

AllBase/AllBase.csproj

@@ -179,6 +179,7 @@
     <Compile Include="Model\Param\ProductManage\ViolateRuleParam.cs" />
     <Compile Include="Model\Param\SalesManage\PromotionAddParam.cs" />
     <Compile Include="Model\Param\ShopManage\DouShopSettingParam.cs" />
+    <Compile Include="Model\Result\StockInfo.cs" />
     <Compile Include="Model\Param\UploadManage\UploadCommissionParam.cs" />
     <Compile Include="Model\Param\UploadManage\UploadErrorParam.cs" />
     <Compile Include="Model\Result\AddressAreaInfo.cs" />
@@ -224,7 +225,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Model\Param\StockManage\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

AllBase/BaseRegex.cs

@@ -638,6 +638,46 @@ namespace AllBase
             return temp;
         }
 
+        /// <summary>
+        /// 获取值
+        /// </summary>
+        /// <param name="html"></param>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public static string GetStringQuery(ref string querString, string key)
+        {
+            int nIndex = querString.IndexOf(key + "=");
+            if (nIndex == -1)
+                return null;
+
+            string temp = querString.Substring(nIndex).Replace(key + "=", "");
+            nIndex = temp.IndexOf('&');
+            if (nIndex > -1)
+                temp = temp.Substring(0, nIndex);
+
+            return temp;
+        }
+
+        /// <summary>
+        /// 获取值
+        /// </summary>
+        /// <param name="html"></param>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public static string GetStringCookie(ref string cookieStr, string key)
+        {
+            int nIndex = cookieStr.IndexOf(key + "=");
+            if (nIndex == -1)
+                return null;
+
+            string temp = cookieStr.Substring(nIndex).Replace(key + "=", "");
+            nIndex = temp.IndexOf(';');
+            if (nIndex > -1)
+                temp = temp.Substring(0, nIndex);
+
+            return temp;
+        }
+
         public static string FliterHtmlTag(string htmlStr)
         {
             if (String.IsNullOrEmpty(htmlStr))

AllBase/Helper/GlobalConfig.cs

@@ -16,11 +16,11 @@ namespace AllBase.Helper
         /// <summary>
         /// 店铺列表
         /// </summary>
-        public static ConcurrentList<DouShopLoginInfo> DouShopLoginList { get; set; } = new ConcurrentList<DouShopLoginInfo>();
+        public static ConcurrentList<DouShopLoginInfo> ShopLoginList { get; set; } = new ConcurrentList<DouShopLoginInfo>();
         /// <summary>
         /// 非当前账户下的店铺列表
         /// </summary>
-        public static ConcurrentList<DouShopLoginInfo> DouShopLoginOtherAccountList { get; set; }
+        public static ConcurrentList<DouShopLoginInfo> DouShopLoginOtherUserShopList { get; set; }
         /// <summary>
         /// 店铺设置参数
         /// </summary>

AllBase/Model/Result/DouShopLoginInfo.cs

@@ -17,8 +17,8 @@ namespace AllBase.Model.Result
         public string DbId { get; set; }
         public string LoginName { get; set; }
         public string Password { get; set; }
-        public string ShopAccountId { get; set; }
-        public string ShopAccount { get; set; }
+        public string ShopId { get; set; } = "";
+        public string ShopAccount { get; set; } = "";
         public string Mobile { get; set; }
         public string ShopToken { get; set; }
         public string Signature { get; set; }

AllBase/Model/Result/StockInfo.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.Result
+{
+    public class StockInfo
+    {
+        /// <summary>
+        /// 卖家店铺id
+        /// </summary>
+        public long supplierId { get; set; }
+        /// <summary>
+        /// 卖家店铺名称
+        /// </summary>
+        public string supplierName { get; set; }
+        /// <summary>
+        /// 备货母单号
+        /// </summary>
+        public string originalPurchaseOrderSn { get; set; }
+        /// <summary>
+        /// 备货单号
+        /// </summary>
+        public string subPurchaseOrderSn { get; set; }
+        /// <summary>
+        /// 商品名
+        /// </summary>
+        public string productName { get; set; }
+        /// <summary>
+        /// 商品Id
+        /// </summary>
+        public long productId { get; set; }
+        /// <summary>
+        /// 商品Skc
+        /// </summary>
+        public long productSkcId { get; set; }
+        /// <summary>
+        /// 货号
+        /// </summary>
+        public string productSn { get; set; }
+        /// <summary>
+        /// skc图片
+        /// </summary>
+        public string productSkcPicture { get; set; }
+    }
+}