From caa2b51bb4133f5a2e59eac242e744fb57f864a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 10 九月 2024 13:01:44 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 105 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 95 insertions(+), 10 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 8183576..511676a 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -644,7 +644,7 @@
model.setOut_trade_no(chargingOrder.getCode());
model.setOut_refund_no(chargingOrderRefund.getRefundCode());
model.setReason("充电失败，取消充电订单");
- model.setNotify_url("http://127.0.0.1:9000/order/t-charging-order/chargingOrderStartupFailureWxRefund");
+ model.setNotify_url("http://221.182.45.100:9000/order/t-charging-order/chargingOrderStartupFailureWxRefund");
WxPaymentRefundModel.RefundAmount amount = new WxPaymentRefundModel.RefundAmount();
amount.setRefund(rechargeAmount.multiply(new BigDecimal(100)).intValue());
amount.setTotal(rechargeAmount.multiply(new BigDecimal(100)).intValue());
@@ -954,7 +954,7 @@
model.setOut_trade_no(chargingOrder.getCode());
model.setOut_refund_no(chargingOrderRefund.getRefundCode());
model.setReason("充电完成退款");
- model.setNotify_url("http://127.0.0.1:9000/order/t-charging-order/chargingOrderStartupFailureWxRefund");
+ model.setNotify_url("http://221.182.45.100:9000/order/t-charging-order/chargingOrderStartupFailureWxRefund");
WxPaymentRefundModel.RefundAmount amount = new WxPaymentRefundModel.RefundAmount();
amount.setRefund(refundAmount.multiply(new BigDecimal(100)).intValue());
amount.setTotal(rechargeAmount.multiply(new BigDecimal(100)).intValue());
@@ -1125,32 +1125,32 @@
}
@Override
- public Map<String, BigDecimal> countAll(LocalDate sixBefore) {
+ public Map<String, Object> countAll(LocalDate sixBefore) {
return this.baseMapper.countAll(sixBefore);
}
@Override
- public List<Map<String, BigDecimal>> getSumByType(List<Long> chargingOrderIds) {
+ public List<Map<String, Object>> getSumByType(List<Long> chargingOrderIds) {
return this.baseMapper.getSumByType(chargingOrderIds);
}
@Override
- public List<Map<String, BigDecimal>> getDateData(List<Long> chargingOrderIds) {
+ public List<Map<String, Object>> getDateData(List<Long> chargingOrderIds) {
return this.baseMapper.getDateData(chargingOrderIds);
}
@Override
- public List<Map<String, BigDecimal>> getWeekData(List<Long> chargingOrderIds) {
+ public List<Map<String, Object>> getWeekData(List<Long> chargingOrderIds) {
return this.baseMapper.getWeekData(chargingOrderIds);
}
@Override
- public List<Map<String, BigDecimal>> getMonthData(List<Long> chargingOrderIds) {
+ public List<Map<String, Object>> getMonthData(List<Long> chargingOrderIds) {
return this.baseMapper.getMonthData(chargingOrderIds);
}
@Override
- public List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds) {
+ public List<Map<String, Object>> getYearData(List<Long> chargingOrderIds) {
return this.baseMapper.getYearData(chargingOrderIds);
}
@Resource
@@ -1217,7 +1217,7 @@
carId.add(chargingOrderListVO.getAppUserCarId());
if (!carId.isEmpty()){
List<TAppUserCar> data4 = appUserCarClient.getCarByIds(carId).getData();
- if (!data4.isEmpty()) chargingOrderListVO.setLicensePlate(data4.get(0).getLicensePlate());
+ if (data4!=null && !data4.isEmpty()) chargingOrderListVO.setLicensePlate(data4.get(0).getLicensePlate());
}
}
if (data3 != null) chargingOrderListVO.setPhone(data3.getPhone());
@@ -1384,6 +1384,22 @@
TChargingOrder chargingOrder= this.getById(uid);
ChargingOrderListInfoVO chargingOrderListInfoVO = new ChargingOrderListInfoVO();
+ chargingOrderListInfoVO.setElectrovalence(chargingOrder.getElectrovalence());
+ chargingOrderListInfoVO.setServiceCharge(chargingOrder.getServiceCharge());
+ if (chargingOrder.getElectrovalence()!=null && chargingOrder.getServiceCharge()!=null){
+ chargingOrderListInfoVO.setTotal(chargingOrder.getElectrovalence().add(chargingOrder.getServiceCharge()));
+ }else{
+ chargingOrderListInfoVO.setTotal(new BigDecimal("0"));
+ }
+ if (chargingOrderListInfoVO.getTotal().compareTo(new BigDecimal("0"))>0){
+ if (chargingOrder.getCouponDiscountAmount()!=null&& chargingOrder.getVipDiscountAmount()!=null&& chargingOrder.getSharingAmount()!=null&& chargingOrder.getCommissionAmount()!=null){
+ chargingOrderListInfoVO.setRealTotal(chargingOrderListInfoVO.getTotal().subtract(chargingOrder.getCouponDiscountAmount()).subtract(chargingOrder.getVipDiscountAmount()).subtract(chargingOrder.getSharingAmount()).subtract(chargingOrder.getCommissionAmount()));
+ }else{
+ chargingOrderListInfoVO.setRealTotal(chargingOrderListInfoVO.getTotal());
+ }
+ }else{
+ chargingOrderListInfoVO.setRealTotal(new BigDecimal("0"));
+ }
chargingOrderListInfoVO.setCode(chargingOrder.getCode());
List<Site> data = siteClient.getSiteByIds(Arrays.asList(chargingOrder.getSiteId())).getData();
if (!data.isEmpty()){
@@ -1612,6 +1628,75 @@
endCharge(orderCode, 0);
}
+ @Override
+ public List<Map<String, Object>> getByDate(List<Long> chargingOrderIds) {
+ return this.baseMapper.getByDate(chargingOrderIds);
+ }
+
+ @Override
+ public List<Map<String, Object>> queryPower(List<Integer> siteIds) {
+ return this.baseMapper.queryPower(siteIds);
+ }
+
+ @Override
+ public Map<String, Object> qureryPowerLevel(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto) {
+ 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() {
+ return this.baseMapper.usersDay();
+ }
+
+ @Override
+ public List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto) {
+ return this.baseMapper.usersByQuery(statisticsQueryDto);
+ }
+
+ @Override
+ public List<Map<String, Object>> getUserTagCount() {
+ return this.baseMapper.getUserTagCount();
+ }
+
+ @Override
+ public List<Map<String, Object>> getVipCount() {
+ return this.baseMapper.getVipCount();
+ }
+
+ @Override
+ public List<Map<String, Object>> unitConsumption(ChargingStatisticsQueryDto statisticsQueryDto) {
+ return this.baseMapper.unitConsumption(statisticsQueryDto);
+ }
+
+ @Override
+ public List<Map<String, Object>> carUserMethod() {
+ return this.baseMapper.carUserMethod();
+ }
+
+ @Override
+ public List<Map<String, Object>> carUserBrand() {
+ return this.baseMapper.carUserBrand();
+ }
+
+ @Override
+ public Map<String, Object> countLocalCar() {
+ return this.baseMapper.countLocalCar();
+ }
+
+ @Override
+ public Long getAver(List<Integer> siteIds) {
+ return this.baseMapper.getAver(siteIds);
+ }
+
+ @Override
+ public List<Map<String, Object>> getLevelEvaluate(List<Integer> siteIds) {
+ return this.baseMapper.getLevelEvaluate(siteIds);
+ }
@Override
@@ -1640,7 +1725,7 @@
model.setOut_refund_no(chargingOrderRefund.getRefundCode());
model.setTransaction_id(tChargingOrder.getRechargeSerialNumber());
model.setReason("取消订单");
- model.setNotify_url("http://127.0.0.1:9000/order/t-shopping-order/cancelShoppingOrderWxRefund");
+ model.setNotify_url("http://221.182.45.100:9000/order/t-shopping-order/cancelShoppingOrderWxRefund");
WxPaymentRefundModel.RefundAmount amount = new WxPaymentRefundModel.RefundAmount();
amount.setRefund(payOrderQueryDto.getRefundAmount().multiply(new BigDecimal(100)).intValue());
amount.setTotal(tChargingOrder.getPaymentAmount().multiply(new BigDecimal(100)).intValue());
--
Gitblit v1.7.1