From 10de85f85ad0874b2d93c851bb4d3eacab24a183 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 21 八月 2024 14:45:25 +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 | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 41f55e8..b01fb9f 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
@@ -7,14 +7,12 @@
import com.ruoyi.account.api.model.TAppCoupon;
import com.ruoyi.account.api.model.TAppUserCar;
import com.ruoyi.account.api.query.ExchangeRecordGoodsQuery;
-import com.ruoyi.account.api.vo.CarListVO;
-import com.ruoyi.account.api.vo.CouponListVOVO;
+import com.ruoyi.other.api.vo.CouponListVOVO;
import com.ruoyi.account.api.vo.ExchangeRecordVO;
import com.ruoyi.account.service.TAppCouponService;
import com.ruoyi.account.service.TAppUserCarService;
import com.ruoyi.chargingPile.api.feignClient.ChargingPileClient;
import com.ruoyi.chargingPile.api.vo.SiteInfoVO;
-import com.ruoyi.chargingPile.api.feignClient.ChargingPileClient;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
@@ -28,6 +26,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@@ -71,9 +70,9 @@
* 查询用户可用优惠券数量
* @return
*/
- @ApiOperation(value = "通过桩编号获取电站详情", tags = {"小程序-扫一扫"})
+ @ApiOperation(value = "通过桩编号和预付金额获取电站详情", tags = {"小程序-扫一扫"})
@GetMapping(value = "/scan/siteInfo")
- public AjaxResult<SiteInfoVO> siteInfo(String number) {
+ public AjaxResult<SiteInfoVO> siteInfo(String number,BigDecimal money) {
SiteInfoVO data = chargingPileClient.getSiteInfoByNumber(number).getData();
List<TAppUserCar> cars = appUserCarService.list(new QueryWrapper<TAppUserCar>()
.eq("app_user_id",tokenService.getLoginUserApplet().getUserId())
@@ -95,6 +94,15 @@
}
}
}
+ BigDecimal electrovalence = data.getElectrovalence();
+ 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);
+ // 优惠金额
+ data.setMoney(subtract.multiply(vipElectrovalence).setScale(2, BigDecimal.ROUND_HALF_UP));
return AjaxResult.ok(data);
}
/**
--
Gitblit v1.7.1