Merge branch 'master' of github.com:jtt-fan/KJD

AllBase/BaseClass.cs

@@ -31,7 +31,7 @@ namespace AllBase
         /// <summary>
         /// 版本ID
         /// </summary>
-        public static int VersionCount = 1300;
+        public static int VersionCount = 1306;
         public static string MainPath = "29wx";
         //public static string MainPath = "29wx";
         //public static string MainPath = "29pdd";
@@ -166,6 +166,7 @@ namespace AllBase
         /// </summary>
         //public static string LoginApiUrl = "http://new.qixiaoke.com/";
         public static string LoginApiUrl = ServerUrl;
+        public static string ImgApiUrl = "http://119.45.29.75:9000"; // ServerUrl;
         public static string BigDataApiUrl = "http://bigdata.qixiaoke.com/";
         public static string GateApi = "";
         public static string QqGroupNum = "";
@@ -777,6 +778,10 @@ namespace AllBase
         {
             return LoginApiUrl + "/wxxd_" + file + "?obj=" + BaseClass.MainPath + "/wxxd_" + file;
         }
+        public static string BuildWXImgObjString(string file, bool IsLoginDef = false)
+        {
+            return ImgApiUrl + "/wxxd_" + file + "?obj=" + BaseClass.MainPath + "/wxxd_" + file;
+        }
 
         private static char[] constant =
         {

AllBase/Model/DBModel/user_payment_record.cs

@@ -85,5 +85,6 @@ namespace AllBase.Model.DBModel
         退货包裹扣费支出 = 26,
         支付宝在线充值 = 30,
         云仓退货支出 = 31,
+        礼物单退费 = 34,
     }
 }

AllBase/Model/Result/KJDDBProduct.cs

@@ -101,6 +101,7 @@ namespace AllBase.Model.Result
 
         public int? view_uv { get; set; }
         public int? sale_count { get; set; }
+        public int? sale_count_num { get; set; }
         public string sale_count_text { get; set; }
         public string wx_safe_status { get; set; }
         public string special_prod_type { get; set; }
@@ -115,5 +116,6 @@ namespace AllBase.Model.Result
         /// </summary>
         public string has_wx_format { get; set; }
         public string add_user_name { get; set; }
+        public int? is_del { get; set; }
     }
 }

AllBase/Model/Result/PDDResult/PDDFrontProductInfo3.cs

@@ -230,7 +230,7 @@ namespace AllBase.Model.Result.PDDResult
     {
         public string url { get; set; } // "https://img.pddpic.com/goods/images/2019-12-14/3d66ace6-62cd-4d82-bfff-65c84b268361.jpg",
         public long? id { get; set; } // 20969775049,
-        public int? aspectRatio { get; set; } // 1
+        public decimal? aspectRatio { get; set; } // 0.75
 
     }
 }