From 60688f1573eadd0c76dea6b94e684bf363bd99ab Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 03 九月 2025 12:08:33 +0800
Subject: [PATCH] 修改手动推送订单
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 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 426df03..e0e8174 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
@@ -31,6 +31,7 @@
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.log.enums.OperatorType;
import com.ruoyi.common.security.annotation.Logical;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.service.TokenService;
@@ -127,6 +128,7 @@
* @param number
* @return
*/
+ @Log(title = "【扫一扫】通过桩编号获取电站信息", businessType = BusinessType.OTHER,operatorType = OperatorType.MOBILE)
@GetMapping("/getSiteInfoByNumber")
@ApiOperation(value = "扫一扫后通过桩编号获取电站信息", tags = {"小程序-扫一扫"})
public R<SiteInfoVO> getSiteInfoByNumber(@RequestParam("number") String number){
@@ -155,6 +157,7 @@
}else {
siteInfoVO.setVipElectrovalence((tAccountingStrategyDetail.getServiceCharge().add(tAccountingStrategyDetail.getElectrovalence())).setScale(4, BigDecimal.ROUND_HALF_UP));
}
+ TVip vip = null;
if(Objects.nonNull(appUser)){
// TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
@@ -164,11 +167,12 @@
TAppUserVipDetail data1 = appUserVipDetail.getData();
if(Objects.nonNull(data1)){
String vipJson = data1.getVipJson();
- 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()));
- }
+ 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()));
}
}
}
@@ -455,7 +459,6 @@
int isLogin = StringUtils.isEmpty(SecurityUtils.getToken(request)) ? 0 : 1;
return AjaxResult.success(siteService.pageList(query,isLogin));
}
-
@ApiOperation(value = "获取站点列表", tags = {"小程序-站点管理-地图导航站点"})
@@ -464,6 +467,8 @@
int isLogin = StringUtils.isEmpty(SecurityUtils.getToken(request)) ? 0 : 1;
return AjaxResult.success(siteService.getMapSiteList(query,isLogin));
}
+
+
@ApiOperation(value = "获取站点详细信息", tags = {"小程序-站点管理-站点详情"})
@PostMapping("/getDetailById")
public AjaxResult<SiteDetailVO> getDetailById(@Validated @RequestBody SiteDetailQuery query){
@@ -484,7 +489,8 @@
}
return AjaxResult.success(siteDetailVO);
}
-
+
+
@ApiOperation(value = "获取站点下充电桩及充电枪列表", tags = {"小程序-站点管理-站点详情"})
@GetMapping("/getChargingGunList")
public AjaxResult<List<TChargingPileVO>> getChargingGunList(@RequestParam(value = "siteId")@ApiParam(value = "站点id", required = true)Integer siteId,
@@ -497,6 +503,7 @@
public AjaxResult<Map<String,ChargingGunCountVO>> getChargingGunCount(@RequestParam(value = "siteId")@ApiParam(value = "站点id", required = true)Integer siteId){
return AjaxResult.success(chargingGunService.getChargingGunCount(siteId));
}
+
@ApiOperation(value = "获取站点下充电枪数量统计", tags = {"小程序-站点管理-站点详情"})
@GetMapping("/getChargingGunCount1")
@@ -635,4 +642,17 @@
.ne(Site::getSiteType, 2).page(pageInfo);
return page;
}
+ /**
+ * 分页查询站电数据
+ * @param PageNo
+ * @param PageSize
+ * @return
+ */
+ @PostMapping("/getSiteListPagingJianGuan")
+ public PageInfo<Site> getSiteListPagingJianGuan(@RequestParam("PageNo") Integer PageNo, @RequestParam("PageSize") Integer PageSize,
+ @RequestParam("ids") List<String> ids){
+ PageInfo<Site> pageInfo = new PageInfo<>(PageNo, PageSize);
+ PageInfo<Site> page = siteService.lambdaQuery().eq(Site::getStatus, 1).in(ids.size() > 0, Site::getId, ids).page(pageInfo);
+ return page;
+ }
}
--
Gitblit v1.7.1