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
ae437036
Commit
ae437036
authored
Aug 07, 2019
by
hanfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改统计
parent
53b5616e
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
154 additions
and
2 deletions
+154
-2
OrderStatistics.java
.../java/com/xxfc/platform/order/entity/OrderStatistics.java
+10
-0
DailyMembersOrderStatisticsBiz.java
...fc/platform/order/biz/DailyMembersOrderStatisticsBiz.java
+12
-1
DailyTravelOrderStatisticsBiz.java
...xfc/platform/order/biz/DailyTravelOrderStatisticsBiz.java
+3
-0
DailyVehicleOrderStatisticsBiz.java
...fc/platform/order/biz/DailyVehicleOrderStatisticsBiz.java
+4
-1
OrderStatisticsBiz.java
.../java/com/xxfc/platform/order/biz/OrderStatisticsBiz.java
+12
-0
DailyMembersOrderStatisticsMapper.java
...tform/order/mapper/DailyMembersOrderStatisticsMapper.java
+1
-0
DailyVehicleOrderStatisticsMapper.java
...tform/order/mapper/DailyVehicleOrderStatisticsMapper.java
+3
-0
OrderStatisticsMapper.java
...com/xxfc/platform/order/mapper/OrderStatisticsMapper.java
+11
-0
OrderStatisticsController.java
...form/order/rest/background/OrderStatisticsController.java
+53
-0
DailyVehicleOrderStatisticsMapper.xml
...in/resources/mapper/DailyVehicleOrderStatisticsMapper.xml
+16
-0
ServiceTest.java
xx-order/xx-order-server/src/test/java/ServiceTest.java
+29
-0
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderStatistics.java
0 → 100644
View file @
ae437036
package
com
.
xxfc
.
platform
.
order
.
entity
;
/**
* @author Administrator
*/
public
class
OrderStatistics
{
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/DailyMembersOrderStatisticsBiz.java
View file @
ae437036
...
@@ -3,8 +3,10 @@ package com.xxfc.platform.order.biz;
...
@@ -3,8 +3,10 @@ package com.xxfc.platform.order.biz;
import
com.github.wxiaoqi.security.common.biz.BaseBiz
;
import
com.github.wxiaoqi.security.common.biz.BaseBiz
;
import
com.xxfc.platform.order.entity.DailyMembersOrderStatistics
;
import
com.xxfc.platform.order.entity.DailyMembersOrderStatistics
;
import
com.xxfc.platform.order.entity.DailyTravelOrderStatistics
;
import
com.xxfc.platform.order.entity.DailyTravelOrderStatistics
;
import
com.xxfc.platform.order.entity.OrderStatistics
;
import
com.xxfc.platform.order.mapper.DailyMembersOrderStatisticsMapper
;
import
com.xxfc.platform.order.mapper.DailyMembersOrderStatisticsMapper
;
import
com.xxfc.platform.order.mapper.DailyTravelOrderStatisticsMapper
;
import
com.xxfc.platform.order.mapper.DailyTravelOrderStatisticsMapper
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.beanutils.BeanUtils
;
import
org.apache.commons.beanutils.BeanUtils
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -19,6 +21,7 @@ import java.util.Map;
...
@@ -19,6 +21,7 @@ import java.util.Map;
* @author Administrator
* @author Administrator
*/
*/
@Service
@Service
@Slf4j
public
class
DailyMembersOrderStatisticsBiz
extends
BaseBiz
<
DailyMembersOrderStatisticsMapper
,
DailyMembersOrderStatistics
>
{
public
class
DailyMembersOrderStatisticsBiz
extends
BaseBiz
<
DailyMembersOrderStatisticsMapper
,
DailyMembersOrderStatistics
>
{
...
@@ -39,7 +42,15 @@ public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderSta
...
@@ -39,7 +42,15 @@ public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderSta
@Override
@Override
public
int
insertSelectiveRe
(
DailyMembersOrderStatistics
entity
)
{
public
int
insertSelectiveRe
(
DailyMembersOrderStatistics
entity
)
{
entity
.
setCrtTime
(
new
Date
());
Date
date
=
new
Date
();
if
(
log
.
isDebugEnabled
()){
log
.
debug
(
"时间******[{}]"
,
date
);
}
entity
.
setCrtTime
(
date
);
return
mapper
.
insertSelective
(
entity
);
return
mapper
.
insertSelective
(
entity
);
}
}
// public OrderStatistics findAll() {
// }
}
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/DailyTravelOrderStatisticsBiz.java
View file @
ae437036
...
@@ -43,4 +43,7 @@ public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStati
...
@@ -43,4 +43,7 @@ public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStati
entity
.
setCrtTime
(
new
Date
());
entity
.
setCrtTime
(
new
Date
());
return
mapper
.
insertSelective
(
entity
);
return
mapper
.
insertSelective
(
entity
);
}
}
public
void
findAll
()
{
}
}
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/DailyVehicleOrderStatisticsBiz.java
View file @
ae437036
...
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
...
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import
com.github.wxiaoqi.security.common.biz.BaseBiz
;
import
com.github.wxiaoqi.security.common.biz.BaseBiz
;
import
com.xxfc.platform.order.entity.DailyMembersOrderStatistics
;
import
com.xxfc.platform.order.entity.DailyMembersOrderStatistics
;
import
com.xxfc.platform.order.entity.DailyVehicleOrderStatistics
;
import
com.xxfc.platform.order.entity.DailyVehicleOrderStatistics
;
import
com.xxfc.platform.order.entity.OrderStatistics
;
import
com.xxfc.platform.order.mapper.DailyVehicleOrderStatisticsMapper
;
import
com.xxfc.platform.order.mapper.DailyVehicleOrderStatisticsMapper
;
import
com.xxfc.platform.order.pojo.DedDetailDTO
;
import
com.xxfc.platform.order.pojo.DedDetailDTO
;
import
org.apache.commons.beanutils.BeanUtils
;
import
org.apache.commons.beanutils.BeanUtils
;
...
@@ -103,9 +104,11 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
...
@@ -103,9 +104,11 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
@Override
@Override
public
int
insertSelectiveRe
(
DailyVehicleOrderStatistics
entity
)
{
public
int
insertSelectiveRe
(
DailyVehicleOrderStatistics
entity
)
{
Date
date
=
new
Date
();
entity
.
setCrtTime
(
new
Date
());
entity
.
setCrtTime
(
new
Date
());
return
mapper
.
insertSelective
(
entity
);
return
mapper
.
insertSelective
(
entity
);
}
}
public
OrderStatistics
findAll
()
{
return
mapper
.
monthOrderTotal
();
}
}
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderStatisticsBiz.java
0 → 100644
View file @
ae437036
package
com
.
xxfc
.
platform
.
order
.
biz
;
import
com.github.wxiaoqi.security.common.biz.BaseBiz
;
import
com.xxfc.platform.order.entity.OrderStatistics
;
import
com.xxfc.platform.order.mapper.OrderStatisticsMapper
;
import
org.springframework.stereotype.Service
;
/**
* @author Administrator
*/
@Service
public
class
OrderStatisticsBiz
extends
BaseBiz
<
OrderStatisticsMapper
,
OrderStatistics
>
{
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/DailyMembersOrderStatisticsMapper.java
View file @
ae437036
...
@@ -10,6 +10,7 @@ import java.util.Map;
...
@@ -10,6 +10,7 @@ import java.util.Map;
* @author Administrator
* @author Administrator
*/
*/
public
interface
DailyMembersOrderStatisticsMapper
extends
Mapper
<
DailyMembersOrderStatistics
>
{
public
interface
DailyMembersOrderStatisticsMapper
extends
Mapper
<
DailyMembersOrderStatistics
>
{
Map
<
String
,
Object
>
getTravelGmv
();
Map
<
String
,
Object
>
getTravelGmv
();
}
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/DailyVehicleOrderStatisticsMapper.java
View file @
ae437036
package
com
.
xxfc
.
platform
.
order
.
mapper
;
package
com
.
xxfc
.
platform
.
order
.
mapper
;
import
com.xxfc.platform.order.entity.DailyVehicleOrderStatistics
;
import
com.xxfc.platform.order.entity.DailyVehicleOrderStatistics
;
import
com.xxfc.platform.order.entity.OrderStatistics
;
import
tk.mybatis.mapper.common.Mapper
;
import
tk.mybatis.mapper.common.Mapper
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
...
@@ -22,4 +23,6 @@ public interface DailyVehicleOrderStatisticsMapper extends Mapper<DailyVehicleOr
...
@@ -22,4 +23,6 @@ public interface DailyVehicleOrderStatisticsMapper extends Mapper<DailyVehicleOr
BigDecimal
getRefundSecurityDeposit
();
BigDecimal
getRefundSecurityDeposit
();
BigDecimal
getViolationMoney
();
BigDecimal
getViolationMoney
();
OrderStatistics
monthOrderTotal
();
}
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderStatisticsMapper.java
0 → 100644
View file @
ae437036
package
com
.
xxfc
.
platform
.
order
.
mapper
;
import
com.xxfc.platform.order.entity.OrderStatistics
;
import
tk.mybatis.mapper.common.Mapper
;
/**
* @author Administrator
*/
public
interface
OrderStatisticsMapper
extends
Mapper
<
OrderStatistics
>
{
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/OrderStatisticsController.java
0 → 100644
View file @
ae437036
package
com
.
xxfc
.
platform
.
order
.
rest
.
background
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.rest.BaseController
;
import
com.github.wxiaoqi.security.common.util.process.ResultCode
;
import
com.xxfc.platform.order.biz.DailyMembersOrderStatisticsBiz
;
import
com.xxfc.platform.order.biz.DailyTravelOrderStatisticsBiz
;
import
com.xxfc.platform.order.biz.DailyVehicleOrderStatisticsBiz
;
import
com.xxfc.platform.order.biz.OrderStatisticsBiz
;
import
com.xxfc.platform.order.entity.OrderStatistics
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
/**
* @author Administrator
*/
@RestController
@RequestMapping
(
"orderStatisticsA"
)
public
class
OrderStatisticsController
extends
BaseController
<
OrderStatisticsBiz
,
OrderStatistics
>
{
private
final
Integer
TYEP_VEHICLE
=
1
;
private
final
Integer
TYEP_TOUR
=
2
;
private
final
Integer
TYEP_MEMBER
=
3
;
@Autowired
private
DailyVehicleOrderStatisticsBiz
vehicleBiz
;
@Autowired
private
DailyTravelOrderStatisticsBiz
TravelBiz
;
@Autowired
private
DailyMembersOrderStatisticsBiz
membersBiz
;
@ApiOperation
(
"获取订单统计数据"
)
@GetMapping
(
"/findAll/{type}"
)
public
ObjectRestResponse
findAll
(
@PathVariable
Integer
type
)
{
if
(
TYEP_VEHICLE
.
equals
(
type
))
{
vehicleBiz
.
findAll
();
}
if
(
TYEP_TOUR
.
equals
(
type
))
{
TravelBiz
.
findAll
();
}
// if (TYEP_MEMBER.equals(type)) {
// membersBiz.findAll();
// }
return
ObjectRestResponse
.
createFailedResult
(
ResultCode
.
FAILED_CODE
,
"属性不能为空!"
);
}
}
xx-order/xx-order-server/src/main/resources/mapper/DailyVehicleOrderStatisticsMapper.xml
View file @
ae437036
...
@@ -106,4 +106,20 @@
...
@@ -106,4 +106,20 @@
and
and
date(FROM_UNIXTIME(r.refund_time/1000))=date(DATE_SUB(now(),interval 1 day))
date(FROM_UNIXTIME(r.refund_time/1000))=date(DATE_SUB(now(),interval 1 day))
</select>
</select>
<select
id=
"monthOrderTotal"
resultType=
"com.xxfc.platform.order.entity.OrderStatistics"
>
SELECT
sum(gmv) as totalGmv,
sum(security_deposit) totalSecurityDeposit
sum(refund_security_deposit) totalRefundSecurityDeposit,
sum(compensation) totalCompensation,
sum(forfeit) totalForfeit,
sum(penal_sum) totalPenalSum,
sum(postpone) totalPostpone,
FROM
daily_vehicle_order_statistics
WHERE
DATE_FORMAT(crt_time,'%d')=DATE_FORMAT(NOW(),'%d')
</select>
</mapper>
</mapper>
\ No newline at end of file
xx-order/xx-order-server/src/test/java/ServiceTest.java
0 → 100644
View file @
ae437036
import
com.xxfc.platform.order.OrderApplication
;
import
com.xxfc.platform.order.biz.DailyOrderStatisticsBiz
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
/**
* @author libin
* @version 1.0
* @description
* @data 2019/8/6 20:05
*/
@RunWith
(
SpringJUnit4ClassRunner
.
class
)
@SpringBootTest
(
classes
=
{
OrderApplication
.
class
})
public
class
ServiceTest
{
@Autowired
private
DailyOrderStatisticsBiz
dailyOrderStatisticsBiz
;
@Test
public
void
testSchedu
(){
dailyOrderStatisticsBiz
.
statisticalOrder
();
}
}
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