调整生成分录信息方法

Bailun.DC.Services/FinanceReportServices.cs

@@ -2247,11 +2247,15 @@ namespace Bailun.DC.Services
                         cn.Open();
                     }
 
-                    // 1、预收款  'eBay竞拍付款','移动支付','普通付款'
-                    sql = $@"select currency, sum(gross) gross from dc_base_income_ebay_paypal where company_id = 1 and `status`= '已完成' and balance_impact = '贷记' and account_name = '{account}' and type in ('eBay竞拍付款', '移动支付', '普通付款') and record_time>= '{start.ToString("yyyy-MM-dd HH:MM:ss")}' and record_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}'
+                    // 1、预收款  'eBay竞拍付款','移动支付','普通付款'   【正数】
+                    sql = $@"select currency, sum(gross) gross from dc_base_income_ebay_paypal where company_id = 1 and `status`= '已完成' and balance_impact = '贷记' and account_name = '{account}' and type in ('eBay竞拍付款', '移动支付', '普通付款') and record_time>= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and record_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}'
 group by currency";
+                    var objAdvanceReceive_p = cn.Query<mPaypalIncome>(sql, null, null, true, 2 * 60);
 
-                    var objAdvanceReceive = cn.Query<mPaypalIncome>(sql, null, null, true, 2 * 60);
+                    // 1、预收款  'eBay竞拍付款','移动支付','普通付款'   【负数】
+                    sql = $@"select currency, sum(-gross) gross from dc_base_income_ebay_paypal where company_id = 1 and `status`= '已完成' and balance_impact = '借记' and account_name = '{account}' and type in ('eBay竞拍付款', '移动支付', '普通付款') and record_time>= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and record_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}'
+group by currency";
+                    var objAdvanceReceive_n = cn.Query<mPaypalIncome>(sql, null, null, true, 2 * 60);
 
                     //--2、临时冻结   '冻结余额以调查争议'
                     sql = $@"select currency, sum(gross) gross from dc_base_income_ebay_paypal where company_id = 1 and `status`= '已完成' and account_name = '{account}' and type in ('冻结余额以调查争议') and record_time>= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and record_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}'
@@ -2323,7 +2327,7 @@ group by currency";
                     var objExpressPayment = cn.Query<mPaypalIncome>(sql, null, null, true, 2 * 60);
 
                     //--费用
-                    sql = $@"select currency, sum(gross) gross from dc_base_income_ebay_paypal where company_id = 1 and `status`= '已完成' and account_name = '{account}' and type in ('费用') and record_time>= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and record_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}'
+                    sql = $@"select currency, sum(gross) gross from dc_base_income_ebay_paypal where company_id = 1 and `status`= '已完成' and account_name = '{account}' and type in ('费用','服务费') and record_time>= '{start.ToString("yyyy-MM-dd HH:mm:ss")}' and record_time<'{end.ToString("yyyy-MM-dd HH:mm:ss")}'
 group by currency";
                     var objFee = cn.Query<mPaypalIncome>(sql, null, null, true, 2 * 60);
 
@@ -2357,9 +2361,9 @@ group by currency";
 
 
                     //已收款项
-                    if (objAdvanceReceive.Count() > 0)
+                    if (objAdvanceReceive_p.Count() > 0)
                     {
-                        foreach (var item in objAdvanceReceive)
+                        foreach (var item in objAdvanceReceive_p)
                         {
                             var m1 = new dc_mid_incoming_paypal
                             {
@@ -2611,7 +2615,7 @@ group by currency";
                             var m1 = new dc_mid_incoming_paypal
                             {
                                 account_subject = "退款和撤销",
-                                amount = item.gross,
+                                amount = Math.Abs(item.gross),
                                 balance_impact = "借",
                                 createtime = DateTime.Now,
                                 currency = item.currency,
@@ -2627,7 +2631,7 @@ group by currency";
                             var m2 = new dc_mid_incoming_paypal
                             {
                                 account_subject = "退款和撤销",
-                                amount = item.gross,
+                                amount = Math.Abs(item.gross),
                                 balance_impact = "贷",
                                 createtime = DateTime.Now,
                                 currency = item.currency,
@@ -2813,7 +2817,7 @@ group by currency";
                             var m1 = new dc_mid_incoming_paypal
                             {
                                 account_subject = account + "转" + item.account,
-                                amount = item.gross,
+                                amount = Math.Abs(item.gross),
                                 balance_impact = "借",
                                 createtime = DateTime.Now,
                                 currency = item.currency,
@@ -2828,7 +2832,7 @@ group by currency";
                             var m2 = new dc_mid_incoming_paypal
                             {
                                 account_subject = account + "转" + item.account,
-                                amount = item.gross,
+                                amount = Math.Abs(item.gross),
                                 balance_impact = "贷",
                                 createtime = DateTime.Now,
                                 currency = item.currency,
@@ -2886,14 +2890,17 @@ group by currency";
                         }
                     }
 
-                    //费用
-                    if (objFee.Count() > 0)
+                    var objPayEbayFee = objFee.ToList();
+                    objPayEbayFee.AddRange(objAdvanceReceive_n);
+
+                    //支付ebay费用
+                    if (objPayEbayFee.Count() > 0)
                     {
-                        foreach (var item in objFee)
+                        foreach (var item in objPayEbayFee)
                         {
                             var m1 = new dc_mid_incoming_paypal
                             {
-                                account_subject = "平台费用",
+                                account_subject = "支付ebay费用",
                                 amount = item.gross,
                                 balance_impact = "借",
                                 createtime = DateTime.Now,
@@ -2908,7 +2915,7 @@ group by currency";
 
                             var m2 = new dc_mid_incoming_paypal
                             {
-                                account_subject = "平台费用",
+                                account_subject = "支付ebay费用",
                                 amount = item.gross,
                                 balance_impact = "贷",
                                 createtime = DateTime.Now,
@@ -3053,7 +3060,7 @@ group by currency";
         /// <param name="account">帐号</param>
         /// <param name="total">符合条件的记录数</param>
         /// <returns></returns>
-        public List<dc_mid_incoming_paypal> ListPaypalIncoming(BtTableParameter parameter, string month, string account,ref int total)
+        public List<dc_mid_incoming_paypal> ListPaypalIncoming(BtTableParameter parameter, string month, string account,string currency,ref int total)
         {
             var sqlparam = new DynamicParameters();
             var sql = "select * from dc_mid_incoming_paypal where recordtime='"+month+"'";
@@ -3064,6 +3071,13 @@ group by currency";
                 sqlparam.Add("account", account);
             }
 
+            if (!string.IsNullOrEmpty(currency))
+            {
+                sql += " and currency=@currency";
+                sqlparam.Add("currency", currency);
+            }
+
+
             using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
             {
                 if (cn.State == ConnectionState.Closed)
@@ -3071,7 +3085,7 @@ group by currency";
                     cn.Open();
                 }
 
-                var obj = cn.Page<dc_mid_incoming_paypal>(parameter.pageIndex, parameter.limit, sql, ref total);
+                var obj = cn.Page<dc_mid_incoming_paypal>(parameter.pageIndex, parameter.limit, sql, ref total,sqlparam);
 
                 return obj.ToList();
             }

Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs

@@ -4783,7 +4783,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                         {
                             var firstDay = DateTime.Parse(objPaypal.record_time.ToString("yyyy-MM") + "-01");
 
-                            var r = new Services.FinanceReportServices().Analyze_PaypalIncoming(accountname, firstDay,firstDay.AddMonths(1).AddDays(-1));
+                            var r = new Services.FinanceReportServices().Analyze_PaypalIncoming(accountname, firstDay,firstDay.AddMonths(1));
 
                             if (!string.IsNullOrEmpty(r))
                             {
@@ -4836,11 +4836,11 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         /// <param name="account">paypal帐号</param>
         /// <returns></returns>
         [BailunAuthentication(LoginMode.Enforce)]
-        public string ListPaypalIncomeAnalyzeJson(BtTableParameter parameter, string month, string account)
+        public string ListPaypalIncomeAnalyzeJson(BtTableParameter parameter, string month, string account,string currency)
         {
             var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
             var total = 0;
-            var obj = new Services.FinanceReportServices().ListPaypalIncoming(parameter, month, account, ref total);
+            var obj = new Services.FinanceReportServices().ListPaypalIncoming(parameter, month, account, currency, ref total);
 
             var list = obj.Select(a => new {
                 a.account_subject,

Bailun.DC.Web/Areas/Reports/Views/Finance/ListPaypalIncomeAnalyze.cshtml

@@ -21,6 +21,16 @@
                         <input id="month" name="month" type="text" class="form-control" style="width:130px;" value="@(DateTime.Now.ToString("yyyy-MM"))" />
                     </div>
                     <div class="form-group">
+                        <label>币种：</label>
+                        <select id="currency" name="currency" class="form-control" style="width:100px;">
+                            <option value="">选择币种</option>
+                            <option value="USD">USD</option>
+                            <option value="EUR">EUR</option>
+                            <option value="GBP">GBP</option>
+                            <option value="HKD">HKD</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
                         <label>&nbsp;</label>
                         <button type="button" class="btn btn-primary" onclick="list();"><i class="fa fa-search"></i>&nbsp;查询</button>
                     </div>