From 93f2bdfbf0f21f173acd4526c77ef1597553c0d4 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Fri, 27 Sep 2024 18:03:54 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=88=86=E6=88=90=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AdapayMemberAccountService.java | 17 +++++++++++++++++ .../impl/AdapayMemberAccountServiceImpl.java | 11 +++++++++++ .../impl/PileStationInfoServiceImpl.java | 4 ++-- .../impl/StationSplitConfigServiceImpl.java | 10 +++++++++- 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayMemberAccountService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayMemberAccountService.java index f0e9b8528..06afb06ef 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayMemberAccountService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayMemberAccountService.java @@ -59,8 +59,25 @@ public interface AdapayMemberAccountService { */ int deleteAdapayMemberAccountByIds(List ids); + /** + * 根据运营商id查询汇付会员信息 + * @param merchantId 运营商id + * @return + */ AdapayMemberAccount selectByMerchantId(String merchantId); + /** + * 根据充电站id查询汇付会员信息 + * @param stationId 站点id + * @return + */ + AdapayMemberAccount selectByStationId(String stationId); + + /** + * 根据汇付会员id查询会员信息 + * @param adapayMemberId 汇付会员id + * @return + */ AdapayMemberAccount selectByAdapayMemberId(String adapayMemberId); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java index bdcc92e07..d45048af1 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java @@ -7,8 +7,10 @@ import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.AdapayMemberAccount; +import com.jsowell.pile.domain.PileStationInfo; import com.jsowell.pile.mapper.AdapayMemberAccountMapper; import com.jsowell.pile.service.AdapayMemberAccountService; +import com.jsowell.pile.service.PileStationInfoService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -32,6 +34,9 @@ public class AdapayMemberAccountServiceImpl implements AdapayMemberAccountServic @Autowired private RedisCache redisCache; + @Autowired + private PileStationInfoService pileStationInfoService; + /** * 查询【请填写功能名称】列表 * @@ -112,6 +117,12 @@ public class AdapayMemberAccountServiceImpl implements AdapayMemberAccountServic return adapayMemberAccount; } + @Override + public AdapayMemberAccount selectByStationId(String stationId) { + PileStationInfo pileStationInfo = pileStationInfoService.selectPileStationInfoById(Long.parseLong(stationId)); + return selectByMerchantId(String.valueOf(pileStationInfo.getMerchantId())); + } + @Override public AdapayMemberAccount selectByAdapayMemberId(String memberId) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java index 5880a5c77..a1d42a0ce 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java @@ -135,10 +135,10 @@ public class PileStationInfoServiceImpl implements PileStationInfoService { CurrentTimePriceDetails currentTimePriceDetails = pileBillingTemplateService.getCurrentTimePriceDetails(stationId); if (currentTimePriceDetails != null) { String electricityPrice = currentTimePriceDetails.getElectricityPrice(); - electricityPrice = StringUtils.isBlank(electricityPrice) ? "0" : electricityPrice; + electricityPrice = StringUtils.isBlank(electricityPrice) ? Constants.ZERO : electricityPrice; String servicePrice = currentTimePriceDetails.getServicePrice(); - servicePrice = StringUtils.isBlank(servicePrice) ? "0" : servicePrice; + servicePrice = StringUtils.isBlank(servicePrice) ? Constants.ZERO : servicePrice; vo.setElectricityPrice(new BigDecimal(electricityPrice)); vo.setServicePrice(new BigDecimal(servicePrice)); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java index 4efb3ea2d..d5a945b23 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java @@ -44,7 +44,15 @@ public class StationSplitConfigServiceImpl implements StationSplitConfigService{ List stationSplitConfigs = queryByStationId(stationId); if (CollectionUtils.isEmpty(stationSplitConfigs)) { // 如果为空的话，说明没有配置站点分账 - + AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByStationId(stationId); + if (adapayMemberAccount != null) { + ShareMemberVO shareMemberVO = new ShareMemberVO(); + shareMemberVO.setAdapayMemberId(adapayMemberAccount.getAdapayMemberId()); + shareMemberVO.setElectricityShareRatio(BigDecimal.valueOf(100)); + shareMemberVO.setServiceShareRatio(BigDecimal.valueOf(100)); + shareMemberVO.setFeeFlag(Constants.Y); + resultList.add(shareMemberVO); + } } else { for (StationSplitConfig stationSplitConfig : stationSplitConfigs) { ShareMemberVO shareMemberVO = new ShareMemberVO();