Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
DataCenter_Core2.1_20190520
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bltdc
DataCenter_Core2.1_20190520
Commits
fc6dc59f
Commit
fc6dc59f
authored
Oct 16, 2019
by
guanzhenshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整上架费
parent
ac55b87e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
38 deletions
+26
-38
FinanceReportServices.cs
Bailun.DC.Services/FinanceReportServices.cs
+1
-1
OrdersController.cs
Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs
+25
-37
No files found.
Bailun.DC.Services/FinanceReportServices.cs
View file @
fc6dc59f
...
...
@@ -2631,7 +2631,7 @@ group by currency";
//退款金额小于等于发货金额,冲营业收入
var
amount_incoming
=
listShippingStatusCurrency
.
Where
(
a
=>
a
.
sales_amount_sku
>=
a
.
amount_return
).
Sum
(
a
=>
a
.
amount_return
);
//退款金额大于发货金额,发货金额冲预收
var
amount
//
var amount
//预收账款
...
...
Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs
View file @
fc6dc59f
...
...
@@ -1137,29 +1137,23 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var
feeType
=
new
string
[]
{
"BuyItNowFee"
,
"CreditFinalValue"
,
"CreditFinalValueShipping"
,
"CreditAuctionEndEarly"
,
"CreditCardOnFile"
,
"CreditInsertion"
,
"ExtendedDurationFee"
,
"FeeAuctionEndEarly"
,
"FeeBold"
,
"FeeGalleryPlus"
,
"FeeInsertion"
,
"FeeLargePicture"
,
"FeePicturePack"
,
"FeeReserve"
,
"FeeReturnShipping"
,
"PaymentCC"
,
"PaypalOnFile"
,
"PrivateListing"
,
"SubscriptionSMBasic"
,
"SubtitleFee"
,
"FeeFinalValueShipping"
,
"eBayDebit"
,
"SnadOutlierFinalValueFee"
,
"SnadOutlierFinalValueFeeOnShipping"
"CreditGalleryPlus"
,
"CreditInsertion"
,
"CreditSMBasicPro"
,
"ExtendedDurationFee"
,
"ExtendedDurationFeeCredit"
,
"FeeAuctionEndEarly"
,
"FeeBold"
,
"FeeFinalValueShipping"
,
"FeeGalleryPlus"
,
"FeeLargePicture"
,
"FeeSchedule"
,
"PrivateListing"
,
"SubscriptionSMBasic"
,
"SubscriptionSMBasicPro"
,
"SubscriptioneBayStores"
,
"SubtitleFee"
,
"SubtitleFeeCredit"
};
...
...
@@ -1352,29 +1346,23 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
};
var
PutAwayFeeType
=
new
string
[]
{
"BuyItNowFee"
,
"CreditFinalValue"
,
"CreditFinalValueShipping"
,
"CreditAuctionEndEarly"
,
"CreditCardOnFile"
,
"CreditGalleryPlus"
,
"CreditInsertion"
,
"CreditSMBasicPro"
,
"ExtendedDurationFee"
,
"ExtendedDurationFeeCredit"
,
"FeeAuctionEndEarly"
,
"FeeBold"
,
"FeeFinalValueShipping"
,
"FeeGalleryPlus"
,
"FeeInsertion"
,
"FeeLargePicture"
,
"FeePicturePack"
,
"FeeReserve"
,
"FeeReturnShipping"
,
"PaymentCC"
,
"PaypalOnFile"
,
"FeeSchedule"
,
"PrivateListing"
,
"SubscriptionSMBasic"
,
"SubscriptionSMBasicPro"
,
"SubscriptioneBayStores"
,
"SubtitleFee"
,
"FeeFinalValueShipping"
,
"eBayDebit"
,
"SnadOutlierFinalValueFee"
,
"SnadOutlierFinalValueFeeOnShipping"
"SubtitleFeeCredit"
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment