Merge branch 'master-vehicle-price' into dev-tiande

ace-common/src/main/java/com/github/wxiaoqi/security/common/vo/PageDataVO.java

@@ -32,6 +32,7 @@ public  class PageDataVO<T> {
     public static <M> PageDataVO<M> pageInfo(PageInfo<M> pageInfo){
         PageDataVO<M> pageDataVo = new PageDataVO<>();
         pageDataVo.setData(pageInfo.getList());
+        pageDataVo.setTotalCount(pageInfo.getTotal());
         pageDataVo.setPageNum(pageInfo.getPageNum());
         pageDataVo.setTotalPage(pageInfo.getPages());
         pageDataVo.setPageSize(pageInfo.getSize());

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/CompanyWalletDetailBiz.java

@@ -4,8 +4,6 @@ package com.xxfc.platform.order.biz;
 
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
@@ -259,9 +257,7 @@ public class CompanyWalletDetailBiz extends BaseBiz<CompanyWalletDetailMapper, C
 
 
     public PageDataVO<CompanyWalletDetailVo> selectList(WalletDetailDTO walletDetailDTO) {
-        PageHelper.startPage(walletDetailDTO.getPage(), walletDetailDTO.getLimit());
-        PageInfo<CompanyWalletDetailVo> branchCompanyPageInfo = new PageInfo<>(getList(walletDetailDTO));
-        return PageDataVO.pageInfo(branchCompanyPageInfo);
+        return PageDataVO.pageInfo(walletDetailDTO.getPage(), walletDetailDTO.getLimit(), () -> getList(walletDetailDTO));
     }
 
     public List<CompanyWalletDetailVo> getList(WalletDetailDTO walletDetailDTO){

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/AdminCompanyWalletDetailController.java

@@ -5,9 +5,11 @@ import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.order.biz.CompanyWalletDetailBiz;
 import com.xxfc.platform.order.entity.CompanyWalletDetail;
 import com.xxfc.platform.order.pojo.dto.WalletDetailDTO;
+import com.xxfc.platform.order.pojo.vo.CompanyWalletDetailVo;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,7 +31,8 @@ public class AdminCompanyWalletDetailController extends BaseController<CompanyWa
 
     @RequestMapping(value = "selectList", method = RequestMethod.GET)
     @ApiModelProperty(value = "营收明细列表")
-    public ObjectRestResponse refundAmount(WalletDetailDTO walletDetailDTO) {
+    public ObjectRestResponse<PageDataVO<CompanyWalletDetailVo>> refundAmount(WalletDetailDTO walletDetailDTO) {
+        setPowerData(walletDetailDTO,true);
         return ObjectRestResponse.succ(baseBiz.selectList(walletDetailDTO));
     }
 
@@ -37,6 +40,7 @@ public class AdminCompanyWalletDetailController extends BaseController<CompanyWa
     @RequestMapping(value = "sumAmount", method = RequestMethod.GET)
     @ApiModelProperty(value = "营收统计")
     public ObjectRestResponse sumAmount(WalletDetailDTO walletDetailDTO) {
+        setPowerData(walletDetailDTO,true);
         return ObjectRestResponse.succ(baseBiz.getSumAmount(walletDetailDTO));
     }
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/BgStatisticsController.java

+package com.xxfc.platform.order.rest.background;
+
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.poi.excel.ExcelUtil;
+import cn.hutool.poi.excel.ExcelWriter;
+import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+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 com.xxfc.platform.order.pojo.MembersOrderDto;
+import com.xxfc.platform.order.pojo.OrderQuery;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+@Slf4j
+@RestController
+@RequestMapping("/background/statistics")
+@Api(description = "每月总的订单统计")
+public class BgStatisticsController extends BaseController<OrderStatisticsBiz, OrderStatistics> {
+
+    @GetMapping("/indexOrder")
+    @ApiOperation(value = "首页订单统计")
+    public ObjectRestResponse<IndexOrderVO> indexOrder()  {
+        IndexOrderVO indexOrderVO = new IndexOrderVO();
+        indexOrderVO.setCurrDayOrderAmount(new BigDecimal("1"));
+        indexOrderVO.setCurrDayOrderNum(2L);
+        indexOrderVO.setCurrDayToLiftVehicleNum(3L);
+        indexOrderVO.setCurrDayToReturnVehicleNum(4L);
+        //获取会员订单统计信息
+        return ObjectRestResponse.succ(indexOrderVO);
+    }
+
+    @Data
+    public static class IndexOrderVO {
+        private BigDecimal currDayOrderAmount;
+        private Long currDayOrderNum;
+        private Long currDayToLiftVehicleNum;
+        private Long currDayToReturnVehicleNum;
+    }
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/OrderStatisticsController.java

@@ -24,12 +24,14 @@ import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.HashMap;
 import java.util.List;
@@ -127,6 +129,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
         }
 
     }
+
     @PostMapping("/order")
     @ApiOperation(value = "会员统计")
     public ObjectRestResponse<List<MembersOrderDto>> getMemberOrderStatisticsData(@RequestBody OrderQuery query) throws ParseException {
@@ -168,6 +171,5 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
         //此处记得关闭输出Servlet流
         IoUtil.close(out);
 
-
     }
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/RentVehicleBookDTO.java

@@ -116,6 +116,12 @@ public class RentVehicleBookDTO extends PageParam {
     @ApiModelProperty(hidden = true)
     Integer useType = 1;
 
+    /**
+     * 是否不检查时间字节上的冲突
+     */
+    @ApiModelProperty(hidden = true)
+    Boolean yearNo4Where;
+
     /**
      * 是否根据预订记录(相交叉)查询
      * 原（大于预约结束时间，小于预约开始时间的预约记录）

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/RentVehicleController.java

@@ -162,6 +162,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
                 rbd.setRecordIntersection(Boolean.TRUE);
                 rbd.setBookStartDateTime(dto.getStartDateTime());
                 rbd.setBookEndDateTime(dto.getEndDateTime());
+                rbd.setYearNo4Where(Boolean.TRUE);
                 //查询可车辆信息
                 PageDataVO<UsableVeicleVO> pageDataVO = vehicleBiz.searchUsableVehicle(rbd);
                 if(CollUtil.isNotEmpty(pageDataVO.getData())) {