From 06e4db5a576c63c10ab4673dba017ffe1a3e7e66 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 17 一月 2025 19:07:27 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
index 7944129..66cbddc 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
@@ -122,13 +122,13 @@
// 没有充电订单 展示最新添加的车辆
data.setLicensePlate(cars.get(0).getLicensePlate());
data.setVehicleBrand(cars.get(0).getVehicleBrand());
- data.setId(cars.get(0).getId());
+ data.setId(cars.get(0).getId().toString());
}else{
for (TAppUserCar car : cars) {
if (car.getId().equals(data1)){
data.setLicensePlate(car.getLicensePlate());
data.setVehicleBrand(car.getVehicleBrand());
- data.setId(car.getId());
+ data.setId(car.getId().toString());
}
}
}
@@ -137,11 +137,11 @@
BigDecimal vipElectrovalence = data.getVipElectrovalence();
// 计算预付金额能充多少度普通电
BigDecimal divide1 = money.divide(electrovalence, 2, BigDecimal.ROUND_HALF_UP);
- // 计算冲会员电能充多少度会员电
- BigDecimal divide = vipElectrovalence.divide(electrovalence, 2, BigDecimal.ROUND_HALF_UP);
- BigDecimal subtract = divide.subtract(divide1);
+ // 计算冲会员充电需要多少钱
+ BigDecimal vipMoney = divide1.multiply(vipElectrovalence).setScale(2,BigDecimal.ROUND_HALF_UP);
+// BigDecimal subtract = divide.subtract(divide1);
// 优惠金额
- data.setMoney(subtract.multiply(vipElectrovalence).setScale(2, BigDecimal.ROUND_HALF_UP));
+ data.setMoney(electrovalence.multiply(divide1).subtract(vipMoney).setScale(2, BigDecimal.ROUND_DOWN));
return AjaxResult.ok(data);
}
/**
@@ -164,6 +164,7 @@
public R<List<TAppUserCar>> carList() {
List<TAppUserCar> appUserId = appUserCarService.list(new QueryWrapper<TAppUserCar>()
.eq("app_user_id",tokenService.getLoginUserApplet().getUserId()));
+ appUserId.forEach(s->s.setId_(s.getId().toString()));
return R.ok(appUserId);
}
--
Gitblit v1.7.1