ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java
@@ -14,7 +14,6 @@ public class ChargingOrderListVO { @ApiModelProperty(value = "电站名称") private String siteName; @ApiModelProperty(value = "订单状态") private Integer status; @ApiModelProperty(value = "充值支付方式（1=微信，2=支付宝）") @@ -49,10 +48,14 @@ private BigDecimal chargingCapacity; @ApiModelProperty(value = "充电电流 度") private BigDecimal electricity; @ApiModelProperty(value = "充电支付金额") private BigDecimal rechargeAmount; @ApiModelProperty(value = "充电到账金额") private BigDecimal orderAmount; @ApiModelProperty(value = "会员抵扣金额") private BigDecimal vipDiscountAmount; @ApiModelProperty(value = "退款金额") private BigDecimal refundAmount; @ApiModelProperty(value = "车牌号") private String licensePlate; @ApiModelProperty(value = "客户手机号") @@ -67,8 +70,6 @@ private BigDecimal serviceCharge; @ApiModelProperty(value = "平台手续费") private BigDecimal commissionAmount; @ApiModelProperty(value = "平台手续费") private BigDecimal rechargeAmount; @ApiModelProperty(value = "引流平台") private String tripartitePlatformName; @ApiModelProperty(value = "平台分佣") ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -27,10 +27,7 @@ import com.ruoyi.order.api.vo.ChargingOrderTimeVO; import com.ruoyi.order.api.vo.SettlementTotalVO; import com.ruoyi.order.export.TChargingOrderExport; import com.ruoyi.order.service.AccountingStrategyOrderService; import com.ruoyi.order.service.TChargingOrderAccountingStrategyService; import com.ruoyi.order.service.TChargingOrderService; import com.ruoyi.order.service.TSettlementConfirmService; import com.ruoyi.order.service.*; import com.ruoyi.order.vo.ChargingOrderListInfoVO; import com.ruoyi.other.api.domain.TVip; import com.ruoyi.other.api.feignClient.VipClient; @@ -69,6 +66,9 @@ @Resource private TChargingOrderService chargingOrderService; @Resource private TChargingOrderRefundService chargingOrderRefundService; @Resource private TSettlementConfirmService tSettlementConfirmService; @Resource @@ -121,8 +121,7 @@ List<Partner> data7 = siteClient.getAllPartner().getData(); List<AccountingStrategyOrder> listAll = accountingStrategyOrderService.lambdaQuery() .list(); List<TChargingOrderAccountingStrategy> stageCostAll = tChargingOrderAccountingStrategyService.list( ); List<TChargingOrderAccountingStrategy> stageCostAll = tChargingOrderAccountingStrategyService.list(); List<TVip> data5 = vipClient.getAllVip().getData(); List<TAppUserCar> data8 = appUserCarClient.getAllCar().getData(); for (ChargingOrderListVO chargingOrderListVO : exportList) { @@ -230,6 +229,8 @@ long between = ChronoUnit.SECONDS.between(startTime, endTime); tChargingOrderExport.setCumulativeChargingTime((between*60)+""); } tChargingOrderExport.setRechargeAmount(chargingOrderListVO.getRechargeAmount().toString()); tChargingOrderExport.setRefundAmount(chargingOrderListVO.getRefundAmount().toString()); tChargingOrderExport.setStartSoc(chargingOrderListVO.getStartSoc()); tChargingOrderExport.setEndtSoc(chargingOrderListVO.getEndSoc()); tChargingOrderExport.setIsSoc("否"); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/TChargingOrderExport.java
@@ -79,6 +79,10 @@ private String serviceChargePriceLook; @Excel(name = "充电时长(分钟)",width = 30) private String cumulativeChargingTime; @Excel(name = "充值金额",width = 30) private String rechargeAmount; @Excel(name = "退款金额",width = 30) private String refundAmount; @Excel(name = "充电前面soc",width = 30) private String startSoc; @Excel(name = "充电后soc",width = 30) ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1826,9 +1826,7 @@ dto.setSiteIds(siteIds); PageInfo<ChargingOrderListVO> pageInfo = new PageInfo<>(dto.getPageCurr(), dto.getPageSize()); List<ChargingOrderListVO> list = this.baseMapper.chargingList(pageInfo, dto, startTime1, startTime2, endTime1, endTime2); List<Integer> siteIdsList = list.stream().map(ChargingOrderListVO::getSiteId).collect(Collectors.toList()); if (siteIdsList.isEmpty()) siteIdsList.add(-1); List<Site> sites = siteClient.getSiteByIds(siteIdsList).getData(); List<Site> sites = siteClient.getSiteAll().getData(); for (ChargingOrderListVO chargingOrderListVO : list) { if (roleType == 2) { ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -952,7 +952,12 @@ </select> <select id="chargingList" resultType="com.ruoyi.order.api.vo.ChargingOrderListVO"> select t1.*, t1.current as chargingCapacity,t1.payment_amount as paymentAmount,t1.electricity as chargingCapacity from t_charging_order t1 t1.current as chargingCapacity, t1.payment_amount as paymentAmount, t1.electricity as chargingCapacity, ifnull(t2.refund_amount, 0) as refundAmount from t_charging_order t1 left join t_charging_order_refund t2 on t1.id = t2.charging_order_id where t1.del_flag = 0 and t1.status = 5 and t1.recharge_payment_status = 2 <if test="null != req.code and req.code!=''"> and t1.code LIKE CONCAT('%',#{req.code},'%')
