From 5a5b01fa9824a42e3eb033088a20e24c32b30dda Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 17 八月 2024 16:17:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingPileClient.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingPileClient.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingPileClient.java
index 7487856..b2e13b0 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingPileClient.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingPileClient.java
@@ -2,6 +2,7 @@
import com.ruoyi.chargingPile.api.factory.ChargingPileFallbackFactory;
import com.ruoyi.chargingPile.api.model.TChargingPile;
+import com.ruoyi.chargingPile.api.vo.SiteInfoVO;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.ApiOperation;
@@ -9,6 +10,7 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -23,7 +25,16 @@
*/
@ApiOperation(value = "管理后台-通过站点id获取充电桩列表 不分页")
@PostMapping(value = "/t-charging-pile/getChargingPileBySiteId")
- public R<List<TChargingPile>> getChargingPileBySiteId(@RequestParam("siteId") Integer siteId);
+ R<List<TChargingPile>> getChargingPileBySiteId(@RequestParam("siteId") Integer siteId);
+ /**
+ * 小程序远程调用 根据会员折扣、预付金额 计算服务费
+ * @return
+ */
+ @PostMapping(value = "/t-accounting-strategy/getServiceMoney")
+ R<BigDecimal> getServiceMoney(@RequestParam("param") String param);
+ @PostMapping("/site/getSiteInfoByNumber")
+ @ApiOperation(value = "扫一扫后通过桩编号获取电站信息", tags = {"小程序-扫一扫"})
+ R<SiteInfoVO> getSiteInfoByNumber(@RequestParam("number") String number);
}
--
Gitblit v1.7.1