调整销售统计报表金额显示格式

Bailun.DC.Services/FinanceReportServices.cs

@@ -387,33 +387,33 @@ namespace Bailun.DC.Services
                             {
                                 if (m != null && m.userable_amount == item.userable_amount)
                                 {
-                                    item.amount = m.amount + item.amount_sales - item.withdraw_amount;  //本期期末=上一期期末+本期销售额-本期提现额
-                                    item.amount_rmb = item.amount * item.exchangerate;
+                                    //item.amount = m.amount + item.amount_sales - item.withdraw_amount;  //本期期末=上一期期末+本期销售额-本期提现额
+                                    //item.amount_rmb = item.amount * item.exchangerate;
                                     item.before_balance = m.amount;
                                 }
                                 else if (m != null && m.userable_amount != item.userable_amount)
                                 {
-                                    item.amount = item.userable_amount + item.amount_sales - item.withdraw_amount;
-                                    item.amount_rmb = item.amount * item.exchangerate;
+                                    //item.amount = item.userable_amount + item.amount_sales - item.withdraw_amount;
+                                    //item.amount_rmb = item.amount * item.exchangerate;
                                     item.before_balance = item.userable_amount;
                                 }
                                 else if (m == null && m.userable_amount == item.userable_amount)
                                 {
-                                    item.amount = 0 + item.amount_sales - item.withdraw_amount;  //本期期末=上一期期末+本期销售额-本期提现额
-                                    item.amount_rmb = item.amount * item.exchangerate;
+                                    //item.amount = 0 + item.amount_sales - item.withdraw_amount;  //本期期末=上一期期末+本期销售额-本期提现额
+                                    //item.amount_rmb = item.amount * item.exchangerate;
                                     item.before_balance = 0;
                                 }
                                 else if (m == null && m.userable_amount != item.userable_amount)
                                 {
-                                    item.amount = item.userable_amount + item.amount_sales - item.withdraw_amount;
-                                    item.amount_rmb = item.amount * item.exchangerate;
+                                    //item.amount = item.userable_amount + item.amount_sales - item.withdraw_amount;
+                                    //item.amount_rmb = item.amount * item.exchangerate;
                                     item.before_balance = item.userable_amount;
                                 }
                             }
                             else
                             {
-                                item.amount = item.userable_amount;
-                                item.amount_rmb = item.userable_amount * item.exchangerate;
+                                //item.amount = item.userable_amount;
+                                //item.amount_rmb = item.userable_amount * item.exchangerate;
                                 item.before_balance = m.userable_amount;
                             }
                             

Bailun.DC.Services/OrdersServices.cs

@@ -76,7 +76,7 @@ namespace Bailun.DC.Services
         {
             var sqlparam = new DynamicParameters();
 
-            var sql = @"select sum(amount_product*seller_order_exchange_rate) 'amount_product',sum(cost_product) 'cost_product',sum(cost_platform_fee*seller_order_exchange_rate) 'platform_fee',sum(cost_first) 'head_fee',count(id) 'order_count',sum(cost_total) 'cost_count',sum(cost_shipping) 'nofba_logisticsfee',sum(profit_total) 'profit_count',(sum(profit_total)/sum(amount_sales*seller_order_exchange_rate)) 'profit_rate',sum(amount_prepaid) amount_prepaid,sum(amount_refund*seller_order_exchange_rate) amount_refund from dc_base_oms_order  from dc_base_oms_order where paid_time>='" + start.ToString("yyyy-MM-dd") + "' and paid_time<'" + end.AddDays(1).ToString("yyyy-MM-dd") + "' and platform_type='Amazon' and bailun_order_status!='Canceled' ";
+            var sql = @"select sum(amount_product*seller_order_exchange_rate) 'amount_product',sum(cost_product) 'cost_product',sum(cost_platform_fee*seller_order_exchange_rate) 'platform_fee',sum(cost_first) 'head_fee',count(id) 'order_count',sum(cost_total) 'cost_count',sum(cost_shipping) 'nofba_logisticsfee',sum(profit_total) 'profit_count',(sum(profit_total)/sum(amount_sales*seller_order_exchange_rate)) 'profit_rate',sum(amount_prepaid) amount_prepaid,sum(amount_refund*seller_order_exchange_rate) amount_refund from dc_base_oms_order where paid_time>='" + start.ToString("yyyy-MM-dd") + "' and paid_time<'" + end.AddDays(1).ToString("yyyy-MM-dd") + "' and platform_type='Amazon' and bailun_order_status!='Canceled' ";
 
             if (!string.IsNullOrWhiteSpace(account))
             {