diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 28b95d35e..5c3398044 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -1278,7 +1278,7 @@ public class OrderService { if (StringUtils.isBlank(memberId)) { return; } - AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMemberId(memberId); + AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByAdapayMemberId(memberId); if (adapayMemberAccount == null) { return; } 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 fa2cbd23c..f0e9b8528 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 @@ -61,7 +61,7 @@ public interface AdapayMemberAccountService { AdapayMemberAccount selectByMerchantId(String merchantId); - AdapayMemberAccount selectByMemberId(String memberId); + AdapayMemberAccount selectByAdapayMemberId(String adapayMemberId); void updateAdapayMemberAccountByMemberId(AdapayMemberAccount adapayMemberAccount); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/StationSplitConfigService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/StationSplitConfigService.java index e6b53f14b..e006218e9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/StationSplitConfigService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/StationSplitConfigService.java @@ -2,6 +2,7 @@ package com.jsowell.pile.service; import com.jsowell.pile.domain.StationSplitConfig; import com.jsowell.pile.dto.SplitConfigDTO; +import com.jsowell.pile.vo.web.ShareMemberVO; import java.util.List; @@ -13,6 +14,8 @@ public interface StationSplitConfigService{ // 根据站点id查询站点分账配置信息 List queryByStationId(String stationId); + List queryShareMembersByStationId(String stationId); + // 插入站点分账配置信息 int settingSplitConfig(SplitConfigDTO splitConfigDTO); 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 e9c49b96c..bdcc92e07 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 @@ -114,7 +114,7 @@ public class AdapayMemberAccountServiceImpl implements AdapayMemberAccountServic @Override - public AdapayMemberAccount selectByMemberId(String memberId) { + public AdapayMemberAccount selectByAdapayMemberId(String memberId) { return adapayMemberAccountMapper.selectByMemberId(memberId); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 24dfd79cb..649119a70 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -185,7 +185,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { @Autowired private IThirdpartySnRelationService snRelationService; - + @Autowired + private StationSplitConfigService stationSplitConfigService; @Override public int deleteByPrimaryKey(Integer id) { @@ -1523,7 +1524,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { } // 根据站点id查询该站点配置的分账信息, 如果为空表示本运营商分100% - List shareMemberList = Lists.newArrayList(); + List shareMemberList = stationSplitConfigService.queryShareMembersByStationId(orderBasicInfo.getStationId()); // 计算每个账户 订单分账金额 List divMemberList = splitAmount(shareMemberList, settleAmount, paymentInfos); 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 44c411887..4efb3ea2d 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 @@ -14,6 +14,8 @@ import com.jsowell.pile.dto.SplitUserDetailDTO; import com.jsowell.pile.mapper.StationSplitConfigMapper; import com.jsowell.pile.service.AdapayMemberAccountService; import com.jsowell.pile.service.StationSplitConfigService; +import com.jsowell.pile.vo.web.ShareMemberVO; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -36,6 +38,26 @@ public class StationSplitConfigServiceImpl implements StationSplitConfigService{ return stationSplitConfigMapper.queryByStationId(stationId); } + @Override + public List queryShareMembersByStationId(String stationId) { + List resultList = Lists.newArrayList(); + List stationSplitConfigs = queryByStationId(stationId); + if (CollectionUtils.isEmpty(stationSplitConfigs)) { + // 如果为空的话,说明没有配置站点分账 + + } else { + for (StationSplitConfig stationSplitConfig : stationSplitConfigs) { + ShareMemberVO shareMemberVO = new ShareMemberVO(); + shareMemberVO.setAdapayMemberId(stationSplitConfig.getAdapayMemberId()); + shareMemberVO.setElectricityShareRatio(stationSplitConfig.getElectricitySplitRatio()); + shareMemberVO.setServiceShareRatio(stationSplitConfig.getServiceSplitRatio()); + shareMemberVO.setFeeFlag(StringUtils.equals(Constants.ONE, stationSplitConfig.getFeeFlag()) ? Constants.Y : Constants.N); + resultList.add(shareMemberVO); + } + } + return resultList; + } + @Override public int settingSplitConfig(SplitConfigDTO splitConfigDTO) { // 参与分成的用户不能超过7位 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ShareMemberVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ShareMemberVO.java index b88d42a20..2d4894a0c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ShareMemberVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ShareMemberVO.java @@ -14,11 +14,6 @@ public class ShareMemberVO { */ private String adapayMemberId; - /** - * 手机号 - */ - private String memberPhoneNumber; - /** * 电费分润比例 */ @@ -28,4 +23,9 @@ public class ShareMemberVO { * 服务费分润比例 */ private BigDecimal serviceShareRatio; + + /** + * 手续费承担方 + */ + private String feeFlag; }