fix

AutoTurnOver.Services/AmazonDataSynchroService.cs

@@ -521,7 +521,7 @@ namespace AutoTurnOver.Services
         /// <summary>
         /// 解析报告
         /// </summary>
-        public void AnaReport(int status = 0)
+        public void AnaReport(int status = 0,string data_id = "19048064482")
         {
             var reportTypeEnum = ReportTypes.GET_V2_SETTLEMENT_REPORT_DATA_XML;
             //var reportTypeEnum = ReportTypes.GET_V2_SETTLEMENT_REPORT_DATA_FLAT_FILE_V2;
@@ -530,6 +530,14 @@ namespace AutoTurnOver.Services
                 report_type = reportTypeEnum.ToString(),
                 status = status
             });
+            if (!string.IsNullOrWhiteSpace(data_id))
+            {
+                ana_task = MyMySqlConnection._connection.QueryFirstOrDefault<dc_base_amazon_fee_report_log>(" select * from dc_base_amazon_fee_report_log where report_type=@report_type and data_id=@data_id order by id desc  limit 1 ", new
+                {
+                    report_type = reportTypeEnum.ToString(),
+                    data_id = data_id
+                });
+            }
             if (ana_task == null)
             {
                 return;
@@ -556,6 +564,10 @@ namespace AutoTurnOver.Services
                     List<dc_base_amazon_fee> feeDatas = new List<dc_base_amazon_fee> { };
                     foreach (var orderItem in settlementData.AmazonEnvelope.Message.SettlementReport.Order)
                     {
+                        if(orderItem.AmazonOrderID== "026-0313606-2436362")
+                        {
+
+                        }
                         var orderDbData = ApiOrderDataMapDbData(pamsAccount, settlementData.AmazonEnvelope.Message.SettlementReport.SettlementData, orderItem);
                         feeDatas.AddRange(orderDbData);
                     }
@@ -825,13 +837,15 @@ namespace AutoTurnOver.Services
             List<dc_base_amazon_fee> datas = new List<dc_base_amazon_fee> { };
             var fbaFeeTypeList = new List<string> { "FBAPerOrderFulfillmentFee", "FBAPerUnitFulfillmentFee", "FBAWeightBasedFee", "ShippingChargeback", "GiftwrapChargeback" };
             var sellingFeesList = new List<string> { "Commission", "RefundCommission" };
+            var item_index = 0;
             foreach (var item in xmlSettlementOrderData.Fulfillment.Item)
             {
+                item_index++;
                 dc_base_amazon_fee feeShipmentEvent = new dc_base_amazon_fee { };
 
                 feeShipmentEvent.account = account.Account;
                 feeShipmentEvent.settlement_id = xmlSettlementData.AmazonSettlementID;
-                feeShipmentEvent.data_id = $"{account.Account}_order_{feeShipmentEvent.settlement_id}_{xmlSettlementOrderData.AmazonOrderID}_{item.SKU}_{item.AmazonOrderItemCode}";
+                feeShipmentEvent.data_id = $"{account.Account}_order_{feeShipmentEvent.settlement_id}_{xmlSettlementOrderData.AmazonOrderID}_{item.SKU}_{item.AmazonOrderItemCode}_{item_index}";
                 feeShipmentEvent.type = "order";
                 feeShipmentEvent.date = xmlSettlementOrderData.Fulfillment.PostedDate == null ? new DateTime(1991, 1, 1) : xmlSettlementOrderData.Fulfillment.PostedDate.Value;
                 feeShipmentEvent.SellerOrderId = xmlSettlementOrderData.MerchantOrderID;
@@ -920,13 +934,15 @@ namespace AutoTurnOver.Services
             var fbaFeeTypeList = new List<string> { "FBAPerOrderFulfillmentFee", "FBAPerUnitFulfillmentFee", "FBAWeightBasedFee", "ShippingChargeback", "GiftwrapChargeback" };
             var sellingFeesList = new List<string> { "Commission", "RefundCommission" };
             var datas = new List<dc_base_amazon_fee> { };
+            var item_index = 0;
             foreach (var itemFeeAdjustment in xmlSettlementOrderData.Fulfillment.AdjustedItem)
             {
+                item_index++;
                 dc_base_amazon_fee feeShipmentEvent = new dc_base_amazon_fee { };
 
                 feeShipmentEvent.account = account.Account;
                 feeShipmentEvent.settlement_id = xmlSettlementData.AmazonSettlementID;
-                feeShipmentEvent.data_id = $"{account.Account}_refund_{feeShipmentEvent.settlement_id}_{xmlSettlementOrderData.AmazonOrderID}_{itemFeeAdjustment.SKU}_{itemFeeAdjustment.AmazonOrderItemCode}";
+                feeShipmentEvent.data_id = $"{account.Account}_refund_{feeShipmentEvent.settlement_id}_{xmlSettlementOrderData.AmazonOrderID}_{itemFeeAdjustment.SKU}_{itemFeeAdjustment.AmazonOrderItemCode}-{item_index}";
                 feeShipmentEvent.type = "refund";
                 feeShipmentEvent.date = xmlSettlementOrderData.Fulfillment.PostedDate == null ? new DateTime(1991, 1, 1) : xmlSettlementOrderData.Fulfillment.PostedDate.Value;
                 feeShipmentEvent.SellerOrderId = xmlSettlementOrderData.MerchantOrderID;
@@ -977,8 +993,8 @@ namespace AutoTurnOver.Services
 
                 if (itemFeeAdjustment.PromotionAdjustment != null && itemFeeAdjustment.PromotionAdjustment.Any(s=>s.Amount.Text != 0))
                 {
-                    feeShipmentEvent.promotional_rebates = feeShipmentEvent.postage_credits;
-                    feeShipmentEvent.promotional_rebates_tax = feeShipmentEvent.shipping_credits_tax;
+                    feeShipmentEvent.promotional_rebates = 0-feeShipmentEvent.postage_credits;
+                    feeShipmentEvent.promotional_rebates_tax = 0-feeShipmentEvent.shipping_credits_tax;
                 }
 
                 feeShipmentEvent.total =

ResetOutofstock/Program.cs

@@ -59,7 +59,7 @@ namespace ResetOutofstock
                 //new AmazonDataSynchroService().SynchroReportIds(FikaAmazonAPI.Utils.Constants.ReportTypes.GET_V2_SETTLEMENT_REPORT_DATA_FLAT_FILE_V2, 10);
                 //while (true)
                 //{
-                //    new AmazonDataSynchroService().AnaReport();
+                    new AmazonDataSynchroService().AnaReport(data_id:"19048064482");
                 //}
 
             }