From 6ee161de0a0ddf9dab91c525aa43fb87649281a2 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Wed, 4 Sep 2024 14:03:28 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=94=B5=E5=8D=95=E8=BD=A6=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jsowell/pile/dto/GenerateOrderDTO.java | 1 + .../com/jsowell/pile/mapper/PileBillingTemplateMapper.java | 4 +++- .../jsowell/pile/service/PileBillingTemplateService.java | 5 ++++- .../java/com/jsowell/pile/service/PileRemoteService.java | 2 +- .../pile/service/impl/PileBillingTemplateServiceImpl.java | 6 +++--- .../service/programlogic/DelayMerchantProgramLogic.java | 2 +- .../resources/mapper/pile/PileBillingTemplateMapper.xml | 1 + 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java index 263c84c22..21c50f5fa 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java @@ -58,6 +58,7 @@ public class GenerateOrderDTO extends BasicPileDTO{ /** * 计费模板相关信息 + * 电动汽车桩专用 */ private BillingTemplateVO billingTemplate; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBillingTemplateMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBillingTemplateMapper.java index 69140c585..5efa0cf7c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBillingTemplateMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBillingTemplateMapper.java @@ -166,10 +166,12 @@ public interface PileBillingTemplateMapper { /** * 根据站点id修改状态 + * * @param stationId * @param status + * @param deviceType */ - void updateStatusByStationId(@Param("stationId") String stationId, @Param("status") String status); + void updateStatusByStationId(@Param("stationId") String stationId, @Param("status") String status, @Param("deviceType")String deviceType); void updateStatusByTemplateId(@Param("templateId") String templateId, @Param("status") String status); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBillingTemplateService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBillingTemplateService.java index aa1c8e7c3..0c28c8a59 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBillingTemplateService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBillingTemplateService.java @@ -177,9 +177,12 @@ public interface PileBillingTemplateService { /** * 修改站点计费模板状态并下发最新模板 + * @param stationId 充电站id + * @param templateId 模板id + * @param deviceType 设备类型 * @return */ - int changeStationTemplate(String stationId, String templateId); + int changeStationTemplate(String stationId, String templateId, String deviceType); /** * 创建优惠计费模板 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java index 96198a399..6dce01b73 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java @@ -211,7 +211,7 @@ public class PileRemoteService { // } // 修改计费模板状态 - pileBillingTemplateService.changeStationTemplate(dto.getStationId(), dto.getTemplateId()); + pileBillingTemplateService.changeStationTemplate(dto.getStationId(), dto.getTemplateId(), billingTemplateVO.getDeviceType()); return true; } 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 8b5b52435..8542a6001 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 @@ -450,9 +450,9 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic */ @Override @Transactional(readOnly = false, propagation = Propagation.REQUIRED) - public int changeStationTemplate(String stationId, String templateId) { - // 根据stationId把站点下所有的计费模板设置为 未启用 - pileBillingTemplateMapper.updateStatusByStationId(stationId, Constants.ZERO); + public int changeStationTemplate(String stationId, String templateId, String deviceType) { + // 根据stationId把站点下所有的计费模板设置为 未启用, 区分deviceType + pileBillingTemplateMapper.updateStatusByStationId(stationId, Constants.ZERO, deviceType); // 根据templateId 修改状态为启用 pileBillingTemplateMapper.updateStatusByTemplateId(templateId, Constants.ONE); // 清缓存 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java index 241617e58..8383b462c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java @@ -104,7 +104,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { * 生成电单车订单 */ private OrderBasicInfo generateOrderForEBike(GenerateOrderDTO dto) { - + logger.info("【{}】-生成电单车订单start, param:{}", this.getClass().getSimpleName(), JSON.toJSONString(dto)); return null; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml index 2ff424374..98cae8193 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml @@ -606,6 +606,7 @@ update pile_billing_template set status = #{status,jdbcType=VARCHAR} where station_id = #{stationId,jdbcType=VARCHAR} + and type = #{deviceType,jdbcType=VARCHAR}