autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-16 07:48:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 电单车协议

Browse Source
This commit is contained in:
Guoqs
2024-09-04 14:03:28 +08:00
parent efe869d79b
commit 6ee161de0a
7 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java
View File

@@ -58,6 +58,7 @@ public class GenerateOrderDTO extends BasicPileDTO{
/** /**
* 计费模板相关信息 * 计费模板相关信息
* 电动汽车桩专用
*/ */
private BillingTemplateVO billingTemplate; private BillingTemplateVO billingTemplate;

4
jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBillingTemplateMapper.java
View File

@@ -166,10 +166,12 @@ public interface PileBillingTemplateMapper {
/** /**
* 根据站点id修改状态 * 根据站点id修改状态
*
* @param stationId * @param stationId
* @param status * @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); void updateStatusByTemplateId(@Param("templateId") String templateId, @Param("status") String status);

5
jsowell-pile/src/main/java/com/jsowell/pile/service/PileBillingTemplateService.java
View File

@@ -177,9 +177,12 @@ public interface PileBillingTemplateService {
/** /**
* 修改站点计费模板状态并下发最新模板 * 修改站点计费模板状态并下发最新模板
* @param stationId 充电站id
* @param templateId 模板id
* @param deviceType 设备类型
* @return * @return
*/ */
int changeStationTemplate(String stationId, String templateId); int changeStationTemplate(String stationId, String templateId, String deviceType);
/** /**
* 创建优惠计费模板 * 创建优惠计费模板

2
jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java
View File

@@ -211,7 +211,7 @@ public class PileRemoteService {
// } // }
// 修改计费模板状态 // 修改计费模板状态
pileBillingTemplateService.changeStationTemplate(dto.getStationId(), dto.getTemplateId()); pileBillingTemplateService.changeStationTemplate(dto.getStationId(), dto.getTemplateId(), billingTemplateVO.getDeviceType());
return true; return true;
} }

6
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java
View File

@@ -450,9 +450,9 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
*/ */
@Override @Override
@Transactional(readOnly = false, propagation = Propagation.REQUIRED) @Transactional(readOnly = false, propagation = Propagation.REQUIRED)
public int changeStationTemplate(String stationId, String templateId) { public int changeStationTemplate(String stationId, String templateId, String deviceType) {
// 根据stationId把站点下所有的计费模板设置为 未启用 // 根据stationId把站点下所有的计费模板设置为 未启用, 区分deviceType
pileBillingTemplateMapper.updateStatusByStationId(stationId, Constants.ZERO); pileBillingTemplateMapper.updateStatusByStationId(stationId, Constants.ZERO, deviceType);
// 根据templateId 修改状态为启用 // 根据templateId 修改状态为启用
pileBillingTemplateMapper.updateStatusByTemplateId(templateId, Constants.ONE); pileBillingTemplateMapper.updateStatusByTemplateId(templateId, Constants.ONE);
// 清缓存 // 清缓存

2
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
View File

@@ -104,7 +104,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
* 生成电单车订单 * 生成电单车订单
*/ */
private OrderBasicInfo generateOrderForEBike(GenerateOrderDTO dto) { private OrderBasicInfo generateOrderForEBike(GenerateOrderDTO dto) {
logger.info("【{}】-生成电单车订单start, param:{}", this.getClass().getSimpleName(), JSON.toJSONString(dto));
return null; return null;
} }

1
jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
View File

@@ -606,6 +606,7 @@
update pile_billing_template update pile_billing_template
set status = #{status,jdbcType=VARCHAR} set status = #{status,jdbcType=VARCHAR}
where station_id = #{stationId,jdbcType=VARCHAR} where station_id = #{stationId,jdbcType=VARCHAR}
and type = #{deviceType,jdbcType=VARCHAR}
</update> </update>
<update id="updateStatusByTemplateId"> <update id="updateStatusByTemplateId">