Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
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
youjj
cloud-platform
Commits
54f93ab8
Commit
54f93ab8
authored
Aug 15, 2019
by
hanfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改订单统计
parent
9d0ed535
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
42 deletions
+45
-42
DailyMembersOrderStatisticsMapper.xml
...in/resources/mapper/DailyMembersOrderStatisticsMapper.xml
+11
-9
DailyTravelOrderStatisticsMapper.xml
...ain/resources/mapper/DailyTravelOrderStatisticsMapper.xml
+14
-13
DailyVehicleOrderStatisticsMapper.xml
...in/resources/mapper/DailyVehicleOrderStatisticsMapper.xml
+20
-19
UniversalApplication.java
...ava/com/xxfc/platform/universal/UniversalApplication.java
+0
-1
No files found.
xx-order/xx-order-server/src/main/resources/mapper/DailyMembersOrderStatisticsMapper.xml
View file @
54f93ab8
...
@@ -16,15 +16,6 @@
...
@@ -16,15 +16,6 @@
</select>
</select>
<select
id=
"monthOrderTotal"
resultType=
"com.xxfc.platform.order.entity.OrderStatistics"
>
<select
id=
"monthOrderTotal"
resultType=
"com.xxfc.platform.order.entity.OrderStatistics"
>
-- SELECT
-- IFNULL(sum(gmv),0) as totalGmv
-- FROM
-- daily_members_order_statistics
-- WHERE
-- branch_company_id =#{companyId}
-- -- and
-- -- DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),interval 1 day),'%Y-%c')
SELECT
SELECT
IFNULL(sum(gmv),0) as totalGmv
IFNULL(sum(gmv),0) as totalGmv
FROM
FROM
...
@@ -43,4 +34,15 @@
...
@@ -43,4 +34,15 @@
WHERE
WHERE
branch_company_id =#{companyId}
branch_company_id =#{companyId}
</select>
</select>
<!-- <select id="updateByExampleSelective">-->
<!-- SELECT-->
<!-- IFNULL(sum(gmv),0) as totalGmv-->
<!-- FROM-->
<!-- daily_members_order_statistics-->
<!-- WHERE-->
<!-- branch_company_id =#{companyId}-->
<!-- and-->
<!-- DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),interval 1 day),'%Y-%c')-->
<!-- </select>-->
</mapper>
</mapper>
\ No newline at end of file
xx-order/xx-order-server/src/main/resources/mapper/DailyTravelOrderStatisticsMapper.xml
View file @
54f93ab8
...
@@ -50,19 +50,7 @@
...
@@ -50,19 +50,7 @@
</select>
</select>
<select
id=
"monthOrderTotal"
resultType=
"com.xxfc.platform.order.entity.OrderStatistics"
>
<select
id=
"monthOrderTotal"
resultType=
"com.xxfc.platform.order.entity.OrderStatistics"
>
-- SELECT
--
-- IFNULL(sum(gmv),0) as totalGmv,
-- IFNULL(sum(penal_sum) ,0) as totalPenalSum
-- FROM
-- daily_travel_order_statistics
-- WHERE
-- branch_company_id =#{branchCompanyId}
-- AND
-- DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY),'%Y-%c')
SELECT
SELECT
IFNULL(sum(gmv),0) as totalGmv,
IFNULL(sum(gmv),0) as totalGmv,
IFNULL(sum(penal_sum) ,0) as totalPenalSum
IFNULL(sum(penal_sum) ,0) as totalPenalSum
FROM
FROM
...
@@ -74,11 +62,24 @@
...
@@ -74,11 +62,24 @@
ANY_VALUE(gmv) AS gmv,
ANY_VALUE(gmv) AS gmv,
ANY_VALUE(penal_sum) AS penal_sum,
ANY_VALUE(penal_sum) AS penal_sum,
ANY_VALUE(crt_time) AS crt_time
ANY_VALUE(crt_time) AS crt_time
FROM daily_travel_order_statistics
FROM
daily_travel_order_statistics
GROUP BY
GROUP BY
one_day,branch_company_id
one_day,branch_company_id
) o
) o
WHERE
WHERE
branch_company_id =#{companyId}
branch_company_id =#{companyId}
</select>
</select>
<!-- <select id="updateByExampleSelective">-->
<!-- SELECT-->
<!-- IFNULL(sum(gmv),0) as totalGmv,-->
<!-- IFNULL(sum(penal_sum) ,0) as totalPenalSum-->
<!-- FROM-->
<!-- daily_travel_order_statistics-->
<!-- WHERE-->
<!-- branch_company_id =#{branchCompanyId}-->
<!-- AND-->
<!-- DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY),'%Y-%c')-->
<!-- </select>-->
</mapper>
</mapper>
\ No newline at end of file
xx-order/xx-order-server/src/main/resources/mapper/DailyVehicleOrderStatisticsMapper.xml
View file @
54f93ab8
...
@@ -138,23 +138,7 @@
...
@@ -138,23 +138,7 @@
<select
id=
"monthOrderTotal"
resultType=
"com.xxfc.platform.order.entity.OrderStatistics"
>
<select
id=
"monthOrderTotal"
resultType=
"com.xxfc.platform.order.entity.OrderStatistics"
>
-- SELECT
SELECT
-- IFNULL(sum(gmv),0) as totalGmv,
-- (IFNULL(sum(security_deposit),0)-IFNULL(sum(refund_security_deposit) ,0)) as totalSecurityDeposit,
-- IFNULL(sum(refund_security_deposit) ,0) as totalRefundSecurityDeposit,
-- IFNULL(sum(compensation) ,0) as totalCompensation,
-- IFNULL(sum(forfeit) ,0) as totalForfeit,
-- IFNULL(sum(penal_sum) ,0) as totalPenalSum,
-- IFNULL(sum(postpone) ,0) as totalPostpone
-- FROM
-- daily_vehicle_order_statistics
-- WHERE
-- branch_company_id =#{companyId}
-- and
-- DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),interval 1 day),'%Y-%c')
SELECT
IFNULL(sum(gmv),0) as totalGmv,
IFNULL(sum(gmv),0) as totalGmv,
(IFNULL(sum(security_deposit),0)-IFNULL(sum(refund_security_deposit) ,0)) as totalSecurityDeposit,
(IFNULL(sum(security_deposit),0)-IFNULL(sum(refund_security_deposit) ,0)) as totalSecurityDeposit,
IFNULL(sum(refund_security_deposit) ,0) as totalRefundSecurityDeposit,
IFNULL(sum(refund_security_deposit) ,0) as totalRefundSecurityDeposit,
...
@@ -175,11 +159,28 @@ SELECT
...
@@ -175,11 +159,28 @@ SELECT
ANY_VALUE(postpone) AS postpone,ANY_VALUE(crt_time) AS crt_time,
ANY_VALUE(postpone) AS postpone,ANY_VALUE(crt_time) AS crt_time,
ANY_VALUE(compensation) AS compensation
ANY_VALUE(compensation) AS compensation
FROM
FROM
`daily_vehicle_order_statistics`
daily_vehicle_order_statistics
GROUP BY
GROUP BY
one_day,branch_company_id
one_day,branch_company_id
) a
) a
WHERE
WHERE
branch_company_id =#{companyId}
branch_company_id =
#{companyId}
</select>
</select>
<!-- <select id="updateByExampleSelective">-->
<!-- SELECT-->
<!-- IFNULL(sum(gmv),0) as totalGmv,-->
<!-- (IFNULL(sum(security_deposit),0)-IFNULL(sum(refund_security_deposit) ,0)) as totalSecurityDeposit,-->
<!-- IFNULL(sum(refund_security_deposit) ,0) as totalRefundSecurityDeposit,-->
<!-- IFNULL(sum(compensation) ,0) as totalCompensation,-->
<!-- IFNULL(sum(forfeit) ,0) as totalForfeit,-->
<!-- IFNULL(sum(penal_sum) ,0) as totalPenalSum,-->
<!-- IFNULL(sum(postpone) ,0) as totalPostpone-->
<!-- FROM-->
<!-- daily_vehicle_order_statistics-->
<!-- WHERE-->
<!-- branch_company_id =#{companyId}-->
<!-- and-->
<!-- DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),interval 1 day),'%Y-%c')-->
<!-- </select>-->
</mapper>
</mapper>
\ No newline at end of file
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/UniversalApplication.java
View file @
54f93ab8
...
@@ -24,7 +24,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
...
@@ -24,7 +24,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@tk
.
mybatis
.
spring
.
annotation
.
MapperScan
(
basePackages
=
"com.xxfc.platform.universal.mapper"
)
@tk
.
mybatis
.
spring
.
annotation
.
MapperScan
(
basePackages
=
"com.xxfc.platform.universal.mapper"
)
@EnableFeignClients
(
value
=
{
"com.xxfc.platform"
,
"com.github.wxiaoqi.security"
},
defaultConfiguration
=
HeaderConfig
.
class
)
@EnableFeignClients
(
value
=
{
"com.xxfc.platform"
,
"com.github.wxiaoqi.security"
},
defaultConfiguration
=
HeaderConfig
.
class
)
public
class
UniversalApplication
{
public
class
UniversalApplication
{
public
static
void
main
(
String
[]
args
)
{
public
static
void
main
(
String
[]
args
)
{
SpringApplication
.
run
(
UniversalApplication
.
class
,
args
);
SpringApplication
.
run
(
UniversalApplication
.
class
,
args
);
}
}
...
...
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