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
8d4f9824
Commit
8d4f9824
authored
Feb 21, 2022
by
jianshuqin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改逻辑:平台利润从2021年12月23号后过虑 美美哒和达馨账号数据
parent
64f044cf
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
38 additions
and
2 deletions
+38
-2
FinanceService.cs
Bailun.DC.Services/WebApiService/FinanceService.cs
+38
-2
No files found.
Bailun.DC.Services/WebApiService/FinanceService.cs
View file @
8d4f9824
...
@@ -1208,6 +1208,18 @@ AND s2.datacenter_col like '%{input.FeeName}' group by s2.platform,s1.website ";
...
@@ -1208,6 +1208,18 @@ AND s2.datacenter_col like '%{input.FeeName}' group by s2.platform,s1.website ";
AND t1.is_deleted = 0
AND t1.is_deleted = 0
AND t1.is_freeze = 0
AND t1.is_freeze = 0
AND t1.company_id = 1
AND t1.company_id = 1
-- 平台利润从2021年12月23号后过虑 美美哒和达馨账号数据平台利润从2021年12月23号后过虑 美美哒和达馨账号数据
AND t1.id NOT IN (
SELECT t2.id FROM dc_base_crm_refund t2
INNER JOIN dc_base_oms_order t3
ON t2.origin_order_id = t3.origin_order_id
AND t3.seller_account IN ('Lagunamoon_Beauty', 'Lagunamoon Nail Varnish', 'dawarmthEU')
AND t3.purchase_create_time >= '2021-12-23'
WHERE 1 = 1
AND t2.platform_type = 'FBA'
AND t2.bailun_account IN ('Lagunamoon_Beauty', 'Lagunamoon Nail Varnish', 'dawarmthEU')
AND t2.refund_time >= '2021-12-23'
)
GROUP BY
GROUP BY
t1.platform_type "
);
t1.platform_type "
);
parameters
.
Add
(
"start"
,
start
);
parameters
.
Add
(
"start"
,
start
);
...
@@ -1232,7 +1244,19 @@ AND s2.datacenter_col like '%{input.FeeName}' group by s2.platform,s1.website ";
...
@@ -1232,7 +1244,19 @@ AND s2.datacenter_col like '%{input.FeeName}' group by s2.platform,s1.website ";
AND t1.shipping_status IN ( 'TotalShipping', 'PartShipping' )
AND t1.shipping_status IN ( 'TotalShipping', 'PartShipping' )
AND t1.is_deleted = 0
AND t1.is_deleted = 0
AND t1.is_freeze = 0
AND t1.is_freeze = 0
AND t1.company_id = 1 "
);
AND t1.company_id = 1
-- 平台利润从2021年12月23号后过虑 美美哒和达馨账号数据平台利润从2021年12月23号后过虑 美美哒和达馨账号数据
AND t1.id NOT IN (
SELECT t2.id FROM dc_base_crm_refund t2
INNER JOIN dc_base_oms_order t3
ON t2.origin_order_id = t3.origin_order_id
AND t3.seller_account IN ('Lagunamoon_Beauty', 'Lagunamoon Nail Varnish', 'dawarmthEU')
AND t3.purchase_create_time >= '2021-12-23'
WHERE 1 = 1
AND t2.platform_type = 'FBA'
AND t2.bailun_account IN ('Lagunamoon_Beauty', 'Lagunamoon Nail Varnish', 'dawarmthEU')
AND t2.refund_time >= '2021-12-23'
)"
);
}
}
else
else
{
{
...
@@ -1257,7 +1281,19 @@ AND s2.datacenter_col like '%{input.FeeName}' group by s2.platform,s1.website ";
...
@@ -1257,7 +1281,19 @@ AND s2.datacenter_col like '%{input.FeeName}' group by s2.platform,s1.website ";
AND t1.shipping_status IN ( 'TotalShipping', 'PartShipping' )
AND t1.shipping_status IN ( 'TotalShipping', 'PartShipping' )
AND t1.is_deleted = 0
AND t1.is_deleted = 0
AND t1.is_freeze = 0
AND t1.is_freeze = 0
AND t1.company_id = 1 "
);
AND t1.company_id = 1
-- 平台利润从2021年12月23号后过虑 美美哒和达馨账号数据平台利润从2021年12月23号后过虑 美美哒和达馨账号数据
AND t1.id NOT IN (
SELECT t2.id FROM dc_base_crm_refund t2
INNER JOIN dc_base_oms_order t3
ON t2.origin_order_id = t3.origin_order_id
AND t3.seller_account IN ('Lagunamoon_Beauty', 'Lagunamoon Nail Varnish', 'dawarmthEU')
AND t3.purchase_create_time >= '2021-12-23'
WHERE 1 = 1
AND t2.platform_type = 'FBA'
AND t2.bailun_account IN ('Lagunamoon_Beauty', 'Lagunamoon Nail Varnish', 'dawarmthEU')
AND t2.refund_time >= '2021-12-23'
)"
);
}
}
parameters
.
Add
(
"start"
,
start
);
parameters
.
Add
(
"start"
,
start
);
parameters
.
Add
(
"end"
,
end
);
parameters
.
Add
(
"end"
,
end
);
...
...
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