java/mx_charging_pile.git

			@@ -31,6 +31,7 @@
			import com.ruoyi.order.api.model.TChargingOrder;
			import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;
			import com.ruoyi.order.api.model.TChargingOrderRefund;
			import com.ruoyi.order.api.model.TOrderEvaluate;
			import com.ruoyi.order.api.query.ChargingOrderQuery;
			import com.ruoyi.order.api.vo.ChargingOrderVO;
			import com.ruoyi.order.api.vo.TCharingOrderVO;
			@@ -38,6 +39,7 @@
			import com.ruoyi.order.mapper.TChargingOrderMapper;
			import com.ruoyi.order.service.TChargingOrderAccountingStrategyService;
			import com.ruoyi.order.service.TChargingOrderService;
			import com.ruoyi.order.service.TOrderEvaluateService;
			import com.ruoyi.payment.api.feignClient.AliPaymentClient;
			import com.ruoyi.payment.api.feignClient.WxPaymentClient;
			import com.ruoyi.payment.api.vo.*;
			@@ -110,6 +112,9 @@
			@Resource
			private SendMessageClient sendMessageClient;

			@Resource
			private TOrderEvaluateService orderEvaluateService;




			@@ -140,6 +145,9 @@
			BigDecimal payMoney = tChargingOrder.getStatus() < 4 ? tChargingOrder.getRechargeAmount() : tChargingOrder.getPaymentAmount();
			myChargingOrderList.setPayMoney(payMoney);
			myChargingOrderList.setCreateTime(tChargingOrder.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
			long count = orderEvaluateService.count(new LambdaQueryWrapper<TOrderEvaluate>().eq(TOrderEvaluate::getOrderType, 1)
			.eq(TOrderEvaluate::getOrderId, tChargingOrder.getId()).eq(TOrderEvaluate::getDelFlag, 0));
			myChargingOrderList.setEvaluate(count + 1L);
			orderLists.add(myChargingOrderList);
			}
			list = this.baseMapper.getMyChargingOrderList(appUserId, query.getType(), null, null);
			@@ -248,6 +256,8 @@
			BigDecimal payMoney = tChargingOrder.getStatus() < 4 ? tChargingOrder.getRechargeAmount() : tChargingOrder.getPaymentAmount();
			myChargingOrderList.setPayMoney(payMoney);
			myChargingOrderList.setCreateTime(tChargingOrder.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
			myChargingOrderList.setElectricCharge(tChargingOrder.getElectrovalence());
			myChargingOrderList.setServiceCharge(tChargingOrder.getServiceCharge());
			list.add(myChargingOrderList);
			}
			return list;

	ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/MyChargingOrderList.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -161,5 +161,11 @@
			@TableField("pay_time")
			private LocalDateTime payTime;

			@ApiModelProperty(value = "累计服务费")
			@TableField("service_charge")
			private BigDecimal serviceCharge;

			@ApiModelProperty(value = "累计电费")
			@TableField("electrovalence")
			private BigDecimal electrovalence;
			}

			@@ -32,7 +32,7 @@
			@ApiModelProperty("订单时间")
			private String createTime;
			@ApiModelProperty("评价状态（1=待评价，2=已评价）")
			private Integer evaluate;
			private Long evaluate;
			@ApiModelProperty("电费")
			private BigDecimal electricCharge;
			@ApiModelProperty("服务费")