From 90177f55a66cc5d5417e95863a18181a3055cbc1 Mon Sep 17 00:00:00 2001 From: "YAS\\29473" <2947326429@qq.com> Date: Wed, 9 Apr 2025 19:53:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=B1=87=E4=BB=98=E4=BC=9A?= =?UTF-8?q?=E5=91=98id=E6=9F=A5=E8=AF=A2=E9=85=8D=E7=BD=AE=E5=88=86?= =?UTF-8?q?=E8=B4=A6=E7=9A=84=E7=AB=99=E7=82=B9=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/StationSplitConfigController.java | 25 +++++++++++++++++ .../pile/mapper/StationSplitConfigMapper.java | 8 ++++++ .../service/StationSplitConfigService.java | 8 +++++- .../impl/StationSplitConfigServiceImpl.java | 28 +++++++++++++++++++ .../jsowell/pile/vo/web/SplitConfigVO.java | 11 ++++++++ .../mapper/pile/StationSplitConfigMapper.xml | 9 ++++++ 6 files changed, 88 insertions(+), 1 deletion(-) 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 ae16a1fc4..ba607f4a4 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 @@ -3,7 +3,9 @@ package com.jsowell.web.controller.pile; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.domain.AjaxResult; import com.jsowell.common.core.page.TableDataInfo; +import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; +import com.jsowell.common.response.RestApiResponse; import com.jsowell.pile.dto.SplitConfigDTO; import com.jsowell.pile.service.StationSplitConfigService; import com.jsowell.pile.vo.web.SplitConfigVO; @@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.List; +import java.util.Map; /** * 站点分成配置controller @@ -56,4 +59,26 @@ public class StationSplitConfigController extends BaseController { } return ajaxResult; } + + /** + * 根据汇付会员id查询配置分账的站点列表 + * /station/splitconfig/queryStationList + * @param adapayMemberId + * @return + */ + @PostMapping("/queryStationList") + public RestApiResponse>> queryStationList(String adapayMemberId) { + RestApiResponse response = null; + Map> result = null; + try { + result = stationSplitConfigService.queryStationList(adapayMemberId); + } catch (BusinessException e) { + logger.error("查询站点列表失败" , e); + response = new RestApiResponse<>(e.getCode() , e.getMessage()); + } catch (Exception e) { + logger.error("查询站点列表失败" , e); + response = new RestApiResponse<>(ReturnCodeEnum.CODE_FAILED); + } + return new RestApiResponse<>(result); + } } 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 adf38e062..d6f861fc0 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.SplitConfigVO; import org.apache.ibatis.annotations.Param; import java.util.Date; @@ -26,4 +27,11 @@ public interface StationSplitConfigMapper { int deleteByMerchantIdAndStationId(@Param("merchantId") String merchantId, @Param("stationId") String stationId, @Param("updateBy") String updateBy, @Param("updateTime") Date updateTime); int deleteByStationId(@Param("stationId") String stationId, @Param("updateBy") String updateBy, @Param("updateTime") Date updateTime); + + /** + * 根据汇付会员id查询配置列表 + * @param adapayMemberId + * @return + */ + 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 40e5095e4..e9ac82fea 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 @@ -7,6 +7,7 @@ import com.jsowell.pile.vo.web.SplitConfigVO; import java.util.Date; import java.util.List; +import java.util.Map; /** * 站点分成配置service @@ -50,5 +51,10 @@ public interface StationSplitConfigService { */ List queryShareMembersByStationId(String stationId); - + /** + * 根据站点id查询站点分账配置信息 + * @param adapayMemberId + * @return + */ + Map> queryStationList(String adapayMemberId); } 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 98531dce5..711aa7a5e 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 @@ -27,8 +27,11 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; @Slf4j @Service @@ -286,4 +289,29 @@ public class StationSplitConfigServiceImpl implements StationSplitConfigService{ } return true; } + + /** + * 根据汇付会员id查询配置分账的站点列表 + * + * @param adapayMemberId + * @return + */ + @Override + public Map> queryStationList(String adapayMemberId) { + List stationList = stationSplitConfigMapper.queryStationList(adapayMemberId); + if (stationList == null || stationList.isEmpty()){ + throw new BusinessException("", "未查询到该汇付会员的分账配置信息"); + } + //按照站点id进行去重,再将id按照降序排序,因为站点id为String类型,所以需要先转换为int类型 + stationList = stationList.stream() + .filter(vo -> vo.getStationId() != null && vo.getStationId().matches("^\\d+")) + .distinct() + .sorted((o1, o2) -> Integer.parseInt(o1.getStationId()) - Integer.parseInt(o2.getStationId())) + .collect(Collectors.toList()); + + Map> stationMap = new HashMap<>(); + stationMap.put("stationList", stationList); + return stationMap; + } + } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitConfigVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitConfigVO.java index 3336117bd..211db6203 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitConfigVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitConfigVO.java @@ -39,4 +39,15 @@ public class SplitConfigVO { */ private String feeFlag; + /** + * 站点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 a956ac38d..88b6be720 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/StationSplitConfigMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/StationSplitConfigMapper.xml @@ -32,6 +32,15 @@ order by fee_flag + + insert into station_split_config