修复BUG:同步FBA发货

Bailun.DC.Services/FinanceReportServices.cs

@@ -8041,11 +8041,12 @@ group by currency";
                                      ,t1.data_json AS data_json
                                 FROM amazon_fba_summary t1
 							    LEFT JOIN (
-									 SELECT DISTINCT ShopName,AccountName FROM amazon_account_map 
+									 SELECT DISTINCT ShopName,AccountName,Site FROM amazon_account_map 
 								) 
 								AS t2 
 							      ON 1 = 1
 							      AND t1.account_name = t2.shopname
+							      AND t1.market = t2.Site
                                 WHERE 1 = 1
                                   AND t1.account_name in @accountName
 	                              AND t1.report_month >= @startReportMonth 
@@ -8130,15 +8131,16 @@ group by currency";
                             count = db.Execute(sql, list);
 
                             transaction.Commit();
+                            result.Result = true;
                         }
                         catch (Exception ex)
                         {
                             transaction.Rollback();
+                            result.Message = ex.Message;
                         }
                     }
                 }
 
-                result.Result = true;
             }
             else
             {