Skip to content

D
DataCenter_Core2.1_20190520
Commit f6db59b5 by guanzhenshan
Options

调整上架费的项

parent c12f3101
Showing with 5 additions and 58 deletions
Bailun.DC.MonthSaleProfit/Services.cs
...@@ -145,7 +145,7 @@ namespace Bailun.DC.MonthSaleProfit ...@@ -145,7 +145,7 @@ namespace Bailun.DC.MonthSaleProfit
sql = $@"select sum(t1.exchange_rate*t1.gross_amount) sql = $@"select sum(t1.exchange_rate*t1.gross_amount)
from dc_base_finance_ebay t1 from dc_base_finance_ebay t1
join dc_base_company_account t2 on t1.company_id=t2.company_id and t1.account_id=t2.account_id join dc_base_company_account t2 on t1.company_id=t2.company_id and t1.account_id=t2.account_id
where t1.account_entry_type in ('BuyItNowFee','CreditGalleryPlus','CreditInsertion','CreditSMBasicPro','ExtendedDurationFee','ExtendedDurationFeeCredit','FeeAuctionEndEarly','FeeBold','FeeFinalValueShipping','FeeGalleryPlus','FeeLargePicture','FeeSchedule','PrivateListing','SubscriptionSMBasic','SubscriptionSMBasicPro','SubscriptioneBayStores','SubtitleFee','SubtitleFeeCredit','CrediteBayStores') and t1.bj_date>='{day.ToString("yyyy-MM-dd")}' and t1.bj_date<'{day.AddMonths(1).ToString("yyyy-MM-dd")}' and t1.company_id=1"; where t1.account_entry_type in ('BuyItNowFee','CreditInsertion','FeeGalleryPlus','PrivateListing','SubscriptioneBayStores','SubscriptionSMBasic','SubscriptionSMBasicPro','SubtitleFee') and t1.bj_date>='{day.ToString("yyyy-MM-dd")}' and t1.bj_date<'{day.AddMonths(1).ToString("yyyy-MM-dd")}' and t1.company_id=1";
obj = cn.QueryFirstOrDefault<decimal?>(sql, null, null, 2 * 60); obj = cn.QueryFirstOrDefault<decimal?>(sql, null, null, 2 * 60);
m.pt_ebay_postingfee = obj ?? 0; m.pt_ebay_postingfee = obj ?? 0;
...@@ -290,7 +290,7 @@ namespace Bailun.DC.MonthSaleProfit ...@@ -290,7 +290,7 @@ namespace Bailun.DC.MonthSaleProfit
sql = $@"select sum(t1.exchange_rate*t1.gross_amount) sql = $@"select sum(t1.exchange_rate*t1.gross_amount)
from dc_base_finance_ebay t1 from dc_base_finance_ebay t1
join dc_base_company_account t2 on t1.company_id=t2.company_id and t1.account_id=t2.account_id join dc_base_company_account t2 on t1.company_id=t2.company_id and t1.account_id=t2.account_id
where t1.account_entry_type in ('BuyItNowFee','CreditGalleryPlus','CreditInsertion','CreditSMBasicPro','ExtendedDurationFee','ExtendedDurationFeeCredit','FeeAuctionEndEarly','FeeBold','FeeFinalValueShipping','FeeGalleryPlus','FeeLargePicture','FeeSchedule','PrivateListing','SubscriptionSMBasic','SubscriptionSMBasicPro','SubscriptioneBayStores','SubtitleFee','SubtitleFeeCredit','CrediteBayStores') and t1.bj_date>='{start.ToString("yyyy-MM-dd")}' and t1.bj_date<'{start.AddMonths(1).ToString("yyyy-MM-dd")}' and t1.company_id=1"; where t1.account_entry_type in ('BuyItNowFee','CreditInsertion','FeeGalleryPlus','PrivateListing','SubscriptioneBayStores','SubscriptionSMBasic','SubscriptionSMBasicPro','SubtitleFee') and t1.bj_date>='{start.ToString("yyyy-MM-dd")}' and t1.bj_date<'{start.AddMonths(1).ToString("yyyy-MM-dd")}' and t1.company_id=1";
obj = cn.QueryFirstOrDefault<decimal?>(sql, null, null, 2 * 60); obj = cn.QueryFirstOrDefault<decimal?>(sql, null, null, 2 * 60);
m.pt_ebay_postingfee = obj ?? 0; m.pt_ebay_postingfee = obj ?? 0;
......
Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs
...@@ -1149,25 +1149,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -1149,25 +1149,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var total = 0; var total = 0;
var feeType = new string[] { var feeType = new string[] {
"BuyItNowFee", "BuyItNowFee","CreditInsertion","FeeGalleryPlus","PrivateListing","SubscriptioneBayStores","SubscriptionSMBasic","SubscriptionSMBasicPro","SubtitleFee"
"CreditGalleryPlus",
"CreditInsertion",
"CreditSMBasicPro",
"ExtendedDurationFee",
"ExtendedDurationFeeCredit",
"FeeAuctionEndEarly",
"FeeBold",
"FeeFinalValueShipping",
"FeeGalleryPlus",
"FeeLargePicture",
"FeeSchedule",
"PrivateListing",
"SubscriptionSMBasic",
"SubscriptionSMBasicPro",
"SubscriptioneBayStores",
"SubtitleFee",
"SubtitleFeeCredit",
"CrediteBayStores"
}; };
...@@ -1617,25 +1599,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -1617,25 +1599,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
"FeeAd" "FeeAd"
}; };
var PutAwayFeeType = new string[] { var PutAwayFeeType = new string[] {
"BuyItNowFee", "BuyItNowFee","CreditInsertion","FeeGalleryPlus","PrivateListing","SubscriptioneBayStores","SubscriptionSMBasic","SubscriptionSMBasicPro","SubtitleFee"
"CreditGalleryPlus",
"CreditInsertion",
"CreditSMBasicPro",
"ExtendedDurationFee",
"ExtendedDurationFeeCredit",
"FeeAuctionEndEarly",
"FeeBold",
"FeeFinalValueShipping",
"FeeGalleryPlus",
"FeeLargePicture",
"FeeSchedule",
"PrivateListing",
"SubscriptionSMBasic",
"SubscriptionSMBasicPro",
"SubscriptioneBayStores",
"SubtitleFee",
"SubtitleFeeCredit",
"CrediteBayStores"
}; };
var producttype = new int[] { }; var producttype = new int[] { };
......
Bailun.DC.Web/Controllers/ApiController.cs
...@@ -387,24 +387,7 @@ namespace Bailun.DC.Web.Controllers ...@@ -387,24 +387,7 @@ namespace Bailun.DC.Web.Controllers
if (m.type == 1) //上架费 if (m.type == 1) //上架费
{ {
arrtype = new List<string> { "BuyItNowFee", arrtype = new List<string> { "BuyItNowFee","CreditInsertion","FeeGalleryPlus","PrivateListing","SubscriptioneBayStores","SubscriptionSMBasic","SubscriptionSMBasicPro","SubtitleFee"
"CreditAuctionEndEarly",
"CreditCardOnFile",
"CreditInsertion",
"ExtendedDurationFee",
"FeeAuctionEndEarly",
"FeeBold",
"FeeGalleryPlus",
"FeeInsertion",
"FeeLargePicture",
"FeePicturePack",
"FeeReserve",
"FeeReturnShipping",
"PaymentCC",
"PaypalOnFile",
"PrivateListing",
"SubscriptionSMBasic",
"SubtitleFee"
}; };
} }
else if (m.type == 2) //广告费 else if (m.type == 2) //广告费
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment