ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/ParkingLotFallbackFactory.java
@@ -47,7 +47,7 @@ } @Override public R<BigDecimal> getRecordAmount(String sixBefore) { public R<BigDecimal> getRecordAmount() { return R.fail("获取数据失败：" + throwable.getMessage()); }
@@ -41,7 +41,7 @@ R<TParkingRecord> getRecordById(@RequestParam("id") Long siteId); @PostMapping(value = "/t-parking-lot/getRecordAmount") R<BigDecimal> getRecordAmount(@RequestParam("sixBefore") String sixBefore); R<BigDecimal> getRecordAmount(); /** ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
@@ -75,14 +75,14 @@ */ @PostMapping(value = "/getAllGun") public R<List<TChargingGun>> getAllGun() { return R.ok(chargingGunService.list(null)); return R.ok(chargingGunService.list()); } /** * 查询所有桩 */ @PostMapping(value = "/getAllPile") public R<List<TChargingPile>> getAllPile() { return R.ok(chargingPileService.list(null)); return R.ok(chargingPileService.list()); } /** ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java
@@ -181,8 +181,8 @@ @PostMapping(value = "/getRecordAmount") public R<BigDecimal> getRecordAmount(@RequestParam("sixBefore") String sixBefore){ BigDecimal sum = parkingRecordService.getSum(sixBefore); public R<BigDecimal> getRecordAmount(){ BigDecimal sum = parkingRecordService.getSum(); return R.ok(sum); }
@@ -24,7 +24,7 @@ */ public interface TParkingRecordMapper extends BaseMapper<TParkingRecord> { BigDecimal getSum(@Param("sixBefore") String sixBefore); BigDecimal getSum(); /** * 停车缴费订单列表 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TParkingRecordService.java
@@ -22,7 +22,7 @@ */ public interface TParkingRecordService extends IService<TParkingRecord> { BigDecimal getSum(String sixBefore); BigDecimal getSum(); /** * 停车缴费订单列表 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TParkingRecordServiceImpl.java
@@ -50,8 +50,8 @@ private SiteClient siteClient; @Override public BigDecimal getSum(String sixBefore) { return this.baseMapper.getSum(sixBefore); public BigDecimal getSum() { return this.baseMapper.getSum(); } @Autowired ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TParkingRecordMapper.xml
@@ -25,7 +25,7 @@ id, code,app_user_id, license_plate, vehicle_color, charging_order_id, parking_lot_id, in_parking_time, out_parking_time, parking_duration, order_amount, status, out_parking_type, create_time </sql> <select id="getSum" resultType="java.math.BigDecimal"> select sum(timeout_amount) from t_parking_record where in_parking_time >= #{sixBefore} select sum(timeout_amount) from t_parking_record </select> <select id="pageList" resultType="com.ruoyi.chargingPile.api.vo.TParkingRecordVO"> select ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -1063,7 +1063,6 @@ @ApiOperation(value = "底部数据分类", tags = {"后台-数据分析-平台收入分析"}) public R<Map<String,Object>> total() { //count近6个月的数据 LocalDateTime sixBefore = LocalDate.now().minusMonths(6).atTime(0, 0, 0); Long userId = tokenService.getLoginUser().getUserid(); //获取当前登录的siteIds List<Integer> siteIds = new ArrayList<>(); @@ -1075,18 +1074,18 @@ if (siteIds.isEmpty()){ siteIds.add(-1); } Map<String,Object> map = chargingOrderService.countAll(sixBefore,siteIds); BigDecimal data = parkingLotClient.getRecordAmount(sixBefore.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))).getData(); Map<String,Object> map = chargingOrderService.countAll(siteIds); BigDecimal data = parkingLotClient.getRecordAmount().getData(); if (map ==null){ map = new HashMap<String,Object>(); } map.put("parkingAmount",data); BigDecimal data1 = shoppingOrderService.getSumAmount(sixBefore); BigDecimal data1 = shoppingOrderService.getSumAmount(); map.put("shopAmount",data1); BigDecimal data2 = vipOrderService.getSumAmout(sixBefore); BigDecimal data2 = vipOrderService.getSumAmout(); map.put("vipAmount",data2); List<TChargingOrder> list = chargingOrderService.lambdaQuery().eq(TChargingOrder::getStatus, 5).eq(TChargingOrder::getDelFlag, 0) .eq(TChargingOrder::getRechargePaymentStatus, 2).between(TChargingOrder::getCreateTime, sixBefore, LocalDateTime.now()).list(); .eq(TChargingOrder::getRechargePaymentStatus, 2).list(); BigDecimal sharingAmount = BigDecimal.ZERO; BigDecimal commissionAmount = BigDecimal.ZERO; //计算list中electrovalence的总和 @@ -1864,7 +1863,8 @@ LocalDateTime max = selectDate.with(LocalTime.MAX); List<TChargingOrder> list = chargingOrderService.lambdaQuery().in(!siteIds.isEmpty(), TChargingOrder::getSiteId, siteIds) .between(TChargingOrder::getCreateTime, min, max).eq(TChargingOrder::getStatus,5) .between(TChargingOrder::getCreateTime, min, max).eq(TChargingOrder::getStatus,5).eq(TChargingOrder::getDelFlag, 0) .eq(TChargingOrder::getRechargePaymentStatus, 2) .eq(statisticsQueryDto.getSiteId() != null, TChargingOrder::getSiteId, statisticsQueryDto.getSiteId()).list(); //当日的订单总数 int size = list.size(); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java
@@ -66,7 +66,7 @@ List<SixCircleDto> circle(@Param("siteIds")List<Integer> siteIds,@Param("sixBefore")LocalDate sixBefore); Map<String, Object> countAll(@Param("sixBefore")LocalDateTime sixBefore,@Param("siteIds")List<Integer> siteIds); Map<String, Object> countAll(@Param("siteIds")List<Integer> siteIds); List<Map<String, Object>> getSumByType(@Param("start")LocalDateTime start,@Param("end")LocalDateTime end,@Param("siteIds")List<Integer> siteIds); @@ -81,13 +81,12 @@ List<ChargingOrderListVO> chargingList(@Param("pageInfo")PageInfo<ChargingOrderListVO> pageInfo, @Param("req") ChargingListQuery dto, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2, @Param("endTime1")String endTime1, @Param("endTime2")String endTime2); List<ChargingOrderListVO> chargingListNoPage( @Param("req")ChargingListQuery dto, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2, @Param("endTime1")String endTime1, @Param("endTime2")String endTime2); List<Map<String, Object>> getByDate(@Param("start")LocalDateTime start,@Param("end")LocalDateTime end,List<Integer> siteIds); List<Map<String, Object>> getByDate(@Param("start")LocalDateTime start,@Param("end")LocalDateTime end,@Param("siteIds")List<Integer> siteIds); List<Map<String, Object>> queryPower(@Param("siteIds")List<Integer> siteIds); Map<String, Object> queryPowerLevel(@Param("siteIds") List<Integer> siteIds,@Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto); List<Map<String, Object>> queryOrderCountAndMoneyBySiteIdDate(@Param("siteIds")List<Integer> siteIds); List<Map<String, Object>> usersDay(@Param("statisticsQueryDto")ChargingStatisticsQueryDto statisticsQueryDto); List<Map<String, Object>> usersDay1(); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TShoppingOrderMapper.java
@@ -45,7 +45,7 @@ List<SixShopDto> sixBefore(@Param("sixBefore")LocalDate sixBefore,@Param("status") Integer status); BigDecimal getSumAmount(@Param("sixBefore")LocalDate sixBefore); BigDecimal getSumAmount(); List<Map<String, Object>> getData(@Param("statisticsQueryDto")ChargingStatisticsQueryDto statisticsQueryDto); } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TVipOrderMapper.java
@@ -31,5 +31,5 @@ List<SixVipDto> sixBefore(@Param("sixBefore")LocalDate sixBefore); BigDecimal getSumAmout(@Param("sixBefore") LocalDateTime sixBefore); BigDecimal getSumAmout(); } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
@@ -145,7 +145,7 @@ List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore); Map<String, Object> countAll(LocalDateTime sixBefore, List<Integer> siteIds); Map<String, Object> countAll(List<Integer> siteIds); List<Map<String, Object>> getSumByType(LocalDate start,LocalDate end,List<Integer> siteIds); @@ -197,7 +197,6 @@ Map<String, Object> qureryPowerLevel(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto); List<Map<String, Object>> queryOrderCountAndMoneyBySiteIdDate(List<Integer> siteIds); List<Map<String, Object>> usersDay(ChargingStatisticsQueryDto statisticsQueryDto); List<Map<String, Object>> usersDay1(); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java
@@ -80,7 +80,7 @@ List<SixShopDto> sixBefore(LocalDate sixBefore, Integer status); BigDecimal getSumAmount(LocalDateTime sixBefore); BigDecimal getSumAmount(); List<Map<String, Object>> getData(ChargingStatisticsQueryDto statisticsQueryDto); } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TVipOrderService.java
@@ -25,7 +25,7 @@ List<SixVipDto> sixBefore(LocalDate sixBefore); BigDecimal getSumAmout(LocalDateTime sixBefore); BigDecimal getSumAmout(); void payBack(String outTradeNo); } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1493,8 +1493,8 @@ } @Override public Map<String, Object> countAll(LocalDateTime sixBefore,List<Integer> siteIds) { return this.baseMapper.countAll(sixBefore,siteIds); public Map<String, Object> countAll(List<Integer> siteIds) { return this.baseMapper.countAll(siteIds); } @Override @@ -2612,10 +2612,7 @@ return this.baseMapper.queryPowerLevel(siteIds,statisticsQueryDto); } @Override public List<Map<String, Object>> queryOrderCountAndMoneyBySiteIdDate(List<Integer> siteIds) { return this.baseMapper.queryOrderCountAndMoneyBySiteIdDate(siteIds); } @Override public List<Map<String, Object>> usersDay(ChargingStatisticsQueryDto statisticsQueryDto) { ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
@@ -650,10 +650,10 @@ public List<SixShopDto> sixBefore(LocalDate sixBefore, Integer status) { return this.baseMapper.sixBefore(sixBefore,status); } @Override public BigDecimal getSumAmount(LocalDate sixBefore) { return this.baseMapper.getSumAmount(sixBefore); public BigDecimal getSumAmount() { return this.baseMapper.getSumAmount(); } @Override ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TVipOrderServiceImpl.java
@@ -76,8 +76,8 @@ } @Override public BigDecimal getSumAmout(LocalDateTime sixBefore) { return this.baseMapper.getSumAmout(sixBefore); public BigDecimal getSumAmout() { return this.baseMapper.getSumAmout(); } @Override ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -342,32 +342,33 @@ </select> <select id="charge" resultType="com.ruoyi.order.dto.SixChargingDto"> SELECT DATE_FORMAT( subquery.create_time, '%m' ) AS MONTH, SUM(electrovalence) AS electrovalence, DATE_FORMAT( subquery.create_time, '%m' ) AS MONTH, SUM(electrovalence) AS electrovalence, SUM( CASE WHEN subquery.order_source = 0 THEN subquery.service_charge WHEN subquery.order_source = 1 THEN subquery.service_charge ELSE subquery.service_charge * 0.2 ELSE subquery.service_charge * 0.8 END ) AS service_charge FROM ( SELECT create_time, electrovalence, service_charge, order_source a.create_time, b.period_electric_price as electrovalence, b.period_service_price as service_charge, a.order_source FROM t_charging_order t_charging_order a left join (select charging_order_id, sum(period_electric_price) as period_electric_price, sum(period_service_price) as period_service_price, sum(period_electric_price + period_service_price) as money from t_charging_order_accounting_strategy group by charging_order_id) b on (a.id = b.charging_order_id) <where> del_flag = 0 and recharge_payment_status = 2 a.del_flag = 0 and a.recharge_payment_status = 2 and a.status = 5 <if test="sixBefore != null"> AND create_time >= #{sixBefore} AND a.create_time >= #{sixBefore} </if> <if test="siteIds != null and siteIds.size() > 0"> AND site_id IN AND a.site_id IN <foreach collection="siteIds" item="siteId" open="(" separator="," close=")"> #{siteId} </foreach> @@ -381,20 +382,19 @@ </select> <select id="circle" resultType="com.ruoyi.order.dto.SixCircleDto"> SELECT site_id as siteId, SUM( CASE WHEN order_source = 0 THEN payment_amount WHEN order_source = 1 THEN payment_amount ELSE service_charge * 0.2 END ) AS paymentAmount site_id as siteId, ROUND(SUM(CASE WHEN a.order_source = 0 THEN b.money WHEN a.order_source = 1 THEN b.money ELSE (b.period_electric_price + b.period_service_price * 0.8) END), 2) AS paymentAmount FROM t_charging_order t_charging_order a left join (select charging_order_id, sum(period_electric_price) as period_electric_price, sum(period_service_price) as period_service_price, sum(period_electric_price + period_service_price) as money from t_charging_order_accounting_strategy group by charging_order_id) b on (a.id = b.charging_order_id) <where> del_flag = 0 and recharge_payment_status = 2 a.del_flag = 0 and a.recharge_payment_status = 2 and a.status = 5 <if test="siteIds != null and siteIds.size() > 0"> AND site_id IN AND a.site_id IN <foreach collection="siteIds" item="siteId" open="(" separator="," close=")"> #{siteId} </foreach> @@ -403,14 +403,14 @@ AND create_time >= #{sixBefore} </if> </where> GROUP BY site_id GROUP BY a.site_id </select> <select id="countAll" resultType="java.util.Map"> select sum(electrovalence) as electrovalence,sum(service_charge) as service_charge,ROUND(sum(electrovalence+service_charge) * 0.006, 2) as commission_amount,sum(sharing_amount) as sharing_amount from t_charging_order where create_time >= #{sixBefore} and del_flag = 0 and recharge_payment_status = 2 where del_flag = 0 and recharge_payment_status = 2 and status = 5 <if test="siteIds != null and siteIds.size() > 0"> AND site_id IN <foreach collection="siteIds" item="siteId" open="(" separator="," close=")"> @@ -422,12 +422,11 @@ SELECT t1.type, SUM( t1.charging_capacity ) as charging_capacity , SUM( CASE WHEN t2.order_source = 0 THEN t1.period_service_price WHEN t2.order_source = 1 THEN t1.period_service_price ELSE t1.period_service_price * 0.2 ELSE t1.period_service_price * 0.8 END )as period_electric_price, SUM(t1.period_electric_price) as total_amount @@ -589,7 +588,7 @@ SUM(CASE WHEN a.order_source = 0 THEN b.period_service_price WHEN a.order_source = 1 THEN b.period_service_price ELSE b.period_service_price * 0.2 ELSE b.period_service_price * 0.8 END) as servicecharge, SUM(a.charging_capacity) as electrovalence, SUM(a.electrovalence) AS paymentAmount, @@ -1444,28 +1443,33 @@ SELECT DATE_FORMAT( <if test="statisticsQueryDto.type == 1"> start_time a.start_time </if> <if test="statisticsQueryDto.type == 2"> end_time a.end_time </if> , '%H:00' ) as time, SUM(service_charge) as servicecharge, SUM(electrovalence) as electrovalence, SUM(charging_capacity) as electricity, SUM(CASE WHEN a.order_source = 0 THEN b.period_service_price WHEN a.order_source = 1 THEN b.period_service_price ELSE b.period_service_price * 0.8 END) as servicecharge, SUM(b.period_electric_price) as electrovalence, SUM(b.charging_capacity) as electricity, count(1) as orderCount FROM t_charging_order WHERE del_flag = 0 and status = 5 and recharge_payment_status = 2 and DATE( t_charging_order a left join (select charging_order_id, sum(period_electric_price) as period_electric_price, sum(period_service_price) as period_service_price, sum(charging_capacity) as charging_capacity, sum(period_electric_price + period_service_price) as money from t_charging_order_accounting_strategy group by charging_order_id) b on (a.id = b.charging_order_id) WHERE a.del_flag = 0 and a.status = 5 and a.recharge_payment_status = 2 and DATE( <if test="statisticsQueryDto.type == 1"> start_time a.start_time </if> <if test="statisticsQueryDto.type == 2"> end_time a.end_time </if> ) = #{statisticsQueryDto.hourDate} <if test="siteIds != null and siteIds.size() > 0"> and site_id IN and a.site_id IN <foreach collection="siteIds" item="siteId" open="(" separator="," close=")"> #{siteId} </foreach> @@ -1479,28 +1483,33 @@ SELECT DATE_FORMAT( <if test="statisticsQueryDto.type == 1"> start_time a.start_time </if> <if test="statisticsQueryDto.type == 2"> end_time a.end_time </if> , '%Y-%m-%d' ) as time, SUM(service_charge) as servicecharge, SUM(electrovalence) as electrovalence, count(1) as orderCount, SUM(electricity) as electricity SUM(CASE WHEN a.order_source = 0 THEN b.period_service_price WHEN a.order_source = 1 THEN b.period_service_price ELSE b.period_service_price * 0.8 END) as servicecharge, SUM(b.period_electric_price) as electrovalence, SUM(b.charging_capacity) as electricity, count(1) as orderCount FROM t_charging_order WHERE del_flag = 0 and recharge_payment_status = 2 and DATE( t_charging_order a left join (select charging_order_id, sum(period_electric_price) as period_electric_price, sum(period_service_price) as period_service_price, sum(charging_capacity) as charging_capacity, sum(period_electric_price + period_service_price) as money from t_charging_order_accounting_strategy group by charging_order_id) b on (a.id = b.charging_order_id) WHERE a.del_flag = 0 and a.status = 5 and a.recharge_payment_status = 2 and DATE( <if test="statisticsQueryDto.type == 1"> start_time a.start_time </if> <if test="statisticsQueryDto.type == 2"> end_time a.end_time </if> ) between #{statisticsQueryDto.startTime} and #{statisticsQueryDto.endTime} <if test="siteIds != null and siteIds.size() > 0"> and site_id IN and a.site_id IN <foreach collection="siteIds" item="siteId" open="(" separator="," close=")"> #{siteId} </foreach> @@ -1514,29 +1523,33 @@ SELECT DATE_FORMAT( <if test="statisticsQueryDto.type == 1"> start_time a.start_time </if> <if test="statisticsQueryDto.type == 2"> end_time a.end_time </if> , '%Y-%m' ) as time, SUM(service_charge) as servicecharge, SUM(electrovalence) as electrovalence, count(1) as orderCount, SUM(electricity) as electricity SUM(CASE WHEN a.order_source = 0 THEN b.period_service_price WHEN a.order_source = 1 THEN b.period_service_price ELSE b.period_service_price * 0.8 END) as servicecharge, SUM(b.period_electric_price) as electrovalence, SUM(b.charging_capacity) as electricity, count(1) as orderCount FROM t_charging_order WHERE del_flag = 0 and recharge_payment_status = 2 and DATE( t_charging_order a left join (select charging_order_id, sum(period_electric_price) as period_electric_price, sum(period_service_price) as period_service_price, sum(charging_capacity) as charging_capacity, sum(period_electric_price + period_service_price) as money from t_charging_order_accounting_strategy group by charging_order_id) b on (a.id = b.charging_order_id) WHERE a.del_flag = 0 and a.status = 5 and a.recharge_payment_status = 2 and DATE( <if test="statisticsQueryDto.type == 1"> start_time a.start_time </if> <if test="statisticsQueryDto.type == 2"> end_time a.end_time </if> ) between #{statisticsQueryDto.startTime} and #{statisticsQueryDto.endTime} <if test="siteIds != null and siteIds.size() > 0"> and site_id IN and a.site_id IN <foreach collection="siteIds" item="siteId" open="(" separator="," close=")"> #{siteId} </foreach> ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml
@@ -278,9 +278,6 @@ select sum(payment_amount) from t_shopping_order where del_flag = 0 and payment_status = 2 and ISNULL(refund_status) and status!=4 <if test="null != sixBefore"> and DATE_FORMAT(create_time, '%Y-%m-%d') >= DATE_FORMAT(#{sixBefore}, '%Y-%m-%d') </if> </select> <select id="getData" resultType="java.util.Map">
@@ -84,9 +84,6 @@ WHERE del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()} AND payment_status = 2 <if test="sixBefore != null"> AND create_time > #{sixBefore} </if> </select> </mapper>
