修复BUG:同步FBA发货

Bailun.DC.Common/GlobalConfig.cs

@@ -68,6 +68,9 @@ namespace Bailun.DC.Common
         /// </summary>
         public static string ConnectionString_Pro = "Server=gz-cdb-oxt89knc.sql.tencentcdb.com;port=62967;database=bailun_bltpro;uid=root;password=#7kfnymAM$Y9-Ntf;Convert Zero Datetime=True;Allow User Variables=True;pooling=true";
 
-
+        /// <summary>
+        /// 产品库
+        /// </summary>
+        public static string ConnectionString_Skums = "Server=gz-cdb-9m81ty4j.sql.tencentcdb.com;port=60421;database=bailun_skums;uid=root;password=#7kfnymAM$Y9-Ntf;Convert Zero Datetime=True;Allow User Variables=True;pooling=true";
     }
 }

Bailun.DC.Models/Component/Enum/ComponentEnum.cs

@@ -3,7 +3,7 @@
 namespace Bailun.DC.Models.Component.Enum
 {
     /// <summary>
-    /// 数据库：1: 数据中心， 2: 交易流水， 3: 产品库， 4: 财务资金， 5: 费用系统
+    /// 数据库：1: 数据中心， 2: 交易流水， 3: 产品库， 4: 财务资金， 5: 费用系统， 6: Skums库
     /// </summary>
     public enum DBEnum
     {
@@ -35,6 +35,12 @@ namespace Bailun.DC.Models.Component.Enum
         /// 费用系统
         /// </summary>
         [Description("费用系统")]
-        Fee = 5
+        Fee = 5,
+
+        /// <summary>
+        /// Skums库
+        /// </summary>
+        [Description("Skums库")]
+        Skums = 6,
     }
 }

Bailun.DC.Services/Component/BaseService.cs

@@ -74,6 +74,24 @@ namespace Bailun.DC.Services.Component
             }
         }
 
+        private MySqlConnection _SKUMS;
+
+        public MySqlConnection SKUMS
+        {
+            get
+            {
+                if (_SKUMS == null)
+                {
+                    _SKUMS = new MySqlConnection(GlobalConfig.ConnectionString_Skums);
+                }
+                if (_SKUMS.State == ConnectionState.Closed)
+                {
+                    _SKUMS.Open();
+                }
+                return _SKUMS;
+            }
+        }
+
         private MySqlConnection _FUND_DB;
 
         public MySqlConnection FUND_DB

Bailun.DC.Services/Component/DictionaryService.cs

@@ -45,6 +45,9 @@ namespace Bailun.DC.Services.Component
                                 case DBEnum.Pro:
                                     db = PRO_DB;
                                     break;
+                                case DBEnum.Skums:
+                                    db = SKUMS;
+                                    break;
                                 case DBEnum.Fund:
                                     db = FUND_DB;
                                     break;

Bailun.DC.Services/Component/TableService.cs

@@ -781,6 +781,9 @@ namespace Bailun.DC.Services.Component
                 case DBEnum.Pro:
                     db = PRO_DB;
                     break;
+                case DBEnum.Skums:
+                    db = SKUMS;
+                    break;
                 case DBEnum.Fund:
                     db = FUND_DB;
                     break;

Bailun.DC.Services/FinanceReportServices.cs

@@ -8067,12 +8067,16 @@ group by currency";
                     foreach (dc_base_fba_shipping_detail dto in list)
                     {
                         var data = JsonConvert.DeserializeObject<dynamic>(dto.data_json, new JsonSerializerSettings() { DateParseHandling = DateParseHandling.DateTimeOffset });
-                        dto.order_id = data["Amazon Order Id"] ?? "";
+                        dto.order_id = data["Amazon Order Id"] ?? data["亚马逊订单编号"] ?? "";
                         DateTimeOffset dt = DateTimeOffset.Parse("1991-01-01 00:00:00");
                         if (data["Shipment Date"] != null && DateTimeOffset.TryParse(data["Shipment Date"].ToString(), out dt))
                         {
                             dto.shipment_date = dt.DateTime;
                         }
+                        else if (data["配送日期"] != null && DateTimeOffset.TryParse(data["配送日期"].ToString(), out dt))
+                        {
+                            dto.shipment_date = dt.DateTime;
+                        }
                         else
                         {
                             dto.shipment_date = data["Shipment Date"];
@@ -8081,12 +8085,16 @@ group by currency";
                         {
                             dto.reporting_date = dt.DateTime;
                         }
+                        else if (data["报告日期"] != null && DateTimeOffset.TryParse(data["报告日期"].ToString(), out dt))
+                        {
+                            dto.reporting_date = dt.DateTime;
+                        }
                         else
                         {
                             dto.reporting_date = data["Reporting Date"];
                         }
-                        dto.currency = data["Currency"] ?? "";
-                        dto.sku = data["Merchant SKU"] ?? "";
+                        dto.currency = data["Currency"] ?? data["货币"] ?? "";
+                        dto.sku = data["Merchant SKU"] ?? data["卖家 SKU"] ?? "";
                     }
                     sql = $@"SELECT 
 	                               id AS id

Bailun.DC.Web/wwwroot/js/component/el-table-control.js

@@ -123,10 +123,10 @@
                         Vue.set(that.setting, "listColumn", listColumn);
                     }
                 } else {
-                    this.$message((!result.data && "配置错误") || (result.Message || " 未知错误!"));
+                    that.$message((!result.data && "配置错误") || (result.Message || " 未知错误!"));
                 }
             }, function (error) {
-                this.$message(error.statusText || " 未知错误!");
+                that.$message(error.statusText || " 未知错误!");
             });
         },
         //获取选择行
@@ -180,10 +180,10 @@
                     if (response.status === 200 && result.result && result.data) {
                         Vue.set(that.setting, "listColumn", result.data);
                     } else {
-                        this.$message(result.message || " 未知错误!");
+                        that.$message(result.message || " 未知错误!");
                     }
                 }, function (error) {
-                    this.$message(error.statusText || " 未知错误!");
+                    that.$message(error.statusText || " 未知错误!");
                 });
             }
         },