diff --git a/src/main/java/com/example/demo/controller/bean/BeanRechargeController.java b/src/main/java/com/example/demo/controller/bean/BeanRechargeController.java index f173799..287a8b2 100644 --- a/src/main/java/com/example/demo/controller/bean/BeanRechargeController.java +++ b/src/main/java/com/example/demo/controller/bean/BeanRechargeController.java @@ -79,6 +79,13 @@ public class BeanRechargeController { return Result.error("请检查数据的格式"); } } + //获取系统充值地区 + @PostMapping("/systemMarket") + public Result systemMarket() + { + List list = beanRechargeService.systemMarket(); + return Result.success(list); + } //线上充值 @PostMapping("/selectByOnline") @@ -109,4 +116,12 @@ public class BeanRechargeController { return Result.error("请检查数据的格式"); } } + + //获取线上充值地区 + @PostMapping("/onlineMarket") + public Result onlineMarket() + { + List list = beanRechargeService.onlineMarket(); + return Result.success(list); + } } \ No newline at end of file diff --git a/src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper2.java b/src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper2.java index 427a270..f61556e 100644 --- a/src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper2.java +++ b/src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper2.java @@ -20,4 +20,5 @@ public interface BeanRechargeMapper2 { List selectBySystem(BeanRechargeInfo beanRechargeInfo); + List systemMarket(); } \ No newline at end of file diff --git a/src/main/java/com/example/demo/mapper/pay/BeanRechargeMapper3.java b/src/main/java/com/example/demo/mapper/pay/BeanRechargeMapper3.java index b43fb4a..8f32789 100644 --- a/src/main/java/com/example/demo/mapper/pay/BeanRechargeMapper3.java +++ b/src/main/java/com/example/demo/mapper/pay/BeanRechargeMapper3.java @@ -20,4 +20,5 @@ public interface BeanRechargeMapper3 { List selectByOnline(BeanRechargeInfo beanRechargeInfo); + List systemMarket(); } \ No newline at end of file diff --git a/src/main/java/com/example/demo/service/bean/BeanRechargeService.java b/src/main/java/com/example/demo/service/bean/BeanRechargeService.java index e3e3941..fd41a35 100644 --- a/src/main/java/com/example/demo/service/bean/BeanRechargeService.java +++ b/src/main/java/com/example/demo/service/bean/BeanRechargeService.java @@ -8,6 +8,8 @@ import com.example.demo.domain.vo.coin.Result; import com.example.demo.domain.vo.bean.BeanRecharge; import com.github.pagehelper.PageInfo; +import java.util.List; + /** * @program: gold-java * @ClassName BeanRechargeService @@ -33,4 +35,10 @@ public interface BeanRechargeService { //线上金豆统计 GoldBean statsOnlineBean(BeanRechargeInfo beanRechargeInfo); + + //获取系统充值地区 + List systemMarket(); + + //获取线上充值地区 + List onlineMarket(); } \ No newline at end of file diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java index d000fa3..5b31ab8 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java @@ -20,7 +20,9 @@ import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; import java.util.List; +import java.util.Objects; import java.util.UUID; +import java.util.stream.Collectors; /** * @program: gold-java @@ -146,6 +148,17 @@ public class BeanRechargeServiceImpl implements BeanRechargeService { return gold; } + @Override + public List systemMarket() { + List list = beanRechargeMapper2.systemMarket(); + // 使用 Java 8 的 Stream API 过滤 null 和空字符串 + List filteredList = list.stream() + .filter(Objects::nonNull) // 过滤掉 null 值 + .filter(str -> !str.trim().isEmpty()) // 过滤掉空字符串和仅包含空白字符的字符串 + .collect(Collectors.toList()); + return filteredList; + } + //线上充值明细 @Override public PageInfo selectByOnline(Integer pageNum, Integer pageSize, BeanRechargeInfo beanRechargeInfo){ @@ -182,4 +195,17 @@ public class BeanRechargeServiceImpl implements BeanRechargeService { return gold; } + + + @Override + public List onlineMarket() { + List list = beanRechargeMapper3.systemMarket(); + // 使用 Java 8 的 Stream API 过滤 null 和空字符串 + List filteredList = list.stream() + .filter(Objects::nonNull) // 过滤掉 null 值 + .filter(str -> !str.trim().isEmpty()) // 过滤掉空字符串和仅包含空白字符的字符串 + .collect(Collectors.toList()); + return filteredList; + } + } \ No newline at end of file diff --git a/src/main/resources/jindouMapper/BeanRechargeMapper2.xml b/src/main/resources/jindouMapper/BeanRechargeMapper2.xml index 48b2fc6..14ab855 100644 --- a/src/main/resources/jindouMapper/BeanRechargeMapper2.xml +++ b/src/main/resources/jindouMapper/BeanRechargeMapper2.xml @@ -57,4 +57,8 @@ + + \ No newline at end of file diff --git a/src/main/resources/paymapper/BeanRechargeMapper3.xml b/src/main/resources/paymapper/BeanRechargeMapper3.xml index 645003c..1078b2b 100644 --- a/src/main/resources/paymapper/BeanRechargeMapper3.xml +++ b/src/main/resources/paymapper/BeanRechargeMapper3.xml @@ -63,4 +63,8 @@ + + \ No newline at end of file