1688上传类目转换等优化 充值用户服务充值和用户续费店铺功能

AllBase/Model/Result/1688/_1688OutProductInfo.cs

@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.Result._1688
+{
+    public class _1688OutProductInfo
+    {
+        public string allItemCount { get; set; } // "",
+        public List<_1688AttributeInfo> attribute { get; set; }
+        public string categoryId { get; set; } // "1042687"
+        public string categoryName { get; set; } // "儿童读物"
+        public string categoryPath { get; set; } // ""
+        public _1688DeliveryInfo deliveryInfo { get; set; }
+        public string desc { get; set; } // "<div id=\"offer-template-0\"></div><div style=\"width: 790.0px;\"><img style=\"display: block;width: 100.0%;height: auto;\" src=\"https://cbu01.alicdn.com/img/ibank/O1CN01l2lVfh2EsSShNqqF9_!!2212923598800-0-cib.jpg\" usemap=\"#_sdmap_0\"/> <img style=\"display: block;width: 100.0%;height: auto;\" src=\"https://cbu01.alicdn.com/img/ibank/O1CN01CnqMwg2EsSSbssPG9_!!2212923598800-0-cib.jpg\" usemap=\"#_sdmap_1\"/> <img style=\"display: block;width: 100.0%;height: auto;\" src=\"https://cbu01.alicdn.com/img/ibank/O1CN01vMG0Zh2EsSShaQoZd_!!2212923598800-0-cib.jpg\" usemap=\"#_sdmap_2\"/> <img style=\"display: block;width: 100.0%;height: auto;\" src=\"https://cbu01.alicdn.com/img/ibank/O1CN01c1AA5A2EsSShNqAf5_!!2212923598800-0-cib.jpg\" usemap=\"#_sdmap_3\"/> <img style=\"display: block;width: 100.0%;height: auto;\" src=\"https://cbu01.alicdn.com/img/ibank/O1CN01M1aZdA2EsSShaQoa8_!!2212923598800-0-cib.jpg\" usemap=\"#_sdmap_4\"/> <img style=\"display: block;width: 100.0%;height: auto;\" src=\"https://cbu01.alicdn.com/img/ibank/O1CN01MBxVQo2EsSShaQ8zT_!!2212923598800-0-cib.jpg\" usemap=\"#_sdmap_5\"/> <img style=\"display: block;width: 100.0%;height: auto;\" src=\"https://cbu01.alicdn.com/img/ibank/O1CN01CEPM9x2EsSSiQJws9_!!2212923598800-0-cib.jpg\" usemap=\"#_sdmap_6\"/> <img style=\"display: block;width: 100.0%;height: auto;\" src=\"https://cbu01.alicdn.com/img/ibank/O1CN01KGAtqd2EsSShJqvP3_!!2212923598800-0-cib.jpg\" usemap=\"#_sdmap_7\"/> <img style=\"display: block;width: 100.0%;height: auto;\" src=\"https://cbu01.alicdn.com/img/ibank/O1CN01xgovhL2EsSSbsrGbF_!!2212923598800-0-cib.jpg\" usemap=\"#_sdmap_8\"/> <img style=\"display: block;width: 100.0%;height: auto;\" src=\"https://cbu01.alicdn.com/img/ibank/O1CN01dRu2uz2EsSSbsu5Eb_!!2212923598800-0-cib.jpg\" usemap=\"#_sdmap_9\"/> <img style=\"display: block;width: 100.0%;height: auto;\" src=\"https://cbu01.alicdn.com/img/ibank/O1CN01BMOh4S2EsSShgAoym_!!2212923598800-0-cib.jpg\" usemap=\"#_sdmap_10\"/> <img style=\"display: block;width: 100.0%;height: auto;\" src=\"https://cbu01.alicdn.com/img/ibank/O1CN014wvt7a2EsSSgiw5fg_!!2212923598800-0-cib.jpg\" usemap=\"#_sdmap_11\"/> <img style=\"display: block;width: 100.0%;height: auto;\" src=\"https://cbu01.alicdn.com/img/ibank/O1CN01Hxn9Vd2EsSSgiu96Q_!!2212923598800-0-cib.jpg\" usemap=\"#_sdmap_12\"/></div>",
+        public string freeShipping { get; set; } // ""
+        public List<string> itemImgs { get; set; } // [ "https://cbu01.alicdn.com/img/ibank/O1CN01JiAErc2EsSSiuKULI_!!2212923598800-0-cib.jpg", "https://cbu01.alicdn.com/img/ibank/O1CN01unRjms2EsSShZZiC5_!!2212923598800-0-cib.jpg", ... ],
+        public string limitCount { get; set; } // "",
+        public string minOrderQuaitity { get; set; } // "1",
+        public string newItemCount { get; set; } // "",
+        public string nick { get; set; } // "悦慧轩图书",
+        public string num { get; set; } // "",
+        public string priceHigh { get; set; } // "3.30",
+        public string priceLow { get; set; } // "1.50",
+        public string priceRange { get; set; } // "1.50-3.30",
+        public string productId { get; set; } // "966477656178",
+        public string productName { get; set; } // "全横式田字格口算题卡天天练书籍幼小衔接数学10以内加减法练习册",
+        public string productPicUrl { get; set; } // "https://cbu01.alicdn.com/img/ibank/O1CN01JiAErc2EsSSiuKULI_!!2212923598800-0-cib.jpg",
+        public string productUrl { get; set; } // "https://detail.1688.com/offer/966477656178.html",
+        public List<_1688PropsName> propsName { get; set; }
+        public string provinceCity { get; set; } // "安徽省合肥市",
+        public string sellerType { get; set; } // "1688",
+        public string shopId { get; set; } // "",
+        public string shopName { get; set; } // "安徽省悦慧轩文化科技有限公司",
+        public List<_1688Sku> skus { get; set; }
+        public Dictionary<string, Dictionary<string, List<string>>> specs { get; set; }  // "颜色": { "3216:7088218": ["10以内数的分解与组成", "https://cbu01.alicdn.com/img/ibank/O1CN01UrBXvP2EsSSiuZ3ay_!!2212923598800-0-cib.jpg"], ... }
+        public int? sysId { get; set; } // 0,
+        public string totalCount { get; set; } // "",
+        public string userId { get; set; } // "2212923598800",
+        public string videoUrl { get; set; } // ""
+
+    }
+
+    public class _1688Sku
+    {
+        public int? quantity { get; set; } // 9984,
+        public int? price { get; set; } // 150,
+        public int? orign_price { get; set; } // 150,
+        public long? skuId { get; set; } // 6074721995513,
+        public string id { get; set; } // "3216:7088218;450:6532962" 
+
+    }
+
+    public class _1688PropsName
+    {
+         public string pname { get; set; } // "颜色",
+        public string pid { get; set; } // "3216",
+        public List<_1688PropsNameValue> values { get; set; }
+    }
+
+    public class _1688PropsNameValue
+    {
+        public string vname { get; set; } // "10以内数的分解与组成",
+        public string vid { get; set; } // "7088218",
+        public string sku_url { get; set; } // "https://cbu01.alicdn.com/img/ibank/O1CN01UrBXvP2EsSSiuZ3ay_!!2212923598800-0-cib.jpg"
+
+    }
+
+    public class _1688DeliveryInfo
+    {
+        public string location { get; set; } // "安徽省合肥市"
+        public List<_1688Carriage> carriageList { get; set; } // [ { "name": "默认", "price": 2.5 } ]
+    }
+
+    public class _1688Carriage
+    {
+        public string name { get; set; } // "默认",
+        public decimal price { get; set; } // 2.5
+    }
+
+    public class _1688AttributeInfo
+    {
+        public string key { get; set; } // "品牌", "出版社", "适合阅读年龄", "开本", "正文语种", "书号", "颜色"
+        public string value { get; set; } // "刊天下", "黑龙江美术出版社", "适合4-8岁", "16", "中文", "9787559389725", "10以内数的分解与组成,10以内数的加减法..."
+    }
+}

AllBase/Model/Result/ShopLoginInfo.cs

@@ -205,12 +205,13 @@ namespace AllBase.Model.Result
         /// </summary>
         public int? expire_time { get; set; }
 
-        public bool is_shop_expire
+        public bool is_point_shop_expire
         {
-            get
-            {
-                return BaseClass.UserAuthority.Contains("积分用户") && BaseClass.DateTimeToTimestampSeconds(DateTime.Now) > expire_time.ParseToInt();
-            }
+            //get
+            //{
+            //    return BaseClass.UserAuthority.Contains("充值用户") && BaseClass.DateTimeToTimestampSeconds(DateTime.Now) > expire_time.ParseToInt();
+            //}
+            get; set;
         }
 
         public string CurrentProdId { get; set; }
@@ -280,7 +281,7 @@ namespace AllBase.Model.Result
         /// </summary>
         public decimal? authorized_amount { get; set; }
         /// <summary>
-        /// 店铺积分
+        /// 用户积分
         /// </summary>
         public int points { get; set; }
     }

AllBase/Model/Result/WXResult/WxOnlineWaybillDeliveryInfo.cs

@@ -20,7 +20,7 @@ namespace AllBase.Model.Result.WXResult
         public string deliveryErrorMsg { get; set; } // "success",
         public string totalFee { get; set; } // "400",
         public feeDetailInfo feeDetail { get; set; }
-        public int? predictedArrivedTime { get; set; } // 0,
+        public long? predictedArrivedTime { get; set; } // 0,
         public string uuid { get; set; } // "4da17f94-b935-4022-a531-3b431279273f",
         public string deliveryId { get; set; } // "JTSD",
         public int? orderType { get; set; } // 1,