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 5efa0cf7c..bdcb539ca 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 @@ -171,7 +171,7 @@ public interface PileBillingTemplateMapper { * @param status * @param deviceType */ - void updateStatusByStationId(@Param("stationId") String stationId, @Param("status") String status, @Param("deviceType")String deviceType); + void updateStatusByStationId(@Param("stationId") String stationId, @Param("status") String status, @Param("deviceType")String deviceType, @Param("memberFlag") String memberFlag); 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 5fe855f86..7e09dac8d 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 @@ -187,9 +187,10 @@ public interface PileBillingTemplateService { * @param stationId 充电站id * @param templateId 模板id * @param deviceType 设备类型 + * @param memberFlag 会员模板标识 * @return */ - int changeStationTemplate(String stationId, String templateId, String deviceType); + int changeStationTemplate(String stationId, String templateId, String deviceType, String memberFlag); /** * 创建优惠计费模板 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 95b08ddd7..1a4597f66 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 @@ -305,7 +305,7 @@ public class PileRemoteService { } } // 修改计费模板状态 - pileBillingTemplateService.changeStationTemplate(dto.getStationId(), dto.getTemplateId(), billingTemplateVO.getDeviceType()); + pileBillingTemplateService.changeStationTemplate(dto.getStationId(), dto.getTemplateId(), billingTemplateVO.getDeviceType(), billingTemplateVO.getMemberFlag()); 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 888c5b0da..2a8d55c01 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 @@ -448,9 +448,9 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic */ @Override @Transactional(readOnly = false, propagation = Propagation.REQUIRED) - public int changeStationTemplate(String stationId, String templateId, String deviceType) { + public int changeStationTemplate(String stationId, String templateId, String deviceType, String memberFlag) { // 根据stationId把站点下所有的计费模板设置为 未启用, 区分deviceType - pileBillingTemplateMapper.updateStatusByStationId(stationId, Constants.ZERO, deviceType); + pileBillingTemplateMapper.updateStatusByStationId(stationId, Constants.ZERO, deviceType, memberFlag); // 根据templateId 修改状态为启用 pileBillingTemplateMapper.updateStatusByTemplateId(templateId, Constants.ONE); // 清缓存 diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml index 18497a41d..42754b8bd 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml @@ -609,6 +609,7 @@ update pile_billing_template set status = #{status,jdbcType=VARCHAR} where station_id = #{stationId,jdbcType=VARCHAR} + and member_flag = #{memberFlag,jdbcType=VARCHAR} and type = #{deviceType,jdbcType=VARCHAR}