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/service/TAccountingStrategyDetailService.java | 6 +++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 1
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/CouponController.java | 8 ++--
ruoyi-api/ruoyi-api-integration/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 3 +
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 5 +-
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 7 ++-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java | 8 ++--
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/ParkingOrderController.java | 12 +++---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java | 36 ++++++++++--------
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java | 2
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java | 9 ++++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java | 2
12 files changed, 60 insertions(+), 39 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-integration/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-integration/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index e9bb146..3e8f391 100644
--- a/ruoyi-api/ruoyi-api-integration/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/ruoyi-api/ruoyi-api-integration/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -6,4 +6,5 @@
com.ruoyi.integration.api.factory.PlatformStopChargingReplyFallbackFactory
com.ruoyi.integration.api.factory.SwitchwayGateFallbackFactory
com.ruoyi.integration.api.factory.IotInterfaceFallbackFactory
-com.ruoyi.integration.api.factory.SecurityDetectionFallbackFactory
\ No newline at end of file
+com.ruoyi.integration.api.factory.SecurityDetectionFallbackFactory
+com.ruoyi.integration.api.factory.BmsDemandAndChargerExportationFallbackFactory
\ No newline at end of file
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 3f0099d..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
@@ -137,11 +137,11 @@
BigDecimal vipElectrovalence = data.getVipElectrovalence();
// 计算预付金额能充多少度普通电
BigDecimal divide1 = money.divide(electrovalence, 2, BigDecimal.ROUND_HALF_UP);
- // 计算冲会员电能充多少度会员电
- BigDecimal divide = money.divide(vipElectrovalence, 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(electrovalence.subtract(vipElectrovalence)).setScale(2, BigDecimal.ROUND_HALF_UP));
+ data.setMoney(electrovalence.multiply(divide1).subtract(vipMoney).setScale(2, BigDecimal.ROUND_DOWN));
return AjaxResult.ok(data);
}
/**
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 f45575b..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
@@ -411,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")
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
index 5661ba5..cc41020 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
@@ -90,7 +90,7 @@
@ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理", "管理后台-充电桩信息"},value = "查询计费策略明细列表")
@GetMapping(value = "/queryAccountingStrategyDetailByStrategyId")
public AjaxResult<List<TAccountingStrategyDetailVO>> queryAccountingStrategyDetailByStrategyId(@RequestParam("strategyId") Integer strategyId) {
- List<TAccountingStrategyDetailVO> list = accountingStrategyDetailService.queryAccountingStrategyDetailByStrategyId(strategyId);
+ List<TAccountingStrategyDetailVO> list = accountingStrategyDetailService.queryMangementAccountingStrategyDetailByStrategyId(strategyId);
list.forEach(detail -> {
detail.setTotalPrice(detail.getElectrovalence().add(detail.getServiceCharge()));
});
@@ -270,8 +270,9 @@
String twoUserName = sysUserClient.getSysUser(accountingStrategy.getTwoUserId()).getData().getNickName();
accountingStrategyVO.setTwoUserName(twoUserName);
}
- if(null != children.getUserId()){
- String userName = sysUserClient.getSysUser(children.getUserId()).getData().getNickName();
+ TAccountingStrategy accountingStrategy1 = accountingStrategyService.getById(id);
+ if(null != accountingStrategy1.getUserId()){
+ String userName = sysUserClient.getSysUser(accountingStrategy1.getUserId()).getData().getNickName();
accountingStrategyVO.setUserName(userName);
}
accountingStrategyVO.setAccountingStrategyDetailList(accountingStrategyDetailService.list(Wrappers.lambdaQuery(TAccountingStrategyDetail.class)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java
index 5d91a4c..f980197 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java
@@ -203,7 +203,7 @@
List<Map<String, Object>> charMap = new ArrayList<>();
- // 生成从 "00:00" 到 "23:00" 的时间数据
+ // 生成从 "00:00" 到 "23:00" 的时间数据-------
for (int hour = 0; hour < 24; hour++) {
String time = String.format("%02d:00", hour);
Map<String, Object> mapWithTimeValue = findMapWithTimeValue(maps, time);
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java
index 367d6da..8053714 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java
@@ -96,5 +96,5 @@
* @param query
* @return
*/
- List<SiteVO> getMapSiteList(SiteQuery query);
+ List<SiteVO> getMapSiteList(SiteQuery query,Integer isLogin);
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TAccountingStrategyDetailService.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TAccountingStrategyDetailService.java
index e644acd..811fa25 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TAccountingStrategyDetailService.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TAccountingStrategyDetailService.java
@@ -23,6 +23,12 @@
* @return
*/
List<TAccountingStrategyDetailVO> queryAccountingStrategyDetailByStrategyId(Integer strategyId);
+ /**
+ * 查询计费策略明细列表---后台
+ * @param strategyId
+ * @return
+ */
+ List<TAccountingStrategyDetailVO> queryMangementAccountingStrategyDetailByStrategyId(Integer strategyId);
/**
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
index 079b76d..eb8c190 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
@@ -293,21 +293,22 @@
public PageInfo<SiteVO> pageList(SiteQuery query,Integer isLogin) {
TAppUser appUser = null;
// 获取当前登录用户id
- Long userId = tokenService.getLoginUserApplet().getUserId();
+ TAppUserVipDetail data1 = null;
if(isLogin == 1){
+ Long userId = tokenService.getLoginUserApplet().getUserId();
// 根据id查询用户信息
appUser = appUserClient.getUserById(userId).getData();
+ GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
+ getAppUserVipDetail.setAppUserId(userId);
+ getAppUserVipDetail.setVipId(appUser.getVipId());
+ R<TAppUserVipDetail> appUserVipDetail = vipDetailClient.getAppUserVipDetail(getAppUserVipDetail);
+ data1 = appUserVipDetail.getData();
}
PageInfo<SiteVO> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
List<SiteVO> list = this.baseMapper.pageList(query,pageInfo);
if(Objects.nonNull(appUser) && Objects.nonNull(appUser.getVipId())){
// 查询会员信息
// TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
- GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
- getAppUserVipDetail.setAppUserId(userId);
- getAppUserVipDetail.setVipId(appUser.getVipId());
- R<TAppUserVipDetail> appUserVipDetail = vipDetailClient.getAppUserVipDetail(getAppUserVipDetail);
- TAppUserVipDetail data1 = appUserVipDetail.getData();
if(Objects.nonNull(data1)){
String vipJson = data1.getVipJson();
TVip vip = JSON.parseObject(vipJson, TVip.class);
@@ -388,25 +389,28 @@
}
@Override
- public List<SiteVO> getMapSiteList(SiteQuery query) {
+ public List<SiteVO> getMapSiteList(SiteQuery query,Integer isLogin) {
if(StringUtils.isEmpty(query.getLon()) || StringUtils.isEmpty(query.getLat())){
return new ArrayList<>();
}
-
+ TAppUser appUser = null;
// 获取当前登录用户id
- Long userId = tokenService.getLoginUserApplet().getUserId();
- // 根据id查询用户信息
- TAppUser appUser = appUserClient.getUserById(userId).getData();
- List<SiteVO> list = this.baseMapper.getMapSiteList(query);
- if(Objects.nonNull(appUser) && Objects.nonNull(appUser.getVipId())){
- // 查询会员信息
-// TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
+ TAppUserVipDetail data1 = null;
+ if(isLogin == 1){
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ // 根据id查询用户信息
+ appUser = appUserClient.getUserById(userId).getData();
GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
getAppUserVipDetail.setAppUserId(userId);
getAppUserVipDetail.setVipId(appUser.getVipId());
R<TAppUserVipDetail> appUserVipDetail = vipDetailClient.getAppUserVipDetail(getAppUserVipDetail);
- TAppUserVipDetail data1 = appUserVipDetail.getData();
+ data1 = appUserVipDetail.getData();
+ }
+ List<SiteVO> list = this.baseMapper.getMapSiteList(query);
+ if(Objects.nonNull(appUser) && Objects.nonNull(appUser.getVipId())){
+ // 查询会员信息
+// TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
if(Objects.nonNull(data1)){
String vipJson = data1.getVipJson();
TVip vip = JSON.parseObject(vipJson, TVip.class);
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java
index b5c657b..82450f6 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java
@@ -73,13 +73,20 @@
if(Objects.nonNull(data1)){
String vipJson = data1.getVipJson();
TVip vip = JSON.parseObject(vipJson, TVip.class);
- tAccountingStrategyDetailVO.setDiscount(vip.getDiscount().divide(new BigDecimal(10)));
+ if(Objects.nonNull(vip) && vip.getType() == 2){
+ tAccountingStrategyDetailVO.setDiscount(vip.getDiscount().divide(new BigDecimal(10)));
+ }
}
}
return tAccountingStrategyDetailVOS;
}
@Override
+ public List<TAccountingStrategyDetailVO> queryMangementAccountingStrategyDetailByStrategyId(Integer strategyId) {
+ return this.baseMapper.queryAccountingStrategyDetailByStrategyId(strategyId);
+ }
+
+ @Override
public List<TAccountingStrategyDetailVO> queryStrategyBySiteIdAndTime(Integer siteId) {
Site site = siteService.getById(siteId);
TAccountingStrategy accountingStrategy = accountingStrategyMapper.selectById(site.getAccountingStrategyId());
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/CouponController.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/CouponController.java
index 13579c4..30b9ded 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/CouponController.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/CouponController.java
@@ -33,8 +33,8 @@
*/
@ResponseBody
@PostMapping("/getCoupon")
- public BaseResponse<GetCouponResp> getCoupon(@RequestBody GetCouponReq req){
- log.warn("停车获取优惠券请求参数：{}" + JSON.toJSONString(req));
+ public BaseResponse<GetCouponResp> getCoupon(GetCouponReq req){
+ log.warn("停车获取优惠券请求参数：{}", JSON.toJSONString(req));
GetCouponResp coupon = couponService.getCoupon(req);
return BaseResponse.ok(coupon);
}
@@ -47,8 +47,8 @@
*/
@ResponseBody
@PostMapping("/usedCoupon")
- public BaseResponse usedCoupon(@RequestBody UsedCoupon req){
- log.warn("停车使用优惠券请求参数：{}" + JSON.toJSONString(req));
+ public BaseResponse usedCoupon(UsedCoupon req){
+ log.warn("停车使用优惠券请求参数：{}", JSON.toJSONString(req));
couponService.usedCoupon(req);
return BaseResponse.ok();
}
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/ParkingOrderController.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/ParkingOrderController.java
index 9c595c4..1e90bd8 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/ParkingOrderController.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/controller/ParkingOrderController.java
@@ -28,7 +28,7 @@
@ResponseBody
@PostMapping("/cloudParkingInOrder")
public BaseResponse cloudParkingInOrder(@RequestBody CloudParkingOrder order){
- log.warn("云停车入场请求参数：{}" + JSON.toJSONString(order));
+ log.warn("云停车入场请求参数：{}", JSON.toJSONString(order));
parkingOrderService.cloudParkingInOrder(order);
return BaseResponse.ok();
}
@@ -41,7 +41,7 @@
@ResponseBody
@PostMapping("/cloudParkingOutOrder")
public BaseResponse cloudParkingOutOrder(@RequestBody CloudParkingOrder order){
- log.warn("云停车出场请求参数：{}" + JSON.toJSONString(order));
+ log.warn("云停车出场请求参数：{}", JSON.toJSONString(order));
parkingOrderService.cloudParkingOutOrder(order);
return BaseResponse.ok();
}
@@ -54,7 +54,7 @@
@ResponseBody
@PostMapping("/cloudParkingSpace")
public BaseResponse cloudParkingSpace(@RequestBody CloudParkingSpace parkingSpace){
- log.warn("云停车实时车位请求参数：{}" + JSON.toJSONString(parkingSpace));
+ log.warn("云停车实时车位请求参数：{}", JSON.toJSONString(parkingSpace));
parkingOrderService.cloudParkingSpace(parkingSpace);
return BaseResponse.ok();
}
@@ -68,7 +68,7 @@
@ResponseBody
@PostMapping("/offlineParkingInOrder")
public BaseResponse offlineParkingInOrder(@RequestBody OfflineParkingOrder order){
- log.warn("线下停车场入场请求参数：{}" + JSON.toJSONString(order));
+ log.warn("线下停车场入场请求参数：{}", JSON.toJSONString(order));
parkingOrderService.offlineParkingInOrder(order);
OfflineParkingResponse offlineParkingResponse = new OfflineParkingResponse();
offlineParkingResponse.setCode(0);
@@ -85,7 +85,7 @@
@ResponseBody
@PostMapping("/offlineParkingOutOrder")
public BaseResponse offlineParkingOutOrder(@RequestBody OfflineParkingOrder order){
- log.warn("线下停车场出场请求参数：{}" + JSON.toJSONString(order));
+ log.warn("线下停车场出场请求参数：{}", JSON.toJSONString(order));
parkingOrderService.offlineParkingOutOrder(order);
OfflineParkingResponse offlineParkingResponse = new OfflineParkingResponse();
offlineParkingResponse.setCode(0);
@@ -102,7 +102,7 @@
@ResponseBody
@PostMapping("/offlineParkingSpace")
public BaseResponse offlineParkingSpace(@RequestBody OfflineParkingSpace parkingSpace){
- log.warn("线下停车场实时车位请求参数：{}" + JSON.toJSONString(parkingSpace));
+ log.warn("线下停车场实时车位请求参数：{}", JSON.toJSONString(parkingSpace));
parkingOrderService.offlineParkingSpace(parkingSpace);
return BaseResponse.ok();
}
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 82ac2b3..87ac655 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
@@ -289,6 +289,7 @@
for (UploadRealTimeMonitoringData uploadRealTimeMonitoringData : dataList) {
if(!sdf.format(uploadRealTimeMonitoringData.getCreate_time()).equals(t)){
dataLists.add(uploadRealTimeMonitoringData);
+ t = sdf.format(uploadRealTimeMonitoringData.getCreate_time());
}
}
--
Gitblit v1.7.1