From 975903e2a5727c2d65c5c162c9ff4d6cba7503a1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 26 九月 2024 18:02:23 +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 |    4 +++-
 1 files changed, 3 insertions(+), 1 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 34355e1..0efa30d 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
@@ -107,7 +107,7 @@
 	 * @param number
 	 * @return
 	 */
-	@PostMapping("/getSiteInfoByNumber")
+	@GetMapping("/getSiteInfoByNumber")
 	@ApiOperation(value = "扫一扫后通过桩编号获取电站信息", tags = {"小程序-扫一扫"})
 	public R<SiteInfoVO> getSiteInfoByNumber(@RequestParam("number") String number){
 		SiteInfoVO siteInfoVO = new SiteInfoVO();
@@ -122,11 +122,13 @@
 				siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence().multiply(byId1.getDiscount()).setScale(4, BigDecimal.ROUND_HALF_UP));
 			}
 		}
+		siteInfoVO.setChargingPileId(one.getId());
 		siteInfoVO.setName(byId.getName());
 		siteInfoVO.setNumber(one.getNumber().toString());
 		siteInfoVO.setSpaceChargeExplain(byId.getSpaceChargeExplain());
 		return R.ok(siteInfoVO);
 	}
+
 	
 	@GetMapping("/getSiteList")
 	@ApiOperation(value = "获取站点列表", tags = {"管理后台-站点管理"})

--
Gitblit v1.7.1