调整应收账款

Bailun.DC.DailyPlatformReceivable/Services.cs

@@ -127,20 +127,20 @@ namespace Bailun.DC.DailyPlatformReceivable
                 //shopify 预收账款=期初预收余额+本期收款（订单付款金额）-发货金额-退款（未发货的）+其他
 
                 //期初预收余额
-                sql = $"select * from dc_daily_receivable where day='{day.AddDays(-1).ToString("yyyy-MM-dd")}' and platform='shopify'";
-                objBefore = cn.QueryFirstOrDefault<dc_daily_receivable>(sql);
+                var sql_shopify = $"select * from dc_daily_receivable where day='{day.AddDays(-1).ToString("yyyy-MM-dd")}' and platform='shopify'";
+                var objBefore_shopify = cn.QueryFirstOrDefault<dc_daily_receivable>(sql_shopify);
                 //本期收款
-                sql = $"select sum(amount_sales*seller_order_exchange_rate) amount from dc_base_oms_order where platform_type='shopify' and paid_time>='{day.ToString("yyyy-MM-dd")}' and paid_time<'{day.AddDays(1).ToString("yyyy-MM-dd")}' and company_id=1 and bailun_order_status!='Canceled' and has_scalp=0 and has_innersale=0 and bailun_interception_status in ('None','Failed')";
-                EbaySales = cn.QueryFirstOrDefault<decimal?>(sql) ?? 0;
+                sql_shopify = $"select sum(amount_sales*seller_order_exchange_rate) amount from dc_base_oms_order where platform_type='shopify' and paid_time>='{day.ToString("yyyy-MM-dd")}' and paid_time<'{day.AddDays(1).ToString("yyyy-MM-dd")}' and company_id=1 and bailun_order_status!='Canceled' and has_scalp=0 and has_innersale=0 and bailun_interception_status in ('None','Failed')";
+                var shopifySales = cn.QueryFirstOrDefault<decimal?>(sql_shopify) ?? 0;
                 //发货金额
-                sql = $@"select sum(t1.amount_sales*t2.quantity_shipped*t1.seller_order_exchange_rate) amount 
+                sql_shopify = $@"select sum(t1.amount_sales*t2.quantity_shipped*t1.seller_order_exchange_rate) amount 
                         from dc_base_oms_pick t2
                         join dc_base_oms_sku t1 on t1.bailun_order_id=t2.bailun_order_id and t1.bailun_sku=t2.bailun_sku and t1.has_scalp=0 and t1.has_delete=0 and t1.has_innersale=0 and t1.bailun_order_status!='Canceled' and t1.has_innersale=0 and t1.company_id=1 and t1.platform_type='shopify'
                         where t2.has_delete=0 and t2.shipping_status='TotalShipping' and t2.company_id=1 and t2.shipping_time>='{day.ToString("yyyy-MM-dd")}' and t2.shipping_time<'{day.AddDays(1).ToString("yyyy-MM-dd")}' ";
-                EbayShipping = cn.QueryFirstOrDefault<decimal?>(sql) ?? 0;
+                var shopifyShipping = cn.QueryFirstOrDefault<decimal?>(sql_shopify) ?? 0;
                 //退款(未发货的)
-                sql = $"select sum(amount_refund_rmb) amount from dc_base_crm_refund where platform_type = 'shopify' and company_id = 1 and is_deleted = 0 and is_freeze = 0 and shipping_status = 'UnShipping' and refund_time>= '{day.ToString("yyyy-MM-dd")}' and refund_time<'{day.AddDays(1).ToString("yyyy-MM-dd")}'";
-                EbayRefund = cn.QueryFirstOrDefault<decimal?>(sql) ?? 0;
+                sql_shopify = $"select sum(amount_refund_rmb) amount from dc_base_crm_refund where platform_type = 'shopify' and company_id = 1 and is_deleted = 0 and is_freeze = 0 and shipping_status = 'UnShipping' and refund_time>= '{day.ToString("yyyy-MM-dd")}' and refund_time<'{day.AddDays(1).ToString("yyyy-MM-dd")}'";
+                var shopifyRefund = cn.QueryFirstOrDefault<decimal?>(sql_shopify) ?? 0;
 
                 sql = $"select * from dc_daily_receivable where day='{day.ToString("yyyy-MM-dd")}' and platform='shopify'";
                 var m_shopify = cn.QueryFirstOrDefault<dc_daily_receivable>(sql);
@@ -150,11 +150,11 @@ namespace Bailun.DC.DailyPlatformReceivable
                     m_shopify = new dc_daily_receivable
                     {
                         day = day,
-                        amount_end = (objBefore != null ? objBefore.amount_end : 0) + EbaySales - EbayShipping - EbayRefund,
-                        amount_start = (objBefore != null ? objBefore.amount_end : 0),
-                        amount_sale_pay = EbaySales,
-                        amount_shipping = EbayShipping,
-                        amount_refund = EbayRefund,
+                        amount_end = (objBefore_shopify != null ? objBefore_shopify.amount_end : 0) + shopifySales - shopifyShipping - shopifyRefund,
+                        amount_start = (objBefore_shopify != null ? objBefore_shopify.amount_end : 0),
+                        amount_sale_pay = shopifySales,
+                        amount_shipping = shopifyShipping,
+                        amount_refund = shopifyRefund,
 
                         amount_incoming = 0,
                         amount_other = 0,
@@ -170,12 +170,12 @@ namespace Bailun.DC.DailyPlatformReceivable
                 }
                 else
                 {
-                    m_shopify.amount_start = (objBefore != null ? objBefore.amount_end : 0);
-                    m_shopify.amount_sale_pay = EbaySales;
-                    m_shopify.amount_shipping = EbayShipping;
-                    m_shopify.amount_refund = EbayRefund;
+                    m_shopify.amount_start = (objBefore_shopify != null ? objBefore_shopify.amount_end : 0);
+                    m_shopify.amount_sale_pay = shopifySales;
+                    m_shopify.amount_shipping = shopifyShipping;
+                    m_shopify.amount_refund = shopifyRefund;
 
-                    m_shopify.amount_end = m_ebay.amount_start + EbaySales - EbayShipping - EbayRefund + m_ebay.amount_other;
+                    m_shopify.amount_end = m_shopify.amount_start + shopifySales - shopifyShipping - shopifyRefund + m_shopify.amount_other;
 
                     m_shopify.lastupdatetime = DateTime.Now;
                     m_shopify.lastupdateuserid = 0;