From f91bb885d680d3f30cbf1bcffdd6819b3b10e6b1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 01 十一月 2024 21:03:36 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
index 8b3b6ac..c4aa46d 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
@@ -144,6 +144,11 @@
Long userId = tokenService.getLoginUserApplet().getUserId();
// 根据id查询用户信息
TAppUser appUser = appUserClient.getUserById(userId).getData();
+ if(Objects.nonNull(byId1.getDiscount())){
+ siteInfoVO.setVipElectrovalence((tAccountingStrategyDetail.getServiceCharge().multiply(byId1.getDiscount()).add(tAccountingStrategyDetail.getElectrovalence())).setScale(4, BigDecimal.ROUND_HALF_UP));
+ }else {
+ siteInfoVO.setVipElectrovalence((tAccountingStrategyDetail.getServiceCharge().add(tAccountingStrategyDetail.getElectrovalence())).setScale(4, BigDecimal.ROUND_HALF_UP));
+ }
if(Objects.nonNull(appUser)){
// TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
@@ -156,14 +161,8 @@
TVip vip = JSON.parseObject(vipJson, TVip.class);
if(Objects.nonNull(vip) && vip.getType() == 2){
siteInfoVO.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(tAccountingStrategyDetail.getServiceCharge()).add(tAccountingStrategyDetail.getElectrovalence()));
- }else {
- siteInfoVO.setVipElectrovalence((tAccountingStrategyDetail.getServiceCharge().multiply(byId1.getDiscount()).add(tAccountingStrategyDetail.getElectrovalence())).setScale(4, BigDecimal.ROUND_HALF_UP));
}
- }else {
- siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence().add(tAccountingStrategyDetail.getServiceCharge()).setScale(4, BigDecimal.ROUND_HALF_UP));
}
- }else {
- siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence().add(tAccountingStrategyDetail.getServiceCharge()).setScale(4, BigDecimal.ROUND_HALF_UP));
}
}
}
@@ -196,6 +195,11 @@
Long userId = tokenService.getLoginUserApplet().getUserId();
// 根据id查询用户信息
TAppUser appUser = appUserClient.getUserById(userId).getData();
+ if(Objects.nonNull(byId1.getDiscount())){
+ siteInfoVO.setVipElectrovalence((tAccountingStrategyDetail.getServiceCharge().multiply(byId1.getDiscount()).add(tAccountingStrategyDetail.getElectrovalence())).setScale(4, BigDecimal.ROUND_HALF_UP));
+ }else {
+ siteInfoVO.setVipElectrovalence((tAccountingStrategyDetail.getServiceCharge().add(tAccountingStrategyDetail.getElectrovalence())).setScale(4, BigDecimal.ROUND_HALF_UP));
+ }
if(Objects.nonNull(appUser)){
// TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
@@ -208,14 +212,8 @@
TVip vip = JSON.parseObject(vipJson, TVip.class);
if(Objects.nonNull(vip) && vip.getType() == 2){
siteInfoVO.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(tAccountingStrategyDetail.getServiceCharge()).add(tAccountingStrategyDetail.getElectrovalence()));
- }else{
- siteInfoVO.setVipElectrovalence((tAccountingStrategyDetail.getServiceCharge().multiply(byId1.getDiscount()).add(tAccountingStrategyDetail.getElectrovalence())).setScale(4, BigDecimal.ROUND_HALF_UP));
}
- }else {
- siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence().add(tAccountingStrategyDetail.getServiceCharge()).setScale(4, BigDecimal.ROUND_HALF_UP));
}
- }else {
- siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence().add(tAccountingStrategyDetail.getServiceCharge()).setScale(4, BigDecimal.ROUND_HALF_UP));
}
}
}
@@ -413,8 +411,9 @@
@ApiOperation(value = "获取站点列表", tags = {"小程序-站点管理-地图导航站点"})
@PostMapping("/getMapSiteList")
- public AjaxResult<List<SiteVO>> getMapSiteList(@Validated @RequestBody SiteQuery query){
- return AjaxResult.success(siteService.getMapSiteList(query));
+ public AjaxResult<List<SiteVO>> getMapSiteList(@Validated @RequestBody SiteQuery query, HttpServletRequest request){
+ int isLogin = StringUtils.isEmpty(SecurityUtils.getToken(request)) ? 0 : 1;
+ return AjaxResult.success(siteService.getMapSiteList(query,isLogin));
}
@ApiOperation(value = "获取站点详细信息", tags = {"小程序-站点管理-站点详情"})
@PostMapping("/getDetailById")
--
Gitblit v1.7.1