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

update 分成功能

Browse Source
This commit is contained in:
Guoqs
2024-09-27 18:03:54 +08:00
parent a5c1b45261
commit 93f2bdfbf0
4 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
jsowell-pile/src/main/java/com/jsowell/pile/service/AdapayMemberAccountService.java
View File

@@ -59,8 +59,25 @@ public interface AdapayMemberAccountService {
*/
int deleteAdapayMemberAccountByIds(List<String> 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);

11
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/AdapayMemberAccountServiceImpl.java
View File

@@ -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) {

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

@@ -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));

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

@@ -44,7 +44,15 @@ public class StationSplitConfigServiceImpl implements StationSplitConfigService{
List<StationSplitConfig> 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();