Fix bugs.

oybab · Apr 27, 2021 · 2029857 · 2029857
1 parent 3ced2b4
commit 2029857
Show file tree

Hide file tree

Showing 20 changed files with 4,033 additions and 4,028 deletions.
diff --git a/TradingSystem/OybabReport/CommonHWP/BackstageReport.cs b/TradingSystem/OybabReport/CommonHWP/BackstageReport.cs
@@ -51,7 +51,7 @@ internal override string ProcessHTMLContent(ReportModel reportModel)
             // 先处理字体
             foreach (var item in reportModel.Fonts)
             {
-                newStr.Append(".").Append(item.Key).Append("{").Append("color:#000000; font-family:'").Append(item.Value.FontFamily.Name).Append("', '微软雅黑', 'Tahoma', 'Times New Roman','Arial'; font-size:").Append(item.Value.Size + "pt;}").AppendLine();
+                newStr.Append(".").Append(item.Key).Append("{").Append("color:#000000; font-family:'").Append(item.Value.FontFamily.Name).Append("', 'Microsoft YaHei', 'Tahoma', 'Times New Roman','Arial'; font-size:").Append(item.Value.Size + "pt;}").AppendLine();
             }
             htmlContent = htmlContent.Replace("/*${DynamicStyles}*/", newStr.ToString());
 

diff --git a/TradingSystem/OybabReport/CommonHWP/BackstageTakeoutReport.cs b/TradingSystem/OybabReport/CommonHWP/BackstageTakeoutReport.cs
@@ -50,7 +50,7 @@ internal override string ProcessHTMLContent(ReportModel reportModel)
             // 先处理字体
             foreach (var item in reportModel.Fonts)
             {
-                newStr.Append(".").Append(item.Key).Append("{").Append("color:#000000; font-family:'").Append(item.Value.FontFamily.Name).Append("', '微软雅黑', 'Tahoma', 'Times New Roman','Arial'; font-size:").Append(item.Value.Size + "pt;}").AppendLine();
+                newStr.Append(".").Append(item.Key).Append("{").Append("color:#000000; font-family:'").Append(item.Value.FontFamily.Name).Append("', 'Microsoft YaHei', 'Tahoma', 'Times New Roman','Arial'; font-size:").Append(item.Value.Size + "pt;}").AppendLine();
             }
             htmlContent = htmlContent.Replace("/*${DynamicStyles}*/", newStr.ToString());
 

diff --git a/TradingSystem/OybabServerManager/Operate/Common.cs b/TradingSystem/OybabServerManager/Operate/Common.cs
@@ -292,7 +292,7 @@ public static void ClearReferences(this Balance model)
             model.tb_adminpay = null;
         }
 
-        public static Balance ReChangeBalance(this Balance model)
+        public static Balance ReChangeBalance(this Balance model, bool withOrder = false)
         {
             // We need that to know Balance
             //x.BalanceId = 0;
@@ -308,7 +308,8 @@ public static Balance ReChangeBalance(this Balance model)
             model.BalanceType = 0;
             model.HideType = 0;
             model.IsBind = 0;
-            model.Order = 0;
+            if (!withOrder)
+                model.Order = 0;
             model.Remark = null;
             model.RemoveRate = 0;
             model.UpdateTime = null;

diff --git a/TradingSystem/OybabServerManager/Operate/ServiceOperate.cs b/TradingSystem/OybabServerManager/Operate/ServiceOperate.cs
@@ -11766,7 +11766,7 @@ public ToClientServiceGetLog ServiceGetLog(ToServerServiceGetLog toServer)
                     {
                         balance = JsonConvert.SerializeObject(Resources.GetRes().BALANCES.Where(x => x.HideType != 1).ToList().Select(x =>
                         {
-                            return x.FastCopy().ReChangeBalance();
+                            return x.FastCopy().ReChangeBalance(true);
                         }).ToList());
 
                         Result = true;
@@ -11777,7 +11777,7 @@ public ToClientServiceGetLog ServiceGetLog(ToServerServiceGetLog toServer)
 
                         balance = JsonConvert.SerializeObject(Resources.GetRes().BALANCES.Where(x => x.HideType != 1).ToList().Select(x =>
                         {
-                            return x.FastCopy().ReChangeBalance();
+                            return x.FastCopy().ReChangeBalance(true);
                         }).ToList());