修改退款数据

Bailun.DC.Services/OrdersServices.cs

@@ -4295,21 +4295,21 @@ namespace Bailun.DC.Services
         public List<dc_base_oms_order> ListPlatformRefund(DateTime? start, DateTime? end, int? companyid, string platform, string website, bool isUSD)
         {
             var sqlparam = new DynamicParameters();
-            var sql = $"select t1.platform_type,{(isUSD? "sum(t1.amount_refund_usd)" : "sum(t1.amount_refund_rmb)")} as amount_refund from dc_base_crm_refund t1 join dc_base_oms_order t2 on t1.origin_order_id=t2.origin_order_id and t2.bailun_order_status!='Canceled' ";
-            var sql1 = $" union all select t1.platform_type,{(isUSD ? "sum(t1.amount_refund_usd)" : "sum(t1.amount_refund_rmb)")} as amount_refund from dc_base_crm_refund t1 join dc_base_oms_order t2 on t1.origin_order_id=t2.transaction_id and t2.bailun_order_status!='Canceled' ";
+            var sql = $"select t1.platform_type,{(isUSD? "sum(t1.amount_refund_usd)" : "sum(t1.amount_refund_rmb)")} as amount_refund from dc_base_crm_refund t1 join dc_base_oms_order t2 on t1.origin_order_id=t2.origin_order_id and t2.bailun_order_status!='Canceled' and t1.bailun_account_id and t2.bailun_account_id ";
+            var sql1 = $" union all select t1.platform_type,{(isUSD ? "sum(t1.amount_refund_usd)" : "sum(t1.amount_refund_rmb)")} as amount_refund from dc_base_crm_refund t1 join dc_base_oms_order t2 on t1.origin_order_id=t2.transaction_id and t2.bailun_order_status!='Canceled' and t1.bailun_account_id and t2.bailun_account_id ";
             sql += " where t1.is_deleted=0 and t1.is_freeze=0 and t1.platform_type!='Ebay' ";
             sql1 += " where t1.is_deleted=0 and t1.is_freeze=0 and t1.platform_type='Ebay' ";
 
             //合并订单的退款数据 非Ebay
             var sql01 = $@" union all select t01.platform_type,{(isUSD ? "sum(t01.amount_refund_usd)" : "sum(t01.amount_refund_rmb)")} as amount_refund from (
                             select t1.amount_refund_rmb,t1.amount_refund_usd,t1.platform_type,t2.aftermerged_bailun_order_no from dc_base_crm_refund t1 
-                            join dc_base_oms_order t2 on t1.origin_order_id=t2.origin_order_id and t2.aftermerged_bailun_order_no != ''
+                            join dc_base_oms_order t2 on t1.origin_order_id=t2.origin_order_id and t2.aftermerged_bailun_order_no != '' and t1.bailun_account_id and t2.bailun_account_id
                             where t1.is_deleted=0 and t1.is_freeze=0 and t1.platform_type!='Ebay' ";
 
             //合并订单的退款数据 Ebay
             var sql02 = $@" union all select t01.platform_type,{(isUSD ? "sum(t01.amount_refund_usd)" : "sum(t01.amount_refund_rmb)")} as amount_refund from (
                             select t1.amount_refund_rmb,t1.amount_refund_usd,t1.platform_type,t2.aftermerged_bailun_order_no from dc_base_crm_refund t1 
-                            join dc_base_oms_order t2 on t1.origin_order_id=t2.transaction_id and t2.aftermerged_bailun_order_no !=''
+                            join dc_base_oms_order t2 on t1.origin_order_id=t2.transaction_id and t2.aftermerged_bailun_order_no !='' and t1.bailun_account_id and t2.bailun_account_id
                             where t1.is_deleted=0 and t1.is_freeze=0 and t1.platform_type='Ebay' ";
 
             if (companyid.HasValue && companyid.Value != 0)