diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/StationSplitConfigController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/StationSplitConfigController.java index 09a7690cc..6c3690ebe 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/StationSplitConfigController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/StationSplitConfigController.java @@ -9,6 +9,7 @@ import com.jsowell.common.response.RestApiResponse; import com.jsowell.pile.dto.SplitConfigDTO; import com.jsowell.pile.dto.SplitConfigStationDTO; import com.jsowell.pile.service.StationSplitConfigService; +import com.jsowell.pile.vo.web.SplitConfigStationVO; import com.jsowell.pile.vo.web.SplitConfigVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -68,9 +69,9 @@ public class StationSplitConfigController extends BaseController { * @return */ @PostMapping("/queryStationList") - public RestApiResponse>> queryStationList(@RequestBody SplitConfigStationDTO splitConfigStationDTO) { + public RestApiResponse>> queryStationList(@RequestBody SplitConfigStationDTO splitConfigStationDTO) { try { - Map> result = stationSplitConfigService.queryStationList(splitConfigStationDTO); + Map> result = stationSplitConfigService.queryStationList(splitConfigStationDTO); return new RestApiResponse<>(result); } catch (BusinessException e) { logger.error("查询站点列表失败", e); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/StationSplitConfigMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/StationSplitConfigMapper.java index d6f861fc0..3ada7f155 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/StationSplitConfigMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/StationSplitConfigMapper.java @@ -1,6 +1,7 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.StationSplitConfig; +import com.jsowell.pile.vo.web.SplitConfigStationVO; import com.jsowell.pile.vo.web.SplitConfigVO; import org.apache.ibatis.annotations.Param; @@ -33,5 +34,5 @@ public interface StationSplitConfigMapper { * @param adapayMemberId * @return */ - List queryStationList(String adapayMemberId); + List queryStationList(String adapayMemberId); } 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 9a8c7a0da..84217da14 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 @@ -3,6 +3,7 @@ package com.jsowell.pile.service; import com.jsowell.pile.domain.StationSplitConfig; import com.jsowell.pile.dto.SplitConfigDTO; import com.jsowell.pile.dto.SplitConfigStationDTO; +import com.jsowell.pile.vo.web.SplitConfigStationVO; import com.jsowell.pile.vo.web.ShareMemberVO; import com.jsowell.pile.vo.web.SplitConfigVO; @@ -57,5 +58,5 @@ public interface StationSplitConfigService { * @param splitConfigStationDTO * @return */ - Map> queryStationList(SplitConfigStationDTO splitConfigStationDTO); + Map> queryStationList(SplitConfigStationDTO splitConfigStationDTO); } 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 4293fcc90..6390bf0dc 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 @@ -18,6 +18,7 @@ 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.SplitConfigStationVO; import com.jsowell.pile.vo.web.ShareMemberVO; import com.jsowell.pile.vo.web.SplitConfigVO; import lombok.extern.slf4j.Slf4j; @@ -295,10 +296,10 @@ public class StationSplitConfigServiceImpl implements StationSplitConfigService{ * @return */ @Override - public Map> queryStationList(SplitConfigStationDTO splitConfigStationDTO) { + public Map> queryStationList(SplitConfigStationDTO splitConfigStationDTO) { String adapayMemberId = splitConfigStationDTO.getAdapayMemberId(); - List stationList = stationSplitConfigMapper.queryStationList(adapayMemberId); + List stationList = stationSplitConfigMapper.queryStationList(adapayMemberId); if (stationList == null || stationList.isEmpty()) { throw new BusinessException("", "未查询到该汇付会员的分账配置信息"); } @@ -310,7 +311,7 @@ public class StationSplitConfigServiceImpl implements StationSplitConfigService{ .sorted((o1, o2) -> Integer.parseInt(o2.getStationId()) - Integer.parseInt(o1.getStationId())) .collect(Collectors.toList()); - Map> stationMap = new HashMap<>(); + Map> stationMap = new HashMap<>(); stationMap.put("stationList", stationList); return stationMap; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitConfigStationVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitConfigStationVO.java new file mode 100644 index 000000000..24597ced8 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitConfigStationVO.java @@ -0,0 +1,18 @@ +package com.jsowell.pile.vo.web; + +import lombok.Data; + +@Data +public class SplitConfigStationVO { + + /** + * 站点ID + */ + private String stationId; + + /** + * 站点名称 + */ + private String stationName; + +} diff --git a/jsowell-pile/src/main/resources/mapper/pile/StationSplitConfigMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/StationSplitConfigMapper.xml index 88b6be720..1225b797e 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/StationSplitConfigMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/StationSplitConfigMapper.xml @@ -32,7 +32,7 @@ order by fee_flag - select t2.id as stationId, t2.station_name as stationName