update 分成功能

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;
         }

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

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<StationSplitConfig> queryByStationId(String stationId);
 
+    List<ShareMemberVO> queryShareMembersByStationId(String stationId);
+
     // 插入站点分账配置信息
     int settingSplitConfig(SplitConfigDTO splitConfigDTO);
 

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

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<ShareMemberVO> shareMemberList = Lists.newArrayList();
+        List<ShareMemberVO> shareMemberList = stationSplitConfigService.queryShareMembersByStationId(orderBasicInfo.getStationId());
 
         // 计算每个账户 订单分账金额
         List<DivMember> divMemberList = splitAmount(shareMemberList, settleAmount, paymentInfos);

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<ShareMemberVO> queryShareMembersByStationId(String stationId) {
+        List<ShareMemberVO> resultList = Lists.newArrayList();
+        List<StationSplitConfig> 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位

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;
 }