From bdc33d3275682db12f35c16829fb23097f8d86ff Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Fri, 27 Sep 2024 18:09:23 +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

---
 .../jsowell/pile/service/StationSplitConfigService.java  | 7 +++++++
 .../pile/service/impl/StationSplitConfigServiceImpl.java | 9 +++++++++
 2 files changed, 16 insertions(+)

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 e006218e9..25ae2cf29 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
@@ -14,6 +14,13 @@ public interface StationSplitConfigService{
     // 根据站点id查询站点分账配置信息
     List<StationSplitConfig> queryByStationId(String stationId);
 
+    /**
+     * 根据站点id查询站点分成用户信息
+     * 如果没有配置分账用户，并且站点对应的运营商设置了结算账户, 返回本站对应的结算账户, 电费和服务费分成比例都为100%
+     * 如果没有配置分账用户, 并且站点对应的运营商没有设置结算账户, 返回默认结算账户(举视的账户)
+     * @param stationId
+     * @return
+     */
     List<ShareMemberVO> queryShareMembersByStationId(String stationId);
 
     // 插入站点分账配置信息
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 d5a945b23..9859c57ed 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
@@ -52,6 +52,15 @@ public class StationSplitConfigServiceImpl implements StationSplitConfigService{
                 shareMemberVO.setServiceShareRatio(BigDecimal.valueOf(100));
                 shareMemberVO.setFeeFlag(Constants.Y);
                 resultList.add(shareMemberVO);
+            } else {
+                // 如果没有配置站点分账，则默认为举视账户
+                AdapayMemberAccount aDefault = adapayMemberAccountService.getDefault();
+                ShareMemberVO shareMemberVO = new ShareMemberVO();
+                shareMemberVO.setAdapayMemberId(aDefault.getAdapayMemberId());
+                shareMemberVO.setElectricityShareRatio(BigDecimal.valueOf(100));
+                shareMemberVO.setServiceShareRatio(BigDecimal.valueOf(100));
+                shareMemberVO.setFeeFlag(Constants.Y);
+                resultList.add(shareMemberVO);
             }
         } else {
             for (StationSplitConfig stationSplitConfig : stationSplitConfigs) {