ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
@@ -24,6 +24,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.domain.BasePojo; import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.common.security.utils.SecurityUtils; @@ -576,6 +577,13 @@ } } } //test // if (status==1||status==7){ // TFaultMessage one = faultMessageService.lambdaQuery().eq(TFaultMessage::getChargingGunId, gunMonitoring.getId()).orderByDesc(TFaultMessage::getCreateTime).last("limit 1").one(); // if (one!=null) { // gunMonitoring.setFaultCause(one.getContent()); // } // } } return pageInfo.setRecords(chargingGunMonitoring); } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -3,6 +3,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ruoyi.account.api.feignClient.AppUserCarClient; import com.ruoyi.account.api.feignClient.AppUserClient; import com.ruoyi.account.api.model.TAppUser; @@ -23,10 +24,10 @@ import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient; import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData; import com.ruoyi.order.api.dto.SettlementConfirmAdd; import com.ruoyi.order.api.model.ChargingListQuery; import com.ruoyi.order.api.model.TChargingOrder; import com.ruoyi.order.api.model.TSettlementConfirm; import com.ruoyi.order.api.model.*; import com.ruoyi.order.api.query.SettlementListQuery; import com.ruoyi.order.api.query.TOrderInvoiceQuery; import com.ruoyi.order.api.vo.ChargingOrderListVO; @@ -37,12 +38,15 @@ import com.ruoyi.order.vo.ChargingOrderListInfoVO; import com.ruoyi.order.api.vo.ChargingOrderTimeVO; import com.ruoyi.order.service.*; import com.ruoyi.other.api.domain.TVip; import com.ruoyi.other.api.feignClient.VipClient; import com.ruoyi.payment.api.feignClient.AliPaymentClient; import com.ruoyi.payment.api.feignClient.WxPaymentClient; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.apache.poi.ss.usermodel.Workbook; import org.omg.CORBA.PRIVATE_MEMBER; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -52,6 +56,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.math.BigDecimal; import java.math.RoundingMode; import java.net.URLEncoder; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -75,6 +80,8 @@ private TChargingOrderService chargingOrderService; @Resource private TSettlementConfirmService tSettlementConfirmService; @Resource private VipClient vipClient; @PostMapping(value = "/chargingList") @ApiOperation(value = "充电时段统计列表", tags = {"管理后台-财务结算"}) public AjaxResult<ChargingOrderTimeVO> chargingList(@RequestBody ChargingListQuery dto) { @@ -95,6 +102,13 @@ private ChargingGunClient chargingGunClient; @Autowired private AppUserCarClient appUserCarClient; @Resource private AccountingStrategyOrderService accountingStrategyOrderService; @Resource private TChargingOrderAccountingStrategyService tChargingOrderAccountingStrategyService; @Resource private UploadRealTimeMonitoringDataClient uploadRealTimeMonitoringDataClient; @ApiOperation(value = "充电时段统计-导出", tags = {"管理后台-财务结算"}) @PutMapping("/export") public void export(@RequestBody ChargingListQuery dto) { @@ -125,7 +139,13 @@ tChargingOrderExport.setId(i); tChargingOrderExport.setCode(chargingOrderListVO.getCode()); tChargingOrderExport.setTerminalName(chargingOrderListVO.getTerminalName()); // tChargingOrderExport.setName(); // 查询这笔订单的计费策略名称 List<AccountingStrategyOrder> list = accountingStrategyOrderService.lambdaQuery() .eq(AccountingStrategyOrder::getChargingOrderId, chargingOrderListVO.getId()) .list(); if (!list.isEmpty()){ tChargingOrderExport.setName(list.get(0).getName()); } tChargingOrderExport.setOrderClassification("1"); tChargingOrderExport.setStartType("扫码"); tChargingOrderExport.setOne("小程序"); @@ -143,16 +163,48 @@ tChargingOrderExport.setServiceCharge(chargingOrderListVO.getServiceCharge()+""); tChargingOrderExport.setTotal(chargingOrderListVO.getPaymentAmount()+""); tChargingOrderExport.setChargingCapacity(chargingOrderListVO.getElectricity()+""); // tChargingOrderExport.setElectrovalencePrice(); // tChargingOrderExport.setServiceChargePrice(); // tChargingOrderExport.setServiceChargePriceLook(); // tChargingOrderExport.setCumulativeChargingTime(); List<TChargingOrderAccountingStrategy> stageCost = tChargingOrderAccountingStrategyService.list( new LambdaQueryWrapper<TChargingOrderAccountingStrategy>() .eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrderListVO.getId())); if (!stageCost.isEmpty()){ // 累加时段电费单价 取平均值 BigDecimal bigDecimal1 = new BigDecimal("0"); BigDecimal bigDecimal2 = new BigDecimal("0"); BigDecimal bigDecimal3 = new BigDecimal("0"); BigDecimal size = new BigDecimal(stageCost.size()); for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : stageCost) { bigDecimal1 = bigDecimal1.add(tChargingOrderAccountingStrategy.getElectrovalence()); bigDecimal2 = bigDecimal2.add(tChargingOrderAccountingStrategy.getPeriodServicePrice()); bigDecimal3 = bigDecimal3.add(tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice()); } BigDecimal divide1 = bigDecimal1.divide(size, 2, RoundingMode.HALF_DOWN); BigDecimal divide2 = bigDecimal2.divide(size, 2, RoundingMode.HALF_DOWN); BigDecimal divide3 = bigDecimal3.divide(size, 2, RoundingMode.HALF_DOWN); tChargingOrderExport.setElectrovalencePrice(divide1+""); tChargingOrderExport.setServiceChargePrice(divide2+""); tChargingOrderExport.setServiceChargePriceLook(divide3+""); } // 获取充电时间 UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrderListVO.getCode()).getData(); if (data5!=null){ if (data5.getTime_remaining()!=null){ tChargingOrderExport.setCumulativeChargingTime(data5.getCumulative_charging_time()+""); } } tChargingOrderExport.setStartSoc(chargingOrderListVO.getStartSoc()); tChargingOrderExport.setEndtSoc(chargingOrderListVO.getEndSoc()); tChargingOrderExport.setIsSoc("否"); tChargingOrderExport.setIsSocType(""); tChargingOrderExport.setIsSocNum("0"); tChargingOrderExport.setUserType("普通个人用户"); TAppUser data2 = appUserClient.getUserById(chargingOrderListVO.getAppUserId()).getData(); if (data2!=null&&data2.getVipId()!=null){ TVip data1 = vipClient.getInfo1(data2.getVipId()).getData(); if (data1!=null){ tChargingOrderExport.setVipType(data1.getName()); } } // tChargingOrderExport.setVipType(); tChargingOrderExport.setIsPlus(chargingOrderListVO.getVipDiscountAmount().compareTo(BigDecimal.ZERO)>0?"是":"否"); if (data3!=null){ ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -1125,6 +1125,8 @@ } else { siteIds.add(statisticsQueryDto.getSiteId()); } List<Map<String,Object>> maps1 = chargingOrderService.queryPower(siteIds); @@ -1330,7 +1332,7 @@ List<Map<String,Object>> badTop = orderEvaluateService.badTop(siteIds); //流量分析 List<Map<String,Object>> sourceMap = chargingOrderService.countBySource(siteIds); List<Map<String,Object>> sourceMap = chargingOrderService.countBySource(siteIds,statisticsQueryDto); tCharingUserEvaluateVO.setGoodTop(goodTop); tCharingUserEvaluateVO.setBadTop(badTop); tCharingUserEvaluateVO.setFlow(sourceMap); @@ -1355,8 +1357,48 @@ } //直流可用率 List<Map<String,Object>> equipmentMap1 = chargingOrderService.equipmentUserType1(siteIds,statisticsQueryDto); for (Map<String, Object> result : equipmentMap1) { Object percentObj = result.get("percent"); if (percentObj instanceof String) { try { BigDecimal percent = new BigDecimal((String) percentObj); if (percent.compareTo(BigDecimal.ZERO) < 0) { result.put("percent", percent.negate().toString()); } } catch (NumberFormatException e) { // 处理转换异常 result.put("percent", BigDecimal.ZERO); // 或者其他默认值 } } else if (percentObj instanceof BigDecimal) { BigDecimal percent = (BigDecimal) percentObj; if (percent.compareTo(BigDecimal.ZERO) < 0) { result.put("percent", percent.negate().toString()); } } } //交流可用率 List<Map<String,Object>> equipmentMap2= chargingOrderService.equipmentUserType2(siteIds,statisticsQueryDto); for (Map<String, Object> result : equipmentMap2) { Object percentObj = result.get("percent"); if (percentObj instanceof String) { try { BigDecimal percent = new BigDecimal((String) percentObj); if (percent.compareTo(BigDecimal.ZERO) < 0) { result.put("percent", percent.negate().toString()); } } catch (NumberFormatException e) { // 处理转换异常 result.put("percent", BigDecimal.ZERO); // 或者其他默认值 } } else if (percentObj instanceof BigDecimal) { BigDecimal percent = (BigDecimal) percentObj; if (percent.compareTo(BigDecimal.ZERO) < 0) { result.put("percent", percent.negate().toString()); } } } //取出直流可用率和交流可用率的percent的平均值保留两位小数 @@ -1457,7 +1499,7 @@ List<TChargingOrder> list = chargingOrderService.lambdaQuery().in(!siteIds.isEmpty(), TChargingOrder::getSiteId, siteIds).ge( TChargingOrder::getCreateTime,min).le(BasePojo::getCreateTime,max).eq(statisticsQueryDto.getSiteId() != null, TChargingOrder::getSiteId, statisticsQueryDto.getSiteId()).list(); List<TChargingOrder> list = chargingOrderService.lambdaQuery().in(!siteIds.isEmpty(), TChargingOrder::getSiteId, siteIds).ge( TChargingOrder::getCreateTime,min).le(BasePojo::getCreateTime,max).eq(TChargingOrder::getStatus,5).eq(statisticsQueryDto.getSiteId() != null, TChargingOrder::getSiteId, statisticsQueryDto.getSiteId()).list(); //当日的订单总数 int size = list.size(); //计算list中paymentAmount的总和 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java
@@ -110,7 +110,7 @@ List<Map<String, Object>> getLevelEvaluate(@Param("siteIds")List<Integer> siteIds); List<Map<String, Object>> countBySource(@Param("siteIds")List<Integer> siteIds); List<Map<String, Object>> countBySource(@Param("siteIds")List<Integer> siteIds,@Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto); List<Map<String, Object>> equipmentUserType1(@Param("siteIds") List<Integer> siteIds, @Param("statisticsQueryDto") ChargingStatisticsQueryDto statisticsQueryDto);
@@ -232,7 +232,7 @@ SettlementTotalVO settlementTotal(String time); List<Map<String, Object>> countBySource(List<Integer> siteIds); List<Map<String, Object>> countBySource(List<Integer> siteIds,ChargingStatisticsQueryDto statisticsQueryDto); List<Map<String, Object>> equipmentUserType1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
@@ -578,8 +578,8 @@ tChargingOrder.setDiscount(tChargingOrder.getCouponDiscountAmount()!=null?tChargingOrder.getCouponDiscountAmount().toString():"0"); UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(tChargingOrder.getCode()).getData(); if (data5!=null){ if (data5.getTime_remaining()!=null){ chargingSecond+=data5.getTime_remaining()*60; if (data5.getCumulative_charging_time()!=null){ chargingSecond+=data5.getCumulative_charging_time()*60; } Integer cumulativeChargingTime = data5.getCumulative_charging_time(); // 将其转化为xx小时xx分钟xx秒显示 如果是0小时则不展示小时 如果是0分钟则不展示分钟 @@ -611,16 +611,12 @@ } } if (data3!=null)tChargingOrder.setUserName(data3.getName()); // 累加实收金额 支付金额减去退款金额 if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getPaymentAmount()!=null){ paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount()); }else if (tChargingOrder.getPaymentAmount()!=null){ if ( tChargingOrder.getPaymentAmount()!=null){ paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount()); } // 累加订单金额 // 总金额 if (tChargingOrder.getOrderAmount()!=null){ orderAmount = orderAmount.add(tChargingOrder.getOrderAmount()); orderAmount = orderAmount.add(tChargingOrder.getPaymentAmount()); } // 累加累计电费 if (tChargingOrder.getElectrovalence()!=null){ @@ -722,18 +718,14 @@ chargingBillListVO.setOrderCount(tChargingOrders.size()); for (TChargingOrder tChargingOrder : tChargingOrders) { // 累加实收金额 支付金额减去退款金额 if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getPaymentAmount()!=null){ paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount()); paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount()); }else if (tChargingOrder.getPaymentAmount()!=null){ if (tChargingOrder.getPaymentAmount()!=null){ paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount()); paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount()); } // 累加订单金额 if (tChargingOrder.getOrderAmount()!=null){ orderAmount = orderAmount.add(tChargingOrder.getOrderAmount()); orderAmountTotal = orderAmountTotal.add(tChargingOrder.getOrderAmount()); orderAmount = orderAmount.add(tChargingOrder.getPaymentAmount()); orderAmountTotal = orderAmountTotal.add(tChargingOrder.getPaymentAmount()); } // 累加累计电费 if (tChargingOrder.getElectrovalence()!=null){ @@ -773,7 +765,7 @@ } } chargingBillVO.setChargingCapacity(chargingCapacityTotal); chargingBillVO.setPaymentAmount(paymentAmountTotal.setScale(2, RoundingMode.HALF_DOWN)); chargingBillVO.setPaymentAmount(orderAmountTotal.subtract(commissionAmountTotal).subtract(sharingAmountTotal).setScale(2, RoundingMode.HALF_DOWN)); chargingBillVO.setOrderAmount(orderAmountTotal.setScale(2, RoundingMode.HALF_DOWN)); chargingBillVO.setElectrovalence(electrovalenceTotal.setScale(2, RoundingMode.HALF_DOWN)); chargingBillVO.setServiceCharge(serviceChargeTotal.setScale(2, RoundingMode.HALF_DOWN)); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -2886,8 +2886,8 @@ } @Override public List<Map<String, Object>> countBySource(List<Integer> siteIds) { return this.baseMapper.countBySource(siteIds); public List<Map<String, Object>> countBySource(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto) { return this.baseMapper.countBySource(siteIds,statisticsQueryDto); } @Override ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -120,8 +120,8 @@ 1 as type, title, `status`, order_amount, payment_amount as payment_amount , recharge_amount as order_amount, recharge_amount as payment_amount , create_time, end_time, pay_time, @@ -601,10 +601,10 @@ </if> <if test="statisticsQueryDto.dayType ==5"> AND create_time >= #{statisticsQueryDto.startTime} AND DATE(create_time) >= #{statisticsQueryDto.startTime} AND create_time <= #{statisticsQueryDto.endTime} AND DATE(create_time) <= #{statisticsQueryDto.endTime} </if> @@ -940,6 +940,13 @@ #{siteId} </foreach> </if> <if test="statisticsQueryDto.dayType == 1"> AND DATE(create_time ) = CURDATE() </if> <if test="statisticsQueryDto.dayType != 1"> and DATE(create_time) >= #{statisticsQueryDto.startTime} and DATE(create_time) <= #{statisticsQueryDto.endTime} </if> group by source_name
