优化fba费计算

AutoTurnOver.Models/dc_base_amazon_fee.cs

@@ -34,6 +34,7 @@ namespace AutoTurnOver.Models
         public decimal marketplace_withheld_tax { get; set; }
         public decimal selling_fees { get; set; }
         public decimal fba_fees { get; set; }
+        public string fee_types { get; set; }
         public decimal other_transaction_fees { get; set; }
         public decimal other { get; set; }
         public decimal total { get; set; }

AutoTurnOver.Services/AmazonDataSynchroService.cs

@@ -842,6 +842,7 @@ namespace AutoTurnOver.Services
                 {
                     feeShipmentEvent.fba_fees = item.ItemFees.Fee.Where(s => fbaFeeTypeList.Any(f1 => f1.Equals(s.Type, StringComparison.InvariantCultureIgnoreCase))).Sum(s => s.Amount.Text ?? 0);
                     feeShipmentEvent.selling_fees = item.ItemFees.Fee.Where(s => sellingFeesList.Any(f1 => s.Type.Equals(f1, StringComparison.InvariantCultureIgnoreCase))).Sum(s => s.Amount.Text ?? 0);
+                    feeShipmentEvent.fee_types =string.Join(",", item.ItemFees.Fee.Select(s=>s.Type)) ;
                 }
 
 
@@ -915,7 +916,7 @@ namespace AutoTurnOver.Services
         public List<dc_base_amazon_fee> ApiRefundDataMapDbData(AmazonAccountDto account, ApiAmazonSettlementDto.AmazonEnvelopeDto.MessageDto.SettlementReportDto.SettlementDataDto xmlSettlementData,
             ApiAmazonSettlementDto.AmazonEnvelopeDto.MessageDto.SettlementReportDto.RefundDto xmlSettlementOrderData)
         {
-            var fbaFeeTypeList = new List<string> { "FBAPerOrderFulfillmentFee", "FBAPerUnitFulfillmentFee", "FBAWeightBasedFee" };
+            var fbaFeeTypeList = new List<string> { "FBAPerOrderFulfillmentFee", "FBAPerUnitFulfillmentFee", "FBAWeightBasedFee", "ShippingChargeback" };
             var sellingFeesList = new List<string> { "Commission", "RefundCommission" };
             var datas = new List<dc_base_amazon_fee> { };
             foreach (var itemFeeAdjustment in xmlSettlementOrderData.Fulfillment.AdjustedItem)
@@ -936,6 +937,7 @@ namespace AutoTurnOver.Services
                 {
                     feeShipmentEvent.fba_fees = itemFeeAdjustment.ItemFeeAdjustments.Fee.Where(s => fbaFeeTypeList.Any(f1 => f1.Equals(s.Type, StringComparison.InvariantCultureIgnoreCase))).Sum(s => s.Amount.Text ?? 0);
                     feeShipmentEvent.selling_fees = itemFeeAdjustment.ItemFeeAdjustments.Fee.Where(s => sellingFeesList.Any(f1 => s.Type.Equals(f1, StringComparison.InvariantCultureIgnoreCase))).Sum(s => s.Amount.Text ?? 0);
+                    feeShipmentEvent.fee_types = string.Join(",", item.ItemFees.Fee.Select(s => s.Type));
                 }