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

配置充电停车优惠

Browse Source
This commit is contained in:
Guoqs
2025-02-18 09:42:37 +08:00
parent afdebd9dc6
commit 154a7f35b6
9 changed files with 79 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,10 +47,12 @@ public class ChargeParkingDiscountServiceImpl implements ChargeParkingDiscountSe
}
// 查询该站点的停车优惠信息
ChargeParkingDiscountVO discountVO = new ChargeParkingDiscountVO();
discountVO.setId(chargeParkingDiscount.getId() + "");
discountVO.setStationId(chargeParkingDiscount.getStationId());
discountVO.setConditionType(chargeParkingDiscount.getConditionType());
discountVO.setParkingPlatformId(chargeParkingDiscount.getParkingPlatformId());
discountVO.setConditionType(Integer.valueOf(chargeParkingDiscount.getConditionType()));
discountVO.setConditionValue(chargeParkingDiscount.getConditionValue());
discountVO.setDiscountType(chargeParkingDiscount.getDiscountType());
discountVO.setDiscountType(Integer.valueOf(chargeParkingDiscount.getDiscountType()));
discountVO.setDiscountValue(chargeParkingDiscount.getDiscountValue());
discountVO.setStartTime(chargeParkingDiscount.getStartTime());
discountVO.setEndTime(chargeParkingDiscount.getEndTime());

4
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -1839,8 +1839,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
}
// 校验分账
verifyOrderAllAmount(afterSettleOrderDTO);
// 根据站点id查询分账配置
List<StationSplitConfig> stationSplitConfigList = stationSplitConfigService.queryByStationId(afterSettleOrderDTO.getStationId());
// 根据站点id查询分账配置(如果未配置则初始化)
List<StationSplitConfig> stationSplitConfigList = stationSplitConfigService.queryStationSplitConfigByStationId(afterSettleOrderDTO.getStationId());
// 计算每个参与分账的用户, 应分多少钱
List<SplitData> splitDataList = calculationSplitDataList(stationSplitConfigList, afterSettleOrderDTO);
List<DivMember> divMemberList = transformDivMemberList(splitDataList);

23
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java
View File

@@ -59,6 +59,19 @@ public class StationSplitConfigServiceImpl implements StationSplitConfigService{
return stationSplitConfigs;
}
@Override
public List<StationSplitConfig> queryByStationIdWithInit(String stationId) {
// 查询站点分账配置
List<StationSplitConfig> stationSplitConfigs = this.queryByStationId(stationId);
if (CollectionUtils.isEmpty(stationSplitConfigs)) {
// 初始化
this.initSplitConfig(stationId);
// 再次查询
stationSplitConfigs = this.queryByStationId(stationId);
}
return stationSplitConfigs;
}
/**
* 初始化站点分账配置
* @param stationId 站点id
@@ -92,15 +105,7 @@ public class StationSplitConfigServiceImpl implements StationSplitConfigService{
@Override
public List<SplitConfigVO> querySplitConfigByStationId(String stationId) {
List<StationSplitConfig> stationSplitConfigs = this.queryByStationId(stationId);
if (CollectionUtils.isEmpty(stationSplitConfigs)) {
// 如果查询为空初始化数据
initSplitConfig(stationId);
// 再次查询
stationSplitConfigs = this.queryByStationId(stationId);
}
List<StationSplitConfig> stationSplitConfigs = this.queryByStationIdWithInit(stationId);
List<SplitConfigVO> resultList = Lists.newArrayList();
for (StationSplitConfig stationSplitConfig : stationSplitConfigs) {
SplitConfigVO vo = new SplitConfigVO();