diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/SplitConfigDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/SplitConfigDTO.java index c59db06f4..f526f88b4 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/SplitConfigDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/SplitConfigDTO.java @@ -2,10 +2,28 @@ package com.jsowell.pile.dto; import lombok.Data; +import java.util.List; + +/** + * 分账配置信息 + */ @Data public class SplitConfigDTO { + /** + * 运营商id + */ private String merchantId; + /** + * 站点id + */ private String stationId; + /** + * 参与分账的用户列表 + * 最多7位, 只能有一位是手续费承担方 + * 所有用户分账比例之和为100.0% + */ + private List splitUserDetailList; + } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/SplitDetailDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/SplitUserDetailDTO.java similarity index 57% rename from jsowell-pile/src/main/java/com/jsowell/pile/dto/SplitDetailDTO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/dto/SplitUserDetailDTO.java index 904edfa4d..afe24d562 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/SplitDetailDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/SplitUserDetailDTO.java @@ -2,8 +2,11 @@ package com.jsowell.pile.dto; import lombok.Data; +/** + * 参与分账的用户详情 + */ @Data -public class SplitDetailDTO { +public class SplitUserDetailDTO { // 汇付会员id private String adapayMemberId; @@ -13,6 +16,6 @@ public class SplitDetailDTO { // 服务费分成比例 private String serviceSplitRatio; - // 是否承担手续费承担方 - private String isServiceCharge; + // 是否手续费承担方,N-否,Y-是,手续费承担方有且只能有一个 + private String feeFlag; } 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 b88bb6563..88ecdd290 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 @@ -1,6 +1,7 @@ package com.jsowell.pile.service; import com.jsowell.pile.domain.StationSplitConfig; +import com.jsowell.pile.dto.SplitConfigDTO; import java.util.List; @@ -10,6 +11,6 @@ public interface StationSplitConfigService{ List queryByStationId(String stationId); // 插入站点分账配置信息 - int insert(StationSplitConfig record); + int insert(SplitConfigDTO splitConfigDTO); } 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 c8b228449..ed0122ebb 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 @@ -1,6 +1,7 @@ package com.jsowell.pile.service.impl; import com.jsowell.pile.domain.StationSplitConfig; +import com.jsowell.pile.dto.SplitConfigDTO; import com.jsowell.pile.mapper.StationSplitConfigMapper; import com.jsowell.pile.service.StationSplitConfigService; import org.springframework.stereotype.Service; @@ -18,4 +19,9 @@ public class StationSplitConfigServiceImpl implements StationSplitConfigService{ public List queryByStationId(String stationId) { return stationSplitConfigMapper.queryByStationId(stationId); } + + @Override + public int insert(SplitConfigDTO splitConfigDTO) { + return 0; + } }