diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java index a281b4d7f..265f66c8b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java @@ -10,10 +10,8 @@ import com.jsowell.common.response.RestApiResponse; import com.jsowell.pile.domain.ykcCommond.RemoteControlGroundLockCommand; import com.jsowell.pile.dto.QueryConnectorListDTO; import com.jsowell.pile.dto.QueryStationDTO; -import com.jsowell.pile.service.IPileBasicInfoService; -import com.jsowell.pile.service.IPileConnectorInfoService; -import com.jsowell.pile.service.IPileStationInfoService; -import com.jsowell.pile.service.YKCPushCommandService; +import com.jsowell.pile.service.*; +import com.jsowell.pile.vo.uniapp.BillingPriceVO; import com.jsowell.pile.vo.uniapp.GroundLockInfoVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -43,6 +41,9 @@ public class PileController extends BaseController { @Autowired private IPileBasicInfoService pileBasicInfoService; + @Autowired + private IPileBillingTemplateService pileBillingTemplateService; + /** * 查询充电站信息列表(主页) @@ -67,6 +68,27 @@ public class PileController extends BaseController { return response; } + /** + * 通过站点id查询计费模板列表 + * http://localhost:8080/uniapp/pile/queryBillingPrice/{stationId} + * @param stationId + * @return + */ + @GetMapping("/queryBillingPrice/{stationId}") + public RestApiResponse queryBillingPrice(@PathVariable("stationId") String stationId) { + logger.info("通过站点id查询计费模板列表 params:{}", stationId); + RestApiResponse response = null; + try { + List billingPriceVOList = pileBillingTemplateService.queryBillingPrice(stationId); + response = new RestApiResponse<>(billingPriceVOList); + } catch (Exception e) { + logger.error("通过站点id查询计费模板列表 error, ", e); + response = new RestApiResponse<>(e); + } + logger.info("通过站点id查询计费模板列表 result:{}", response); + return response; + } + /** * 通过前端参数查询充电枪口列表 * diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java index 2bb1c7478..a5414d4f4 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java @@ -264,8 +264,8 @@ public class TempController extends BaseController { * @param dto * @return */ - @PostMapping("/batchRefund") - public RestApiResponse batchRefund(@RequestBody ApplyRefundDTO dto) { + @PostMapping("/batchWechatRefund") + public RestApiResponse batchWechatRefund(@RequestBody ApplyRefundDTO dto) { logger.info("批量退款接口 params:{}", JSONObject.toJSONString(dto)); RestApiResponse response = null; List memberIdList = dto.getMemberIdList(); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java index 8d521d97d..00b851cfa 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java @@ -520,6 +520,11 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi return resultList; } + /** + * 通过站点id查询计费模板列表 + * @param stationId 站点id + * @return + */ @Override public List queryBillingPrice(String stationId) { // 查询站点当前计费模板 有缓存