Skip to content

C
cloud-platform
Commit 2e67d79c authored by hanfeng's avatar hanfeng
Browse files
Options

修改统计

parent 9686012d
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 46 deletions
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/DailyMembersOrderStatisticsBiz.java
View file @ 2e67d79c
......@@ -9,6 +9,7 @@ import com.xxfc.platform.order.mapper.DailyTravelOrderStatisticsMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
......@@ -30,10 +31,14 @@ public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderSta
private final Integer headOfficeId = 1;
@Value("${order.day}")
private Integer day;
@Transactional(rollbackFor = Exception.class)
public boolean memberOrderStatistics() {
try {
List<Map<String, Object>> travelGmv = mapper.getTravelGmv();
List<Map<String, Object>> travelGmv = mapper.getTravelGmv(day);
if (CollectionUtils.isEmpty(travelGmv)) {
return true;
}
......@@ -53,8 +58,8 @@ public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderSta
@Override
public int insertSelectiveRe(DailyMembersOrderStatistics entity) {
Date date = new Date();
if (log.isDebugEnabled()){
log.debug("时间******[{}]",date);
if (log.isDebugEnabled()) {
log.debug("时间******[{}]", date);
}
entity.setBranchCompanyId(headOfficeId);
entity.setCrtTime(date);
......@@ -62,6 +67,6 @@ public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderSta
}
public OrderStatistics findAll(Integer companyId) {
return mapper.monthOrderTotal(companyId);
return mapper.monthOrderTotal(companyId);
}
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/DailyTravelOrderStatisticsBiz.java
View file @ 2e67d79c
......@@ -7,6 +7,7 @@ import com.xxfc.platform.order.entity.DailyTravelOrderStatistics;
import com.xxfc.platform.order.entity.OrderStatistics;
import com.xxfc.platform.order.mapper.DailyTravelOrderStatisticsMapper;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
......@@ -20,15 +21,17 @@ import java.util.*;
*/
@Service
public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStatisticsMapper, DailyTravelOrderStatistics> {
@Value("${order.day}")
private Integer day;
@Transactional(rollbackFor = Exception.class)
public boolean StatisticsOfTravelOrders() {
try {
ArrayList<DailyTravelOrderStatistics> objects = new ArrayList<>();
List<DailyTravelOrderStatistics> travelGmv = mapper.getTravelGmv();
List<DailyTravelOrderStatistics> travelGmv = mapper.getTravelGmv(day);
objects.addAll(travelGmv);
List<DailyTravelOrderStatistics> travelPenalSum = mapper.getTravelPenalSum();
List<DailyTravelOrderStatistics> travelPenalSum = mapper.getTravelPenalSum(day);
objects.addAll(travelPenalSum);
insertByList(objects);
......@@ -45,6 +48,7 @@ public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStati
if (CollectionUtils.isNotEmpty(objects)) {
HashMap<Integer, DailyTravelOrderStatistics> map = new HashMap<>();
for (DailyTravelOrderStatistics object : objects) {
DailyTravelOrderStatistics statistics = map.get(object.getBranchCompanyId());
if (statistics == null) {
statistics = new DailyTravelOrderStatistics();
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/DailyVehicleOrderStatisticsBiz.java
View file @ 2e67d79c
......@@ -10,11 +10,11 @@ import com.xxfc.platform.order.mapper.DailyVehicleOrderStatisticsMapper;
import com.xxfc.platform.order.pojo.DedDetailDTO;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal;
import java.util.*;
......@@ -30,6 +30,8 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
private final Integer TYPE_DAMAGE = 2;
private final Integer TYPE_OTHER = 3;
@Value("${order.day}")
private Integer day;
@Transactional(rollbackFor = Exception.class)
public boolean StatisticsOfCarRentalOrders() {
......@@ -39,23 +41,23 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
ArrayList<DailyVehicleOrderStatistics> result = new ArrayList<>();
// 获取每日租车订单成交金和押金总额
List<DailyVehicleOrderStatistics> gmvAndMarginTotal = mapper.getGmvAndMarginTotal();
List<DailyVehicleOrderStatistics> gmvAndMarginTotal = mapper.getGmvAndMarginTotal(day);
result.addAll(gmvAndMarginTotal);
// 获取取消订单扣款总额
List<DailyVehicleOrderStatistics> penalSum = mapper.getPenalSum();
List<DailyVehicleOrderStatistics> penalSum = mapper.getPenalSum(day);
result.addAll(penalSum);
// 获取订单退还押金总额
List<DailyVehicleOrderStatistics> refundSecurityDeposit = mapper.getRefundSecurityDeposit();
List<DailyVehicleOrderStatistics> refundSecurityDeposit = mapper.getRefundSecurityDeposit(day);
result.addAll(refundSecurityDeposit);
// 获取违章查询总和
List<DailyVehicleOrderStatistics> violationMoney = mapper.getViolationMoney();
List<DailyVehicleOrderStatistics> violationMoney = mapper.getViolationMoney(day);
result.addAll(violationMoney);
// 获取赔偿和延期JSON字符串
List<Map> compensationAndPostpone = mapper.getCompensationAndPostpone();
List<Map> compensationAndPostpone = mapper.getCompensationAndPostpone(day);
// 获取赔偿和延期JSON字符串转换为map
List<DailyVehicleOrderStatistics> compensationAndPostpones = getCompensationAndPostpones(compensationAndPostpone);
result.addAll(compensationAndPostpones);
......@@ -82,16 +84,16 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
if (statistics == null) {
statistics = new DailyVehicleOrderStatistics();
map.put(branchCompanyId, statistics);
BeanUtil.copyProperties(
value,
statistics,
CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
}
BeanUtil.copyProperties(
value,
statistics,
CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
for (Map.Entry<Integer, DailyVehicleOrderStatistics> entry : map.entrySet()) {
insertSelectiveRe(entry.getValue());
}
}
for (Map.Entry<Integer, DailyVehicleOrderStatistics> entry : map.entrySet()) {
insertSelectiveRe(entry.getValue());
}
}
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderStatisticsBiz.java
View file @ 2e67d79c
......@@ -26,7 +26,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
@Autowired
private DailyMembersOrderStatisticsBiz membersBiz;
public OrderStatistics getToalOrder(Integer companyId) {
public OrderStatistics getTotalOrder(Integer companyId) {
OrderStatistics result = new OrderStatistics();
ArrayList<OrderStatistics> orderStatistics = new ArrayList<>();
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/DailyMembersOrderStatisticsMapper.java
View file @ 2e67d79c
......@@ -2,6 +2,7 @@ package com.xxfc.platform.order.mapper;
import com.xxfc.platform.order.entity.DailyMembersOrderStatistics;
import com.xxfc.platform.order.entity.OrderStatistics;
import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.common.Mapper;
import java.util.List;
......@@ -13,8 +14,8 @@ import java.util.Map;
*/
public interface DailyMembersOrderStatisticsMapper extends Mapper<DailyMembersOrderStatistics> {
List<Map<String, Object>> getTravelGmv();
List<Map<String, Object>> getTravelGmv(@Param("day") Integer day);
OrderStatistics monthOrderTotal(Integer companyId);
OrderStatistics monthOrderTotal(@Param("companyId") Integer companyId);
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/DailyTravelOrderStatisticsMapper.java
View file @ 2e67d79c
......@@ -2,6 +2,7 @@ package com.xxfc.platform.order.mapper;
import com.xxfc.platform.order.entity.DailyTravelOrderStatistics;
import com.xxfc.platform.order.entity.OrderStatistics;
import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.common.Mapper;
import java.math.BigDecimal;
......@@ -14,9 +15,9 @@ import java.util.Map;
public interface DailyTravelOrderStatisticsMapper extends Mapper<DailyTravelOrderStatistics> {
List<DailyTravelOrderStatistics> getTravelGmv();
List<DailyTravelOrderStatistics> getTravelGmv(@Param("day") Integer day);
List<DailyTravelOrderStatistics> getTravelPenalSum();
List<DailyTravelOrderStatistics> getTravelPenalSum(@Param("day") Integer day);
OrderStatistics monthOrderTotal(Integer branchCompanyId);
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/DailyVehicleOrderStatisticsMapper.java
View file @ 2e67d79c
......@@ -2,6 +2,7 @@ package com.xxfc.platform.order.mapper;
import com.xxfc.platform.order.entity.DailyVehicleOrderStatistics;
import com.xxfc.platform.order.entity.OrderStatistics;
import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.common.Mapper;
import java.math.BigDecimal;
......@@ -14,15 +15,15 @@ import java.util.Map;
*/
public interface DailyVehicleOrderStatisticsMapper extends Mapper<DailyVehicleOrderStatistics> {
List<DailyVehicleOrderStatistics> getGmvAndMarginTotal();
List<DailyVehicleOrderStatistics> getGmvAndMarginTotal(@Param("day") Integer day);
List<Map> getCompensationAndPostpone();
List<Map> getCompensationAndPostpone(@Param("day") Integer day);
List<DailyVehicleOrderStatistics> getPenalSum();
List<DailyVehicleOrderStatistics> getPenalSum(@Param("day") Integer day);
List<DailyVehicleOrderStatistics> getRefundSecurityDeposit();
List<DailyVehicleOrderStatistics> getRefundSecurityDeposit(@Param("day") Integer day);
List<DailyVehicleOrderStatistics> getViolationMoney();
List<DailyVehicleOrderStatistics> getViolationMoney(@Param("day") Integer day);
OrderStatistics monthOrderTotal(Integer companyId);
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/OrderStatisticsController.java
View file @ 2e67d79c
......@@ -91,7 +91,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
}
if (TYEP_TOTAL.equals(type)) {
return ObjectRestResponse.succ(baseBiz.getToalOrder(companyId));
return ObjectRestResponse.succ(baseBiz.getTotalOrder(companyId));
}
return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "参数错误!");
} catch (Exception e) {
......
xx-order/xx-order-server/src/main/resources/application.yml
View file @ 2e67d79c
......@@ -4,4 +4,6 @@ logging:
com.github.wxiaoqi:
debug
com.xxfc.platform:
debug
\ No newline at end of file
debug
order:
day: 1
\ No newline at end of file
xx-order/xx-order-server/src/main/resources/mapper/DailyMembersOrderStatisticsMapper.xml
View file @ 2e67d79c
......@@ -5,14 +5,14 @@
<!-- 获取会员订单成交金-->
<select id="getTravelGmv" resultType="HashMap">
select
COALESCE(date_format(FROM_UNIXTIME(pay_time/1000),'%Y-%c-%d'),date(DATE_SUB(now(),interval 1 day))) as oneDay,
date(DATE_SUB(now(),interval #{day} day)) as oneDay,
IFNULL(SUM(real_amount),0) as gmv
from
base_order
where
type=3
AND
date(FROM_UNIXTIME(pay_time/1000))=date(DATE_SUB(now(),interval 1 day))
date(FROM_UNIXTIME(pay_time/1000))=date(DATE_SUB(now(),interval #{day} day))
</select>
<select id="monthOrderTotal" resultType="com.xxfc.platform.order.entity.OrderStatistics">
......@@ -23,6 +23,6 @@
WHERE
branch_company_id =#{companyId}
and
DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY),'%Y-%c')
DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),interval 1 day),'%Y-%c')
</select>
</mapper>
\ No newline at end of file
xx-order/xx-order-server/src/main/resources/mapper/DailyTravelOrderStatisticsMapper.xml
View file @ 2e67d79c
......@@ -6,7 +6,7 @@
<select id="getTravelGmv" resultType="com.xxfc.platform.order.entity.DailyTravelOrderStatistics">
select
t.start_company_id as branchCompanyId,
COALESCE(date_format(FROM_UNIXTIME(o.pay_time/1000),'%Y-%c-%d'),date(DATE_SUB(now(),interval 1 day))) as oneDay,
date(DATE_SUB(now(),interval #{day} day)) as oneDay,
IFNULL(SUM(o.real_amount),0) as gmv
from
base_order o
......@@ -17,7 +17,7 @@
where
type=2
and
date(FROM_UNIXTIME(o.pay_time/1000))=date(DATE_SUB(now(),interval 1 day))
date(FROM_UNIXTIME(o.pay_time/1000))=date(DATE_SUB(now(),interval #{day} day))
group by
t.start_company_id
</select>
......@@ -44,7 +44,7 @@
and
r.refund_type =1
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 #{day} day))
group by
t.start_company_id
</select>
......
xx-order/xx-order-server/src/main/resources/mapper/DailyVehicleOrderStatisticsMapper.xml
View file @ 2e67d79c
......@@ -6,7 +6,7 @@
<select id="getGmvAndMarginTotal" resultType="com.xxfc.platform.order.entity.DailyVehicleOrderStatistics">
SELECT
v.start_company_id AS branchCompanyId,
COALESCE(date_format(FROM_UNIXTIME(b.pay_time/1000),'%Y-%c-%d'),date(DATE_SUB(now(),interval 1 day))) as oneDay,
date(DATE_SUB(now(),interval #{day} day)) as oneDay,
IFNULL(SUM(b.real_amount-v.deposit),0) AS gmv,
IFNULL(SUM(v.deposit),0) AS securityDeposit
FROM
......@@ -18,7 +18,7 @@
WHERE
b.type=1
AND
DATE(FROM_UNIXTIME(b.pay_time/1000))=DATE(DATE_SUB(now(),INTERVAL 1 DAY))
DATE(FROM_UNIXTIME(b.pay_time/1000))=DATE(DATE_SUB(now(),INTERVAL #{day} DAY))
GROUP BY
v.start_company_id
</select>
......@@ -46,7 +46,7 @@
AND
r.refund_type >1
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 #{day} DAY))
GROUP BY
v.start_company_id
</select>
......@@ -74,7 +74,7 @@
AND
r.refund_type =1
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 #{day} day))
GROUP BY
v.start_company_id
</select>
......@@ -101,7 +101,7 @@
and
c.type=3
and
date(FROM_UNIXTIME(refund_time/1000))=date(DATE_SUB(now(),interval 1 day))
date(FROM_UNIXTIME(refund_time/1000))=date(DATE_SUB(now(),interval #{day} day))
order by v.start_company_id asc
</select>
......@@ -109,7 +109,7 @@
<select id="getViolationMoney" resultType="com.xxfc.platform.order.entity.DailyVehicleOrderStatistics">
SELECT
d.start_company_id AS branchCompanyId,
v.price as violationMoney
IFNULL(sum(v.price),0) as violationMoney
FROM
order_refund r
LEFT JOIN
......@@ -131,9 +131,9 @@
and
r.refund_type = 4
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 #{day} day))
GROUP BY
d.start_company_id
d.start_company_id
</select>
......@@ -152,6 +152,6 @@
WHERE
branch_company_id =#{companyId}
and
DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY),'%Y-%c')
DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),interval 1 day),'%Y-%c')
</select>
</mapper>
\ No newline at end of file
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