update

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<Map<String, List<SplitConfigVO>>> queryStationList(@RequestBody SplitConfigStationDTO splitConfigStationDTO) {
+    public RestApiResponse<Map<String, List<SplitConfigStationVO>>> queryStationList(@RequestBody SplitConfigStationDTO splitConfigStationDTO) {
         try {
-            Map<String, List<SplitConfigVO>> result = stationSplitConfigService.queryStationList(splitConfigStationDTO);
+            Map<String, List<SplitConfigStationVO>> result = stationSplitConfigService.queryStationList(splitConfigStationDTO);
             return new RestApiResponse<>(result);
         } catch (BusinessException e) {
             logger.error("查询站点列表失败", e);

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<SplitConfigVO> queryStationList(String adapayMemberId);
+    List<SplitConfigStationVO> queryStationList(String adapayMemberId);
 }

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<String,List<SplitConfigVO>> queryStationList(SplitConfigStationDTO splitConfigStationDTO);
+    Map<String,List<SplitConfigStationVO>> queryStationList(SplitConfigStationDTO splitConfigStationDTO);
 }

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<String,List<SplitConfigVO>> queryStationList(SplitConfigStationDTO splitConfigStationDTO) {
+    public Map<String,List<SplitConfigStationVO>> queryStationList(SplitConfigStationDTO splitConfigStationDTO) {
         String adapayMemberId = splitConfigStationDTO.getAdapayMemberId();
 
-        List<SplitConfigVO> stationList = stationSplitConfigMapper.queryStationList(adapayMemberId);
+        List<SplitConfigStationVO> 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<String, List<SplitConfigVO>> stationMap = new HashMap<>();
+        Map<String, List<SplitConfigStationVO>> stationMap = new HashMap<>();
         stationMap.put("stationList", stationList);
         return stationMap;
     }

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

jsowell-pile/src/main/resources/mapper/pile/StationSplitConfigMapper.xml

@@ -32,7 +32,7 @@
     order by fee_flag
   </select>
 
-  <select id="queryStationList" resultType="com.jsowell.pile.vo.web.SplitConfigVO">
+  <select id="queryStationList" resultType="com.jsowell.pile.vo.web.SplitConfigStationVO">
     select
       t2.id as stationId,
       t2.station_name as stationName