Commit ae437036 authored by hanfeng's avatar hanfeng

修改统计

parent 53b5616e
package com.xxfc.platform.order.entity;
/**
* @author Administrator
*/
public class OrderStatistics {
}
......@@ -3,8 +3,10 @@ package com.xxfc.platform.order.biz;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.xxfc.platform.order.entity.DailyMembersOrderStatistics;
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.DailyTravelOrderStatisticsMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.stereotype.Service;
......@@ -19,6 +21,7 @@ import java.util.Map;
* @author Administrator
*/
@Service
@Slf4j
public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderStatisticsMapper, DailyMembersOrderStatistics> {
......@@ -39,7 +42,15 @@ public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderSta
@Override
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);
}
// public OrderStatistics findAll() {
// }
}
......@@ -43,4 +43,7 @@ public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStati
entity.setCrtTime(new Date());
return mapper.insertSelective(entity);
}
public void findAll() {
}
}
......@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.xxfc.platform.order.entity.DailyMembersOrderStatistics;
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.pojo.DedDetailDTO;
import org.apache.commons.beanutils.BeanUtils;
......@@ -103,9 +104,11 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
@Override
public int insertSelectiveRe(DailyVehicleOrderStatistics entity) {
Date date = new Date();
entity.setCrtTime(new Date());
return mapper.insertSelective(entity);
}
public OrderStatistics findAll() {
return mapper.monthOrderTotal();
}
}
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> {
}
......@@ -10,6 +10,7 @@ import java.util.Map;
* @author Administrator
*/
public interface DailyMembersOrderStatisticsMapper extends Mapper<DailyMembersOrderStatistics> {
Map<String, Object> getTravelGmv();
}
package com.xxfc.platform.order.mapper;
import com.xxfc.platform.order.entity.DailyVehicleOrderStatistics;
import com.xxfc.platform.order.entity.OrderStatistics;
import tk.mybatis.mapper.common.Mapper;
import java.math.BigDecimal;
......@@ -22,4 +23,6 @@ public interface DailyVehicleOrderStatisticsMapper extends Mapper<DailyVehicleOr
BigDecimal getRefundSecurityDeposit();
BigDecimal getViolationMoney();
OrderStatistics monthOrderTotal();
}
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> {
}
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,"属性不能为空!");
}
}
......@@ -106,4 +106,20 @@
and
date(FROM_UNIXTIME(r.refund_time/1000))=date(DATE_SUB(now(),interval 1 day))
</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>
\ No newline at end of file
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();
}
}
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