订单金额统计利润计算功能

AllBase/BaseClass.cs

@@ -27,8 +27,8 @@ namespace AllBase
         /// <summary>
         /// 版本ID
         /// </summary>
-        public static int VersionCount = 565;
-        //public static int VersionCount = 565;
+        public static int VersionCount = 566;
+        //public static int VersionCount = 566;
 
         /// <summary>
         /// 版本号

AllBase/Model/Result/ShopLoginInfo.cs

@@ -278,6 +278,10 @@ namespace AllBase.Model.Result
         /// 店铺保证金信息
         /// </summary>
         public bool is_search_4 { get; set; } = false;
+        /// <summary>
+        /// 店铺利润详情计算
+        /// </summary>
+        public bool is_search_5 { get; set; } = false;
         public string err_msg { get; set; }
         #endregion
 
@@ -361,6 +365,20 @@ namespace AllBase.Model.Result
         /// 提现总金额
         /// </summary>
         public decimal? withdrawCashAmount { get; set; } = 0;
+
+        /// <summary>
+        /// 今日利润（通过KJD库获取进货价计算获得）
+        /// </summary>
+        public decimal? todayProfit { get; set; } = null;
+        /// <summary>
+        /// 近7日利润（通过KJD库获取进货价计算获得）
+        /// </summary>
+        public decimal? sevenDaysProfit
+        { get; set; } = null;
+        /// <summary>
+        /// 近30日利润（通过KJD库获取进货价计算获得）
+        /// </summary>
+        public decimal? thirtyDaysProfit { get; set; } = null;
     }
 
 

AllBase/Model/Result/TemuStockInfo.cs

@@ -57,7 +57,7 @@ namespace AllBase.Model.Result
     /// <summary>
     /// 待备货商品信息
     /// </summary>
-    public class SubOrderInfo
+    public class WarehouseProductSubOrderInfo
     {
         /// <summary>
         /// 卖家店铺id
@@ -106,7 +106,14 @@ namespace AllBase.Model.Result
         /// </summary>
         public bool isStockUp { get; set; } = false;
 
+        /// <summary>
+        /// 商品评价分数
+        /// </summary>
         public decimal? goodsAfsScore { get; set; } = null;
+        /// <summary>
+        /// 获取评价分错误
+        /// </summary>
+        public string getAfsScoreError { get; set; } = "";
     }
 
     /// <summary>
@@ -173,6 +180,11 @@ namespace AllBase.Model.Result
         /// 拟备货数量，=0不备货
         /// </summary>
         public int wantStockUpBound { get; set; } = 0;
+
+        /// <summary>
+        /// 进货价，保存于KJD库
+        /// </summary>
+        public int purchasePrice { get; set; } = 0;
     }
 
     /// <summary>

AllBase/OutExcel.cs

@@ -38,7 +38,7 @@ namespace AllBase
                 for (int j = 0; j < dt.ColumnCount; j++)
                 {
                     if (dt.Columns[j].Visible && dt.Columns[j].HeaderText != "删除" && dt.Columns[j].HeaderText != "历史记录")
-                        temp += dt.Rows[i].Cells[j].Value + "\t";
+                        temp += "\"" + dt.Rows[i].Cells[j].Value + "\"\t";
                 }
                 temp += "\r\n";
                 if (temp.Length > 2000)